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

Fixing amalgamate under ARM

This commit is contained in:
Daniel Lemire 2019-07-30 22:10:48 +00:00
parent c2eea8abba
commit 76da659977
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -3,6 +3,7 @@ FROM gcc:8.3
COPY . /usr/src/ COPY . /usr/src/
WORKDIR /usr/src/ WORKDIR /usr/src/
RUN make clean RUN make clean
RUN make amalgamate
RUN make RUN make
RUN make test RUN make test
RUN make parsingcompetition RUN make parsingcompetition

3
amalgamation.sh
View File

@ -114,6 +114,9 @@ cat <<< '
#include "simdjson.h" #include "simdjson.h"
#include "simdjson.cpp" #include "simdjson.cpp"
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
if(argc < 2) {
std::cerr << "Please specify a filename " << std::endl;
}
const char * filename = argv[1]; const char * filename = argv[1];
simdjson::padded_string p = simdjson::get_corpus(filename); simdjson::padded_string p = simdjson::get_corpus(filename);
simdjson::ParsedJson pj = simdjson::build_parsed_json(p); // do the parsing simdjson::ParsedJson pj = simdjson::build_parsed_json(p); // do the parsing

4
include/simdjson/stage1_find_marks_flatten_haswell.h
View File

@ -9,6 +9,8 @@
#include "simdjson/common_defs.h" #include "simdjson/common_defs.h"
#include "simdjson/portability.h" #include "simdjson/portability.h"
#ifdef IS_X86_64
TARGET_HASWELL TARGET_HASWELL
namespace simdjson { namespace simdjson {
namespace haswell { namespace haswell {
@ -82,5 +84,5 @@ really_inline void flatten_bits(uint32_t *base_ptr, uint32_t &base,
} // namespace haswell } // namespace haswell
} // namespace simdjson } // namespace simdjson
UNTARGET_REGION UNTARGET_REGION
#endif // IS_X86_64
#endif // SIMDJSON_STAGE1_FIND_MARKS_FLATTEN_H #endif // SIMDJSON_STAGE1_FIND_MARKS_FLATTEN_H