github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

limex_compile: reduce state id lookups

Browse Source
This commit is contained in:
Justin Viiret 2017-07-14 13:01:00 +10:00 committed by Matthew Barr
parent 58004f15f0
commit d55e8fdf94
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/nfa/limex_compile.cpp
View File

@ -1519,18 +1519,14 @@ u32 depth_to_u32(const depth &d) {
} }
static static
bool isExceptionalTransition(const NGHolder &h, const NFAEdge &e, bool isExceptionalTransition(u32 from, u32 to, const build_info &args,
const build_info &args, u32 maxShift) { u32 maxShift) {
NFAVertex from = source(e, h); if (!isLimitedTransition(from, to, maxShift)) {
NFAVertex to = target(e, h);
u32 f = args.state_ids.at(from);
u32 t = args.state_ids.at(to);
if (!isLimitedTransition(f, t, maxShift)) {
return true; return true;
} }
// All transitions out of a tug trigger are exceptional. // All transitions out of a tug trigger are exceptional.
if (args.tugs.test(f)) { if (args.tugs.test(from)) {
return true; return true;
} }
return false; return false;
@ -1546,7 +1542,7 @@ u32 findMaxVarShift(const build_info &args, u32 nShifts) {
if (from == NO_STATE || to == NO_STATE) { if (from == NO_STATE || to == NO_STATE) {
continue; continue;
} }
if (!isExceptionalTransition(h, e, args, MAX_SHIFT_AMOUNT)) { if (!isExceptionalTransition(from, to, args, MAX_SHIFT_AMOUNT)) {
shiftMask |= (1UL << (to - from)); shiftMask |= (1UL << (to - from));
} }
} }
@ -1575,7 +1571,7 @@ int getLimexScore(const build_info &args, u32 nShifts) {
if (from == NO_STATE || to == NO_STATE) { if (from == NO_STATE || to == NO_STATE) {
continue; continue;
} }
if (isExceptionalTransition(h, e, args, maxVarShift)) { if (isExceptionalTransition(from, to, args, maxVarShift)) {
exceptionalStates.set(from); exceptionalStates.set(from);
} }
} }
@ -1870,7 +1866,7 @@ struct Factory {
// We check for exceptional transitions here, as we don't want tug // We check for exceptional transitions here, as we don't want tug
// trigger transitions emitted as limited transitions (even if they // trigger transitions emitted as limited transitions (even if they
// could be in this model). // could be in this model).
if (!isExceptionalTransition(h, e, args, maxShift)) { if (!isExceptionalTransition(from, to, args, maxShift)) {
u32 shift = to - from; u32 shift = to - from;
if ((shiftMask & (1UL << shift)) == 0UL) { if ((shiftMask & (1UL << shift)) == 0UL) {
shiftMask |= (1UL << shift); shiftMask |= (1UL << shift);
@ -1905,7 +1901,7 @@ struct Factory {
continue; continue;
} }
if (isExceptionalTransition(h, e, args, maxShift)) { if (isExceptionalTransition(from, to, args, maxShift)) {
exceptional.insert(e); exceptional.insert(e);
} }
} }