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

Discard HAVE_AVX512VBMI checks at Sheng/McSheng compile time.

Browse Source
This commit is contained in:
Chang, Harry
2020-10-21 12:30:04 +00:00
committed by Konstantinos Margaritis
parent 86b57e409f
commit 191cfef6cd
12 changed files with 18 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nfa/shengcompile.cpp
View File

@@ -302,7 +302,6 @@ void dumpShuffleMask(const u8 chr, const u8 *buf, unsigned sz) {
DEBUG_PRINTF("chr %3u: %s\n", chr, o.str().c_str());
}
#if defined (HAVE_AVX512VBMI)
static really_inline
void dumpShuffleMask32(const u8 chr, const u8 *buf, unsigned sz) {
stringstream o;
@@ -325,7 +324,6 @@ void dumpShuffleMask64(const u8 chr, const u8 *buf, unsigned sz) {
DEBUG_PRINTF("chr %3u: %s\n", chr, o.str().c_str());
}
#endif
#endif
static
void fillAccelOut(const map<dstate_id_t, AccelScheme> &accel_escape_info,
@@ -358,7 +356,6 @@ u8 getShengState<sheng>(dstate &state, dfa_info &info,
return s;
}
#if defined(HAVE_AVX512VBMI)
template <>
u8 getShengState<sheng32>(dstate &state, dfa_info &info,
map<dstate_id_t, AccelScheme> &accelInfo) {
@@ -387,7 +384,6 @@ u8 getShengState<sheng64>(dstate &state, dfa_info &info,
}
return s;
}
#endif
template <typename T>
static
@@ -446,7 +442,6 @@ void populateBasicInfo<sheng>(struct NFA *n, dfa_info &info,
s->floating = getShengState<sheng>(info.floating, info, accelInfo);
}
#if defined(HAVE_AVX512VBMI)
template <>
void populateBasicInfo<sheng32>(struct NFA *n, dfa_info &info,
map<dstate_id_t, AccelScheme> &accelInfo,
@@ -496,7 +491,6 @@ void populateBasicInfo<sheng64>(struct NFA *n, dfa_info &info,
s->anchored = getShengState<sheng64>(info.anchored, info, accelInfo);
s->floating = getShengState<sheng64>(info.floating, info, accelInfo);
}
#endif
template <typename T>
static
@@ -582,7 +576,6 @@ bool createShuffleMasks<sheng>(sheng *s, dfa_info &info,
return true;
}
#if defined(HAVE_AVX512VBMI)
template <>
bool createShuffleMasks<sheng32>(sheng32 *s, dfa_info &info,
map<dstate_id_t, AccelScheme> &accelInfo) {
@@ -627,7 +620,6 @@ bool createShuffleMasks<sheng64>(sheng64 *s, dfa_info &info,
}
return true;
}
#endif
bool has_accel_sheng(const NFA *) {
return true; /* consider the sheng region as accelerated */
@@ -731,7 +723,6 @@ bytecode_ptr<NFA> shengCompile(raw_dfa &raw, const CompileContext &cc,
return shengCompile_int<sheng>(raw, cc, accel_states, strat, info);
}
#if defined(HAVE_AVX512VBMI)
bytecode_ptr<NFA> sheng32Compile(raw_dfa &raw, const CompileContext &cc,
const ReportManager &rm, bool only_accel_init,
set<dstate_id_t> *accel_states) {
@@ -740,6 +731,11 @@ bytecode_ptr<NFA> sheng32Compile(raw_dfa &raw, const CompileContext &cc,
return nullptr;
}
if (!cc.target_info.has_avx512vbmi()) {
DEBUG_PRINTF("Sheng32 failed, no HS_CPU_FEATURES_AVX512VBMI!\n");
return nullptr;
}
sheng_build_strat strat(raw, rm, only_accel_init);
dfa_info info(strat);
@@ -767,6 +763,11 @@ bytecode_ptr<NFA> sheng64Compile(raw_dfa &raw, const CompileContext &cc,
return nullptr;
}
if (!cc.target_info.has_avx512vbmi()) {
DEBUG_PRINTF("Sheng64 failed, no HS_CPU_FEATURES_AVX512VBMI!\n");
return nullptr;
}
sheng_build_strat strat(raw, rm, only_accel_init);
dfa_info info(strat);
@@ -790,6 +791,5 @@ bytecode_ptr<NFA> sheng64Compile(raw_dfa &raw, const CompileContext &cc,
}
return nfa;
}
#endif
} // namespace ue2