🔀 merge branch 'feature/nonius_benchmarks' into TurpentineDistillery-…

…feature/locale_independent_num_to_str

.gitignore

@@ -13,13 +13,15 @@ doc/xml
 doc/html
 me.nlohmann.json.docset
 
-benchmarks/files/numbers/*.json
+benchmarks/data/numbers/*.json
 
 .idea
 cmake-build-debug
 
 
 test/test-*
+
+benchmarks/benchmarks
 .svn
 
 test/thirdparty/Fuzzer/libFuzzer.a

Makefile

@@ -11,7 +11,7 @@ all:
 # clean up
 clean:
 	rm -fr json_unit json_benchmarks fuzz fuzz-testing *.dSYM test/*.dSYM
-	rm -fr benchmarks/files/numbers/*.json
+	rm -fr benchmarks/files/numbers/*.json benchmarks/benchmarks_*
 	$(MAKE) clean -Cdoc
 	$(MAKE) clean -Ctest
 
@@ -113,18 +113,7 @@ pretty:
 	   --align-reference=type --add-brackets --convert-tabs --close-templates \
 	   --lineend=linux --preserve-date --suffix=none --formatted \
 	   src/json.hpp src/json.hpp.re2c test/src/*.cpp \
-	   benchmarks/benchmarks.cpp doc/examples/*.cpp
-
-
-##########################################################################
-# benchmarks
-##########################################################################
-
-# benchmarks
-json_benchmarks: benchmarks/benchmarks.cpp benchmarks/benchpress.hpp benchmarks/cxxopts.hpp src/json.hpp
-	cd benchmarks/files/numbers ; python generate.py
-	$(CXX) -std=c++11 -pthread $(CXXFLAGS) -DNDEBUG -O3 -flto -I src -I benchmarks $< $(LDFLAGS) -o $@
-	./json_benchmarks
+	   benchmarks/src/*.cpp doc/examples/*.cpp
 
 
 ##########################################################################

benchmarks/Makefile

@@ -0,0 +1,17 @@
+# benchmarks
+all: benchmarks_dump_json benchmarks_dump_cbor benchmarks_dump_msgpack benchmarks_parse_json
+
+benchmarks_dump_json: src/benchmarks.cpp
+	$(CXX) -std=c++11 $(CXXFLAGS) -DNDEBUG -DJSON_BENCHMARK_DUMP_JSON -O3 -flto -I ../src -I src -I thirdparty $< $(LDFLAGS) -o $@	
+
+benchmarks_dump_cbor: src/benchmarks.cpp
+	$(CXX) -std=c++11 $(CXXFLAGS) -DNDEBUG -DJSON_BENCHMARK_DUMP_CBOR -O3 -flto -I ../src -I src -I thirdparty $< $(LDFLAGS) -o $@	
+
+benchmarks_dump_msgpack: src/benchmarks.cpp
+	$(CXX) -std=c++11 $(CXXFLAGS) -DNDEBUG -DJSON_BENCHMARK_DUMP_MSGPACK -O3 -flto -I ../src -I src -I thirdparty $< $(LDFLAGS) -o $@	
+
+benchmarks_parse_json: src/benchmarks.cpp
+	$(CXX) -std=c++11 $(CXXFLAGS) -DNDEBUG -DJSON_BENCHMARK_PARSE_JSON -O3 -flto -I ../src -I src -I thirdparty $< $(LDFLAGS) -o $@	
+
+prepare:
+	cd data/numbers ; python generate.py