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: invert scoring to count up from zero

Browse Source
This commit is contained in:
Justin Viiret 2016-06-21 12:48:54 +10:00 committed by Matthew Barr
parent 9d2403e8bb
commit 8648397257
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/nfa/limex_compile.cpp
View File

@ -167,11 +167,9 @@ struct build_info {
limex_accel_info accel; limex_accel_info accel;
}; };
// Constants for scoring mechanism
#define LAST_LIMEX_NFA LIMEX_NFA_512 #define LAST_LIMEX_NFA LIMEX_NFA_512
const int LIMEX_INITIAL_SCORE = 2000; // Constants for scoring mechanism
const int SHIFT_COST = 10; // limex: cost per shift mask const int SHIFT_COST = 10; // limex: cost per shift mask
const int EXCEPTION_COST = 4; // limex: per exception const int EXCEPTION_COST = 4; // limex: per exception
@ -1371,9 +1369,9 @@ static
int getLimexScore(const build_info &args, u32 nShifts) { int getLimexScore(const build_info &args, u32 nShifts) {
const NGHolder &h = args.h; const NGHolder &h = args.h;
u32 maxVarShift = nShifts; u32 maxVarShift = nShifts;
int score = LIMEX_INITIAL_SCORE; int score = 0;
score -= SHIFT_COST * nShifts; score += SHIFT_COST * nShifts;
maxVarShift = findMaxVarShift(args, nShifts); maxVarShift = findMaxVarShift(args, nShifts);
NFAStateSet exceptionalStates(args.num_states); NFAStateSet exceptionalStates(args.num_states);
@ -1387,10 +1385,7 @@ int getLimexScore(const build_info &args, u32 nShifts) {
exceptionalStates.set(from); exceptionalStates.set(from);
} }
} }
score -= EXCEPTION_COST * exceptionalStates.count(); score += EXCEPTION_COST * exceptionalStates.count();
if (score < 0) {
score = 0;
}
return score; return score;
} }
@ -1401,10 +1396,10 @@ static
u32 findBestNumOfVarShifts(const build_info &args, u32 findBestNumOfVarShifts(const build_info &args,
int *bestScoreRet = nullptr) { int *bestScoreRet = nullptr) {
u32 bestNumOfVarShifts = 0; u32 bestNumOfVarShifts = 0;
int bestScore = 0; int bestScore = INT_MAX;
for (u32 shiftCount = 1; shiftCount <= MAX_SHIFT_COUNT; shiftCount++) { for (u32 shiftCount = 1; shiftCount <= MAX_SHIFT_COUNT; shiftCount++) {
int score = getLimexScore(args, shiftCount); int score = getLimexScore(args, shiftCount);
if (score > bestScore) { if (score < bestScore) {
bestScore = score; bestScore = score;
bestNumOfVarShifts = shiftCount; bestNumOfVarShifts = shiftCount;
} }
@ -2188,8 +2183,8 @@ aligned_unique_ptr<NFA> generate(NGHolder &h,
NFAEngineType ntype = (NFAEngineType)i; NFAEngineType ntype = (NFAEngineType)i;
int score = DISPATCH_BY_LIMEX_TYPE(ntype, scoreNfa, arg); int score = DISPATCH_BY_LIMEX_TYPE(ntype, scoreNfa, arg);
DEBUG_PRINTF("%s scores %d\n", nfa_type_name(ntype), score);
if (score >= 0) { if (score >= 0) {
DEBUG_PRINTF("%s scores %d\n", nfa_type_name(ntype), score);
scores.push_back(make_pair(score, ntype)); scores.push_back(make_pair(score, ntype));
} }
} }
@ -2200,7 +2195,7 @@ aligned_unique_ptr<NFA> generate(NGHolder &h,
return nullptr; return nullptr;
} }
sort(scores.begin(), scores.end(), greater<EngineScore>()); sort(scores.begin(), scores.end(), less<EngineScore>());
aligned_unique_ptr<NFA> nfa; aligned_unique_ptr<NFA> nfa;
for (auto i = scores.begin(); !nfa && i != scores.end(); ++i) { for (auto i = scores.begin(); !nfa && i != scores.end(); ++i) {