Basically, haswell processor should be able to count on lzcnt. (simdjson#458)

lemire · web-flow · commit 3488c49d0a62 · 2020-01-22T16:52:55.000-05:00
diff --git a/include/simdjson/portability.h b/include/simdjson/portability.h
@@ -48,7 +48,7 @@
 #endif
 
 // under GCC and CLANG, we use these two macros
-#define TARGET_HASWELL TARGET_REGION("avx2,bmi,pclmul")
+#define TARGET_HASWELL TARGET_REGION("avx2,bmi,pclmul,lzcnt")
 #define TARGET_WESTMERE TARGET_REGION("sse4.2,pclmul")
 #define TARGET_ARM64
 
diff --git a/src/arm64/numberparsing.h b/src/arm64/numberparsing.h
@@ -5,7 +5,8 @@
 
 #include "simdjson/common_defs.h"
 #include "simdjson/portability.h"
-#include "westmere/intrinsics.h"
+#include "arm64/intrinsics.h"
+#include "arm64/bitmanipulation.h"
 #include "simdjson/parsedjson.h"
 #include "jsoncharutils.h"
 #include <cmath>
diff --git a/src/haswell/numberparsing.h b/src/haswell/numberparsing.h
@@ -5,7 +5,8 @@
 
 #include "simdjson/common_defs.h"
 #include "simdjson/portability.h"
-#include "westmere/intrinsics.h"
+#include "haswell/intrinsics.h"
+#include "haswell/bitmanipulation.h"
 #include "simdjson/parsedjson.h"
 #include "jsoncharutils.h"
 #include <cmath>
diff --git a/src/westmere/numberparsing.h b/src/westmere/numberparsing.h
@@ -9,6 +9,7 @@
 #include "simdjson/common_defs.h"
 #include "simdjson/portability.h"
 #include "westmere/intrinsics.h"
+#include "westmere/bitmanipulation.h"
 #include "simdjson/parsedjson.h"
 #include "jsoncharutils.h"
 #include <cmath>
