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

rose: don't accel noodle engines

Browse Source
This commit is contained in:
Justin Viiret 2017-01-10 10:07:12 +11:00 committed by Matthew Barr
parent 68a35ff3b8
commit 1584da9025
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/rose/rose_build_matchers.cpp
View File

@ -37,6 +37,7 @@
#include "rose_build_lit_accel.h" #include "rose_build_lit_accel.h"
#include "rose_build_width.h" #include "rose_build_width.h"
#include "hwlm/hwlm_build.h" #include "hwlm/hwlm_build.h"
#include "hwlm/hwlm_internal.h"
#include "hwlm/hwlm_literal.h" #include "hwlm/hwlm_literal.h"
#include "nfa/castlecompile.h" #include "nfa/castlecompile.h"
#include "nfa/nfa_api_queue.h" #include "nfa/nfa_api_queue.h"
@ -811,6 +812,20 @@ void MatcherProto::insert(const MatcherProto &a) {
history_required = max(history_required, a.history_required); history_required = max(history_required, a.history_required);
} }
static
void buildAccel(const RoseBuildImpl &build, const MatcherProto &mp,
HWLM &hwlm) {
if (!build.cc.grey.hamsterAccelForward) {
return;
}
if (hwlm.type == HWLM_ENGINE_NOOD) {
return;
}
buildForwardAccel(&hwlm, mp.accel_lits, build.getInitialGroups());
}
aligned_unique_ptr<HWLM> aligned_unique_ptr<HWLM>
buildFloatingMatcher(const RoseBuildImpl &build, size_t longLitLengthThreshold, buildFloatingMatcher(const RoseBuildImpl &build, size_t longLitLengthThreshold,
const map<u32, u32> &final_to_frag_map, const map<u32, u32> &final_to_frag_map,
@ -835,9 +850,7 @@ buildFloatingMatcher(const RoseBuildImpl &build, size_t longLitLengthThreshold,
throw CompileError("Unable to generate bytecode."); throw CompileError("Unable to generate bytecode.");
} }
if (build.cc.grey.hamsterAccelForward) { buildAccel(build, mp, *hwlm);
buildForwardAccel(hwlm.get(), mp.accel_lits, build.getInitialGroups());
}
if (build.cc.streaming) { if (build.cc.streaming) {
DEBUG_PRINTF("history_required=%zu\n", mp.history_required); DEBUG_PRINTF("history_required=%zu\n", mp.history_required);
@ -903,9 +916,7 @@ buildSmallBlockMatcher(const RoseBuildImpl &build,
throw CompileError("Unable to generate bytecode."); throw CompileError("Unable to generate bytecode.");
} }
if (build.cc.grey.hamsterAccelForward) { buildAccel(build, mp, *hwlm);
buildForwardAccel(hwlm.get(), mp.accel_lits, build.getInitialGroups());
}
*sbsize = hwlmSize(hwlm.get()); *sbsize = hwlmSize(hwlm.get());
assert(*sbsize); assert(*sbsize);
@ -934,9 +945,7 @@ buildEodAnchoredMatcher(const RoseBuildImpl &build,
throw CompileError("Unable to generate bytecode."); throw CompileError("Unable to generate bytecode.");
} }
if (build.cc.grey.hamsterAccelForward) { buildAccel(build, mp, *hwlm);
buildForwardAccel(hwlm.get(), mp.accel_lits, build.getInitialGroups());
}
*esize = hwlmSize(hwlm.get()); *esize = hwlmSize(hwlm.get());
assert(*esize); assert(*esize);