Include bitmanip/simd everywhere

jkeiser · jkeiser · commit 44b7a7145c90 · 2020-07-24T02:56:39.000-07:00
diff --git a/src/arm64/begin_implementation.h b/src/arm64/begin_implementation.h
@@ -1,5 +1,9 @@
 #include "simdjson.h"
 #include "arm64/implementation.h"
-#include "arm64/intrinsics.h" // Generally need to be included outside SIMDJSON_TARGET_REGION
+#include "arm64/intrinsics.h"
 
 #define SIMDJSON_IMPLEMENTATION arm64
+
+#include "arm64/bitmanipulation.h"
+#include "arm64/bitmask.h"
+#include "arm64/simd.h"
diff --git a/src/arm64/bitmanipulation.h b/src/arm64/bitmanipulation.h
@@ -1,8 +1,6 @@
 #ifndef SIMDJSON_ARM64_BITMANIPULATION_H
 #define SIMDJSON_ARM64_BITMANIPULATION_H
 
-#include "simdjson.h"
-
 namespace simdjson {
 namespace arm64 {
 
diff --git a/src/arm64/bitmask.h b/src/arm64/bitmask.h
@@ -1,8 +1,6 @@
 #ifndef SIMDJSON_ARM64_BITMASK_H
 #define SIMDJSON_ARM64_BITMASK_H
 
-#include "simdjson.h"
-
 namespace simdjson {
 namespace arm64 {
 
diff --git a/src/arm64/dom_parser_implementation.cpp b/src/arm64/dom_parser_implementation.cpp
@@ -4,10 +4,6 @@
 //
 // Stage 1
 //
-#include "arm64/bitmask.h"
-#include "arm64/simd.h"
-#include "arm64/bitmanipulation.h"
-
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
 
diff --git a/src/arm64/numberparsing.h b/src/arm64/numberparsing.h
@@ -1,20 +1,6 @@
 #ifndef SIMDJSON_ARM64_NUMBERPARSING_H
 #define SIMDJSON_ARM64_NUMBERPARSING_H
 
-#include "simdjson.h"
-#include "jsoncharutils.h"
-#include "arm64/bitmanipulation.h"
-#include <cmath>
-#include <limits>
-
-
-#ifdef JSON_TEST_NUMBERS // for unit testing
-void found_invalid_number(const uint8_t *buf);
-void found_integer(int64_t result, const uint8_t *buf);
-void found_unsigned_integer(uint64_t result, const uint8_t *buf);
-void found_float(double result, const uint8_t *buf);
-#endif
-
 namespace simdjson {
 namespace arm64 {
 
diff --git a/src/arm64/stringparsing.h b/src/arm64/stringparsing.h
@@ -2,7 +2,6 @@
 #define SIMDJSON_ARM64_STRINGPARSING_H
 
 #include "simdjson.h"
-#include "jsoncharutils.h"
 #include "arm64/simd.h"
 #include "arm64/bitmanipulation.h"
 
diff --git a/src/fallback/begin_implementation.h b/src/fallback/begin_implementation.h
@@ -2,3 +2,5 @@
 #include "fallback/implementation.h"
 
 #define SIMDJSON_IMPLEMENTATION fallback
+
+#include "fallback/bitmanipulation.h"
diff --git a/src/fallback/numberparsing.h b/src/fallback/numberparsing.h
@@ -1,12 +1,6 @@
 #ifndef SIMDJSON_FALLBACK_NUMBERPARSING_H
 #define SIMDJSON_FALLBACK_NUMBERPARSING_H
 
-#include "simdjson.h"
-#include "jsoncharutils.h"
-#include "fallback/bitmanipulation.h"
-#include <cmath>
-#include <limits>
-
 #ifdef JSON_TEST_NUMBERS // for unit testing
 void found_invalid_number(const uint8_t *buf);
 void found_integer(int64_t result, const uint8_t *buf);
diff --git a/src/fallback/stringparsing.h b/src/fallback/stringparsing.h
@@ -2,7 +2,6 @@
 #define SIMDJSON_FALLBACK_STRINGPARSING_H
 
 #include "simdjson.h"
-#include "jsoncharutils.h"
 
 namespace simdjson {
 namespace fallback {
diff --git a/src/generic/stage2/numberparsing.h b/src/generic/stage2/numberparsing.h
@@ -1,3 +1,7 @@
+#include "jsoncharutils.h"
+#include <cmath>
+#include <limits>
+
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
 namespace stage2 {
diff --git a/src/generic/stage2/stringparsing.h b/src/generic/stage2/stringparsing.h
@@ -1,7 +1,7 @@
 // This file contains the common code every implementation uses
 // It is intended to be included multiple times and compiled multiple times
-// We assume the file in which it is include already includes
-// "stringparsing.h" (this simplifies amalgation)
+
+#include "jsoncharutils.h"
 
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
diff --git a/src/haswell/begin_implementation.h b/src/haswell/begin_implementation.h
@@ -1,6 +1,12 @@
 #include "simdjson.h"
+
 #include "haswell/implementation.h"
 #include "haswell/intrinsics.h" // Generally need to be included outside SIMDJSON_TARGET_REGION
 
 #define SIMDJSON_IMPLEMENTATION haswell
 SIMDJSON_TARGET_REGION("avx2,bmi,pclmul,lzcnt")
+
+#include "haswell/bitmanipulation.h"
+#include "haswell/bitmask.h"
+#include "haswell/simd.h"
+
diff --git a/src/haswell/bitmanipulation.h b/src/haswell/bitmanipulation.h
@@ -1,8 +1,6 @@
 #ifndef SIMDJSON_HASWELL_BITMANIPULATION_H
 #define SIMDJSON_HASWELL_BITMANIPULATION_H
 
-#include "simdjson.h"
-
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
 
diff --git a/src/haswell/bitmask.h b/src/haswell/bitmask.h
@@ -1,8 +1,6 @@
 #ifndef SIMDJSON_HASWELL_BITMASK_H
 #define SIMDJSON_HASWELL_BITMASK_H
 
-#include "simdjson.h"
-
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
 
diff --git a/src/haswell/dom_parser_implementation.cpp b/src/haswell/dom_parser_implementation.cpp
@@ -4,9 +4,6 @@
 //
 // Stage 1
 //
-#include "haswell/bitmask.h"
-#include "haswell/simd.h"
-#include "haswell/bitmanipulation.h"
 
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
diff --git a/src/haswell/numberparsing.h b/src/haswell/numberparsing.h
@@ -1,20 +1,6 @@
 #ifndef SIMDJSON_HASWELL_NUMBERPARSING_H
 #define SIMDJSON_HASWELL_NUMBERPARSING_H
 
-#include "simdjson.h"
-
-#include "jsoncharutils.h"
-#include "haswell/bitmanipulation.h"
-#include <cmath>
-#include <limits>
-
-#ifdef JSON_TEST_NUMBERS // for unit testing
-void found_invalid_number(const uint8_t *buf);
-void found_integer(int64_t result, const uint8_t *buf);
-void found_unsigned_integer(uint64_t result, const uint8_t *buf);
-void found_float(double result, const uint8_t *buf);
-#endif
-
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
 
diff --git a/src/haswell/simd.h b/src/haswell/simd.h
@@ -1,9 +1,7 @@
 #ifndef SIMDJSON_HASWELL_SIMD_H
 #define SIMDJSON_HASWELL_SIMD_H
 
-#include "simdjson.h"
 #include "simdprune_tables.h"
-#include "haswell/bitmanipulation.h"
 
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
diff --git a/src/haswell/stringparsing.h b/src/haswell/stringparsing.h
@@ -2,7 +2,6 @@
 #define SIMDJSON_HASWELL_STRINGPARSING_H
 
 #include "simdjson.h"
-#include "jsoncharutils.h"
 #include "haswell/simd.h"
 #include "haswell/bitmanipulation.h"
 
diff --git a/src/westmere/begin_implementation.h b/src/westmere/begin_implementation.h
@@ -4,3 +4,7 @@
 
 #define SIMDJSON_IMPLEMENTATION westmere
 SIMDJSON_TARGET_REGION("sse4.2,pclmul")
+
+#include "westmere/bitmanipulation.h"
+#include "westmere/bitmask.h"
+#include "westmere/simd.h"
diff --git a/src/westmere/bitmanipulation.h b/src/westmere/bitmanipulation.h
@@ -1,8 +1,6 @@
 #ifndef SIMDJSON_WESTMERE_BITMANIPULATION_H
 #define SIMDJSON_WESTMERE_BITMANIPULATION_H
 
-#include "simdjson.h"
-
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
 
diff --git a/src/westmere/bitmask.h b/src/westmere/bitmask.h
@@ -1,8 +1,6 @@
 #ifndef SIMDJSON_WESTMERE_BITMASK_H
 #define SIMDJSON_WESTMERE_BITMASK_H
 
-#include "simdjson.h"
-
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
 
diff --git a/src/westmere/dom_parser_implementation.cpp b/src/westmere/dom_parser_implementation.cpp
@@ -3,10 +3,6 @@
 //
 // Stage 1
 //
-#include "westmere/bitmask.h"
-#include "westmere/simd.h"
-#include "westmere/bitmanipulation.h"
-#include "westmere/implementation.h"
 
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
diff --git a/src/westmere/numberparsing.h b/src/westmere/numberparsing.h
@@ -1,20 +1,6 @@
 #ifndef SIMDJSON_WESTMERE_NUMBERPARSING_H
 #define SIMDJSON_WESTMERE_NUMBERPARSING_H
 
-#include "simdjson.h"
-#include "jsoncharutils.h"
-#include "westmere/bitmanipulation.h"
-#include <cmath>
-#include <limits>
-
-
-#ifdef JSON_TEST_NUMBERS // for unit testing
-void found_invalid_number(const uint8_t *buf);
-void found_integer(int64_t result, const uint8_t *buf);
-void found_unsigned_integer(uint64_t result, const uint8_t *buf);
-void found_float(double result, const uint8_t *buf);
-#endif
-
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
 
diff --git a/src/westmere/simd.h b/src/westmere/simd.h
@@ -1,9 +1,7 @@
 #ifndef SIMDJSON_WESTMERE_SIMD_H
 #define SIMDJSON_WESTMERE_SIMD_H
 
-#include "simdjson.h"
 #include "simdprune_tables.h"
-#include "westmere/bitmanipulation.h"
 
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
diff --git a/src/westmere/stringparsing.h b/src/westmere/stringparsing.h
@@ -1,11 +1,6 @@
 #ifndef SIMDJSON_WESTMERE_STRINGPARSING_H
 #define SIMDJSON_WESTMERE_STRINGPARSING_H
 
-#include "simdjson.h"
-#include "jsoncharutils.h"
-#include "westmere/simd.h"
-#include "westmere/bitmanipulation.h"
-
 namespace simdjson {
 namespace SIMDJSON_IMPLEMENTATION {
 
