jasder
/
simdjson
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Untangle amalgamated headers

This commit is contained in:
John Keiser 2020-07-16 14:42:16 -07:00
parent a456d78fe0
commit 7d347be902
6 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
singleheader/amalgamate.sh
View File

@ -54,6 +54,11 @@ function doinclude()
# generic includes are included multiple times # generic includes are included multiple times
if [[ "${file}" == *'generic/'*'.h' ]]; then if [[ "${file}" == *'generic/'*'.h' ]]; then
dofile $AMALGAMATE_SOURCE_PATH $file dofile $AMALGAMATE_SOURCE_PATH $file
# begin/end_implementation are also included multiple times
elif [[ "${file}" == *'begin_implementation.h' ]]; then
dofile $AMALGAMATE_SOURCE_PATH $file
elif [[ "${file}" == *'end_implementation.h' ]]; then
dofile $AMALGAMATE_SOURCE_PATH $file
elif [[ ! " ${found_includes[@]} " =~ " ${file} " ]]; then elif [[ ! " ${found_includes[@]} " =~ " ${file} " ]]; then
found_includes+=("$file") found_includes+=("$file")
dofile $AMALGAMATE_SOURCE_PATH $file dofile $AMALGAMATE_SOURCE_PATH $file

5
src/arm64/begin_implementation.h
View File

@ -1,9 +1,6 @@
#include "simdjson.h" #define SIMDJSON_IMPLEMENTATION arm64
#include "arm64/implementation.h" #include "arm64/implementation.h"
#include "arm64/intrinsics.h" #include "arm64/intrinsics.h"
#define SIMDJSON_IMPLEMENTATION arm64
#include "arm64/bitmanipulation.h" #include "arm64/bitmanipulation.h"
#include "arm64/bitmask.h" #include "arm64/bitmask.h"
#include "arm64/simd.h" #include "arm64/simd.h"

5
src/fallback/begin_implementation.h
View File

@ -1,6 +1,3 @@
#include "simdjson.h"
#include "fallback/implementation.h"
#define SIMDJSON_IMPLEMENTATION fallback #define SIMDJSON_IMPLEMENTATION fallback
#include "fallback/implementation.h"
#include "fallback/bitmanipulation.h" #include "fallback/bitmanipulation.h"

6
src/haswell/begin_implementation.h
View File

@ -1,10 +1,10 @@
#include "simdjson.h" #define SIMDJSON_IMPLEMENTATION haswell
#define SIMDJSON_TARGET_HASWELL SIMDJSON_TARGET_REGION("avx2,bmi,pclmul,lzcnt")
#include "haswell/implementation.h" #include "haswell/implementation.h"
#include "haswell/intrinsics.h" // Generally need to be included outside SIMDJSON_TARGET_REGION #include "haswell/intrinsics.h" // Generally need to be included outside SIMDJSON_TARGET_REGION
#define SIMDJSON_IMPLEMENTATION haswell SIMDJSON_TARGET_HASWELL
SIMDJSON_TARGET_REGION("avx2,bmi,pclmul,lzcnt")
#include "haswell/bitmanipulation.h" #include "haswell/bitmanipulation.h"
#include "haswell/bitmask.h" #include "haswell/bitmask.h"

11
src/haswell/intrinsics.h
View File

@ -41,17 +41,12 @@
// has it as a macro. // has it as a macro.
#ifndef _blsr_u64 #ifndef _blsr_u64
// we roll our own // we roll our own
#include "haswell/begin_implementation.h" SIMDJSON_TARGET_HASWELL
namespace simdjson {
namespace SIMDJSON_IMPLEMENTATION {
static really_inline uint64_t _blsr_u64(uint64_t n) { static really_inline uint64_t _blsr_u64(uint64_t n) {
return (n - 1) & n; return (n - 1) & n;
} }
} // namespace SIMDJSON_IMPLEMENTATION SIMDJSON_UNTARGET_REGION
} // namespace simdjson
#include "haswell/end_implementation.h"
#endif // _blsr_u64 #endif // _blsr_u64
#endif #endif // SIMDJSON_CLANG_VISUAL_STUDIO
#endif // SIMDJSON_HASWELL_INTRINSICS_H #endif // SIMDJSON_HASWELL_INTRINSICS_H

7
src/westmere/begin_implementation.h
View File

@ -1,9 +1,10 @@
#include "simdjson.h" #define SIMDJSON_IMPLEMENTATION westmere
#define SIMDJSON_TARGET_WESTMERE SIMDJSON_TARGET_REGION("sse4.2,pclmul")
#include "westmere/intrinsics.h" // Generally need to be included outside SIMDJSON_TARGET_REGION #include "westmere/intrinsics.h" // Generally need to be included outside SIMDJSON_TARGET_REGION
#include "westmere/implementation.h" #include "westmere/implementation.h"
#define SIMDJSON_IMPLEMENTATION westmere SIMDJSON_TARGET_WESTMERE
SIMDJSON_TARGET_REGION("sse4.2,pclmul")
#include "westmere/bitmanipulation.h" #include "westmere/bitmanipulation.h"
#include "westmere/bitmask.h" #include "westmere/bitmask.h"