github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-11-16 17:31:51 +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

14
src/nfa/nfa_internal.h
View File

@@ -152,12 +152,8 @@ static really_inline int isMcClellanType(u8 t) {
/** \brief True if the given type (from NFA::type) is a Sheng-McClellan hybrid
* DFA. */
static really_inline int isShengMcClellanType(u8 t) {
#if defined(HAVE_AVX512VBMI)
return t == MCSHENG_64_NFA_8 || t == MCSHENG_64_NFA_16 || t == MCSHENG_NFA_8 ||
t == MCSHENG_NFA_16;
#else
return t == MCSHENG_NFA_8 || t == MCSHENG_NFA_16;
#endif
return t == MCSHENG_NFA_8 || t == MCSHENG_NFA_16 ||
t == MCSHENG_64_NFA_8 || t == MCSHENG_64_NFA_16;
}
/** \brief True if the given type (from NFA::type) is a Gough DFA. */
@@ -170,7 +166,6 @@ static really_inline int isSheng16Type(u8 t) {
return t == SHENG_NFA;
}
#if defined(HAVE_AVX512VBMI)
/** \brief True if the given type (from NFA::type) is a Sheng32 DFA. */
static really_inline int isSheng32Type(u8 t) {
return t == SHENG_NFA_32;
@@ -180,15 +175,10 @@ static really_inline int isSheng32Type(u8 t) {
static really_inline int isSheng64Type(u8 t) {
return t == SHENG_NFA_64;
}
#endif
/** \brief True if the given type (from NFA::type) is a Sheng16/32/64 DFA. */
static really_inline int isShengType(u8 t) {
#if defined(HAVE_AVX512VBMI)
return t == SHENG_NFA || t == SHENG_NFA_32 || t == SHENG_NFA_64;
#else
return t == SHENG_NFA;
#endif
}
/**