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

Make ondemand build without #include "simdjson.cpp"

This commit is contained in:
John Keiser 2020-09-08 15:25:50 -07:00
parent a700848bae
commit baf6607e74
10 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
benchmark/CMakeLists.txt
View File

@ -44,6 +44,7 @@ if (TARGET benchmark::benchmark)
link_libraries(benchmark::benchmark)
add_executable(bench_parse_call bench_parse_call.cpp)
add_executable(bench_dom_api bench_dom_api.cpp)
add_executable(bench_ondemand bench_ondemand.cpp)
endif()
include(checkperf.cmake)

30
benchmark/bench_ondemand.cpp Normal file
View File

@ -0,0 +1,30 @@
#include "simdjson.h"
#include <iostream>
#include <sstream>
#include <random>
#include <vector>
SIMDJSON_PUSH_DISABLE_ALL_WARNINGS
#include <benchmark/benchmark.h>
SIMDJSON_POP_DISABLE_WARNINGS
#if SIMDJSON_IMPLEMENTATION_HASWELL
#include "simdjson/haswell/begin.h"
#endif // SIMDJSON_IMPLEMENTATION_HASWELL
#include "partial_tweets/ondemand.h"
#include "partial_tweets/iter.h"
#include "partial_tweets/dom.h"
#include "largerandom/ondemand.h"
#include "largerandom/iter.h"
#include "largerandom/dom.h"
#include "kostya/ondemand.h"
#include "kostya/iter.h"
#include "kostya/dom.h"
BENCHMARK_MAIN();
#if SIMDJSON_IMPLEMENTATION_HASWELL
#include "simdjson/haswell/end.h"
#endif // SIMDJSON_IMPLEMENTATION_HASWELL

22
benchmark/bench_sax.cpp
View File

@ -1,32 +1,20 @@
#include "simdjson.h"
#include "simdjson.cpp"
#include <iostream>
#include <sstream>
#include <random>
#include <vector>
SIMDJSON_PUSH_DISABLE_ALL_WARNINGS
#include <benchmark/benchmark.h>
SIMDJSON_POP_DISABLE_WARNINGS
#if SIMDJSON_IMPLEMENTATION_HASWELL
#include "simdjson/haswell/begin.h"
#endif // SIMDJSON_IMPLEMENTATION_HASWELL
#include <iostream>
#include <sstream>
#include <random>
#include <vector>
#include "partial_tweets/ondemand.h"
#include "partial_tweets/iter.h"
#include "partial_tweets/sax.h"
#include "partial_tweets/dom.h"
#include "largerandom/ondemand.h"
#include "largerandom/iter.h"
#include "largerandom/sax.h"
#include "largerandom/dom.h"
#include "kostya/ondemand.h"
#include "kostya/iter.h"
#include "kostya/dom.h"
BENCHMARK_MAIN();

3
benchmark/kostya/iter.h
View File

@ -8,8 +8,7 @@
namespace kostya {
using namespace simdjson;
using namespace SIMDJSON_IMPLEMENTATION;
using namespace SIMDJSON_IMPLEMENTATION::stage2;
using namespace simdjson::SIMDJSON_IMPLEMENTATION;
class Iter {
public:

3
benchmark/kostya/ondemand.h
View File

@ -8,8 +8,7 @@
namespace kostya {
using namespace simdjson;
using namespace SIMDJSON_IMPLEMENTATION;
using namespace SIMDJSON_IMPLEMENTATION::stage2;
using namespace simdjson::SIMDJSON_IMPLEMENTATION;
class OnDemand {
public:

3
benchmark/largerandom/iter.h
View File

@ -8,8 +8,7 @@
namespace largerandom {
using namespace simdjson;
using namespace SIMDJSON_IMPLEMENTATION;
using namespace SIMDJSON_IMPLEMENTATION::stage2;
using namespace simdjson::SIMDJSON_IMPLEMENTATION;
class Iter {
public:

3
benchmark/largerandom/ondemand.h
View File

@ -8,8 +8,7 @@
namespace largerandom {
using namespace simdjson;
using namespace SIMDJSON_IMPLEMENTATION;
using namespace SIMDJSON_IMPLEMENTATION::stage2;
using namespace simdjson::SIMDJSON_IMPLEMENTATION;
class OnDemand {
public:

4
benchmark/partial_tweets/domnoexcept.h
View File

@ -5,10 +5,6 @@
namespace partial_tweets {
using namespace simdjson;
#ifdef SIMDJSON_IMPLEMENTATION
using namespace SIMDJSON_IMPLEMENTATION;
using namespace SIMDJSON_IMPLEMENTATION::stage2;
#endif
class DomNoExcept {
public:

3
benchmark/partial_tweets/iter.h
View File

@ -8,8 +8,7 @@
namespace partial_tweets {
using namespace simdjson;
using namespace SIMDJSON_IMPLEMENTATION;
using namespace SIMDJSON_IMPLEMENTATION::stage2;
using namespace simdjson::SIMDJSON_IMPLEMENTATION;
class Iter {
public:

3
benchmark/partial_tweets/ondemand.h
View File

@ -8,8 +8,7 @@
namespace partial_tweets {
using namespace simdjson;
using namespace SIMDJSON_IMPLEMENTATION;
using namespace SIMDJSON_IMPLEMENTATION::stage2;
using namespace simdjson::SIMDJSON_IMPLEMENTATION;
class OnDemand {
public: