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

215 lines
10 KiB
Makefile
Raw Normal View History

Validate perf against master, not v0.2.1
2019-08-27 04:35:18 +08:00
REFERENCE_VERSION = master
Private research repo.
2018-03-23 12:05:32 +08:00
.SUFFIXES:
#
.SUFFIXES: .cpp .o .c .h
.PHONY: clean cleandist
simdjson vs. JSON for Modern C++ (#247) * New competitor. * Fixing makefile.
2019-08-03 07:48:34 +08:00
COREDEPSINCLUDE = -Idependencies/json/single_include -Idependencies/rapidjson/include -Idependencies/sajson/include -Idependencies/cJSON -Idependencies/jsmn
Adding jsoncpp
2019-01-25 03:28:26 +08:00
EXTRADEPSINCLUDE = -Idependencies/jsoncppdist -Idependencies/json11 -Idependencies/fastjson/src -Idependencies/fastjson/include -Idependencies/gason/src -Idependencies/ujson4c/3rdparty -Idependencies/ujson4c/src
Allowing users to provide additional flags.
2019-06-04 02:17:42 +08:00
# users can provide their own additional flags with make EXTRAFLAGS=something
On ARM NEON, we need crypto support.
2019-06-20 04:45:09 +08:00
architecture:=$(shell arch)
Various minor tweaks.
2019-07-05 05:19:05 +08:00
####
# If you want to specify your own target architecture,
# then define ARCHFLAGS. Otherwise, we set good default.
Adding comments.
2019-07-05 07:10:05 +08:00
# E.g., type ' ARCHFLAGS="-march=nehalem" make parse '
Various minor tweaks.
2019-07-05 05:19:05 +08:00
###
On ARM NEON, we need crypto support.
2019-06-20 04:45:09 +08:00
ifeq ($(architecture),aarch64)
Various minor tweaks.
2019-07-05 05:19:05 +08:00
ARCHFLAGS ?= -march=armv8-a+crc+crypto
On ARM NEON, we need crypto support.
2019-06-20 04:45:09 +08:00
else
Runtime dispatch * Attempt 1 - fn targeting GCC won't work with templates with different targets, need to specialize all the way up the call stack. * Compiles properly with cmake. Does not with the Makefile. * Compilation works with Makefile * instruction_set changes to architecture * some aesthetic changes * fix amalgation and tests + aesthetic changes * This now compiles and passes tests under CLANG * Minor correction. * Trying to make it work on ARM * Adding missing namespace * Missing bracket * Fixing minor compilation issues. * Getting parse to use runtime dispatch * Fixing amalgamation script. * Making sure that NEON is supported. * Fixing typo * Merging https://github.com/lemire/simdjson/pull/229 * Manual merge of https://github.com/lemire/simdjson/pull/229 by @jkeiser (second part) * Trying another way. * Removing the paral. * Fixing the make file * Let us make the practice run long enough. * Resolved the awful slowness. * Cleaning the README.md * With runtime dispatching, we should not need flags anymore. * Changing isa detection file's name + fixing typos.
2019-07-29 10:46:33 +08:00
ARCHFLAGS ?= -msse4.2 -mpclmul # lowest supported feature set?
On ARM NEON, we need crypto support.
2019-06-20 04:45:09 +08:00
endif
Allows additional C(XX)FLAGS to be passed through command line (#142) * Allow passing additional compiler flags through command line * Simplify branching for compiler flags * Optimize for debug while debugging or sanitizing specified
2019-04-17 10:07:03 +08:00
Move architecture-specific headers to src/ (#287) * Use namespaces instead of templates for stage1 impls * Move stage1 implementation into the src/ directory * Move architecture-specific code to src/
2019-08-21 19:59:49 +08:00
CXXFLAGS = $(ARCHFLAGS) -std=c++17 -Wall -Wextra -Wshadow -Iinclude -Isrc -Ibenchmark/linux $(EXTRAFLAGS)
Various minor tweaks.
2019-07-05 05:19:05 +08:00
CFLAGS = $(ARCHFLAGS) -Idependencies/ujson4c/3rdparty -Idependencies/ujson4c/src $(EXTRAFLAGS)
With this commit we can do all tests with full sanitizers on, and get no warning (#132) * Making sure we can run with the sanitizers on. * Minor code simplification in the number parsing. * Following @EmilGedda 's recommendations regarding the makefile. * Reference to blog post. * Adding link to https://johnnylee-sde.github.io/Fast-numeric-string-to-int/ * Better hex parsing.
2019-04-25 05:31:47 +08:00
# This is a convenience flag
ifdef SANITIZEGOLD
SANITIZE = 1
LINKER = gold
Various cleaning steps.
2018-11-10 10:31:14 +08:00
endif
With this commit we can do all tests with full sanitizers on, and get no warning (#132) * Making sure we can run with the sanitizers on. * Minor code simplification in the number parsing. * Following @EmilGedda 's recommendations regarding the makefile. * Reference to blog post. * Adding link to https://johnnylee-sde.github.io/Fast-numeric-string-to-int/ * Better hex parsing.
2019-04-25 05:31:47 +08:00
ifdef LINKER
CXXFLAGS += -fuse-ld=$(LINKER)
CFLAGS += -fuse-ld=$(LINKER)
Removing memory leaks.
2018-12-12 06:20:29 +08:00
endif
Various cleaning steps.
2018-11-10 10:31:14 +08:00
With this commit we can do all tests with full sanitizers on, and get no warning (#132) * Making sure we can run with the sanitizers on. * Minor code simplification in the number parsing. * Following @EmilGedda 's recommendations regarding the makefile. * Reference to blog post. * Adding link to https://johnnylee-sde.github.io/Fast-numeric-string-to-int/ * Better hex parsing.
2019-04-25 05:31:47 +08:00
# SANITIZE *implies* DEBUG
Adding white-listing for memory sanitizer.
2019-05-19 23:18:54 +08:00
ifeq ($(MEMSANITIZE),1)
CXXFLAGS += -g3 -O0 -fsanitize=memory -fno-omit-frame-pointer -fsanitize=undefined
CFLAGS += -g3 -O0 -fsanitize=memory -fno-omit-frame-pointer -fsanitize=undefined
else
With this commit we can do all tests with full sanitizers on, and get no warning (#132) * Making sure we can run with the sanitizers on. * Minor code simplification in the number parsing. * Following @EmilGedda 's recommendations regarding the makefile. * Reference to blog post. * Adding link to https://johnnylee-sde.github.io/Fast-numeric-string-to-int/ * Better hex parsing.
2019-04-25 05:31:47 +08:00
ifeq ($(SANITIZE),1)
CXXFLAGS += -g3 -O0 -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined
CFLAGS += -g3 -O0 -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined
else
ifeq ($(DEBUG),1)
CXXFLAGS += -g3 -O0
CFLAGS += -g3 -O0
else
# we opt for -O3 for regular builds
CXXFLAGS += -O3
CFLAGS += -O3
endif # ifeq ($(DEBUG),1)
endif # ifeq ($(SANITIZE),1)
Adding white-listing for memory sanitizer.
2019-05-19 23:18:54 +08:00
endif # ifeq ($(MEMSANITIZE),1)
With this commit we can do all tests with full sanitizers on, and get no warning (#132) * Making sure we can run with the sanitizers on. * Minor code simplification in the number parsing. * Following @EmilGedda 's recommendations regarding the makefile. * Reference to blog post. * Adding link to https://johnnylee-sde.github.io/Fast-numeric-string-to-int/ * Better hex parsing.
2019-04-25 05:31:47 +08:00
Json pointer (#220) * json pointer support * Addition of tests for the json pointer * Adding a new tool for the JSON Pointer support, and some documentation.
2019-07-27 06:38:10 +08:00
MAINEXECUTABLES=parse minify json2json jsonstats statisticalmodel jsonpointer
TESTEXECUTABLES=jsoncheck numberparsingcheck stringparsingcheck pointercheck
Adding more competition.
2019-01-18 06:24:29 +08:00
COMPARISONEXECUTABLES=minifiercompetition parsingcompetition parseandstatcompetition distinctuseridcompetition allparserscheckfile allparsingcompetition
Trying a detailed analysis.
2018-12-20 10:23:37 +08:00
SUPPLEMENTARYEXECUTABLES=parse_noutf8validation parse_nonumberparsing parse_nostringparsing
Private research repo.
2018-03-23 12:05:32 +08:00
Move architecture-specific headers to src/ (#287) * Use namespaces instead of templates for stage1 impls * Move stage1 implementation into the src/ directory * Move architecture-specific code to src/
2019-08-21 19:59:49 +08:00
# Load headers and sources
LIBHEADERS=src/simd_input.h src/simdutf8check.h src/stringparsing.h src/arm64/architecture.h src/arm64/simd_input.h src/arm64/simdutf8check.h src/arm64/stage1_find_marks.h src/arm64/stage2_build_tape.h src/arm64/stringparsing.h src/generic/stage1_find_marks_flatten.h src/generic/stage1_find_marks.h src/generic/stage2_build_tape.h src/generic/stringparsing.h src/haswell/architecture.h src/haswell/simd_input.h src/haswell/simdutf8check.h src/haswell/stage1_find_marks.h src/haswell/stage2_build_tape.h src/haswell/stringparsing.h src/westmere/architecture.h src/westmere/simd_input.h src/westmere/simdutf8check.h src/westmere/stage1_find_marks.h src/westmere/stage2_build_tape.h src/westmere/stringparsing.h
PUBHEADERS=include/simdjson/common_defs.h include/simdjson/isadetection.h include/simdjson/jsoncharutils.h include/simdjson/jsonformatutils.h include/simdjson/jsonioutil.h include/simdjson/jsonminifier.h include/simdjson/jsonparser.h include/simdjson/numberparsing.h include/simdjson/padded_string.h include/simdjson/parsedjson.h include/simdjson/parsedjsoniterator.h include/simdjson/portability.h include/simdjson/simdjson.h include/simdjson/simdjson_version.h include/simdjson/simdprune_tables.h include/simdjson/stage1_find_marks.h include/simdjson/stage2_build_tape.h
HEADERS=$(PUBHEADERS) $(LIBHEADERS)
Runtime dispatch * Attempt 1 - fn targeting GCC won't work with templates with different targets, need to specialize all the way up the call stack. * Compiles properly with cmake. Does not with the Makefile. * Compilation works with Makefile * instruction_set changes to architecture * some aesthetic changes * fix amalgation and tests + aesthetic changes * This now compiles and passes tests under CLANG * Minor correction. * Trying to make it work on ARM * Adding missing namespace * Missing bracket * Fixing minor compilation issues. * Getting parse to use runtime dispatch * Fixing amalgamation script. * Making sure that NEON is supported. * Fixing typo * Merging https://github.com/lemire/simdjson/pull/229 * Manual merge of https://github.com/lemire/simdjson/pull/229 by @jkeiser (second part) * Trying another way. * Removing the paral. * Fixing the make file * Let us make the practice run long enough. * Resolved the awful slowness. * Cleaning the README.md * With runtime dispatching, we should not need flags anymore. * Changing isa detection file's name + fixing typos.
2019-07-29 10:46:33 +08:00
LIBFILES=src/jsonioutil.cpp src/jsonparser.cpp src/simdjson.cpp src/stage1_find_marks.cpp src/stage2_build_tape.cpp src/parsedjson.cpp src/parsedjsoniterator.cpp
Some refactoring.
2018-11-30 22:37:57 +08:00
MINIFIERHEADERS=include/simdjson/jsonminifier.h include/simdjson/simdprune_tables.h
Minor fixes + new scripts.
2018-08-21 05:40:50 +08:00
MINIFIERLIBFILES=src/jsonminifier.cpp
Private research repo.
2018-03-23 12:05:32 +08:00
Major surgery.
2018-08-21 05:27:25 +08:00
RAPIDJSON_INCLUDE:=dependencies/rapidjson/include
Integrating sajson.
2018-09-28 12:00:52 +08:00
SAJSON_INCLUDE:=dependencies/sajson/include
Added dropbox
2018-11-21 03:09:43 +08:00
JSON11_INCLUDE:=dependencies/json11/json11.hpp
Added another ref.
2018-11-21 03:32:12 +08:00
FASTJSON_INCLUDE:=dependencies/include/fastjson/fastjson.h
Added dependencies.
2018-11-21 05:43:22 +08:00
GASON_INCLUDE:=dependencies/gason/src/gason.h
UJSON4C_INCLUDE:=dependencies/ujson4c/src/ujdecode.c
Fixing the makefile build.
2019-02-23 04:34:35 +08:00
CJSON_INCLUDE:=dependencies/cJSON/cJSON.h
Adding more competition.
2019-01-18 06:24:29 +08:00
JSMN_INCLUDE:=dependencies/jsmn/jsmn.h
simdjson vs. JSON for Modern C++ (#247) * New competitor. * Fixing makefile.
2019-08-03 07:48:34 +08:00
JSON_INCLUDE:=dependencies/json/single_include/nlohmann/json.hpp
Adding more competition.
2019-01-18 06:24:29 +08:00
simdjson vs. JSON for Modern C++ (#247) * New competitor. * Fixing makefile.
2019-08-03 07:48:34 +08:00
LIBS=$(RAPIDJSON_INCLUDE) $(JSON_INCLUDE) $(SAJSON_INCLUDE) $(JSON11_INCLUDE) $(FASTJSON_INCLUDE) $(GASON_INCLUDE) $(UJSON4C_INCLUDE) $(CJSON_INCLUDE) $(JSMN_INCLUDE)
Added Google double conversion.
2018-07-29 08:18:56 +08:00
Ok. Looks complete.
2018-12-15 10:32:42 +08:00
EXTRAOBJECTS=ujdecode.o
Cleaning.
2018-12-01 11:02:32 +08:00
all: $(MAINEXECUTABLES)
Moving tests to a separate file and directory.
2018-08-18 07:57:31 +08:00
Ok. Looks complete.
2018-12-15 10:32:42 +08:00
competition: $(COMPARISONEXECUTABLES)
Updating documentation.
2018-12-15 10:50:55 +08:00
.PHONY: benchmark test
Fixing the makefile build.
2019-02-23 04:34:35 +08:00
benchmark:
Updating documentation.
2018-12-15 10:50:55 +08:00
bash ./scripts/parser.sh
bash ./scripts/parseandstat.sh
Json pointer (#220) * json pointer support * Addition of tests for the json pointer * Adding a new tool for the JSON Pointer support, and some documentation.
2019-07-27 06:38:10 +08:00
test: jsoncheck numberparsingcheck stringparsingcheck basictests allparserscheckfile minify json2json pointercheck
Fix for issue 154 (#157) * Changes necessary to reproduce https://github.com/lemire/simdjson/issues/154 * Fixing issue 154.
2019-05-09 10:33:11 +08:00
./basictests
Added more thorough testing.
2018-10-24 08:19:33 +08:00
./numberparsingcheck
./stringparsingcheck
Moving tests to a separate file and directory.
2018-08-18 07:57:31 +08:00
./jsoncheck
Json pointer (#220) * json pointer support * Addition of tests for the json pointer * Adding a new tool for the JSON Pointer support, and some documentation.
2019-07-27 06:38:10 +08:00
./pointercheck
Adding more tests.
2018-12-07 06:22:22 +08:00
./scripts/testjson2json.sh
Fix for issue 150 (#162) * Checks for issue 150. We run through the test files with sanitizers on. * Fix for issue 150: the remaining issues were an overrun on the depth capacity and an "off-by-1" overrun on tape capacity. * Improving makefile. * Safer git submodule command. * Getting get 'git' on circleci
2019-05-10 08:51:33 +08:00
./scripts/issue150.sh
Added more thorough testing.
2018-10-24 08:19:33 +08:00
@echo "It looks like the code is good!"
Json pointer (#220) * json pointer support * Addition of tests for the json pointer * Adding a new tool for the JSON Pointer support, and some documentation.
2019-07-27 06:38:10 +08:00
quiettest: jsoncheck numberparsingcheck stringparsingcheck basictests allparserscheckfile minify json2json pointercheck
Fix for issue 154 (#157) * Changes necessary to reproduce https://github.com/lemire/simdjson/issues/154 * Fixing issue 154.
2019-05-09 10:33:11 +08:00
./basictests
Use tabs please.
2019-02-23 03:12:16 +08:00
./numberparsingcheck
./stringparsingcheck
./jsoncheck
Json pointer (#220) * json pointer support * Addition of tests for the json pointer * Adding a new tool for the JSON Pointer support, and some documentation.
2019-07-27 06:38:10 +08:00
./pointercheck
Use tabs please.
2019-02-23 03:12:16 +08:00
./scripts/testjson2json.sh
Fix for issue 150 (#162) * Checks for issue 150. We run through the test files with sanitizers on. * Fix for issue 150: the remaining issues were an overrun on the depth capacity and an "off-by-1" overrun on tape capacity. * Improving makefile. * Safer git submodule command. * Getting get 'git' on circleci
2019-05-10 08:51:33 +08:00
./scripts/issue150.sh
Introducing a quiet test (for automated testing).
2019-02-23 03:09:03 +08:00
Single-header version.
2018-12-31 10:50:10 +08:00
amalgamate:
./amalgamation.sh
Fixing amalgamation.
2019-07-30 21:10:40 +08:00
$(CXX) $(CXXFLAGS) -o singleheader/demo ./singleheader/amalgamation_demo.cpp -Isingleheader
Major surgery.
2018-08-21 05:27:25 +08:00
Fix for issue 150 (#162) * Checks for issue 150. We run through the test files with sanitizers on. * Fix for issue 150: the remaining issues were an overrun on the depth capacity and an "off-by-1" overrun on tape capacity. * Improving makefile. * Safer git submodule command. * Getting get 'git' on circleci
2019-05-10 08:51:33 +08:00
submodules:
Makefile: A git failure should not be considered a critical failure.
2019-05-30 00:03:07 +08:00
-git submodule update --init --recursive
Tweaking makefile.
2019-07-11 23:54:17 +08:00
-touch submodules
Major surgery.
2018-08-21 05:27:25 +08:00
simdjson vs. JSON for Modern C++ (#247) * New competitor. * Fixing makefile.
2019-08-03 07:48:34 +08:00
$(JSON_INCLUDE) $(SAJSON_INCLUDE) $(RAPIDJSON_INCLUDE) $(JSON11_INCLUDE) $(FASTJSON_INCLUDE) $(GASON_INCLUDE) $(UJSON4C_INCLUDE) $(CJSON_INCLUDE) $(JSMN_INCLUDE) : submodules
Major surgery.
2018-08-21 05:27:25 +08:00
Moved the files into subdirectories.
2018-08-21 02:45:51 +08:00
parse: benchmark/parse.cpp $(HEADERS) $(LIBFILES)
$(CXX) $(CXXFLAGS) -o parse $(LIBFILES) benchmark/parse.cpp $(LIBFLAGS)
Moving tests to a separate file and directory.
2018-08-18 07:57:31 +08:00
check for performance degradation in CI (#270) * Add -n and -w arguments * Add Dockerfile that compares perf against master * Add checkperf to .drone.yml * Clone from github instead of .git since CI doesn't have .git
2019-08-13 04:03:56 +08:00
perfdiff: benchmark/perfdiff.cpp
$(CXX) $(CXXFLAGS) -o perfdiff benchmark/perfdiff.cpp $(LIBFLAGS)
checkperf:
Make perf validation more stable, check no-AVX as well (#275) * Compare against v0.2.1, fail only if perf is less 6 times in a row * Run AVX and no-AVX perf tests in Circle CI * Set % difference threshold to 0.2%
2019-08-16 08:43:21 +08:00
bash ./scripts/checkperf.sh $(REFERENCE_VERSION)
check for performance degradation in CI (#270) * Add -n and -w arguments * Add Dockerfile that compares perf against master * Add checkperf to .drone.yml * Clone from github instead of .git since CI doesn't have .git
2019-08-13 04:03:56 +08:00
Let us try this.
2018-12-25 01:28:27 +08:00
statisticalmodel: benchmark/statisticalmodel.cpp $(HEADERS) $(LIBFILES)
$(CXX) $(CXXFLAGS) -o statisticalmodel $(LIBFILES) benchmark/statisticalmodel.cpp $(LIBFLAGS)
Trying a detailed analysis.
2018-12-20 10:23:37 +08:00
parse_noutf8validation: benchmark/parse.cpp $(HEADERS) $(LIBFILES)
$(CXX) $(CXXFLAGS) -o parse_noutf8validation -DSIMDJSON_SKIPUTF8VALIDATION $(LIBFILES) benchmark/parse.cpp $(LIBFLAGS)
parse_nonumberparsing: benchmark/parse.cpp $(HEADERS) $(LIBFILES)
$(CXX) $(CXXFLAGS) -o parse_nonumberparsing -DSIMDJSON_SKIPNUMBERPARSING $(LIBFILES) benchmark/parse.cpp $(LIBFLAGS)
parse_nostringparsing: benchmark/parse.cpp $(HEADERS) $(LIBFILES)
$(CXX) $(CXXFLAGS) -o parse_nostringparsing -DSIMDJSON_SKIPSTRINGPARSING $(LIBFILES) benchmark/parse.cpp $(LIBFLAGS)
Moving tests to a separate file and directory.
2018-08-18 07:57:31 +08:00
jsoncheck:tests/jsoncheck.cpp $(HEADERS) $(LIBFILES)
$(CXX) $(CXXFLAGS) -o jsoncheck $(LIBFILES) tests/jsoncheck.cpp -I. $(LIBFLAGS)
Fix for issue 154 (#157) * Changes necessary to reproduce https://github.com/lemire/simdjson/issues/154 * Fixing issue 154.
2019-05-09 10:33:11 +08:00
basictests:tests/basictests.cpp $(HEADERS) $(LIBFILES)
$(CXX) $(CXXFLAGS) -o basictests $(LIBFILES) tests/basictests.cpp -I. $(LIBFLAGS)
Moving toward having number-parsing testing.
2018-09-28 05:38:15 +08:00
numberparsingcheck:tests/numberparsingcheck.cpp $(HEADERS) $(LIBFILES)
Change parse_json return type from bool to int (#82) * Added simdjerr namespace * Updated jsonparser files * updated stage1 and stage2 * removed stage2 inline function * Added forgotten return statements * Updated tools and benchmarks * Corrected parenthesis * Removed extra = * Accidentally undid reinterpret_cast * Better comments, undid a header name fuckup * Added an errorMsg method, updated readme * Removed useless header from stage2 * Updated single-header file * added simdjerr.cpp contents to simdjson.cpp * Made single header version work * Updated singleheader test, fixed simdjson.cpp * Renamed simdjerr namespace and files to simdjson * Updating the amalgamation.
2019-03-03 06:18:45 +08:00
$(CXX) $(CXXFLAGS) -o numberparsingcheck tests/numberparsingcheck.cpp src/jsonioutil.cpp src/jsonparser.cpp src/simdjson.cpp src/stage1_find_marks.cpp src/parsedjson.cpp -I. $(LIBFLAGS) -DJSON_TEST_NUMBERS
Moving toward having number-parsing testing.
2018-09-28 05:38:15 +08:00
Added more thorough testing.
2018-10-24 08:19:33 +08:00
stringparsingcheck:tests/stringparsingcheck.cpp $(HEADERS) $(LIBFILES)
Change parse_json return type from bool to int (#82) * Added simdjerr namespace * Updated jsonparser files * updated stage1 and stage2 * removed stage2 inline function * Added forgotten return statements * Updated tools and benchmarks * Corrected parenthesis * Removed extra = * Accidentally undid reinterpret_cast * Better comments, undid a header name fuckup * Added an errorMsg method, updated readme * Removed useless header from stage2 * Updated single-header file * added simdjerr.cpp contents to simdjson.cpp * Made single header version work * Updated singleheader test, fixed simdjson.cpp * Renamed simdjerr namespace and files to simdjson * Updating the amalgamation.
2019-03-03 06:18:45 +08:00
$(CXX) $(CXXFLAGS) -o stringparsingcheck tests/stringparsingcheck.cpp src/jsonioutil.cpp src/jsonparser.cpp src/simdjson.cpp src/stage1_find_marks.cpp src/parsedjson.cpp -I. $(LIBFLAGS) -DJSON_TEST_STRINGS
Added more thorough testing.
2018-10-24 08:19:33 +08:00
Json pointer (#220) * json pointer support * Addition of tests for the json pointer * Adding a new tool for the JSON Pointer support, and some documentation.
2019-07-27 06:38:10 +08:00
pointercheck:tests/pointercheck.cpp $(HEADERS) $(LIBFILES)
Runtime dispatch * Attempt 1 - fn targeting GCC won't work with templates with different targets, need to specialize all the way up the call stack. * Compiles properly with cmake. Does not with the Makefile. * Compilation works with Makefile * instruction_set changes to architecture * some aesthetic changes * fix amalgation and tests + aesthetic changes * This now compiles and passes tests under CLANG * Minor correction. * Trying to make it work on ARM * Adding missing namespace * Missing bracket * Fixing minor compilation issues. * Getting parse to use runtime dispatch * Fixing amalgamation script. * Making sure that NEON is supported. * Fixing typo * Merging https://github.com/lemire/simdjson/pull/229 * Manual merge of https://github.com/lemire/simdjson/pull/229 by @jkeiser (second part) * Trying another way. * Removing the paral. * Fixing the make file * Let us make the practice run long enough. * Resolved the awful slowness. * Cleaning the README.md * With runtime dispatching, we should not need flags anymore. * Changing isa detection file's name + fixing typos.
2019-07-29 10:46:33 +08:00
$(CXX) $(CXXFLAGS) -o pointercheck tests/pointercheck.cpp src/stage2_build_tape.cpp src/jsonioutil.cpp src/jsonparser.cpp src/simdjson.cpp src/stage1_find_marks.cpp src/parsedjson.cpp src/parsedjsoniterator.cpp -I. $(LIBFLAGS)
Added more thorough testing.
2018-10-24 08:19:33 +08:00
Tweaking makefile.
2019-07-11 23:54:17 +08:00
minifiercompetition: benchmark/minifiercompetition.cpp $(HEADERS) submodules $(MINIFIERHEADERS) $(LIBFILES) $(MINIFIERLIBFILES)
Ok. Looks complete.
2018-12-15 10:32:42 +08:00
$(CXX) $(CXXFLAGS) -o minifiercompetition $(LIBFILES) $(MINIFIERLIBFILES) benchmark/minifiercompetition.cpp -I. $(LIBFLAGS) $(COREDEPSINCLUDE)
Major surgery.
2018-08-21 05:27:25 +08:00
Integrating sajson.
2018-09-28 12:00:52 +08:00
minify: tools/minify.cpp $(HEADERS) $(MINIFIERHEADERS) $(LIBFILES) $(MINIFIERLIBFILES)
Fixing the makefile build.
2019-02-23 04:34:35 +08:00
$(CXX) $(CXXFLAGS) -o minify $(MINIFIERLIBFILES) $(LIBFILES) tools/minify.cpp -I.
Integrating sajson.
2018-09-28 12:00:52 +08:00
Adding more tests.
2018-12-07 06:22:22 +08:00
json2json: tools/json2json.cpp $(HEADERS) $(LIBFILES)
Fixing the makefile build.
2019-02-23 04:34:35 +08:00
$(CXX) $(CXXFLAGS) -o json2json $ tools/json2json.cpp $(LIBFILES) -I.
Adding more tests.
2018-12-07 06:22:22 +08:00
Json pointer (#220) * json pointer support * Addition of tests for the json pointer * Adding a new tool for the JSON Pointer support, and some documentation.
2019-07-27 06:38:10 +08:00
jsonpointer: tools/jsonpointer.cpp $(HEADERS) $(LIBFILES)
$(CXX) $(CXXFLAGS) -o jsonpointer $ tools/jsonpointer.cpp $(LIBFILES) -I.
Adding jsonstats tool.
2018-12-23 01:13:42 +08:00
jsonstats: tools/jsonstats.cpp $(HEADERS) $(LIBFILES)
Fixing the makefile build.
2019-02-23 04:34:35 +08:00
$(CXX) $(CXXFLAGS) -o jsonstats $ tools/jsonstats.cpp $(LIBFILES) -I.
Adding more tests.
2018-12-07 06:22:22 +08:00
Added dependencies.
2018-11-21 05:43:22 +08:00
ujdecode.o: $(UJSON4C_INCLUDE)
Fixing the makefile build.
2019-02-23 04:34:35 +08:00
$(CC) $(CFLAGS) -c dependencies/ujson4c/src/ujdecode.c
Added dependencies.
2018-11-21 05:43:22 +08:00
Tweaking makefile.
2019-07-11 23:54:17 +08:00
parseandstatcompetition: benchmark/parseandstatcompetition.cpp $(HEADERS) $(LIBFILES) submodules
Ok. Looks complete.
2018-12-15 10:32:42 +08:00
$(CXX) $(CXXFLAGS) -o parseandstatcompetition $(LIBFILES) benchmark/parseandstatcompetition.cpp -I. $(LIBFLAGS) $(COREDEPSINCLUDE)
Tweaking makefile.
2019-07-11 23:54:17 +08:00
distinctuseridcompetition: benchmark/distinctuseridcompetition.cpp $(HEADERS) $(LIBFILES) submodules
Ok. Looks complete.
2018-12-15 10:32:42 +08:00
$(CXX) $(CXXFLAGS) -o distinctuseridcompetition $(LIBFILES) benchmark/distinctuseridcompetition.cpp -I. $(LIBFLAGS) $(COREDEPSINCLUDE)
Getting there slowly.
2018-12-12 11:39:39 +08:00
Tweaking makefile.
2019-07-11 23:54:17 +08:00
parsingcompetition: benchmark/parsingcompetition.cpp $(HEADERS) $(LIBFILES) submodules
simdjson vs. JSON for Modern C++ (#247) * New competitor. * Fixing makefile.
2019-08-03 07:48:34 +08:00
@echo "In case of build error due to missing files, try 'make clean'"
Fixing the makefile build.
2019-02-23 04:34:35 +08:00
$(CXX) $(CXXFLAGS) -o parsingcompetition $(LIBFILES) benchmark/parsingcompetition.cpp -I. $(LIBFLAGS) $(COREDEPSINCLUDE)
Trying a detailed analysis.
2018-12-20 10:23:37 +08:00
Tweaking makefile.
2019-07-11 23:54:17 +08:00
allparsingcompetition: benchmark/parsingcompetition.cpp $(HEADERS) $(LIBFILES) $(EXTRAOBJECTS) submodules
Adding more competition.
2019-01-18 06:24:29 +08:00
$(CXX) $(CXXFLAGS) -o allparsingcompetition $(LIBFILES) benchmark/parsingcompetition.cpp $(EXTRAOBJECTS) -I. $(LIBFLAGS) $(COREDEPSINCLUDE) $(EXTRADEPSINCLUDE) -DALLPARSER
Major surgery.
2018-08-21 05:27:25 +08:00
Tweaking makefile.
2019-07-11 23:54:17 +08:00
allparserscheckfile: tests/allparserscheckfile.cpp $(HEADERS) $(LIBFILES) $(EXTRAOBJECTS) submodules
Ok. Looks complete.
2018-12-15 10:32:42 +08:00
$(CXX) $(CXXFLAGS) -o allparserscheckfile $(LIBFILES) tests/allparserscheckfile.cpp $(EXTRAOBJECTS) -I. $(LIBFLAGS) $(COREDEPSINCLUDE) $(EXTRADEPSINCLUDE)
Private research repo.
2018-03-23 12:05:32 +08:00
Tweaking makefile.
2019-07-11 23:54:17 +08:00
.PHONY: clean cppcheck cleandist
Histograms and more widths
2018-07-30 01:09:47 +08:00
Some refactoring.
2018-11-30 22:37:57 +08:00
cppcheck:
Fixing the makefile build.
2019-02-23 04:34:35 +08:00
cppcheck --enable=all src/*.cpp benchmarks/*.cpp tests/*.cpp -Iinclude -I. -Ibenchmark/linux
Some refactoring.
2018-11-30 22:37:57 +08:00
Removing custom types (more standard code).
2018-12-28 09:09:25 +08:00
everything: $(MAINEXECUTABLES) $(EXTRA_EXECUTABLES) $(TESTEXECUTABLES) $(COMPARISONEXECUTABLES) $(SUPPLEMENTARYEXECUTABLES)
Some refactoring.
2018-11-30 22:37:57 +08:00
Private research repo.
2018-03-23 12:05:32 +08:00
clean:
Tweaking makefile.
2019-07-11 23:54:17 +08:00
rm -f submodules $(EXTRAOBJECTS) $(MAINEXECUTABLES) $(EXTRA_EXECUTABLES) $(TESTEXECUTABLES) $(COMPARISONEXECUTABLES) $(SUPPLEMENTARYEXECUTABLES)
Private research repo.
2018-03-23 12:05:32 +08:00
cleandist:
Tweaking makefile.
2019-07-11 23:54:17 +08:00
rm -f submodules $(EXTRAOBJECTS) $(MAINEXECUTABLES) $(EXTRA_EXECUTABLES) $(TESTEXECUTABLES) $(COMPARISONEXECUTABLES) $(SUPPLEMENTARYEXECUTABLES)