Restoring authorship annotation for <thegeorg@yandex-team.ru>. Commit 1 of 2.

1 files changed, 402 insertions, 402 deletions

diff --git a/contrib/libs/hyperscan/src/nfa/sheng_defs.h b/contrib/libs/hyperscan/src/nfa/sheng_defs.h
index 390af75221..d14018829c 100644
--- a/contrib/libs/hyperscan/src/nfa/sheng_defs.h
+++ b/contrib/libs/hyperscan/src/nfa/sheng_defs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020, Intel Corporation
+ * Copyright (c) 2016-2020, Intel Corporation 
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -52,43 +52,43 @@ u8 hasInterestingStates(const u8 a, const u8 b, const u8 c, const u8 d) {
     return (a | b | c | d) & (SHENG_STATE_FLAG_MASK);
 }
 
-#if defined(HAVE_AVX512VBMI)
-static really_inline
-u8 isDeadState32(const u8 a) {
-    return a & SHENG32_STATE_DEAD;
-}
-
-static really_inline
-u8 isAcceptState32(const u8 a) {
-    return a & SHENG32_STATE_ACCEPT;
-}
-
-static really_inline
-u8 isAccelState32(const u8 a) {
-    return a & SHENG32_STATE_ACCEL;
-}
-
-static really_inline
-u8 hasInterestingStates32(const u8 a, const u8 b, const u8 c, const u8 d) {
-    return (a | b | c | d) & (SHENG32_STATE_FLAG_MASK);
-}
-
-static really_inline
-u8 isDeadState64(const u8 a) {
-    return a & SHENG64_STATE_DEAD;
-}
-
-static really_inline
-u8 isAcceptState64(const u8 a) {
-    return a & SHENG64_STATE_ACCEPT;
-}
-
-static really_inline
-u8 hasInterestingStates64(const u8 a, const u8 b, const u8 c, const u8 d) {
-    return (a | b | c | d) & (SHENG64_STATE_FLAG_MASK);
-}
-#endif
-
+#if defined(HAVE_AVX512VBMI) 
+static really_inline 
+u8 isDeadState32(const u8 a) { 
+    return a & SHENG32_STATE_DEAD; 
+} 
+ 
+static really_inline 
+u8 isAcceptState32(const u8 a) { 
+    return a & SHENG32_STATE_ACCEPT; 
+} 
+ 
+static really_inline 
+u8 isAccelState32(const u8 a) { 
+    return a & SHENG32_STATE_ACCEL; 
+} 
+ 
+static really_inline 
+u8 hasInterestingStates32(const u8 a, const u8 b, const u8 c, const u8 d) { 
+    return (a | b | c | d) & (SHENG32_STATE_FLAG_MASK); 
+} 
+ 
+static really_inline 
+u8 isDeadState64(const u8 a) { 
+    return a & SHENG64_STATE_DEAD; 
+} 
+ 
+static really_inline 
+u8 isAcceptState64(const u8 a) { 
+    return a & SHENG64_STATE_ACCEPT; 
+} 
+ 
+static really_inline 
+u8 hasInterestingStates64(const u8 a, const u8 b, const u8 c, const u8 d) { 
+    return (a | b | c | d) & (SHENG64_STATE_FLAG_MASK); 
+} 
+#endif 
+ 
 /* these functions should be optimized out, used by NO_MATCHES mode */
 static really_inline
 u8 dummyFunc4(UNUSED const u8 a, UNUSED const u8 b, UNUSED const u8 c,
@@ -108,162 +108,162 @@ u8 dummyFunc(UNUSED const u8 a) {
 #define SHENG_IMPL sheng_cod
 #define DEAD_FUNC isDeadState
 #define ACCEPT_FUNC isAcceptState
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_cod
-#define DEAD_FUNC32 isDeadState32
-#define ACCEPT_FUNC32 isAcceptState32
-#define SHENG64_IMPL sheng64_cod
-#define DEAD_FUNC64 isDeadState64
-#define ACCEPT_FUNC64 isAcceptState64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_cod 
+#define DEAD_FUNC32 isDeadState32 
+#define ACCEPT_FUNC32 isAcceptState32 
+#define SHENG64_IMPL sheng64_cod 
+#define DEAD_FUNC64 isDeadState64 
+#define ACCEPT_FUNC64 isAcceptState64 
+#endif 
 #define STOP_AT_MATCH 0
 #include "sheng_impl.h"
 #undef SHENG_IMPL
 #undef DEAD_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef DEAD_FUNC32
-#undef ACCEPT_FUNC32
-#undef SHENG64_IMPL
-#undef DEAD_FUNC64
-#undef ACCEPT_FUNC64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef DEAD_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef SHENG64_IMPL 
+#undef DEAD_FUNC64 
+#undef ACCEPT_FUNC64 
+#endif 
 #undef STOP_AT_MATCH
 
 /* callback output, can't die */
 #define SHENG_IMPL sheng_co
 #define DEAD_FUNC dummyFunc
 #define ACCEPT_FUNC isAcceptState
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_co
-#define DEAD_FUNC32 dummyFunc
-#define ACCEPT_FUNC32 isAcceptState32
-#define SHENG64_IMPL sheng64_co
-#define DEAD_FUNC64 dummyFunc
-#define ACCEPT_FUNC64 isAcceptState64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_co 
+#define DEAD_FUNC32 dummyFunc 
+#define ACCEPT_FUNC32 isAcceptState32 
+#define SHENG64_IMPL sheng64_co 
+#define DEAD_FUNC64 dummyFunc 
+#define ACCEPT_FUNC64 isAcceptState64 
+#endif 
 #define STOP_AT_MATCH 0
 #include "sheng_impl.h"
 #undef SHENG_IMPL
 #undef DEAD_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef DEAD_FUNC32
-#undef ACCEPT_FUNC32
-#undef SHENG64_IMPL
-#undef DEAD_FUNC64
-#undef ACCEPT_FUNC64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef DEAD_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef SHENG64_IMPL 
+#undef DEAD_FUNC64 
+#undef ACCEPT_FUNC64 
+#endif 
 #undef STOP_AT_MATCH
 
 /* stop at match, can die */
 #define SHENG_IMPL sheng_samd
 #define DEAD_FUNC isDeadState
 #define ACCEPT_FUNC isAcceptState
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_samd
-#define DEAD_FUNC32 isDeadState32
-#define ACCEPT_FUNC32 isAcceptState32
-#define SHENG64_IMPL sheng64_samd
-#define DEAD_FUNC64 isDeadState64
-#define ACCEPT_FUNC64 isAcceptState64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_samd 
+#define DEAD_FUNC32 isDeadState32 
+#define ACCEPT_FUNC32 isAcceptState32 
+#define SHENG64_IMPL sheng64_samd 
+#define DEAD_FUNC64 isDeadState64 
+#define ACCEPT_FUNC64 isAcceptState64 
+#endif 
 #define STOP_AT_MATCH 1
 #include "sheng_impl.h"
 #undef SHENG_IMPL
 #undef DEAD_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef DEAD_FUNC32
-#undef ACCEPT_FUNC32
-#undef SHENG64_IMPL
-#undef DEAD_FUNC64
-#undef ACCEPT_FUNC64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef DEAD_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef SHENG64_IMPL 
+#undef DEAD_FUNC64 
+#undef ACCEPT_FUNC64 
+#endif 
 #undef STOP_AT_MATCH
 
 /* stop at match, can't die */
 #define SHENG_IMPL sheng_sam
 #define DEAD_FUNC dummyFunc
 #define ACCEPT_FUNC isAcceptState
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_sam
-#define DEAD_FUNC32 dummyFunc
-#define ACCEPT_FUNC32 isAcceptState32
-#define SHENG64_IMPL sheng64_sam
-#define DEAD_FUNC64 dummyFunc
-#define ACCEPT_FUNC64 isAcceptState64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_sam 
+#define DEAD_FUNC32 dummyFunc 
+#define ACCEPT_FUNC32 isAcceptState32 
+#define SHENG64_IMPL sheng64_sam 
+#define DEAD_FUNC64 dummyFunc 
+#define ACCEPT_FUNC64 isAcceptState64 
+#endif 
 #define STOP_AT_MATCH 1
 #include "sheng_impl.h"
 #undef SHENG_IMPL
 #undef DEAD_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef DEAD_FUNC32
-#undef ACCEPT_FUNC32
-#undef SHENG64_IMPL
-#undef DEAD_FUNC64
-#undef ACCEPT_FUNC64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef DEAD_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef SHENG64_IMPL 
+#undef DEAD_FUNC64 
+#undef ACCEPT_FUNC64 
+#endif 
 #undef STOP_AT_MATCH
 
 /* no match, can die */
 #define SHENG_IMPL sheng_nmd
 #define DEAD_FUNC isDeadState
 #define ACCEPT_FUNC dummyFunc
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_nmd
-#define DEAD_FUNC32 isDeadState32
-#define ACCEPT_FUNC32 dummyFunc
-#define SHENG64_IMPL sheng64_nmd
-#define DEAD_FUNC64 isDeadState64
-#define ACCEPT_FUNC64 dummyFunc
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_nmd 
+#define DEAD_FUNC32 isDeadState32 
+#define ACCEPT_FUNC32 dummyFunc 
+#define SHENG64_IMPL sheng64_nmd 
+#define DEAD_FUNC64 isDeadState64 
+#define ACCEPT_FUNC64 dummyFunc 
+#endif 
 #define STOP_AT_MATCH 0
 #include "sheng_impl.h"
 #undef SHENG_IMPL
 #undef DEAD_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef DEAD_FUNC32
-#undef ACCEPT_FUNC32
-#undef SHENG64_IMPL
-#undef DEAD_FUNC64
-#undef ACCEPT_FUNC64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef DEAD_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef SHENG64_IMPL 
+#undef DEAD_FUNC64 
+#undef ACCEPT_FUNC64 
+#endif 
 #undef STOP_AT_MATCH
 
 /* no match, can't die */
 #define SHENG_IMPL sheng_nm
 #define DEAD_FUNC dummyFunc
 #define ACCEPT_FUNC dummyFunc
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_nm
-#define DEAD_FUNC32 dummyFunc
-#define ACCEPT_FUNC32 dummyFunc
-#define SHENG64_IMPL sheng64_nm
-#define DEAD_FUNC64 dummyFunc
-#define ACCEPT_FUNC64 dummyFunc
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_nm 
+#define DEAD_FUNC32 dummyFunc 
+#define ACCEPT_FUNC32 dummyFunc 
+#define SHENG64_IMPL sheng64_nm 
+#define DEAD_FUNC64 dummyFunc 
+#define ACCEPT_FUNC64 dummyFunc 
+#endif 
 #define STOP_AT_MATCH 0
 #include "sheng_impl.h"
 #undef SHENG_IMPL
 #undef DEAD_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef DEAD_FUNC32
-#undef ACCEPT_FUNC32
-#undef SHENG64_IMPL
-#undef DEAD_FUNC64
-#undef ACCEPT_FUNC64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef DEAD_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef SHENG64_IMPL 
+#undef DEAD_FUNC64 
+#undef ACCEPT_FUNC64 
+#endif 
 #undef STOP_AT_MATCH
 
 /*
@@ -277,16 +277,16 @@ u8 dummyFunc(UNUSED const u8 a) {
 #define INNER_ACCEL_FUNC isAccelState
 #define OUTER_ACCEL_FUNC dummyFunc
 #define ACCEPT_FUNC isAcceptState
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_4_coda
-#define INTERESTING_FUNC32 hasInterestingStates32
-#define INNER_DEAD_FUNC32 isDeadState32
-#define OUTER_DEAD_FUNC32 dummyFunc
-#define INNER_ACCEL_FUNC32 isAccelState32
-#define OUTER_ACCEL_FUNC32 dummyFunc
-#define ACCEPT_FUNC32 isAcceptState32
-#define NO_SHENG64_IMPL
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_4_coda 
+#define INTERESTING_FUNC32 hasInterestingStates32 
+#define INNER_DEAD_FUNC32 isDeadState32 
+#define OUTER_DEAD_FUNC32 dummyFunc 
+#define INNER_ACCEL_FUNC32 isAccelState32 
+#define OUTER_ACCEL_FUNC32 dummyFunc 
+#define ACCEPT_FUNC32 isAcceptState32 
+#define NO_SHENG64_IMPL 
+#endif 
 #define STOP_AT_MATCH 0
 #include "sheng_impl4.h"
 #undef SHENG_IMPL
@@ -296,16 +296,16 @@ u8 dummyFunc(UNUSED const u8 a) {
 #undef INNER_ACCEL_FUNC
 #undef OUTER_ACCEL_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef INTERESTING_FUNC32
-#undef INNER_DEAD_FUNC32
-#undef OUTER_DEAD_FUNC32
-#undef INNER_ACCEL_FUNC32
-#undef OUTER_ACCEL_FUNC32
-#undef ACCEPT_FUNC32
-#undef NO_SHENG64_IMPL
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef INTERESTING_FUNC32 
+#undef INNER_DEAD_FUNC32 
+#undef OUTER_DEAD_FUNC32 
+#undef INNER_ACCEL_FUNC32 
+#undef OUTER_ACCEL_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef NO_SHENG64_IMPL 
+#endif 
 #undef STOP_AT_MATCH
 
 /* callback output, can die, not accelerated */
@@ -316,20 +316,20 @@ u8 dummyFunc(UNUSED const u8 a) {
 #define INNER_ACCEL_FUNC dummyFunc
 #define OUTER_ACCEL_FUNC dummyFunc
 #define ACCEPT_FUNC isAcceptState
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_4_cod
-#define INTERESTING_FUNC32 hasInterestingStates32
-#define INNER_DEAD_FUNC32 isDeadState32
-#define OUTER_DEAD_FUNC32 dummyFunc
-#define INNER_ACCEL_FUNC32 dummyFunc
-#define OUTER_ACCEL_FUNC32 dummyFunc
-#define ACCEPT_FUNC32 isAcceptState32
-#define SHENG64_IMPL sheng64_4_cod
-#define INTERESTING_FUNC64 hasInterestingStates64
-#define INNER_DEAD_FUNC64 isDeadState64
-#define OUTER_DEAD_FUNC64 dummyFunc
-#define ACCEPT_FUNC64 isAcceptState64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_4_cod 
+#define INTERESTING_FUNC32 hasInterestingStates32 
+#define INNER_DEAD_FUNC32 isDeadState32 
+#define OUTER_DEAD_FUNC32 dummyFunc 
+#define INNER_ACCEL_FUNC32 dummyFunc 
+#define OUTER_ACCEL_FUNC32 dummyFunc 
+#define ACCEPT_FUNC32 isAcceptState32 
+#define SHENG64_IMPL sheng64_4_cod 
+#define INTERESTING_FUNC64 hasInterestingStates64 
+#define INNER_DEAD_FUNC64 isDeadState64 
+#define OUTER_DEAD_FUNC64 dummyFunc 
+#define ACCEPT_FUNC64 isAcceptState64 
+#endif 
 #define STOP_AT_MATCH 0
 #include "sheng_impl4.h"
 #undef SHENG_IMPL
@@ -339,20 +339,20 @@ u8 dummyFunc(UNUSED const u8 a) {
 #undef INNER_ACCEL_FUNC
 #undef OUTER_ACCEL_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef INTERESTING_FUNC32
-#undef INNER_DEAD_FUNC32
-#undef OUTER_DEAD_FUNC32
-#undef INNER_ACCEL_FUNC32
-#undef OUTER_ACCEL_FUNC32
-#undef ACCEPT_FUNC32
-#undef SHENG64_IMPL
-#undef INTERESTING_FUNC64
-#undef INNER_DEAD_FUNC64
-#undef OUTER_DEAD_FUNC64
-#undef ACCEPT_FUNC64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef INTERESTING_FUNC32 
+#undef INNER_DEAD_FUNC32 
+#undef OUTER_DEAD_FUNC32 
+#undef INNER_ACCEL_FUNC32 
+#undef OUTER_ACCEL_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef SHENG64_IMPL 
+#undef INTERESTING_FUNC64 
+#undef INNER_DEAD_FUNC64 
+#undef OUTER_DEAD_FUNC64 
+#undef ACCEPT_FUNC64 
+#endif 
 #undef STOP_AT_MATCH
 
 /* callback output, can't die, accelerated */
@@ -363,16 +363,16 @@ u8 dummyFunc(UNUSED const u8 a) {
 #define INNER_ACCEL_FUNC isAccelState
 #define OUTER_ACCEL_FUNC dummyFunc
 #define ACCEPT_FUNC isAcceptState
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_4_coa
-#define INTERESTING_FUNC32 hasInterestingStates32
-#define INNER_DEAD_FUNC32 dummyFunc
-#define OUTER_DEAD_FUNC32 dummyFunc
-#define INNER_ACCEL_FUNC32 isAccelState32
-#define OUTER_ACCEL_FUNC32 dummyFunc
-#define ACCEPT_FUNC32 isAcceptState32
-#define NO_SHENG64_IMPL
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_4_coa 
+#define INTERESTING_FUNC32 hasInterestingStates32 
+#define INNER_DEAD_FUNC32 dummyFunc 
+#define OUTER_DEAD_FUNC32 dummyFunc 
+#define INNER_ACCEL_FUNC32 isAccelState32 
+#define OUTER_ACCEL_FUNC32 dummyFunc 
+#define ACCEPT_FUNC32 isAcceptState32 
+#define NO_SHENG64_IMPL 
+#endif 
 #define STOP_AT_MATCH 0
 #include "sheng_impl4.h"
 #undef SHENG_IMPL
@@ -382,16 +382,16 @@ u8 dummyFunc(UNUSED const u8 a) {
 #undef INNER_ACCEL_FUNC
 #undef OUTER_ACCEL_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef INTERESTING_FUNC32
-#undef INNER_DEAD_FUNC32
-#undef OUTER_DEAD_FUNC32
-#undef INNER_ACCEL_FUNC32
-#undef OUTER_ACCEL_FUNC32
-#undef ACCEPT_FUNC32
-#undef NO_SHENG64_IMPL
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef INTERESTING_FUNC32 
+#undef INNER_DEAD_FUNC32 
+#undef OUTER_DEAD_FUNC32 
+#undef INNER_ACCEL_FUNC32 
+#undef OUTER_ACCEL_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef NO_SHENG64_IMPL 
+#endif 
 #undef STOP_AT_MATCH
 
 /* callback output, can't die, not accelerated */
@@ -402,20 +402,20 @@ u8 dummyFunc(UNUSED const u8 a) {
 #define INNER_ACCEL_FUNC dummyFunc
 #define OUTER_ACCEL_FUNC dummyFunc
 #define ACCEPT_FUNC isAcceptState
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_4_co
-#define INTERESTING_FUNC32 hasInterestingStates32
-#define INNER_DEAD_FUNC32 dummyFunc
-#define OUTER_DEAD_FUNC32 dummyFunc
-#define INNER_ACCEL_FUNC32 dummyFunc
-#define OUTER_ACCEL_FUNC32 dummyFunc
-#define ACCEPT_FUNC32 isAcceptState32
-#define SHENG64_IMPL sheng64_4_co
-#define INTERESTING_FUNC64 hasInterestingStates64
-#define INNER_DEAD_FUNC64 dummyFunc
-#define OUTER_DEAD_FUNC64 dummyFunc
-#define ACCEPT_FUNC64 isAcceptState64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_4_co 
+#define INTERESTING_FUNC32 hasInterestingStates32 
+#define INNER_DEAD_FUNC32 dummyFunc 
+#define OUTER_DEAD_FUNC32 dummyFunc 
+#define INNER_ACCEL_FUNC32 dummyFunc 
+#define OUTER_ACCEL_FUNC32 dummyFunc 
+#define ACCEPT_FUNC32 isAcceptState32 
+#define SHENG64_IMPL sheng64_4_co 
+#define INTERESTING_FUNC64 hasInterestingStates64 
+#define INNER_DEAD_FUNC64 dummyFunc 
+#define OUTER_DEAD_FUNC64 dummyFunc 
+#define ACCEPT_FUNC64 isAcceptState64 
+#endif 
 #define STOP_AT_MATCH 0
 #include "sheng_impl4.h"
 #undef SHENG_IMPL
@@ -425,20 +425,20 @@ u8 dummyFunc(UNUSED const u8 a) {
 #undef INNER_ACCEL_FUNC
 #undef OUTER_ACCEL_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef INTERESTING_FUNC32
-#undef INNER_DEAD_FUNC32
-#undef OUTER_DEAD_FUNC32
-#undef INNER_ACCEL_FUNC32
-#undef OUTER_ACCEL_FUNC32
-#undef ACCEPT_FUNC32
-#undef SHENG64_IMPL
-#undef INTERESTING_FUNC64
-#undef INNER_DEAD_FUNC64
-#undef OUTER_DEAD_FUNC64
-#undef ACCEPT_FUNC64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef INTERESTING_FUNC32 
+#undef INNER_DEAD_FUNC32 
+#undef OUTER_DEAD_FUNC32 
+#undef INNER_ACCEL_FUNC32 
+#undef OUTER_ACCEL_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef SHENG64_IMPL 
+#undef INTERESTING_FUNC64 
+#undef INNER_DEAD_FUNC64 
+#undef OUTER_DEAD_FUNC64 
+#undef ACCEPT_FUNC64 
+#endif 
 #undef STOP_AT_MATCH
 
 /* stop at match, can die, accelerated */
@@ -449,16 +449,16 @@ u8 dummyFunc(UNUSED const u8 a) {
 #define INNER_ACCEL_FUNC isAccelState
 #define OUTER_ACCEL_FUNC dummyFunc
 #define ACCEPT_FUNC isAcceptState
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_4_samda
-#define INTERESTING_FUNC32 hasInterestingStates32
-#define INNER_DEAD_FUNC32 isDeadState32
-#define OUTER_DEAD_FUNC32 dummyFunc
-#define INNER_ACCEL_FUNC32 isAccelState32
-#define OUTER_ACCEL_FUNC32 dummyFunc
-#define ACCEPT_FUNC32 isAcceptState32
-#define NO_SHENG64_IMPL
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_4_samda 
+#define INTERESTING_FUNC32 hasInterestingStates32 
+#define INNER_DEAD_FUNC32 isDeadState32 
+#define OUTER_DEAD_FUNC32 dummyFunc 
+#define INNER_ACCEL_FUNC32 isAccelState32 
+#define OUTER_ACCEL_FUNC32 dummyFunc 
+#define ACCEPT_FUNC32 isAcceptState32 
+#define NO_SHENG64_IMPL 
+#endif 
 #define STOP_AT_MATCH 1
 #include "sheng_impl4.h"
 #undef SHENG_IMPL
@@ -468,16 +468,16 @@ u8 dummyFunc(UNUSED const u8 a) {
 #undef INNER_ACCEL_FUNC
 #undef OUTER_ACCEL_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef INTERESTING_FUNC32
-#undef INNER_DEAD_FUNC32
-#undef OUTER_DEAD_FUNC32
-#undef INNER_ACCEL_FUNC32
-#undef OUTER_ACCEL_FUNC32
-#undef ACCEPT_FUNC32
-#undef NO_SHENG64_IMPL
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef INTERESTING_FUNC32 
+#undef INNER_DEAD_FUNC32 
+#undef OUTER_DEAD_FUNC32 
+#undef INNER_ACCEL_FUNC32 
+#undef OUTER_ACCEL_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef NO_SHENG64_IMPL 
+#endif 
 #undef STOP_AT_MATCH
 
 /* stop at match, can die, not accelerated */
@@ -488,20 +488,20 @@ u8 dummyFunc(UNUSED const u8 a) {
 #define INNER_ACCEL_FUNC dummyFunc
 #define OUTER_ACCEL_FUNC dummyFunc
 #define ACCEPT_FUNC isAcceptState
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_4_samd
-#define INTERESTING_FUNC32 hasInterestingStates32
-#define INNER_DEAD_FUNC32 isDeadState32
-#define OUTER_DEAD_FUNC32 dummyFunc
-#define INNER_ACCEL_FUNC32 dummyFunc
-#define OUTER_ACCEL_FUNC32 dummyFunc
-#define ACCEPT_FUNC32 isAcceptState32
-#define SHENG64_IMPL sheng64_4_samd
-#define INTERESTING_FUNC64 hasInterestingStates64
-#define INNER_DEAD_FUNC64 isDeadState64
-#define OUTER_DEAD_FUNC64 dummyFunc
-#define ACCEPT_FUNC64 isAcceptState64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_4_samd 
+#define INTERESTING_FUNC32 hasInterestingStates32 
+#define INNER_DEAD_FUNC32 isDeadState32 
+#define OUTER_DEAD_FUNC32 dummyFunc 
+#define INNER_ACCEL_FUNC32 dummyFunc 
+#define OUTER_ACCEL_FUNC32 dummyFunc 
+#define ACCEPT_FUNC32 isAcceptState32 
+#define SHENG64_IMPL sheng64_4_samd 
+#define INTERESTING_FUNC64 hasInterestingStates64 
+#define INNER_DEAD_FUNC64 isDeadState64 
+#define OUTER_DEAD_FUNC64 dummyFunc 
+#define ACCEPT_FUNC64 isAcceptState64 
+#endif 
 #define STOP_AT_MATCH 1
 #include "sheng_impl4.h"
 #undef SHENG_IMPL
@@ -511,20 +511,20 @@ u8 dummyFunc(UNUSED const u8 a) {
 #undef INNER_ACCEL_FUNC
 #undef OUTER_ACCEL_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef INTERESTING_FUNC32
-#undef INNER_DEAD_FUNC32
-#undef OUTER_DEAD_FUNC32
-#undef INNER_ACCEL_FUNC32
-#undef OUTER_ACCEL_FUNC32
-#undef ACCEPT_FUNC32
-#undef SHENG64_IMPL
-#undef INTERESTING_FUNC64
-#undef INNER_DEAD_FUNC64
-#undef OUTER_DEAD_FUNC64
-#undef ACCEPT_FUNC64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef INTERESTING_FUNC32 
+#undef INNER_DEAD_FUNC32 
+#undef OUTER_DEAD_FUNC32 
+#undef INNER_ACCEL_FUNC32 
+#undef OUTER_ACCEL_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef SHENG64_IMPL 
+#undef INTERESTING_FUNC64 
+#undef INNER_DEAD_FUNC64 
+#undef OUTER_DEAD_FUNC64 
+#undef ACCEPT_FUNC64 
+#endif 
 #undef STOP_AT_MATCH
 
 /* stop at match, can't die, accelerated */
@@ -535,16 +535,16 @@ u8 dummyFunc(UNUSED const u8 a) {
 #define INNER_ACCEL_FUNC isAccelState
 #define OUTER_ACCEL_FUNC dummyFunc
 #define ACCEPT_FUNC isAcceptState
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_4_sama
-#define INTERESTING_FUNC32 hasInterestingStates32
-#define INNER_DEAD_FUNC32 dummyFunc
-#define OUTER_DEAD_FUNC32 dummyFunc
-#define INNER_ACCEL_FUNC32 isAccelState32
-#define OUTER_ACCEL_FUNC32 dummyFunc
-#define ACCEPT_FUNC32 isAcceptState32
-#define NO_SHENG64_IMPL
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_4_sama 
+#define INTERESTING_FUNC32 hasInterestingStates32 
+#define INNER_DEAD_FUNC32 dummyFunc 
+#define OUTER_DEAD_FUNC32 dummyFunc 
+#define INNER_ACCEL_FUNC32 isAccelState32 
+#define OUTER_ACCEL_FUNC32 dummyFunc 
+#define ACCEPT_FUNC32 isAcceptState32 
+#define NO_SHENG64_IMPL 
+#endif 
 #define STOP_AT_MATCH 1
 #include "sheng_impl4.h"
 #undef SHENG_IMPL
@@ -554,16 +554,16 @@ u8 dummyFunc(UNUSED const u8 a) {
 #undef INNER_ACCEL_FUNC
 #undef OUTER_ACCEL_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef INTERESTING_FUNC32
-#undef INNER_DEAD_FUNC32
-#undef OUTER_DEAD_FUNC32
-#undef INNER_ACCEL_FUNC32
-#undef OUTER_ACCEL_FUNC32
-#undef ACCEPT_FUNC32
-#undef NO_SHENG64_IMPL
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef INTERESTING_FUNC32 
+#undef INNER_DEAD_FUNC32 
+#undef OUTER_DEAD_FUNC32 
+#undef INNER_ACCEL_FUNC32 
+#undef OUTER_ACCEL_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef NO_SHENG64_IMPL 
+#endif 
 #undef STOP_AT_MATCH
 
 /* stop at match, can't die, not accelerated */
@@ -574,20 +574,20 @@ u8 dummyFunc(UNUSED const u8 a) {
 #define INNER_ACCEL_FUNC dummyFunc
 #define OUTER_ACCEL_FUNC dummyFunc
 #define ACCEPT_FUNC isAcceptState
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_4_sam
-#define INTERESTING_FUNC32 hasInterestingStates32
-#define INNER_DEAD_FUNC32 dummyFunc
-#define OUTER_DEAD_FUNC32 dummyFunc
-#define INNER_ACCEL_FUNC32 dummyFunc
-#define OUTER_ACCEL_FUNC32 dummyFunc
-#define ACCEPT_FUNC32 isAcceptState32
-#define SHENG64_IMPL sheng64_4_sam
-#define INTERESTING_FUNC64 hasInterestingStates64
-#define INNER_DEAD_FUNC64 dummyFunc
-#define OUTER_DEAD_FUNC64 dummyFunc
-#define ACCEPT_FUNC64 isAcceptState64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_4_sam 
+#define INTERESTING_FUNC32 hasInterestingStates32 
+#define INNER_DEAD_FUNC32 dummyFunc 
+#define OUTER_DEAD_FUNC32 dummyFunc 
+#define INNER_ACCEL_FUNC32 dummyFunc 
+#define OUTER_ACCEL_FUNC32 dummyFunc 
+#define ACCEPT_FUNC32 isAcceptState32 
+#define SHENG64_IMPL sheng64_4_sam 
+#define INTERESTING_FUNC64 hasInterestingStates64 
+#define INNER_DEAD_FUNC64 dummyFunc 
+#define OUTER_DEAD_FUNC64 dummyFunc 
+#define ACCEPT_FUNC64 isAcceptState64 
+#endif 
 #define STOP_AT_MATCH 1
 #include "sheng_impl4.h"
 #undef SHENG_IMPL
@@ -597,20 +597,20 @@ u8 dummyFunc(UNUSED const u8 a) {
 #undef INNER_ACCEL_FUNC
 #undef OUTER_ACCEL_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef INTERESTING_FUNC32
-#undef INNER_DEAD_FUNC32
-#undef OUTER_DEAD_FUNC32
-#undef INNER_ACCEL_FUNC32
-#undef OUTER_ACCEL_FUNC32
-#undef ACCEPT_FUNC32
-#undef SHENG64_IMPL
-#undef INTERESTING_FUNC64
-#undef INNER_DEAD_FUNC64
-#undef OUTER_DEAD_FUNC64
-#undef ACCEPT_FUNC64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef INTERESTING_FUNC32 
+#undef INNER_DEAD_FUNC32 
+#undef OUTER_DEAD_FUNC32 
+#undef INNER_ACCEL_FUNC32 
+#undef OUTER_ACCEL_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef SHENG64_IMPL 
+#undef INTERESTING_FUNC64 
+#undef INNER_DEAD_FUNC64 
+#undef OUTER_DEAD_FUNC64 
+#undef ACCEPT_FUNC64 
+#endif 
 #undef STOP_AT_MATCH
 
 /* no-match have interesting func as dummy, and die/accel checks are outer */
@@ -623,16 +623,16 @@ u8 dummyFunc(UNUSED const u8 a) {
 #define INNER_ACCEL_FUNC dummyFunc
 #define OUTER_ACCEL_FUNC isAccelState
 #define ACCEPT_FUNC dummyFunc
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_4_nmda
-#define INTERESTING_FUNC32 dummyFunc4
-#define INNER_DEAD_FUNC32 dummyFunc
-#define OUTER_DEAD_FUNC32 isDeadState32
-#define INNER_ACCEL_FUNC32 dummyFunc
-#define OUTER_ACCEL_FUNC32 isAccelState32
-#define ACCEPT_FUNC32 dummyFunc
-#define NO_SHENG64_IMPL
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_4_nmda 
+#define INTERESTING_FUNC32 dummyFunc4 
+#define INNER_DEAD_FUNC32 dummyFunc 
+#define OUTER_DEAD_FUNC32 isDeadState32 
+#define INNER_ACCEL_FUNC32 dummyFunc 
+#define OUTER_ACCEL_FUNC32 isAccelState32 
+#define ACCEPT_FUNC32 dummyFunc 
+#define NO_SHENG64_IMPL 
+#endif 
 #define STOP_AT_MATCH 0
 #include "sheng_impl4.h"
 #undef SHENG_IMPL
@@ -642,16 +642,16 @@ u8 dummyFunc(UNUSED const u8 a) {
 #undef INNER_ACCEL_FUNC
 #undef OUTER_ACCEL_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef INTERESTING_FUNC32
-#undef INNER_DEAD_FUNC32
-#undef OUTER_DEAD_FUNC32
-#undef INNER_ACCEL_FUNC32
-#undef OUTER_ACCEL_FUNC32
-#undef ACCEPT_FUNC32
-#undef NO_SHENG64_IMPL
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef INTERESTING_FUNC32 
+#undef INNER_DEAD_FUNC32 
+#undef OUTER_DEAD_FUNC32 
+#undef INNER_ACCEL_FUNC32 
+#undef OUTER_ACCEL_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef NO_SHENG64_IMPL 
+#endif 
 #undef STOP_AT_MATCH
 
 /* no match, can die, not accelerated */
@@ -662,20 +662,20 @@ u8 dummyFunc(UNUSED const u8 a) {
 #define INNER_ACCEL_FUNC dummyFunc
 #define OUTER_ACCEL_FUNC dummyFunc
 #define ACCEPT_FUNC dummyFunc
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_4_nmd
-#define INTERESTING_FUNC32 dummyFunc4
-#define INNER_DEAD_FUNC32 dummyFunc
-#define OUTER_DEAD_FUNC32 isDeadState32
-#define INNER_ACCEL_FUNC32 dummyFunc
-#define OUTER_ACCEL_FUNC32 dummyFunc
-#define ACCEPT_FUNC32 dummyFunc
-#define SHENG64_IMPL sheng64_4_nmd
-#define INTERESTING_FUNC64 dummyFunc4
-#define INNER_DEAD_FUNC64 dummyFunc
-#define OUTER_DEAD_FUNC64 isDeadState64
-#define ACCEPT_FUNC64 dummyFunc
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_4_nmd 
+#define INTERESTING_FUNC32 dummyFunc4 
+#define INNER_DEAD_FUNC32 dummyFunc 
+#define OUTER_DEAD_FUNC32 isDeadState32 
+#define INNER_ACCEL_FUNC32 dummyFunc 
+#define OUTER_ACCEL_FUNC32 dummyFunc 
+#define ACCEPT_FUNC32 dummyFunc 
+#define SHENG64_IMPL sheng64_4_nmd 
+#define INTERESTING_FUNC64 dummyFunc4 
+#define INNER_DEAD_FUNC64 dummyFunc 
+#define OUTER_DEAD_FUNC64 isDeadState64 
+#define ACCEPT_FUNC64 dummyFunc 
+#endif 
 #define STOP_AT_MATCH 0
 #include "sheng_impl4.h"
 #undef SHENG_IMPL
@@ -685,20 +685,20 @@ u8 dummyFunc(UNUSED const u8 a) {
 #undef INNER_ACCEL_FUNC
 #undef OUTER_ACCEL_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef INTERESTING_FUNC32
-#undef INNER_DEAD_FUNC32
-#undef OUTER_DEAD_FUNC32
-#undef INNER_ACCEL_FUNC32
-#undef OUTER_ACCEL_FUNC32
-#undef ACCEPT_FUNC32
-#undef SHENG64_IMPL
-#undef INTERESTING_FUNC64
-#undef INNER_DEAD_FUNC64
-#undef OUTER_DEAD_FUNC64
-#undef ACCEPT_FUNC64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef INTERESTING_FUNC32 
+#undef INNER_DEAD_FUNC32 
+#undef OUTER_DEAD_FUNC32 
+#undef INNER_ACCEL_FUNC32 
+#undef OUTER_ACCEL_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef SHENG64_IMPL 
+#undef INTERESTING_FUNC64 
+#undef INNER_DEAD_FUNC64 
+#undef OUTER_DEAD_FUNC64 
+#undef ACCEPT_FUNC64 
+#endif 
 #undef STOP_AT_MATCH
 
 /* there is no performance benefit in accelerating a no-match case that can't
@@ -712,20 +712,20 @@ u8 dummyFunc(UNUSED const u8 a) {
 #define INNER_ACCEL_FUNC dummyFunc
 #define OUTER_ACCEL_FUNC dummyFunc
 #define ACCEPT_FUNC dummyFunc
-#if defined(HAVE_AVX512VBMI)
-#define SHENG32_IMPL sheng32_4_nm
-#define INTERESTING_FUNC32 dummyFunc4
-#define INNER_DEAD_FUNC32 dummyFunc
-#define OUTER_DEAD_FUNC32 dummyFunc
-#define INNER_ACCEL_FUNC32 dummyFunc
-#define OUTER_ACCEL_FUNC32 dummyFunc
-#define ACCEPT_FUNC32 dummyFunc
-#define SHENG64_IMPL sheng64_4_nm
-#define INTERESTING_FUNC64 dummyFunc4
-#define INNER_DEAD_FUNC64 dummyFunc
-#define OUTER_DEAD_FUNC64 dummyFunc
-#define ACCEPT_FUNC64 dummyFunc
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#define SHENG32_IMPL sheng32_4_nm 
+#define INTERESTING_FUNC32 dummyFunc4 
+#define INNER_DEAD_FUNC32 dummyFunc 
+#define OUTER_DEAD_FUNC32 dummyFunc 
+#define INNER_ACCEL_FUNC32 dummyFunc 
+#define OUTER_ACCEL_FUNC32 dummyFunc 
+#define ACCEPT_FUNC32 dummyFunc 
+#define SHENG64_IMPL sheng64_4_nm 
+#define INTERESTING_FUNC64 dummyFunc4 
+#define INNER_DEAD_FUNC64 dummyFunc 
+#define OUTER_DEAD_FUNC64 dummyFunc 
+#define ACCEPT_FUNC64 dummyFunc 
+#endif 
 #define STOP_AT_MATCH 0
 #include "sheng_impl4.h"
 #undef SHENG_IMPL
@@ -735,20 +735,20 @@ u8 dummyFunc(UNUSED const u8 a) {
 #undef INNER_ACCEL_FUNC
 #undef OUTER_ACCEL_FUNC
 #undef ACCEPT_FUNC
-#if defined(HAVE_AVX512VBMI)
-#undef SHENG32_IMPL
-#undef INTERESTING_FUNC32
-#undef INNER_DEAD_FUNC32
-#undef OUTER_DEAD_FUNC32
-#undef INNER_ACCEL_FUNC32
-#undef OUTER_ACCEL_FUNC32
-#undef ACCEPT_FUNC32
-#undef SHENG64_IMPL
-#undef INTERESTING_FUNC64
-#undef INNER_DEAD_FUNC64
-#undef OUTER_DEAD_FUNC64
-#undef ACCEPT_FUNC64
-#endif
+#if defined(HAVE_AVX512VBMI) 
+#undef SHENG32_IMPL 
+#undef INTERESTING_FUNC32 
+#undef INNER_DEAD_FUNC32 
+#undef OUTER_DEAD_FUNC32 
+#undef INNER_ACCEL_FUNC32 
+#undef OUTER_ACCEL_FUNC32 
+#undef ACCEPT_FUNC32 
+#undef SHENG64_IMPL 
+#undef INTERESTING_FUNC64 
+#undef INNER_DEAD_FUNC64 
+#undef OUTER_DEAD_FUNC64 
+#undef ACCEPT_FUNC64 
+#endif 
 #undef STOP_AT_MATCH
 
 #endif // SHENG_DEFS_H