mirror of
https://github.com/simdjson/simdjson
synced 2026-06-08 17:27:07 +00:00
Compare commits
221 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 812f8823d2 | |||
| 1726505f66 | |||
| 98fde69253 | |||
| dc485f845d | |||
| 79bbba3e3e | |||
| 1a29a5e53a | |||
| 57561f64f4 | |||
| 00563f9133 | |||
| 5db72ab9d3 | |||
| d3d99b8fc5 | |||
| 168ef58075 | |||
| fb8c575121 | |||
| 7732480b25 | |||
| 1ae93a70d4 | |||
| 396ca141fd | |||
| 8e2e9b8e02 | |||
| 599895e54d | |||
| 77a53d19a2 | |||
| 8c7cc2f963 | |||
| 43766fc7ef | |||
| c2f25ab455 | |||
| ec49efa5da | |||
| a16e5128fe | |||
| bd42858383 | |||
| 7d30ff2574 | |||
| 42c047a927 | |||
| 376ef7e8e9 | |||
| 0a23ebbfef | |||
| 9803884546 | |||
| b9b20be80e | |||
| f902769b35 | |||
| 389f7ce8e3 | |||
| 32b52e3f34 | |||
| b3fe96cdb2 | |||
| 45d296e219 | |||
| c1681e9d0a | |||
| 63b10bca21 | |||
| 3b782fab7a | |||
| df16e96767 | |||
| 2e7ad956eb | |||
| 30d7204312 | |||
| b6af1a0456 | |||
| 7cc60672e3 | |||
| 3ecda9ee99 | |||
| b648a5fc0a | |||
| 4ec44e88c9 | |||
| ede3129081 | |||
| 8ea4c1c2e6 | |||
| 486b2a3828 | |||
| 22773f3c70 | |||
| 249eb2c28a | |||
| 94c429aa70 | |||
| 72e51a9a81 | |||
| 1a57afec1f | |||
| 4de7426b9f | |||
| 85cadf4074 | |||
| bc48e72070 | |||
| 8955c2c6d5 | |||
| 73e69a5e84 | |||
| fb83b114ef | |||
| 542cd7af71 | |||
| 769364abb2 | |||
| f25d5f9fc2 | |||
| 12fb30ae9c | |||
| c0a952687d | |||
| 307ddd4415 | |||
| 21657455ed | |||
| afb1c9f4b1 | |||
| 9973f7b3a3 | |||
| 18d612df15 | |||
| bddb23177e | |||
| 2c5de6c6ed | |||
| 844e5eac23 | |||
| 45caa861cd | |||
| 50bf372d3f | |||
| b4a0fd3ff4 | |||
| a1ff05a5e8 | |||
| 5395aacb8b | |||
| 781ea4b495 | |||
| 03e8d14eee | |||
| be94694290 | |||
| 6065b3b424 | |||
| 019bf1dfe0 | |||
| 2922822622 | |||
| 262ddad037 | |||
| ba007b0cb9 | |||
| ec675d9c61 | |||
| 7dcc196f66 | |||
| 7ec4572d33 | |||
| 5891d4b64b | |||
| 3cd9875f1f | |||
| 6cf1bdba43 | |||
| 817f10dd7d | |||
| e829566589 | |||
| dbe0c1543e | |||
| 06c774c655 | |||
| 95d8c81810 | |||
| af2a43610e | |||
| e362b18499 | |||
| 6e60ed8338 | |||
| e2ca00c841 | |||
| b7124f7c64 | |||
| e6c6db6493 | |||
| 6fffc99dac | |||
| 8c5cc8c443 | |||
| d8c49a8f25 | |||
| cda98064b8 | |||
| e532d61e16 | |||
| db93de2a21 | |||
| fc57c09cf0 | |||
| 2058b47dfe | |||
| b0486c7fa2 | |||
| feb1e7feb6 | |||
| 2c7fbc1538 | |||
| 8b69401d8a | |||
| f504e57e7a | |||
| 135c173053 | |||
| b4ed3a99a9 | |||
| d8e1b36c88 | |||
| c249a1b456 | |||
| 9c4b793c90 | |||
| dd92a8414c | |||
| 835bdba123 | |||
| ad3cd71ca2 | |||
| 860f7e0458 | |||
| 980f2ad3af | |||
| 7ad9fe63a6 | |||
| 7987418b1f | |||
| 5e871f6724 | |||
| 5d16fd5f31 | |||
| 4e9ff03af5 | |||
| aa7489060a | |||
| ae32422891 | |||
| 667d0ed3c7 | |||
| b1c31b428d | |||
| 56ac56ba32 | |||
| 19549c60ec | |||
| 16e99f229b | |||
| 21342a4142 | |||
| d0e841d3e9 | |||
| a962652ec3 | |||
| 77d73b068a | |||
| 19ff7a572d | |||
| 235dbc5369 | |||
| 2b9c8977af | |||
| 3d87bd4abc | |||
| a60c0d1e39 | |||
| 86bfbaada7 | |||
| ccac6403d9 | |||
| aade58c3dc | |||
| 3319815e25 | |||
| a24f845bd7 | |||
| 212e2d5857 | |||
| 547e156e33 | |||
| 98a45f7229 | |||
| 8589509d1e | |||
| 2fce4a843d | |||
| 62803512e4 | |||
| 76d9dee854 | |||
| bf15f21b0b | |||
| 32b301893c | |||
| 7f1531a1f9 | |||
| 0a3b555ff7 | |||
| 114d45ad54 | |||
| 0112be86b0 | |||
| bf52d8198b | |||
| 58c92d6d82 | |||
| 781a7d6c89 | |||
| 3d0de709a8 | |||
| 49b86721b4 | |||
| def2b6efd2 | |||
| 87a186fbf1 | |||
| 81f10a01b7 | |||
| 36ed7ab48a | |||
| c3d1d62dfe | |||
| 67821cb6fd | |||
| 3ac287ba3d | |||
| ec352430a0 | |||
| d326f2ce9f | |||
| ca42a49fba | |||
| 8a9daeb0ad | |||
| 9c5a88f1f3 | |||
| a7f8fb71c5 | |||
| a553db4c67 | |||
| 1fa1af8c15 | |||
| 5ed1044056 | |||
| 62913867ff | |||
| 6700d48b57 | |||
| b5577d5e85 | |||
| b84a4ec2b9 | |||
| 1638a185f7 | |||
| 6fe450f5ce | |||
| c7b70de070 | |||
| 3279fbd55b | |||
| 66e64e0e5f | |||
| 03f81e66af | |||
| e3b7eddb37 | |||
| 99c4ba6e8f | |||
| 6aa7eea334 | |||
| 6a47cda07f | |||
| 617c69e104 | |||
| 625adceb24 | |||
| bd0e9c1336 | |||
| 7bf82b02d5 | |||
| 88a1b3e83b | |||
| c72954eade | |||
| 4456a10469 | |||
| d8ed2417ad | |||
| 5517df7aee | |||
| 6e618b0805 | |||
| bde288a623 | |||
| b2932d1b8f | |||
| a7811090ef | |||
| 3320885fac | |||
| 786c68b158 | |||
| 703ef54bd9 | |||
| 2526068e2f | |||
| ddc7b8c7dd | |||
| d8f90bdd14 | |||
| e38a4923e5 | |||
| e6dfa2e0ed |
@@ -1,316 +0,0 @@
|
|||||||
version: 2.1
|
|
||||||
|
|
||||||
|
|
||||||
# We constantly run out of memory so please do not use parallelism (-j, -j4).
|
|
||||||
|
|
||||||
# Reusable image / compiler definitions
|
|
||||||
executors:
|
|
||||||
gcc8:
|
|
||||||
docker:
|
|
||||||
- image: conanio/gcc8
|
|
||||||
environment:
|
|
||||||
CXX: g++-8
|
|
||||||
CC: gcc-8
|
|
||||||
CMAKE_BUILD_FLAGS:
|
|
||||||
CTEST_FLAGS: --output-on-failure
|
|
||||||
|
|
||||||
gcc9:
|
|
||||||
docker:
|
|
||||||
- image: conanio/gcc9
|
|
||||||
environment:
|
|
||||||
CXX: g++-9
|
|
||||||
CC: gcc-9
|
|
||||||
CMAKE_BUILD_FLAGS:
|
|
||||||
CTEST_FLAGS: --output-on-failure
|
|
||||||
|
|
||||||
gcc10:
|
|
||||||
docker:
|
|
||||||
- image: conanio/gcc10
|
|
||||||
environment:
|
|
||||||
CXX: g++-10
|
|
||||||
CC: gcc-10
|
|
||||||
CMAKE_BUILD_FLAGS:
|
|
||||||
CTEST_FLAGS: --output-on-failure
|
|
||||||
|
|
||||||
clang10:
|
|
||||||
docker:
|
|
||||||
- image: conanio/clang10
|
|
||||||
environment:
|
|
||||||
CXX: clang++-10
|
|
||||||
CC: clang-10
|
|
||||||
CMAKE_BUILD_FLAGS:
|
|
||||||
CTEST_FLAGS: --output-on-failure
|
|
||||||
|
|
||||||
clang9:
|
|
||||||
docker:
|
|
||||||
- image: conanio/clang9
|
|
||||||
environment:
|
|
||||||
CXX: clang++-9
|
|
||||||
CC: clang-9
|
|
||||||
CMAKE_BUILD_FLAGS:
|
|
||||||
CTEST_FLAGS: --output-on-failure
|
|
||||||
|
|
||||||
clang6:
|
|
||||||
docker:
|
|
||||||
- image: conanio/clang60
|
|
||||||
environment:
|
|
||||||
CXX: clang++-6.0
|
|
||||||
CC: clang-6.0
|
|
||||||
CMAKE_BUILD_FLAGS:
|
|
||||||
CTEST_FLAGS: --output-on-failure
|
|
||||||
|
|
||||||
# Reusable test commands (and initializer for clang 6)
|
|
||||||
commands:
|
|
||||||
dependency_restore:
|
|
||||||
steps:
|
|
||||||
- restore_cache:
|
|
||||||
keys:
|
|
||||||
- cmake-cache-{{ checksum "dependencies/CMakeLists.txt" }}
|
|
||||||
|
|
||||||
dependency_cache:
|
|
||||||
steps:
|
|
||||||
- save_cache:
|
|
||||||
key: cmake-cache-{{ checksum "dependencies/CMakeLists.txt" }}
|
|
||||||
paths:
|
|
||||||
- dependencies/.cache
|
|
||||||
|
|
||||||
install_cmake:
|
|
||||||
steps:
|
|
||||||
- run: apt-get update -qq
|
|
||||||
- run: apt-get install -y cmake
|
|
||||||
|
|
||||||
cmake_prep:
|
|
||||||
steps:
|
|
||||||
- checkout
|
|
||||||
- run: mkdir -p build
|
|
||||||
|
|
||||||
cmake_build_cache:
|
|
||||||
steps:
|
|
||||||
- cmake_prep
|
|
||||||
- dependency_restore
|
|
||||||
- run: cmake -DSIMDJSON_DEVELOPER_MODE=ON $CMAKE_FLAGS -DCMAKE_INSTALL_PREFIX:PATH=destination -B build .
|
|
||||||
- dependency_cache # dependencies are produced in the configure step
|
|
||||||
|
|
||||||
cmake_build:
|
|
||||||
steps:
|
|
||||||
- cmake_build_cache
|
|
||||||
- run: cmake --build build
|
|
||||||
|
|
||||||
cmake_test:
|
|
||||||
steps:
|
|
||||||
- cmake_build
|
|
||||||
- run: |
|
|
||||||
cd build &&
|
|
||||||
tools/json2json -h &&
|
|
||||||
ctest $CTEST_FLAGS -L acceptance &&
|
|
||||||
ctest $CTEST_FLAGS -LE acceptance -LE explicitonly
|
|
||||||
|
|
||||||
cmake_assert_test:
|
|
||||||
steps:
|
|
||||||
- run: |
|
|
||||||
cd build &&
|
|
||||||
tools/json2json -h &&
|
|
||||||
ctest $CTEST_FLAGS -L assert
|
|
||||||
|
|
||||||
cmake_test_all:
|
|
||||||
steps:
|
|
||||||
- cmake_build
|
|
||||||
- run: |
|
|
||||||
cd build &&
|
|
||||||
tools/json2json -h &&
|
|
||||||
ctest $CTEST_FLAGS -DSIMDJSON_IMPLEMENTATION="haswell;westmere;fallback" -L acceptance -LE per_implementation &&
|
|
||||||
SIMDJSON_FORCE_IMPLEMENTATION=haswell ctest $CTEST_FLAGS -L per_implementation -LE explicitonly &&
|
|
||||||
SIMDJSON_FORCE_IMPLEMENTATION=westmere ctest $CTEST_FLAGS -L per_implementation -LE explicitonly &&
|
|
||||||
SIMDJSON_FORCE_IMPLEMENTATION=fallback ctest $CTEST_FLAGS -L per_implementation -LE explicitonly &&
|
|
||||||
ctest $CTEST_FLAGS -LE "acceptance|per_implementation" # Everything we haven't run yet, run now.
|
|
||||||
|
|
||||||
|
|
||||||
cmake_perftest:
|
|
||||||
steps:
|
|
||||||
- cmake_build_cache
|
|
||||||
- run: |
|
|
||||||
cmake -DSIMDJSON_ENABLE_DOM_CHECKPERF=ON --build build --target checkperf &&
|
|
||||||
cd build &&
|
|
||||||
ctest --output-on-failure -R checkperf
|
|
||||||
|
|
||||||
# we not only want cmake to build and run tests, but we want also a successful installation from which we can build, link and run programs
|
|
||||||
cmake_install_test: # this version builds, install, test and then verify from the installation
|
|
||||||
steps:
|
|
||||||
- run: cd build && make install
|
|
||||||
- run: echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Ibuild/destination/include -Lbuild/destination/lib -std=c++17 -Wl,-rpath,build/destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json
|
|
||||||
|
|
||||||
cmake_installed_test_cxx20: # assuming that it was installed, this tries to build using C++20
|
|
||||||
steps:
|
|
||||||
- run: echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Ibuild/destination/include -Lbuild/destination/lib -std=c++20 -Wl,-rpath,build/destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
|
|
||||||
# static
|
|
||||||
justlib-gcc10:
|
|
||||||
description: Build just the library, install it and do a basic test
|
|
||||||
executor: gcc10
|
|
||||||
environment: { CMAKE_FLAGS: -DSIMDJSON_JUST_LIBRARY=ON }
|
|
||||||
steps: [ cmake_build, cmake_install_test, cmake_installed_test_cxx20 ]
|
|
||||||
assert-gcc10:
|
|
||||||
description: Build the library with asserts on, install it and run tests
|
|
||||||
executor: gcc10
|
|
||||||
environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DCMAKE_CXX_FLAGS_RELEASE=-O3 }
|
|
||||||
steps: [ cmake_test, cmake_assert_test ]
|
|
||||||
assert-clang10:
|
|
||||||
description: Build just the library, install it and do a basic test
|
|
||||||
executor: clang10
|
|
||||||
environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DCMAKE_CXX_FLAGS_RELEASE=-O3 }
|
|
||||||
steps: [ cmake_test, cmake_assert_test ]
|
|
||||||
gcc10-perftest:
|
|
||||||
description: Build and run performance tests on GCC 10 and AVX 2 with a cmake static build, this test performance regression
|
|
||||||
executor: gcc10
|
|
||||||
environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DBUILD_SHARED_LIBS=OFF }
|
|
||||||
steps: [ cmake_perftest ]
|
|
||||||
gcc10:
|
|
||||||
description: Build and run tests on GCC 10 and AVX 2 with a cmake static build
|
|
||||||
executor: gcc10
|
|
||||||
environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF }
|
|
||||||
steps: [ cmake_test, cmake_install_test, cmake_installed_test_cxx20 ]
|
|
||||||
clang6:
|
|
||||||
description: Build and run tests on clang 6 and AVX 2 with a cmake static build
|
|
||||||
executor: clang6
|
|
||||||
environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF }
|
|
||||||
steps: [ cmake_test, cmake_install_test ]
|
|
||||||
clang10:
|
|
||||||
description: Build and run tests on clang 10 and AVX 2 with a cmake static build
|
|
||||||
executor: clang10
|
|
||||||
environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF }
|
|
||||||
steps: [ cmake_test, cmake_install_test, cmake_installed_test_cxx20 ]
|
|
||||||
# libcpp
|
|
||||||
libcpp-clang10:
|
|
||||||
description: Build and run tests on clang 10 and AVX 2 with a cmake static build and libc++
|
|
||||||
executor: clang10
|
|
||||||
environment: { CMAKE_FLAGS: -DSIMDJSON_USE_LIBCPP=ON -DBUILD_SHARED_LIBS=OFF }
|
|
||||||
steps: [ cmake_test, cmake_install_test, cmake_installed_test_cxx20 ]
|
|
||||||
# sanitize
|
|
||||||
sanitize-gcc10:
|
|
||||||
description: Build and run tests on GCC 10 and AVX 2 with a cmake sanitize build
|
|
||||||
executor: gcc10
|
|
||||||
environment: { CMAKE_FLAGS: -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=ON -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
|
|
||||||
steps: [ cmake_test ]
|
|
||||||
sanitize-clang10:
|
|
||||||
description: Build and run tests on clang 10 and AVX 2 with a cmake sanitize build
|
|
||||||
executor: clang10
|
|
||||||
environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON -DSIMDJSON_NO_FORCE_INLINING=ON -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
|
|
||||||
steps: [ cmake_test ]
|
|
||||||
threadsanitize-gcc10:
|
|
||||||
description: Build and run tests on GCC 10 and AVX 2 with a cmake sanitize build
|
|
||||||
executor: gcc10
|
|
||||||
environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON -DSIMDJSON_SANITIZE_THREADS=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
|
|
||||||
steps: [ cmake_test ]
|
|
||||||
threadsanitize-clang10:
|
|
||||||
description: Build and run tests on clang 10 and AVX 2 with a cmake sanitize build
|
|
||||||
executor: clang10
|
|
||||||
environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON -DSIMDJSON_NO_FORCE_INLINING=ON -DSIMDJSON_SANITIZE_THREADS=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
|
|
||||||
steps: [ cmake_test ]
|
|
||||||
# dynamic
|
|
||||||
dynamic-gcc10:
|
|
||||||
description: Build and run tests on GCC 10 and AVX 2 with a cmake dynamic build
|
|
||||||
executor: gcc10
|
|
||||||
environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON }
|
|
||||||
steps: [ cmake_test, cmake_install_test ]
|
|
||||||
dynamic-clang10:
|
|
||||||
description: Build and run tests on clang 10 and AVX 2 with a cmake dynamic build
|
|
||||||
executor: clang10
|
|
||||||
environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON }
|
|
||||||
steps: [ cmake_test, cmake_install_test ]
|
|
||||||
|
|
||||||
# unthreaded
|
|
||||||
unthreaded-gcc10:
|
|
||||||
description: Build and run tests on GCC 10 and AVX 2 *without* threads
|
|
||||||
executor: gcc10
|
|
||||||
environment: { CMAKE_FLAGS: -DSIMDJSON_ENABLE_THREADS=OFF }
|
|
||||||
steps: [ cmake_test, cmake_install_test ]
|
|
||||||
unthreaded-clang10:
|
|
||||||
description: Build and run tests on Clang 10 and AVX 2 *without* threads
|
|
||||||
executor: clang10
|
|
||||||
environment: { CMAKE_FLAGS: -DSIMDJSON_ENABLE_THREADS=OFF }
|
|
||||||
steps: [ cmake_test, cmake_install_test ]
|
|
||||||
|
|
||||||
# noexcept
|
|
||||||
noexcept-gcc10:
|
|
||||||
description: Build and run tests on GCC 10 and AVX 2 with exceptions off
|
|
||||||
executor: gcc10
|
|
||||||
environment: { CMAKE_FLAGS: -DSIMDJSON_EXCEPTIONS=OFF }
|
|
||||||
steps: [ cmake_test, cmake_install_test ]
|
|
||||||
noexcept-clang10:
|
|
||||||
description: Build and run tests on Clang 10 and AVX 2 with exceptions off
|
|
||||||
executor: clang10
|
|
||||||
environment: { CMAKE_FLAGS: -DSIMDJSON_EXCEPTIONS=OFF }
|
|
||||||
steps: [ cmake_test, cmake_install_test ]
|
|
||||||
|
|
||||||
#
|
|
||||||
# Misc.
|
|
||||||
#
|
|
||||||
|
|
||||||
# make (test and checkperf)
|
|
||||||
arch-haswell-gcc10:
|
|
||||||
description: Build, run tests and check performance on GCC 10 with -march=haswell
|
|
||||||
executor: gcc10
|
|
||||||
environment: { CXXFLAGS: -march=haswell }
|
|
||||||
steps: [ cmake_test ]
|
|
||||||
arch-nehalem-gcc10:
|
|
||||||
description: Build, run tests and check performance on GCC 10 with -march=nehalem
|
|
||||||
executor: gcc10
|
|
||||||
environment: { CXXFLAGS: -march=nehalem }
|
|
||||||
steps: [ cmake_test ]
|
|
||||||
sanitize-haswell-gcc10:
|
|
||||||
description: Build and run tests on GCC 10 and AVX 2 with a cmake sanitize build
|
|
||||||
executor: gcc10
|
|
||||||
environment: { CXXFLAGS: -march=haswell, CMAKE_FLAGS: -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=ON -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
|
|
||||||
steps: [ cmake_test ]
|
|
||||||
sanitize-haswell-clang10:
|
|
||||||
description: Build and run tests on clang 10 and AVX 2 with a cmake sanitize build
|
|
||||||
executor: clang10
|
|
||||||
environment: { CXXFLAGS: -march=haswell, CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON -DSIMDJSON_NO_FORCE_INLINING=ON -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
|
|
||||||
steps: [ cmake_test ]
|
|
||||||
|
|
||||||
workflows:
|
|
||||||
version: 2.1
|
|
||||||
build_and_test:
|
|
||||||
jobs:
|
|
||||||
# full multi-implementation tests
|
|
||||||
#- gcc7 tested on GitHub actions
|
|
||||||
- gcc10 # do not delete this as it tests our performance
|
|
||||||
- clang6
|
|
||||||
#- clang10 # this gets tested a lot below
|
|
||||||
|
|
||||||
# libc++
|
|
||||||
- libcpp-clang10
|
|
||||||
|
|
||||||
# full single-implementation tests
|
|
||||||
- sanitize-gcc10
|
|
||||||
- sanitize-clang10
|
|
||||||
- threadsanitize-gcc10
|
|
||||||
- threadsanitize-clang10
|
|
||||||
- dynamic-gcc10
|
|
||||||
- dynamic-clang10
|
|
||||||
- unthreaded-gcc10
|
|
||||||
- unthreaded-clang10
|
|
||||||
|
|
||||||
# no exceptions
|
|
||||||
- noexcept-gcc10
|
|
||||||
- noexcept-clang10
|
|
||||||
|
|
||||||
# quicker make single-implementation tests
|
|
||||||
- arch-haswell-gcc10
|
|
||||||
- arch-nehalem-gcc10
|
|
||||||
|
|
||||||
|
|
||||||
# sanitized single-implementation tests
|
|
||||||
- sanitize-haswell-gcc10
|
|
||||||
- sanitize-haswell-clang10
|
|
||||||
|
|
||||||
# testing "just the library"
|
|
||||||
- justlib-gcc10
|
|
||||||
|
|
||||||
# testing asserts
|
|
||||||
- assert-gcc10
|
|
||||||
- assert-clang10
|
|
||||||
|
|
||||||
# TODO add windows: https://circleci.com/docs/2.0/configuration-reference/#windows
|
|
||||||
@@ -29,6 +29,9 @@ We accept the identification of an issue by a sanitizer or some checker tool (e.
|
|||||||
|
|
||||||
We recommend that you run your tests using different optimization levels. In particular, we recommend your run tests with the simdjson library and you code compiled in debug mode. The simdjson then sets the SIMDJSON_DEVELOPMENT_CHECKS macro to 1, and this triggers additional checks on your code and on the internals of the library. If possible, we recommend that you run tests with sanitizers (e.g., see [No more leaks with sanitize flags in gcc and clang](https://lemire.me/blog/2016/04/20/no-more-leaks-with-sanitize-flags-in-gcc-and-clang/)). You can compile the library with sanitizers for debugging purposes (e.g., set SIMDJSON_SANITIZE to ON using CMake), but you should also turn on sanitizers on your own code. You may also use tools like valgrind or the commercial equivalent.
|
We recommend that you run your tests using different optimization levels. In particular, we recommend your run tests with the simdjson library and you code compiled in debug mode. The simdjson then sets the SIMDJSON_DEVELOPMENT_CHECKS macro to 1, and this triggers additional checks on your code and on the internals of the library. If possible, we recommend that you run tests with sanitizers (e.g., see [No more leaks with sanitize flags in gcc and clang](https://lemire.me/blog/2016/04/20/no-more-leaks-with-sanitize-flags-in-gcc-and-clang/)). You can compile the library with sanitizers for debugging purposes (e.g., set SIMDJSON_SANITIZE to ON using CMake), but you should also turn on sanitizers on your own code. You may also use tools like valgrind or the commercial equivalent.
|
||||||
|
|
||||||
|
Mixing debug and release simdjson code is unsafe: you either build all your code using simdjson in
|
||||||
|
release mode or all of it in debug mode.
|
||||||
|
|
||||||
Before reporting a bug, please ensure that you have read our documentation.
|
Before reporting a bug, please ensure that you have read our documentation.
|
||||||
|
|
||||||
**To Reproduce**
|
**To Reproduce**
|
||||||
@@ -38,7 +41,7 @@ If we cannot reproduce the issue, then we cannot address it. Note that a stack t
|
|||||||
|
|
||||||
It should be possible to trigger the bug by using solely simdjson with our default build setup. If you can only observe the bug within some specific context, with some other software, please reduce the issue first.
|
It should be possible to trigger the bug by using solely simdjson with our default build setup. If you can only observe the bug within some specific context, with some other software, please reduce the issue first.
|
||||||
|
|
||||||
**simjson release**
|
**simdjson release**
|
||||||
|
|
||||||
Unless you plan to contribute to simdjson, you should only work from releases. Please be mindful that our main branch may have additional features, bugs and documentation items.
|
Unless you plan to contribute to simdjson, you should only work from releases. Please be mindful that our main branch may have additional features, bugs and documentation items.
|
||||||
|
|
||||||
@@ -55,6 +58,7 @@ We support up-to-date 64-bit ARM and x64 FreeBSD, macOS, Windows and Linux syste
|
|||||||
* We do not support unreleased or experimental compilers. If you encounter an issue with a
|
* We do not support unreleased or experimental compilers. If you encounter an issue with a
|
||||||
pre-release version of a compiler, do not report it as a bug to simdjson. However, we always
|
pre-release version of a compiler, do not report it as a bug to simdjson. However, we always
|
||||||
invite contributions either in the form an analysis or of a code contribution.
|
invite contributions either in the form an analysis or of a code contribution.
|
||||||
|
* Vendors (e.g., Apple and Microsoft) stop supporting old systems. Once a compiler system is no longer supported by its vendor, we no longer support it. We will gladly accept code contributions, but we do not consider it a *bug* if you have issues with an obsolete compiler systems. This policy extends to obsolete standard libraries, linkers and other build tools. Please do not report it as an issue. If you cannot resolve the issue yourself, we encourage you to reach out to the vendor for legacy support. As of 2026, Windows 10 is no longer supported.
|
||||||
|
|
||||||
Under Windows, we support Visual Studio (both with LLVM and without). We do not support MinGW and other alternate compiler systems. Windows users should be aware that there [is a long-running bug with GCC under Windows](https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412).
|
Under Windows, we support Visual Studio (both with LLVM and without). We do not support MinGW and other alternate compiler systems. Windows users should be aware that there [is a long-running bug with GCC under Windows](https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412).
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ Description
|
|||||||
|
|
||||||
Type of change
|
Type of change
|
||||||
- [ ] Bug fix
|
- [ ] Bug fix
|
||||||
|
- [ ] Optimization
|
||||||
- [ ] New feature
|
- [ ] New feature
|
||||||
- [ ] Refactor / cleanup
|
- [ ] Refactor / cleanup
|
||||||
- [ ] Documentation / tests
|
- [ ] Documentation / tests
|
||||||
@@ -19,7 +20,7 @@ How to verify / test
|
|||||||
Please read before contributing:
|
Please read before contributing:
|
||||||
- CONTRIBUTING: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md
|
- CONTRIBUTING: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md
|
||||||
- HACKING: https://github.com/simdjson/simdjson/blob/master/HACKING.md
|
- HACKING: https://github.com/simdjson/simdjson/blob/master/HACKING.md
|
||||||
|
- AI Usage Policy: https://github.com/simdjson/simdjson/blob/master/AI_USAGE_POLICY.md
|
||||||
|
|
||||||
|
|
||||||
If you can, we recommend running our tests with the sanitizers turned on.
|
If you can, we recommend running our tests with the sanitizers turned on.
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
name: Ubuntu ppc64le (GCC 11)
|
name: Ubuntu aarch64 (GCC 13)
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
@@ -12,7 +12,7 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: uraimo/run-on-arch-action@v3
|
- uses: uraimo/run-on-arch-action@v3
|
||||||
name: Test
|
name: Test
|
||||||
id: runcmd
|
id: runcmd
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ jobs:
|
|||||||
image: debian:testing
|
image: debian:testing
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -2,7 +2,13 @@ name: Doxygen GitHub Pages
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
release:
|
release:
|
||||||
types: [created]
|
# Trigger when a release object is created and when it's published.
|
||||||
|
# Some GitHub flows create a release object then publish it later; include both.
|
||||||
|
types: [created, published]
|
||||||
|
# Also trigger on tag creation pushes so releasing via Git tags still runs the workflow
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- "v*" # common release tag pattern like v1.2.3
|
||||||
# Allows you to run this workflow manually from the Actions tab
|
# Allows you to run this workflow manually from the Actions tab
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
@@ -18,7 +24,7 @@ jobs:
|
|||||||
url: ${{ steps.deployment.outputs.page_url }}
|
url: ${{ steps.deployment.outputs.page_url }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- name: Install Doxygen
|
- name: Install Doxygen
|
||||||
run: sudo apt-get install doxygen graphviz -y
|
run: sudo apt-get install doxygen graphviz -y
|
||||||
- run: mkdir docs
|
- run: mkdir docs
|
||||||
@@ -27,7 +33,7 @@ jobs:
|
|||||||
- name: Generate Doxygen Documentation
|
- name: Generate Doxygen Documentation
|
||||||
run: doxygen
|
run: doxygen
|
||||||
- name: Deploy to GitHub Pages
|
- name: Deploy to GitHub Pages
|
||||||
uses: peaceiris/actions-gh-pages@v3
|
uses: peaceiris/actions-gh-pages@v4
|
||||||
with:
|
with:
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
publish_dir: doc/api/html
|
publish_dir: doc/api/html
|
||||||
|
|||||||
@@ -4,14 +4,14 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
|
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
|
||||||
- uses: mymindstorm/setup-emsdk@6ab9eb1bda2574c4ddb79809fc9247783eaf9021 # v14
|
- uses: mymindstorm/setup-emsdk@6ab9eb1bda2574c4ddb79809fc9247783eaf9021 # v14
|
||||||
- name: Verify
|
- name: Verify
|
||||||
run: emcc -v
|
run: emcc -v
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.6.0
|
uses: actions/checkout@v6
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: emcmake cmake -B build
|
run: emcmake cmake -B build
|
||||||
- name: Build # We build but do not test
|
- name: Build # We build but do not test
|
||||||
run: cmake --build build
|
run: cmake --build build
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ jobs:
|
|||||||
whitespace:
|
whitespace:
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- name: Remove whitespace and check the diff
|
- name: Remove whitespace and check the diff
|
||||||
run: |
|
run: |
|
||||||
set -eu
|
set -eu
|
||||||
|
|||||||
@@ -38,14 +38,14 @@ jobs:
|
|||||||
chmod +x llvm.sh
|
chmod +x llvm.sh
|
||||||
sudo ./llvm.sh $CLANGVERSION
|
sudo ./llvm.sh $CLANGVERSION
|
||||||
|
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
id: cache-corpus
|
id: cache-corpus
|
||||||
with:
|
with:
|
||||||
path: out/
|
path: out/
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
name: gcc 16
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
container:
|
||||||
|
image: 'gcc:16'
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
- name: Install dependencies
|
||||||
|
run: |
|
||||||
|
apt -y update
|
||||||
|
apt -y --no-install-recommends install cmake ninja-build
|
||||||
|
- name: Build and test
|
||||||
|
run: |
|
||||||
|
cmake -B build -D SIMDJSON_STATIC_REFLECTION=ON -DSIMDJSON_DEVELOPER_MODE=ON -GNinja
|
||||||
|
cmake --build build
|
||||||
|
ctest --test-dir build --parallel $(nproc)
|
||||||
@@ -11,13 +11,13 @@ jobs:
|
|||||||
platform:
|
platform:
|
||||||
- { toolchain-version: 2023.08.08 }
|
- { toolchain-version: 2023.08.08 }
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- name: Install build requirements
|
- name: Install build requirements
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update -y
|
sudo apt-get update -y
|
||||||
sudo apt-get install -y --no-install-recommends cmake
|
sudo apt-get install -y --no-install-recommends cmake
|
||||||
|
|
||||||
- uses: actions/cache/restore@v4
|
- uses: actions/cache/restore@v5
|
||||||
id: restore-cache
|
id: restore-cache
|
||||||
with:
|
with:
|
||||||
path: /opt/cross-tools
|
path: /opt/cross-tools
|
||||||
@@ -33,7 +33,7 @@ jobs:
|
|||||||
mkdir -p /opt
|
mkdir -p /opt
|
||||||
tar -C /opt -x -f /tmp/toolchain.tar.xz
|
tar -C /opt -x -f /tmp/toolchain.tar.xz
|
||||||
|
|
||||||
- uses: actions/cache/save@v3
|
- uses: actions/cache/save@v5
|
||||||
if: ${{ !steps.restore-cache.outputs.cache-hit }}
|
if: ${{ !steps.restore-cache.outputs.cache-hit }}
|
||||||
with:
|
with:
|
||||||
path: /opt/cross-tools
|
path: /opt/cross-tools
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
@@ -42,3 +42,14 @@ jobs:
|
|||||||
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
|
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
|
||||||
cd ../tests/installation_tests/find &&
|
cd ../tests/installation_tests/find &&
|
||||||
mkdir buildshared && cd buildshared && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../buildshared/destination .. && cmake --build .
|
mkdir buildshared && cd buildshared && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../buildshared/destination .. && cmake --build .
|
||||||
|
- name: Use cmake (parsing for NaN/Infinity enabled)
|
||||||
|
run: |
|
||||||
|
mkdir build_nan_inf &&
|
||||||
|
cd build_nan_inf &&
|
||||||
|
cmake -DSIMDJSON_ENABLE_NAN_INF=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
||||||
|
cmake --build . &&
|
||||||
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
|
cmake --install . &&
|
||||||
|
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
|
||||||
|
cd ../tests/installation_tests/find &&
|
||||||
|
mkdir build_nan_inf && cd build_nan_inf && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../build_nan_inf/destination .. && cmake --build .
|
||||||
|
|||||||
@@ -27,8 +27,8 @@ jobs:
|
|||||||
CMAKE_GENERATOR: Ninja
|
CMAKE_GENERATOR: Ninja
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -29,8 +29,8 @@ jobs:
|
|||||||
CMAKE_GENERATOR: Ninja
|
CMAKE_GENERATOR: Ninja
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: uraimo/run-on-arch-action@v3
|
- uses: uraimo/run-on-arch-action@v3
|
||||||
name: Test
|
name: Test
|
||||||
id: runcmd
|
id: runcmd
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: uraimo/run-on-arch-action@v3
|
- uses: uraimo/run-on-arch-action@v3
|
||||||
name: Test
|
name: Test
|
||||||
id: runcmd
|
id: runcmd
|
||||||
@@ -26,4 +26,4 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
|
cmake -DCMAKE_BUILD_TYPE=Release -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
|
||||||
cmake --build build -j=2
|
cmake --build build -j=2
|
||||||
ctest --output-on-failure --test-dir build
|
ctest --output-on-failure --test-dir build -E ondemand_cacheline
|
||||||
|
|||||||
@@ -12,18 +12,18 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- name: Install packages
|
- name: Install packages
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update -q -y
|
sudo apt-get update -q -y
|
||||||
sudo apt-get install -y cmake make g++-riscv64-linux-gnu qemu-user-static clang-18
|
sudo apt-get install -y cmake make g++-riscv64-linux-gnu qemu-user-static clang-18
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
CXX=clang++-18 CXXFLAGS="--target=riscv64-linux-gnu -march=rv64gcv_zvbb" \
|
CC=clang-18 CXX=clang++-18 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv_zvbb" CXXFLAGS="${CFLAGS}" \
|
||||||
cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DCMAKE_BUILD_TYPE=Release -B build
|
cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build
|
||||||
cmake --build build/ -j$(nproc)
|
cmake --build build/ -j$(nproc) --config Release
|
||||||
- name: Test VLEN=1024
|
- name: Test VLEN=1024
|
||||||
run: |
|
run: |
|
||||||
export QEMU_LD_PREFIX="/usr/riscv64-linux-gnu"
|
QEMU_LD_PREFIX="/usr/riscv64-linux-gnu" \
|
||||||
export QEMU_CPU="rv64,v=on,zvbb=on,vlen=1024,rvv_ta_all_1s=on,rvv_ma_all_1s=on"
|
QEMU_CPU="rv64,v=on,zvbb=on,vlen=1024,rvv_ta_all_1s=on,rvv_ma_all_1s=on" \
|
||||||
ctest --timeout 1800 --output-on-failure --test-dir build -j $(nproc)
|
ctest --timeout 1800 --output-on-failure --test-dir build -j $(nproc)
|
||||||
|
|||||||
@@ -12,18 +12,13 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- name: Install packages
|
- name: Install packages
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update -q -y
|
sudo apt-get update -q -y
|
||||||
sudo apt-get install -y cmake make g++-riscv64-linux-gnu qemu-user-static clang-17
|
sudo apt-get install -y cmake make g++-riscv64-linux-gnu qemu-user-static clang-17
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
CXX=clang++-17 CXXFLAGS="--target=riscv64-linux-gnu -march=rv64gcv" \
|
CC=clang-17 CXX=clang++-17 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv" CXXFLAGS="${CFLAGS}" \
|
||||||
cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DCMAKE_BUILD_TYPE=Release -B build
|
cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build
|
||||||
cmake --build build/ -j$(nproc)
|
cmake --build build/ -j$(nproc) --config Release
|
||||||
- name: Test VLEN=128
|
|
||||||
run: |
|
|
||||||
export QEMU_LD_PREFIX="/usr/riscv64-linux-gnu"
|
|
||||||
export QEMU_CPU="rv64,v=on,vlen=128,rvv_ta_all_1s=on,rvv_ma_all_1s=on"
|
|
||||||
ctest --timeout 1800 --output-on-failure --test-dir build -j $(nproc)
|
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
name: Ubuntu rvv VLEN=128 (clang 20)
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
- name: Install packages
|
||||||
|
run: |
|
||||||
|
sudo apt-get update -q -y
|
||||||
|
sudo apt-get install -y cmake make g++-riscv64-linux-gnu qemu-user-static clang-20
|
||||||
|
- name: Build
|
||||||
|
run: |
|
||||||
|
CC=clang-20 CXX=clang++-20 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv" CXXFLAGS="${CFLAGS}" \
|
||||||
|
cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build
|
||||||
|
cmake --build build/ -j$(nproc) --config Release
|
||||||
|
- name: Test VLEN=128
|
||||||
|
run: |
|
||||||
|
QEMU_LD_PREFIX="/usr/riscv64-linux-gnu" \
|
||||||
|
QEMU_CPU="rv64,v=on,vlen=128,rvv_ta_all_1s=on,rvv_ma_all_1s=on" \
|
||||||
|
ctest --timeout 1800 --output-on-failure --test-dir build -j $(nproc)
|
||||||
|
- name: Build VLS
|
||||||
|
run: |
|
||||||
|
CC=clang-20 CXX=clang++-20 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv_zvl128b_zba_zbb_zbc -mrvv-vector-bits=zvl" CXXFLAGS="${CFLAGS}" \
|
||||||
|
cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build-vls
|
||||||
|
cmake --build build-vls/ -j$(nproc) --config Release
|
||||||
|
- name: Test VLEN=128 VLS
|
||||||
|
run: |
|
||||||
|
QEMU_LD_PREFIX="/usr/riscv64-linux-gnu" \
|
||||||
|
QEMU_CPU="rv64,v=on,zba=on,zbb=on,zbc=on,vlen=128,rvv_ta_all_1s=on,rvv_ma_all_1s=on" \
|
||||||
|
ctest --timeout 1800 --output-on-failure --test-dir build-vls -j $(nproc)
|
||||||
@@ -12,18 +12,28 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- name: Install packages
|
- name: Install packages
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update -q -y
|
sudo apt-get update -q -y
|
||||||
sudo apt-get install -y cmake make g++-14-riscv64-linux-gnu qemu-user-static
|
sudo apt-get install -y cmake make g++-14-riscv64-linux-gnu qemu-user-static
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
CXX=riscv64-linux-gnu-g++-14 CXXFLAGS=-march=rv64gcv \
|
CC=riscv64-linux-gnu-gcc-14 CXX=riscv64-linux-gnu-g++-14 CFLAGS=-march=rv64gcv CXXFLAGS="${CFLAGS}" \
|
||||||
cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DCMAKE_BUILD_TYPE=Release -B build
|
cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build
|
||||||
cmake --build build/ -j$(nproc)
|
cmake --build build/ -j$(nproc) --config Release
|
||||||
- name: Test VLEN=256
|
- name: Test VLEN=256
|
||||||
run: |
|
run: |
|
||||||
export QEMU_LD_PREFIX="/usr/riscv64-linux-gnu"
|
QEMU_LD_PREFIX="/usr/riscv64-linux-gnu" \
|
||||||
export QEMU_CPU="rv64,v=on,zvbb=on,vlen=256,rvv_ta_all_1s=on,rvv_ma_all_1s=on"
|
QEMU_CPU="rv64,v=on,zvbb=on,vlen=256,rvv_ta_all_1s=on,rvv_ma_all_1s=on" \
|
||||||
ctest --timeout 1800 --output-on-failure --test-dir build -j $(nproc)
|
ctest --timeout 1800 --output-on-failure --test-dir build -j $(nproc)
|
||||||
|
- name: Build VLS
|
||||||
|
run: |
|
||||||
|
CC=riscv64-linux-gnu-gcc-14 CXX=riscv64-linux-gnu-g++-14 CFLAGS="-march=rv64gcv_zvl256b -mrvv-vector-bits=zvl" CXXFLAGS="${CFLAGS}" \
|
||||||
|
cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build-vls
|
||||||
|
cmake --build build-vls/ -j$(nproc) --config Release
|
||||||
|
- name: Test VLEN=256 VLS
|
||||||
|
run: |
|
||||||
|
QEMU_LD_PREFIX="/usr/riscv64-linux-gnu" \
|
||||||
|
QEMU_CPU="rv64,v=on,zvbb=on,vlen=256,rvv_ta_all_1s=on,rvv_ma_all_1s=on" \
|
||||||
|
ctest --timeout 1800 --output-on-failure --test-dir build-vls -j $(nproc)
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
name: Ubuntu rvv VLEN=512 (clang 19)
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
- name: Install packages
|
||||||
|
run: |
|
||||||
|
sudo apt-get update -q -y
|
||||||
|
sudo apt-get install -y cmake make g++-riscv64-linux-gnu qemu-user-static clang-19
|
||||||
|
- name: Build
|
||||||
|
run: |
|
||||||
|
CC=clang-19 CXX=clang++-19 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv" CXXFLAGS="${CFLAGS}" \
|
||||||
|
cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build
|
||||||
|
cmake --build build/ -j$(nproc) --config Release
|
||||||
|
- name: Test VLEN=512
|
||||||
|
run: |
|
||||||
|
QEMU_LD_PREFIX="/usr/riscv64-linux-gnu" \
|
||||||
|
QEMU_CPU="rv64,v=on,vlen=512,rvv_ta_all_1s=on,rvv_ma_all_1s=on" \
|
||||||
|
ctest --timeout 1800 --output-on-failure --test-dir build -j $(nproc)
|
||||||
|
- name: Build VLS
|
||||||
|
run: |
|
||||||
|
CC=clang-19 CXX=clang++-19 CFLAGS="--target=riscv64-linux-gnu -march=rv64gcv_zvl512b_zba_zbb_zbc -mrvv-vector-bits=zvl" CXXFLAGS="${CFLAGS}" \
|
||||||
|
cmake --toolchain=cmake/toolchains-ci/riscv64-linux-gnu.cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build-vls
|
||||||
|
cmake --build build-vls/ -j$(nproc) --config Release
|
||||||
|
- name: Test VLEN=512 VLS
|
||||||
|
run: |
|
||||||
|
QEMU_LD_PREFIX="/usr/riscv64-linux-gnu" \
|
||||||
|
QEMU_CPU="rv64,v=on,zba=on,zbb=on,zbc=on,vlen=512,rvv_ta_all_1s=on,rvv_ma_all_1s=on" \
|
||||||
|
ctest --timeout 1800 --output-on-failure --test-dir build-vls -j $(nproc)
|
||||||
@@ -12,7 +12,7 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: uraimo/run-on-arch-action@v3
|
- uses: uraimo/run-on-arch-action@v3
|
||||||
name: Test
|
name: Test
|
||||||
id: runcmd
|
id: runcmd
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
@@ -20,4 +20,4 @@ jobs:
|
|||||||
cd build &&
|
cd build &&
|
||||||
CXX=clang++-13 cmake -DSIMDJSON_DEVELOPER_MODE=ON .. &&
|
CXX=clang++-13 cmake -DSIMDJSON_DEVELOPER_MODE=ON .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest --output-on-failure -LE explicitonly -j
|
ctest --output-on-failure -LE explicitonly -j
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
@@ -20,4 +20,4 @@ jobs:
|
|||||||
cd build &&
|
cd build &&
|
||||||
CXX=g++-12 cmake -DSIMDJSON_DEVELOPER_MODE=ON .. &&
|
CXX=g++-12 cmake -DSIMDJSON_DEVELOPER_MODE=ON .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest --output-on-failure -LE explicitonly -j
|
ctest --output-on-failure -LE explicitonly -j
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
@@ -21,4 +21,4 @@ jobs:
|
|||||||
cd build &&
|
cd build &&
|
||||||
CXX=g++-12 cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GLIBCXX_ASSERTIONS=ON -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON .. &&
|
CXX=g++-12 cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GLIBCXX_ASSERTIONS=ON -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest . -E avoid_
|
ctest . -E avoid_
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
@@ -21,4 +21,4 @@ jobs:
|
|||||||
CXX=g++-12 cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE_THREADS=ON .. &&
|
CXX=g++-12 cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE_THREADS=ON .. &&
|
||||||
cmake --build . --target document_stream_tests --target ondemand_document_stream_tests --target parse_many_test &&
|
cmake --build . --target document_stream_tests --target ondemand_document_stream_tests --target parse_many_test &&
|
||||||
ctest --output-on-failure -R parse_many_test &&
|
ctest --output-on-failure -R parse_many_test &&
|
||||||
ctest --output-on-failure -R document_stream_tests
|
ctest --output-on-failure -R document_stream_tests
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
name: Performance check on Ubuntu 20.04 CI (GCC 9)
|
name: Performance check on Ubuntu 24.04 CI (GCC 13)
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
@@ -15,8 +15,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
name: Ubuntu 24.04 CI (CLANG 20)
|
||||||
|
|
||||||
|
on: [push, pull_request]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
ubuntu-build:
|
||||||
|
if: >-
|
||||||
|
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
||||||
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
- uses: actions/cache@v5
|
||||||
|
with:
|
||||||
|
path: dependencies/.cache
|
||||||
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
- name: Install clang-20
|
||||||
|
run: |
|
||||||
|
sudo apt-get update -q -y
|
||||||
|
sudo apt-get install -y clang-20
|
||||||
|
- name: Use cmake
|
||||||
|
run: |
|
||||||
|
mkdir build &&
|
||||||
|
cd build &&
|
||||||
|
CXX=clang++-20 cmake -DSIMDJSON_DEVELOPER_MODE=ON .. &&
|
||||||
|
cmake --build . &&
|
||||||
|
ctest --output-on-failure -LE explicitonly -j
|
||||||
@@ -11,7 +11,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
cxx: [g++-13, clang++-16]
|
cxx: [g++-13, clang++-16]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
|
- uses: actions/checkout@v6
|
||||||
- name: Prepare
|
- name: Prepare
|
||||||
run: cmake -DSIMDJSON_CXX_STANDARD=20 -DSIMDJSON_EXCEPTIONS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -B build
|
run: cmake -DSIMDJSON_CXX_STANDARD=20 -DSIMDJSON_EXCEPTIONS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -B build
|
||||||
env:
|
env:
|
||||||
@@ -19,4 +19,4 @@ jobs:
|
|||||||
- name: Build
|
- name: Build
|
||||||
run: cmake --build build -j=2
|
run: cmake --build build -j=2
|
||||||
- name: Test
|
- name: Test
|
||||||
run: ctest --output-on-failure --test-dir build
|
run: ctest --output-on-failure --test-dir build
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
cxx: [g++-13, clang++-16]
|
cxx: [g++-13, clang++-16]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
|
- uses: actions/checkout@v6
|
||||||
- name: Prepare
|
- name: Prepare
|
||||||
run: cmake -DSIMDJSON_CXX_STANDARD=20 -DSIMDJSON_DEVELOPER_MODE=ON -B build
|
run: cmake -DSIMDJSON_CXX_STANDARD=20 -DSIMDJSON_DEVELOPER_MODE=ON -B build
|
||||||
env:
|
env:
|
||||||
@@ -19,4 +19,4 @@ jobs:
|
|||||||
- name: Build
|
- name: Build
|
||||||
run: cmake --build build -j=2
|
run: cmake --build build -j=2
|
||||||
- name: Test
|
- name: Test
|
||||||
run: ctest --output-on-failure --test-dir build
|
run: ctest --output-on-failure --test-dir build
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
name: Ubuntu 20.04 CI (GCC 9) without exceptions
|
name: Ubuntu 24.04 CI (GCC 13) without exceptions
|
||||||
|
|
||||||
on: [push, pull_request]
|
on: [push, pull_request]
|
||||||
|
|
||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
@@ -24,11 +24,11 @@ jobs:
|
|||||||
cd .. &&
|
cd .. &&
|
||||||
mkdir build &&
|
mkdir build &&
|
||||||
cd build &&
|
cd build &&
|
||||||
cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_EXCEPTIONS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_EXCEPTIONS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest --output-on-failure -LE explicitonly -j &&
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
make install &&
|
make install &&
|
||||||
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
|
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
|
||||||
mkdir testfindpackage &&
|
mkdir testfindpackage &&
|
||||||
cd testfindpackage &&
|
cd testfindpackage &&
|
||||||
echo -e 'cmake_minimum_required(VERSION 3.1)\nproject(simdjsontester)\nset(CMAKE_CXX_STANDARD 17)\nfind_package(simdjson REQUIRED)'> CMakeLists.txt && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../destination .. && cmake --build .
|
echo -e 'cmake_minimum_required(VERSION 3.14)\nproject(simdjsontester)\nset(CMAKE_CXX_STANDARD 17)\nfind_package(simdjson REQUIRED)'> CMakeLists.txt && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../destination .. && cmake --build .
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
name: Ubuntu 20.04 CI (GCC 9) Without Threads
|
name: Ubuntu 24.04 CI (GCC 13) Without Threads
|
||||||
|
|
||||||
on: [push, pull_request]
|
on: [push, pull_request]
|
||||||
|
|
||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
@@ -31,4 +31,4 @@ jobs:
|
|||||||
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
|
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
|
||||||
mkdir testfindpackage &&
|
mkdir testfindpackage &&
|
||||||
cd testfindpackage &&
|
cd testfindpackage &&
|
||||||
echo -e 'cmake_minimum_required(VERSION 3.1)\nproject(simdjsontester)\nset(CMAKE_CXX_STANDARD 17)\nfind_package(simdjson REQUIRED)'> CMakeLists.txt && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../destination .. && cmake --build .
|
echo -e 'cmake_minimum_required(VERSION 3.14)\nproject(simdjsontester)\nset(CMAKE_CXX_STANDARD 17)\nfind_package(simdjson REQUIRED)'> CMakeLists.txt && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../destination .. && cmake --build .
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
name: Ubuntu 20.04 CI (GCC 9) With Memory Sanitizer
|
name: Ubuntu 24.04 CI (GCC 13) With Memory Sanitizer
|
||||||
|
|
||||||
on: [push, pull_request]
|
on: [push, pull_request]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
ubuntu-build-address-sanitizier:
|
ubuntu-build-address-sanitizer:
|
||||||
if: >-
|
if: >-
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
@@ -21,14 +21,21 @@ jobs:
|
|||||||
cmake -DSIMDJSON_SANITIZE=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
cmake -DSIMDJSON_SANITIZE=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest --output-on-failure -LE explicitonly -j
|
ctest --output-on-failure -LE explicitonly -j
|
||||||
|
- name: Use cmake with address sanitizer (Parsing of NaN/Infinity enabled)
|
||||||
|
run: |
|
||||||
|
mkdir builddebug_nan_inf &&
|
||||||
|
cd builddebug_nan_inf &&
|
||||||
|
cmake -DSIMDJSON_SANITIZE=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_ENABLE_NAN_INF=ON .. &&
|
||||||
|
cmake --build . &&
|
||||||
|
ctest --output-on-failure -LE explicitonly -j
|
||||||
ubuntu-build-undefined-sanitizer:
|
ubuntu-build-undefined-sanitizer:
|
||||||
if: >-
|
if: >-
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
@@ -39,3 +46,10 @@ jobs:
|
|||||||
cmake -DSIMDJSON_SANITIZE_UNDEFINED=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
cmake -DSIMDJSON_SANITIZE_UNDEFINED=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest --output-on-failure -LE explicitonly -j
|
ctest --output-on-failure -LE explicitonly -j
|
||||||
|
- name: Use cmake with undefined sanitizer (Parsing of NaN/Infinity enabled)
|
||||||
|
run: |
|
||||||
|
mkdir builddebugundefsani_nan_inf &&
|
||||||
|
cd builddebugundefsani_nan_inf &&
|
||||||
|
cmake -DSIMDJSON_SANITIZE_UNDEFINED=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_ENABLE_NAN_INF=ON .. &&
|
||||||
|
cmake --build . &&
|
||||||
|
ctest --output-on-failure -LE explicitonly -j
|
||||||
|
|||||||
@@ -12,14 +12,15 @@ jobs:
|
|||||||
shared: [ON, OFF]
|
shared: [ON, OFF]
|
||||||
cxx: [g++-13, clang++-16]
|
cxx: [g++-13, clang++-16]
|
||||||
sanitizer: [ON, OFF]
|
sanitizer: [ON, OFF]
|
||||||
|
nan_inf: [ON, OFF]
|
||||||
build_type: [RelWithDebInfo, Debug, Release]
|
build_type: [RelWithDebInfo, Debug, Release]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
|
- uses: actions/checkout@v6
|
||||||
- name: Prepare
|
- name: Prepare
|
||||||
run: cmake -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE=${{matrix.sanitizer}} -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
|
run: cmake -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE=${{matrix.sanitizer}} -DBUILD_SHARED_LIBS=${{matrix.shared}} -DSIMDJSON_ENABLE_NAN_INF=${{matrix.nan_inf}} -B build
|
||||||
env:
|
env:
|
||||||
CXX: ${{matrix.cxx}}
|
CXX: ${{matrix.cxx}}
|
||||||
- name: Build
|
- name: Build
|
||||||
run: cmake --build build -j=2
|
run: cmake --build build -j=2
|
||||||
- name: Test
|
- name: Test
|
||||||
run: ctest --output-on-failure --test-dir build
|
run: ctest --output-on-failure --test-dir build
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ jobs:
|
|||||||
- {arch: ARM64EC}
|
- {arch: ARM64EC}
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
- name: Use cmake
|
- name: Use cmake
|
||||||
run: |
|
run: |
|
||||||
cmake -A ${{ matrix.arch }} -DCMAKE_SYSTEM_VERSION="10.0.22621.0" -DCMAKE_CROSSCOMPILING=1 -DSIMDJSON_DEVELOPER_MODE=ON -D SIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_EXCEPTIONS=OFF -B build &&
|
cmake -A ${{ matrix.arch }} -DCMAKE_SYSTEM_VERSION="10.0.22621.0" -DCMAKE_CROSSCOMPILING=1 -DSIMDJSON_DEVELOPER_MODE=ON -D SIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_EXCEPTIONS=OFF -B build &&
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ jobs:
|
|||||||
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF}
|
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF}
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
cmake -DSIMDJSON_CXX_STANDARD=20 -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
|
cmake -DSIMDJSON_CXX_STANDARD=20 -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
|
||||||
@@ -41,4 +41,4 @@ jobs:
|
|||||||
- name: Test Installation
|
- name: Test Installation
|
||||||
run: |
|
run: |
|
||||||
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -B build_install_test tests/installation_tests/find
|
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -B build_install_test tests/installation_tests/find
|
||||||
cmake --build build_install_test --config Release
|
cmake --build build_install_test --config Release
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ jobs:
|
|||||||
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: RelWithDebInfo}
|
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: RelWithDebInfo}
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSANITIZE=ON -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
|
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSANITIZE=ON -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
|
||||||
@@ -27,4 +27,4 @@ jobs:
|
|||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: |
|
run: |
|
||||||
cd build
|
cd build
|
||||||
ctest -C ${{matrix.build_type}} -LE explicitonly --output-on-failure
|
ctest -C ${{matrix.build_type}} -LE explicitonly --output-on-failure
|
||||||
|
|||||||
@@ -13,18 +13,20 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- {gen: Visual Studio 17 2022, arch: Win32, shared: ON, build_type: Release}
|
- {gen: Visual Studio 17 2022, arch: Win32, shared: ON, build_type: Release, memory_map: OFF, nan_inf: OFF}
|
||||||
- {gen: Visual Studio 17 2022, arch: Win32, shared: OFF, build_type: Release}
|
- {gen: Visual Studio 17 2022, arch: Win32, shared: OFF, build_type: Release, memory_map: OFF, nan_inf: OFF}
|
||||||
- {gen: Visual Studio 17 2022, arch: x64, shared: ON, build_type: Release}
|
- {gen: Visual Studio 17 2022, arch: x64, shared: ON, build_type: Release, memory_map: ON, nan_inf: OFF}
|
||||||
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: Debug}
|
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: Debug, memory_map: ON, nan_inf: OFF}
|
||||||
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: Release}
|
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: Release, memory_map: ON, nan_inf: OFF}
|
||||||
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: RelWithDebInfo}
|
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: RelWithDebInfo, memory_map: ON, nan_inf: OFF}
|
||||||
|
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: Debug, memory_map: ON, nan_inf: ON}
|
||||||
|
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: Release, memory_map: ON, nan_inf: ON}
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
|
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -DSIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS=${{matrix.memory_map}} -DSIMDJSON_ENABLE_NAN_INF=${{matrix.nan_inf}} -B build
|
||||||
- name: Build Debug
|
- name: Build Debug
|
||||||
run: cmake --build build --config ${{matrix.build_type}} --verbose
|
run: cmake --build build --config ${{matrix.build_type}} --verbose
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
@@ -37,4 +39,4 @@ jobs:
|
|||||||
- name: Test Installation
|
- name: Test Installation
|
||||||
run: |
|
run: |
|
||||||
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -B build_install_test tests/installation_tests/find
|
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -B build_install_test tests/installation_tests/find
|
||||||
cmake --build build_install_test --config ${{matrix.build_type}}
|
cmake --build build_install_test --config ${{matrix.build_type}}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ jobs:
|
|||||||
- {gen: Visual Studio 17 2022, arch: x64, build_type: RelWithDebInfo}
|
- {gen: Visual Studio 17 2022, arch: x64, build_type: RelWithDebInfo}
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -T ClangCL -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
|
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -T ClangCL -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
|
||||||
@@ -34,4 +34,4 @@ jobs:
|
|||||||
- name: Test Installation
|
- name: Test Installation
|
||||||
run: |
|
run: |
|
||||||
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -B build_install_test tests/installation_tests/find
|
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -B build_install_test tests/installation_tests/find
|
||||||
cmake --build build_install_test --config ${{matrix.build_type}}
|
cmake --build build_install_test --config ${{matrix.build_type}}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ jobs:
|
|||||||
- {gen: Visual Studio 17 2022, arch: x64, build_type: RelWithDebInfo}
|
- {gen: Visual Studio 17 2022, arch: x64, build_type: RelWithDebInfo}
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -T ClangCL -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
|
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -T ClangCL -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
|
||||||
@@ -34,4 +34,4 @@ jobs:
|
|||||||
- name: Test Installation
|
- name: Test Installation
|
||||||
run: |
|
run: |
|
||||||
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -B build_install_test tests/installation_tests/find
|
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -B build_install_test tests/installation_tests/find
|
||||||
cmake --build build_install_test --config ${{matrix.build_type}}
|
cmake --build build_install_test --config ${{matrix.build_type}}
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ jobs:
|
|||||||
name: windows-vs17
|
name: windows-vs17
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions/cache@v4
|
- uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -0,0 +1,56 @@
|
|||||||
|
# AI Usage Policy
|
||||||
|
|
||||||
|
Contributors can use whatever tools they would like to
|
||||||
|
craft their contributions, but there must be a **human in the loop**.
|
||||||
|
**Contributors must read and review all LLM-generated code or text before they
|
||||||
|
ask other project members to review it.** The contributor is always the author
|
||||||
|
and is fully accountable for their contributions. Contributors should be
|
||||||
|
sufficiently confident that the contribution is high enough quality that asking
|
||||||
|
for a review is a good use of scarce maintainer time, and they should be **able
|
||||||
|
to answer questions about their work** during review.
|
||||||
|
|
||||||
|
We expect that new contributors will be less confident in their contributions,
|
||||||
|
and our guidance to them is to **start with small contributions** that they can
|
||||||
|
fully understand to build confidence. We aspire to be a welcoming community
|
||||||
|
that helps new contributors grow their expertise, but learning involves taking
|
||||||
|
small steps, getting feedback, and iterating. Passing maintainer feedback to an
|
||||||
|
LLM doesn't help anyone grow, and does not sustain our community.
|
||||||
|
|
||||||
|
This policy includes, but is not limited to, the following kinds of
|
||||||
|
contributions:
|
||||||
|
|
||||||
|
- Code, usually in the form of a pull request
|
||||||
|
- Issues or security vulnerabilities
|
||||||
|
- Comments and feedback on pull requests
|
||||||
|
|
||||||
|
## Extractive Contributions
|
||||||
|
|
||||||
|
The reason for our "human-in-the-loop" contribution policy is that processing
|
||||||
|
patches, PRs, RFCs, and comments is not free -- it takes a lot of
|
||||||
|
maintainer time and energy to review those contributions! Sending the
|
||||||
|
unreviewed output of an LLM to open source project maintainers *extracts* work
|
||||||
|
from them in the form of design and code review, so we call this kind of
|
||||||
|
contribution an "extractive contribution".
|
||||||
|
|
||||||
|
## Transparency
|
||||||
|
|
||||||
|
For contributions involving significant AI assistance, we encourage you to disclose
|
||||||
|
its use and explain your process. If a submission appears to rely heavily on AI
|
||||||
|
without disclosure, we may doubt that the **human-in-the-loop** requirement has
|
||||||
|
been met. Please show awareness of your use of AI.
|
||||||
|
|
||||||
|
## Copyright
|
||||||
|
|
||||||
|
Artificial intelligence systems raise many questions around copyright that have
|
||||||
|
yet to be answered. Our policy on AI tools is similar to our copyright policy:
|
||||||
|
Contributors are responsible for ensuring that they have the right to
|
||||||
|
contribute code under the terms of our license, typically meaning that either
|
||||||
|
they, their employer, or their collaborators hold the copyright. Using AI tools
|
||||||
|
to regenerate copyrighted material does not remove the copyright, and
|
||||||
|
contributors are responsible for ensuring that such material does not appear in
|
||||||
|
their contributions. Contributions found to violate this policy will be removed
|
||||||
|
just like any other offending contribution.
|
||||||
|
|
||||||
|
## Reference
|
||||||
|
|
||||||
|
- [LLVM AI Tool Use Policy](https://discourse.llvm.org/t/rfc-llvm-ai-tool-policy-human-in-the-loop/89159)
|
||||||
+221
-105
@@ -1,9 +1,18 @@
|
|||||||
cmake_minimum_required(VERSION 3.14)
|
cmake_minimum_required(VERSION 3.14)
|
||||||
|
|
||||||
|
# Build performance optimizations
|
||||||
|
set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "Export compile commands for faster IDE integration")
|
||||||
|
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
||||||
|
|
||||||
|
# Enable parallel compilation on MSVC
|
||||||
|
if(MSVC)
|
||||||
|
add_compile_options(/MP)
|
||||||
|
endif()
|
||||||
|
|
||||||
project(
|
project(
|
||||||
simdjson
|
simdjson
|
||||||
# The version number is modified by tools/release.py
|
# The version number is modified by tools/release.py
|
||||||
VERSION 4.0.3
|
VERSION 4.6.1
|
||||||
DESCRIPTION "Parsing gigabytes of JSON per second"
|
DESCRIPTION "Parsing gigabytes of JSON per second"
|
||||||
HOMEPAGE_URL "https://simdjson.org/"
|
HOMEPAGE_URL "https://simdjson.org/"
|
||||||
LANGUAGES CXX C
|
LANGUAGES CXX C
|
||||||
@@ -20,8 +29,8 @@ string(
|
|||||||
# ---- Options, variables ----
|
# ---- Options, variables ----
|
||||||
|
|
||||||
# These version numbers are modified by tools/release.py
|
# These version numbers are modified by tools/release.py
|
||||||
set(SIMDJSON_LIB_VERSION "27.0.0" CACHE STRING "simdjson library version")
|
set(SIMDJSON_LIB_VERSION "33.0.0" CACHE STRING "simdjson library version")
|
||||||
set(SIMDJSON_LIB_SOVERSION "27" CACHE STRING "simdjson library soversion")
|
set(SIMDJSON_LIB_SOVERSION "33" CACHE STRING "simdjson library soversion")
|
||||||
|
|
||||||
option(SIMDJSON_BUILD_STATIC_LIB "Build simdjson_static library along with simdjson (only makes sense if BUILD_SHARED_LIBS=ON)" OFF)
|
option(SIMDJSON_BUILD_STATIC_LIB "Build simdjson_static library along with simdjson (only makes sense if BUILD_SHARED_LIBS=ON)" OFF)
|
||||||
if(SIMDJSON_BUILD_STATIC_LIB AND NOT BUILD_SHARED_LIBS)
|
if(SIMDJSON_BUILD_STATIC_LIB AND NOT BUILD_SHARED_LIBS)
|
||||||
@@ -66,10 +75,48 @@ if(SIMDJSON_DEVELOPMENT_CHECKS)
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# padded_memory_map is always available on POSIX. On Windows it is disabled
|
||||||
|
# by default because it depends on the `CreateFileMapping2` / `MapViewOfFile3`
|
||||||
|
# APIs, which require Windows 10 version 1803 or later and are exported via
|
||||||
|
# onecore.lib rather than the default kernel32.lib. Turn this option ON to
|
||||||
|
# opt into the feature on Windows; simdjson will then set the appropriate
|
||||||
|
# Windows version macros and link onecore, so everything that links
|
||||||
|
# simdjson picks up both the compile-time declarations and the import
|
||||||
|
# library automatically. The option is a no-op on POSIX (where the feature
|
||||||
|
# is unconditionally enabled).
|
||||||
|
option(SIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS
|
||||||
|
"Enable simdjson::padded_memory_map on Windows (requires Windows 10 \
|
||||||
|
version 1803 or later). Always enabled on POSIX." OFF)
|
||||||
|
if(SIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS)
|
||||||
|
simdjson_add_props(
|
||||||
|
target_compile_definitions PUBLIC
|
||||||
|
SIMDJSON_ENABLE_MEMORY_FILE_MAPPING_ON_WINDOWS=1
|
||||||
|
)
|
||||||
|
if(WIN32)
|
||||||
|
# Raise the Windows version floor so that <windows.h> declares the
|
||||||
|
# modern memory-mapping APIs, and link the import library that
|
||||||
|
# actually exports them. _WIN32_WINNT / WINVER / NTDDI_VERSION together
|
||||||
|
# tell <sdkddkver.h> which APIs to light up.
|
||||||
|
simdjson_add_props(
|
||||||
|
target_compile_definitions PUBLIC
|
||||||
|
_WIN32_WINNT=0x0A00
|
||||||
|
WINVER=0x0A00
|
||||||
|
NTDDI_VERSION=0x0A000006 # NTDDI_WIN10_RS5, Windows 10 version 1809
|
||||||
|
)
|
||||||
|
simdjson_add_props(
|
||||||
|
target_link_libraries PUBLIC
|
||||||
|
onecore
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
if(is_top_project)
|
if(is_top_project)
|
||||||
|
option(SIMDJSON_INSTALL "Enable target install" ON)
|
||||||
option(SIMDJSON_DEVELOPER_MODE "Enable targets for developing simdjson" OFF)
|
option(SIMDJSON_DEVELOPER_MODE "Enable targets for developing simdjson" OFF)
|
||||||
option(BUILD_SHARED_LIBS "Build simdjson as a shared library" OFF)
|
option(BUILD_SHARED_LIBS "Build simdjson as a shared library" OFF)
|
||||||
option(SIMDJSON_SINGLEHEADER "Disable singleheader generation" ON)
|
option(SIMDJSON_SINGLEHEADER "Disable singleheader generation" ON)
|
||||||
|
else()
|
||||||
|
option(SIMDJSON_INSTALL "Enable target install" ${BUILD_SHARED_LIBS})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include(cmake/handle-deprecations.cmake)
|
include(cmake/handle-deprecations.cmake)
|
||||||
@@ -83,10 +130,45 @@ add_library(simdjson ${SIMDJSON_SOURCES})
|
|||||||
add_library(simdjson::simdjson ALIAS simdjson)
|
add_library(simdjson::simdjson ALIAS simdjson)
|
||||||
set(SIMDJSON_LIBRARIES simdjson)
|
set(SIMDJSON_LIBRARIES simdjson)
|
||||||
|
|
||||||
|
# Check for <bit> header compatibility
|
||||||
|
include(CheckIncludeFileCXX)
|
||||||
|
check_include_file_cxx(bit SIMDJSON_HAS_BIT_HEADER)
|
||||||
|
|
||||||
|
# Enable precompiled headers for faster builds
|
||||||
|
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16")
|
||||||
|
set(SIMDJSON_PRECOMPILE_HEADERS
|
||||||
|
<algorithm>
|
||||||
|
<array>
|
||||||
|
<atomic>
|
||||||
|
<cassert>
|
||||||
|
<cctype>
|
||||||
|
<cerrno>
|
||||||
|
<cstddef>
|
||||||
|
<cstdint>
|
||||||
|
<cstdlib>
|
||||||
|
<cstring>
|
||||||
|
<memory>
|
||||||
|
<string>
|
||||||
|
<utility>
|
||||||
|
<vector>
|
||||||
|
)
|
||||||
|
|
||||||
|
if(SIMDJSON_HAS_BIT_HEADER)
|
||||||
|
list(APPEND SIMDJSON_PRECOMPILE_HEADERS <bit>)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
target_precompile_headers(simdjson PRIVATE ${SIMDJSON_PRECOMPILE_HEADERS})
|
||||||
|
endif()
|
||||||
|
|
||||||
if(SIMDJSON_BUILD_STATIC_LIB)
|
if(SIMDJSON_BUILD_STATIC_LIB)
|
||||||
add_library(simdjson_static STATIC ${SIMDJSON_SOURCES})
|
add_library(simdjson_static STATIC ${SIMDJSON_SOURCES})
|
||||||
add_library(simdjson::simdjson_static ALIAS simdjson_static)
|
add_library(simdjson::simdjson_static ALIAS simdjson_static)
|
||||||
list(APPEND SIMDJSON_LIBRARIES simdjson_static)
|
list(APPEND SIMDJSON_LIBRARIES simdjson_static)
|
||||||
|
|
||||||
|
# Reuse precompiled headers for static library
|
||||||
|
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16")
|
||||||
|
target_precompile_headers(simdjson_static REUSE_FROM simdjson)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_target_properties(
|
set_target_properties(
|
||||||
@@ -112,13 +194,45 @@ simdjson_add_props(
|
|||||||
PRIVATE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>"
|
PRIVATE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Optimize linker settings for faster builds
|
||||||
|
if(MSVC)
|
||||||
|
target_link_options(simdjson PRIVATE /INCREMENTAL)
|
||||||
|
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
|
target_link_options(simdjson PRIVATE /DEBUG:FASTLINK)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(SIMDJSON_STATIC_REFLECTION)
|
if(SIMDJSON_STATIC_REFLECTION)
|
||||||
|
|
||||||
|
|
||||||
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION MATCHES "^21")
|
||||||
|
execute_process(
|
||||||
|
COMMAND ${CMAKE_CXX_COMPILER} --version
|
||||||
|
OUTPUT_VARIABLE CLANG_VERSION_OUTPUT
|
||||||
|
ERROR_VARIABLE CLANG_VERSION_ERROR
|
||||||
|
RESULT_VARIABLE CLANG_VERSION_RESULT
|
||||||
|
)
|
||||||
|
if(CLANG_VERSION_RESULT EQUAL 0 AND CLANG_VERSION_OUTPUT MATCHES "https://github.com/bloomberg/clang-p2996.git")
|
||||||
|
set(IS_BLOOMBERG_P2996_CLANG ON)
|
||||||
|
message(STATUS "Using Bloomberg P2996 Clang fork")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
# We would like to require C++26, but no compiler supports that!
|
# We would like to require C++26, but no compiler supports that!
|
||||||
# This is a hack:
|
# This is a hack:
|
||||||
|
if(IS_BLOOMBERG_P2996_CLANG)
|
||||||
simdjson_add_props(
|
simdjson_add_props(
|
||||||
target_compile_options PUBLIC
|
target_compile_options PUBLIC
|
||||||
-freflection -fexpansion-statements -stdlib=libc++ -std=c++26
|
-freflection -fexpansion-statements -stdlib=libc++ -std=c++26
|
||||||
)
|
)
|
||||||
|
else()
|
||||||
|
simdjson_add_props(
|
||||||
|
target_compile_options PUBLIC
|
||||||
|
-freflection -std=c++26
|
||||||
|
)
|
||||||
|
endif()
|
||||||
else()
|
else()
|
||||||
simdjson_add_props(target_compile_features PUBLIC cxx_std_11)
|
simdjson_add_props(target_compile_features PUBLIC cxx_std_11)
|
||||||
endif()
|
endif()
|
||||||
@@ -140,22 +254,10 @@ if(SIMDJSON_MINUS_ZERO_AS_FLOAT)
|
|||||||
simdjson_add_props(target_compile_definitions PRIVATE SIMDJSON_MINUS_ZERO_AS_FLOAT=1)
|
simdjson_add_props(target_compile_definitions PRIVATE SIMDJSON_MINUS_ZERO_AS_FLOAT=1)
|
||||||
endif(SIMDJSON_MINUS_ZERO_AS_FLOAT)
|
endif(SIMDJSON_MINUS_ZERO_AS_FLOAT)
|
||||||
|
|
||||||
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(loongarch64)$")
|
option(SIMDJSON_ENABLE_NAN_INF "Allow parsing of NaN and Infinity JSON values" OFF)
|
||||||
option(SIMDJSON_PREFER_LSX "Prefer LoongArch SX" ON)
|
if(SIMDJSON_ENABLE_NAN_INF)
|
||||||
include(CheckCXXCompilerFlag)
|
message(STATUS "simdjson NaN and Infinity parsing is enabled.")
|
||||||
check_cxx_compiler_flag(-mlasx COMPILER_SUPPORTS_LASX)
|
simdjson_add_props(target_compile_definitions PUBLIC SIMDJSON_ENABLE_NAN_INF=1)
|
||||||
check_cxx_compiler_flag(-mlsx COMPILER_SUPPORTS_LSX)
|
|
||||||
if(COMPILER_SUPPORTS_LASX AND NOT SIMDJSON_PREFER_LSX)
|
|
||||||
simdjson_add_props(
|
|
||||||
target_compile_options PRIVATE
|
|
||||||
-mlasx
|
|
||||||
)
|
|
||||||
elseif(COMPILER_SUPPORTS_LSX)
|
|
||||||
simdjson_add_props(
|
|
||||||
target_compile_options PRIVATE
|
|
||||||
-mlsx
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# GCC and Clang have horrendous Debug builds when using SIMD.
|
# GCC and Clang have horrendous Debug builds when using SIMD.
|
||||||
@@ -171,7 +273,12 @@ if(
|
|||||||
target_compile_options PRIVATE
|
target_compile_options PRIVATE
|
||||||
$<$<CONFIG:DEBUG>:-Og>
|
$<$<CONFIG:DEBUG>:-Og>
|
||||||
)
|
)
|
||||||
endif()
|
# We still want to enable development checks in Debug mode
|
||||||
|
simdjson_add_props(
|
||||||
|
target_compile_definitions PUBLIC
|
||||||
|
SIMDJSON_DEVELOPMENT_CHECKS
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(SIMDJSON_ENABLE_THREADS)
|
if(SIMDJSON_ENABLE_THREADS)
|
||||||
find_package(Threads REQUIRED)
|
find_package(Threads REQUIRED)
|
||||||
@@ -186,87 +293,89 @@ endif()
|
|||||||
|
|
||||||
# ---- Install rules ----
|
# ---- Install rules ----
|
||||||
|
|
||||||
include(CMakePackageConfigHelpers)
|
if(SIMDJSON_INSTALL)
|
||||||
include(GNUInstallDirs)
|
include(CMakePackageConfigHelpers)
|
||||||
|
include(GNUInstallDirs)
|
||||||
|
|
||||||
if(SIMDJSON_SINGLEHEADER)
|
if(SIMDJSON_SINGLEHEADER)
|
||||||
install(
|
install(
|
||||||
FILES singleheader/simdjson.h
|
FILES singleheader/simdjson.h
|
||||||
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
||||||
COMPONENT simdjson_Development
|
COMPONENT simdjson_Development
|
||||||
)
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
install(
|
||||||
|
TARGETS simdjson
|
||||||
|
EXPORT simdjsonTargets
|
||||||
|
RUNTIME COMPONENT simdjson_Runtime
|
||||||
|
LIBRARY COMPONENT simdjson_Runtime
|
||||||
|
NAMELINK_COMPONENT simdjson_Development
|
||||||
|
ARCHIVE COMPONENT simdjson_Development
|
||||||
|
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
||||||
|
)
|
||||||
|
configure_file(cmake/simdjson-config.cmake.in simdjson-config.cmake @ONLY)
|
||||||
|
|
||||||
|
write_basic_package_version_file(
|
||||||
|
simdjson-config-version.cmake
|
||||||
|
COMPATIBILITY SameMinorVersion
|
||||||
|
)
|
||||||
|
|
||||||
|
set(
|
||||||
|
SIMDJSON_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/simdjson"
|
||||||
|
CACHE STRING "CMake package config location relative to the install prefix"
|
||||||
|
)
|
||||||
|
mark_as_advanced(SIMDJSON_INSTALL_CMAKEDIR)
|
||||||
|
|
||||||
|
install(
|
||||||
|
FILES
|
||||||
|
"${PROJECT_BINARY_DIR}/simdjson-config.cmake"
|
||||||
|
"${PROJECT_BINARY_DIR}/simdjson-config-version.cmake"
|
||||||
|
DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
|
||||||
|
COMPONENT simdjson_Development
|
||||||
|
)
|
||||||
|
|
||||||
|
install(
|
||||||
|
EXPORT simdjsonTargets
|
||||||
|
NAMESPACE simdjson::
|
||||||
|
DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
|
||||||
|
COMPONENT simdjson_Development
|
||||||
|
)
|
||||||
|
|
||||||
|
if(SIMDJSON_BUILD_STATIC_LIB)
|
||||||
|
install(
|
||||||
|
TARGETS simdjson_static
|
||||||
|
EXPORT simdjson_staticTargets
|
||||||
|
ARCHIVE COMPONENT simdjson_Development
|
||||||
|
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
||||||
|
)
|
||||||
|
install(
|
||||||
|
EXPORT simdjson_staticTargets
|
||||||
|
NAMESPACE simdjson::
|
||||||
|
DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
|
||||||
|
COMPONENT simdjson_Development
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# pkg-config
|
||||||
|
include(cmake/JoinPaths.cmake)
|
||||||
|
join_paths(PKGCONFIG_INCLUDEDIR "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
|
||||||
|
join_paths(PKGCONFIG_LIBDIR "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
|
||||||
|
|
||||||
|
if(SIMDJSON_ENABLE_THREADS)
|
||||||
|
set(PKGCONFIG_CFLAGS "-DSIMDJSON_THREADS_ENABLED=1")
|
||||||
|
if(CMAKE_THREAD_LIBS_INIT)
|
||||||
|
set(PKGCONFIG_LIBS_PRIVATE "Libs.private: ${CMAKE_THREAD_LIBS_INIT}")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
configure_file("simdjson.pc.in" "simdjson.pc" @ONLY)
|
||||||
|
install(
|
||||||
|
FILES "${CMAKE_CURRENT_BINARY_DIR}/simdjson.pc"
|
||||||
|
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
|
||||||
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
install(
|
|
||||||
TARGETS simdjson
|
|
||||||
EXPORT simdjsonTargets
|
|
||||||
RUNTIME COMPONENT simdjson_Runtime
|
|
||||||
LIBRARY COMPONENT simdjson_Runtime
|
|
||||||
NAMELINK_COMPONENT simdjson_Development
|
|
||||||
ARCHIVE COMPONENT simdjson_Development
|
|
||||||
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
|
||||||
)
|
|
||||||
configure_file(cmake/simdjson-config.cmake.in simdjson-config.cmake @ONLY)
|
|
||||||
|
|
||||||
write_basic_package_version_file(
|
|
||||||
simdjson-config-version.cmake
|
|
||||||
COMPATIBILITY SameMinorVersion
|
|
||||||
)
|
|
||||||
|
|
||||||
set(
|
|
||||||
SIMDJSON_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/simdjson"
|
|
||||||
CACHE STRING "CMake package config location relative to the install prefix"
|
|
||||||
)
|
|
||||||
mark_as_advanced(SIMDJSON_INSTALL_CMAKEDIR)
|
|
||||||
|
|
||||||
install(
|
|
||||||
FILES
|
|
||||||
"${PROJECT_BINARY_DIR}/simdjson-config.cmake"
|
|
||||||
"${PROJECT_BINARY_DIR}/simdjson-config-version.cmake"
|
|
||||||
DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
|
|
||||||
COMPONENT simdjson_Development
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
|
||||||
EXPORT simdjsonTargets
|
|
||||||
NAMESPACE simdjson::
|
|
||||||
DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
|
|
||||||
COMPONENT simdjson_Development
|
|
||||||
)
|
|
||||||
|
|
||||||
if(SIMDJSON_BUILD_STATIC_LIB)
|
|
||||||
install(
|
|
||||||
TARGETS simdjson_static
|
|
||||||
EXPORT simdjson_staticTargets
|
|
||||||
ARCHIVE COMPONENT simdjson_Development
|
|
||||||
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
|
||||||
)
|
|
||||||
install(
|
|
||||||
EXPORT simdjson_staticTargets
|
|
||||||
NAMESPACE simdjson::
|
|
||||||
DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
|
|
||||||
COMPONENT simdjson_Development
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# pkg-config
|
|
||||||
include(cmake/JoinPaths.cmake)
|
|
||||||
join_paths(PKGCONFIG_INCLUDEDIR "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
|
|
||||||
join_paths(PKGCONFIG_LIBDIR "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
|
|
||||||
|
|
||||||
if(SIMDJSON_ENABLE_THREADS)
|
|
||||||
set(PKGCONFIG_CFLAGS "-DSIMDJSON_THREADS_ENABLED=1")
|
|
||||||
if(CMAKE_THREAD_LIBS_INIT)
|
|
||||||
set(PKGCONFIG_LIBS_PRIVATE "Libs.private: ${CMAKE_THREAD_LIBS_INIT}")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
configure_file("simdjson.pc.in" "simdjson.pc" @ONLY)
|
|
||||||
install(
|
|
||||||
FILES "${CMAKE_CURRENT_BINARY_DIR}/simdjson.pc"
|
|
||||||
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
|
|
||||||
)
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# CPack
|
# CPack
|
||||||
#
|
#
|
||||||
@@ -343,18 +452,25 @@ add_subdirectory(fuzz)
|
|||||||
#
|
#
|
||||||
# Source files should be just ASCII
|
# Source files should be just ASCII
|
||||||
#
|
#
|
||||||
find_program(FIND find)
|
find_program(FIND_CMD find)
|
||||||
find_program(FILE file)
|
find_program(FILE_CMD file)
|
||||||
find_program(GREP grep)
|
find_program(GREP_CMD grep)
|
||||||
if(FIND AND FILE AND GREP)
|
if(FIND_CMD AND FILE_CMD AND GREP_CMD)
|
||||||
add_test(
|
add_test(
|
||||||
NAME just_ascii
|
NAME just_ascii
|
||||||
COMMAND sh -c "\
|
COMMAND sh -c "\
|
||||||
${FIND} include src windows tools singleheader tests examples benchmark \
|
non_ascii=$(${FIND_CMD} include src windows tools singleheader tests examples benchmark \
|
||||||
-path benchmark/checkperf-reference -prune -name '*.h' -o -name '*.cpp' \
|
-path benchmark/checkperf-reference -prune -name '*.h' -o -name '*.cpp' \
|
||||||
-type f -exec ${FILE} '{}' \; | ${GREP} -qv ASCII || exit 0 && exit 1"
|
-type f -exec ${FILE_CMD} '{}' \; | ${GREP_CMD} -v ASCII); \
|
||||||
|
if [ -n \"$non_ascii\" ]; then \
|
||||||
|
echo 'The following files contain non-ASCII characters:'; \
|
||||||
|
echo \"$non_ascii\"; \
|
||||||
|
exit 1; \
|
||||||
|
fi"
|
||||||
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
|
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
|
||||||
)
|
)
|
||||||
|
else()
|
||||||
|
message(WARNING "just_ascii test disabled because required tools were not found: find='${FIND_CMD}', file='${FILE_CMD}', grep='${GREP_CMD}'")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
##
|
##
|
||||||
|
|||||||
@@ -101,3 +101,10 @@ Getting Started Hacking
|
|||||||
|
|
||||||
An overview of simdjson's directory structure, with pointers to architecture and design
|
An overview of simdjson's directory structure, with pointers to architecture and design
|
||||||
considerations and other helpful notes, can be found at [HACKING.md](HACKING.md).
|
considerations and other helpful notes, can be found at [HACKING.md](HACKING.md).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
AI Usage Policy
|
||||||
|
---------------
|
||||||
|
|
||||||
|
Please also review our [AI Usage Policy](AI_USAGE_POLICY.md).
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ PROJECT_NAME = simdjson
|
|||||||
# could be handy for archiving the generated documentation or if some version
|
# could be handy for archiving the generated documentation or if some version
|
||||||
# control system is used.
|
# control system is used.
|
||||||
|
|
||||||
PROJECT_NUMBER = "4.0.3"
|
PROJECT_NUMBER = "4.6.1"
|
||||||
|
|
||||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
||||||
# for a project that appears at the top of each page and should give viewer a
|
# for a project that appears at the top of each page and should give viewer a
|
||||||
|
|||||||
+25
@@ -110,6 +110,24 @@ workflows used by simdjson.
|
|||||||
Directory Structure and Source
|
Directory Structure and Source
|
||||||
------------------------------
|
------------------------------
|
||||||
|
|
||||||
|
Before diving into the directory structure, here are key concepts used in the codebase:
|
||||||
|
|
||||||
|
- **Amalgamated File**: A file that is conditionally included in the amalgamation process. These are wrapped in `#ifndef SIMDJSON_CONDITIONAL_INCLUDE` blocks and are included based on the target implementation (e.g., ARM64, x86). They include implementation-specific files (e.g., `arm64.h`) and generic files (e.g., under `generic/`). Amalgamated files have associated dependency files (`dependencies.h`) to track includes.
|
||||||
|
|
||||||
|
- **Amalgamator File**: A file that orchestrates the inclusion of amalgamated files. Examples: `arm64.h`, `arm64/implementation.h`, `generic/amalgamated.h`. These are not themselves amalgamated but control conditional inclusions.
|
||||||
|
|
||||||
|
- **Free Dependency File**: A top-level header that is always included unconditionally. These do not have dependency files and represent the public API (e.g., main headers).
|
||||||
|
|
||||||
|
- **Implementation-Specific File**: A file tied to a specific CPU architecture or instruction set (e.g., `arm64/`, `haswell/`). These must be amalgamated.
|
||||||
|
|
||||||
|
- **Generic File**: A shared file (under `generic/` or `simdjson/generic/`) that contains common code included once per implementation.
|
||||||
|
|
||||||
|
- **Builtin File**: Special files under `simdjson/builtin/` that handle the builtin implementation, a fallback/default implementation used when no optimized implementation is available.
|
||||||
|
|
||||||
|
- **Conditional Include Block**: A section wrapped in `#ifndef SIMDJSON_CONDITIONAL_INCLUDE` for editor-only or implementation-specific content.
|
||||||
|
|
||||||
|
The script `singleheader/amalgation_helper.py` will generate an HTML report which you can use to visualize the status of each file.
|
||||||
|
|
||||||
simdjson's source structure, from the top level, looks like this:
|
simdjson's source structure, from the top level, looks like this:
|
||||||
|
|
||||||
* **CMakeLists.txt:** The main build system.
|
* **CMakeLists.txt:** The main build system.
|
||||||
@@ -133,6 +151,12 @@ simdjson's source structure, from the top level, looks like this:
|
|||||||
* simdjson/generic/ondemand/*.h: individual On-Demand classes, generically written.
|
* simdjson/generic/ondemand/*.h: individual On-Demand classes, generically written.
|
||||||
* simdjson/generic/ondemand/dependencies.h: dependencies on common, non-implementation-specific simdjson classes. This will be included before including amalgamated.h.
|
* simdjson/generic/ondemand/dependencies.h: dependencies on common, non-implementation-specific simdjson classes. This will be included before including amalgamated.h.
|
||||||
* simdjson/generic/ondemand/amalgamated.h: all generic ondemand classes for an implementation.
|
* simdjson/generic/ondemand/amalgamated.h: all generic ondemand classes for an implementation.
|
||||||
|
* simdjson/builder.h: the `simdjson::builder` namespace. Includes all public builder classes.
|
||||||
|
* simdjson/builtin/builder.h: the `simdjson::builtin::builder` namespace.
|
||||||
|
* simdjson/arm64|fallback|haswell|icelake|ppc64|westmere/builder.h: the `simdjson::<implementation>::builder` namespace. Builder compiled for the specific implementation.
|
||||||
|
* simdjson/generic/builder/*.h: individual Builder classes, generically written.
|
||||||
|
* simdjson/generic/builder/dependencies.h: dependencies on common, non-implementation-specific simdjson classes. This will be included before including amalgamated.h.
|
||||||
|
* simdjson/generic/builder/amalgamated.h: all generic builder classes for an implementation.
|
||||||
* **src:** The source files for non-inlined functionality (e.g. the architecture-specific parser
|
* **src:** The source files for non-inlined functionality (e.g. the architecture-specific parser
|
||||||
implementations).
|
implementations).
|
||||||
* simdjson.cpp: A "main source" that includes all implementation files from src/. This is
|
* simdjson.cpp: A "main source" that includes all implementation files from src/. This is
|
||||||
@@ -147,6 +171,7 @@ Other important files and directories:
|
|||||||
* **.github/workflows:** Definitions for GitHub Actions (CI).
|
* **.github/workflows:** Definitions for GitHub Actions (CI).
|
||||||
* **singleheader:** Contains generated `simdjson.h` and `simdjson.cpp` that we release. The files `singleheader/simdjson.h` and `singleheader/simdjson.cpp` should never be edited by hand.
|
* **singleheader:** Contains generated `simdjson.h` and `simdjson.cpp` that we release. The files `singleheader/simdjson.h` and `singleheader/simdjson.cpp` should never be edited by hand.
|
||||||
* **singleheader/amalgamate.py:** Generates `singleheader/simdjson.h` and `singleheader/simdjson.cpp` for release (python script). If you add a new implementation (e.g., rvv), you need to edit this file (IMPLEMENTATIONS).
|
* **singleheader/amalgamate.py:** Generates `singleheader/simdjson.h` and `singleheader/simdjson.cpp` for release (python script). If you add a new implementation (e.g., rvv), you need to edit this file (IMPLEMENTATIONS).
|
||||||
|
* **singleheader/amalgation_helper.py:** Generates and `amalgamation_report.html` that helps you understand the status of each file.
|
||||||
* **benchmark:** This is where we do benchmarking. Benchmarking is core to every change we make; the
|
* **benchmark:** This is where we do benchmarking. Benchmarking is core to every change we make; the
|
||||||
cardinal rule is don't regress performance without knowing exactly why, and what you're trading
|
cardinal rule is don't regress performance without knowing exactly why, and what you're trading
|
||||||
for it. Many of our benchmarks are microbenchmarks. We are effectively doing controlled scientific experiments for the purpose of understanding what affects our performance. So we simplify as much as possible. We try to avoid irrelevant factors such as page faults, interrupts, unnecessary system calls. We recommend checking the performance as follows:
|
for it. Many of our benchmarks are microbenchmarks. We are effectively doing controlled scientific experiments for the purpose of understanding what affects our performance. So we simplify as much as possible. We try to avoid irrelevant factors such as page faults, interrupts, unnecessary system calls. We recommend checking the performance as follows:
|
||||||
|
|||||||
@@ -6,7 +6,8 @@
|
|||||||
simdjson : Parsing gigabytes of JSON per second
|
simdjson : Parsing gigabytes of JSON per second
|
||||||
===============================================
|
===============================================
|
||||||
|
|
||||||
<img src="images/logo.png" width="10%" style="float: right">
|
<img src="images/official_logo/logo_noir/SVG/logo_simdjson_noir.svg" width="40%" style="float: right">
|
||||||
|
|
||||||
JSON is everywhere on the Internet. Servers spend a *lot* of time parsing it. We need a fresh
|
JSON is everywhere on the Internet. Servers spend a *lot* of time parsing it. We need a fresh
|
||||||
approach. The simdjson library uses commonly available SIMD instructions and microparallel algorithms
|
approach. The simdjson library uses commonly available SIMD instructions and microparallel algorithms
|
||||||
to parse JSON 4x faster than RapidJSON and 25x faster than JSON for Modern C++.
|
to parse JSON 4x faster than RapidJSON and 25x faster than JSON for Modern C++.
|
||||||
@@ -62,10 +63,16 @@ Real-world usage
|
|||||||
- [WasmEdge](https://wasmedge.org)
|
- [WasmEdge](https://wasmedge.org)
|
||||||
- [RonDB](https://github.com/logicalclocks/rondb)
|
- [RonDB](https://github.com/logicalclocks/rondb)
|
||||||
- [GreptimeDB](https://github.com/GreptimeTeam/greptimedb)
|
- [GreptimeDB](https://github.com/GreptimeTeam/greptimedb)
|
||||||
|
- [mamba](https://github.com/mamba-org/mamba)
|
||||||
|
- [Ladybird Browser](https://ladybird.org)
|
||||||
|
- [SereneDB](https://github.com/serenedb/serenedb)
|
||||||
|
|
||||||
|
|
||||||
If you are planning to use simdjson in a product, please work from one of our releases.
|
If you are planning to use simdjson in a product, please work from one of our releases.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Quick Start
|
Quick Start
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
@@ -82,7 +89,7 @@ The simdjson library is easily consumable with a single .h and .cpp file.
|
|||||||
```
|
```
|
||||||
2. Create `quickstart.cpp`:
|
2. Create `quickstart.cpp`:
|
||||||
|
|
||||||
```c++
|
```cpp
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include "simdjson.h"
|
#include "simdjson.h"
|
||||||
using namespace simdjson;
|
using namespace simdjson;
|
||||||
@@ -112,6 +119,8 @@ Usage documentation is available:
|
|||||||
* [Implementation Selection](doc/implementation-selection.md) describes runtime CPU detection and
|
* [Implementation Selection](doc/implementation-selection.md) describes runtime CPU detection and
|
||||||
how you can work with it.
|
how you can work with it.
|
||||||
* [API](https://simdjson.github.io/simdjson/) contains the automatically generated API documentation.
|
* [API](https://simdjson.github.io/simdjson/) contains the automatically generated API documentation.
|
||||||
|
* [Compile-Time Parsing](doc/compile_time.md) presents our compile-time parsing function (C++26 only).
|
||||||
|
|
||||||
|
|
||||||
Godbolt
|
Godbolt
|
||||||
-------------
|
-------------
|
||||||
@@ -120,7 +129,6 @@ Some users may want to browse code along with the compiled assembly. You want to
|
|||||||
* [C++26 reflection example](https://godbolt.org/z/K3Px64TqK)
|
* [C++26 reflection example](https://godbolt.org/z/K3Px64TqK)
|
||||||
* [simdjson examples with errors handled through exceptions](https://godbolt.org/z/7G5qE4sr9)
|
* [simdjson examples with errors handled through exceptions](https://godbolt.org/z/7G5qE4sr9)
|
||||||
* [simdjson examples with errors without exceptions](https://godbolt.org/z/e9dWb9E4v)
|
* [simdjson examples with errors without exceptions](https://godbolt.org/z/e9dWb9E4v)
|
||||||
|
|
||||||
|
|
||||||
Performance results
|
Performance results
|
||||||
-------------------
|
-------------------
|
||||||
@@ -181,6 +189,8 @@ We distinguish between "bindings" (which just wrap the C++ code) and a port to a
|
|||||||
- [JSON::SIMD](https://metacpan.org/pod/JSON::SIMD): Perl bindings; fully-featured JSON module that uses simdjson for decoding.
|
- [JSON::SIMD](https://metacpan.org/pod/JSON::SIMD): Perl bindings; fully-featured JSON module that uses simdjson for decoding.
|
||||||
- [gemmaJSON](https://github.com/sainttttt/gemmaJSON): Nim JSON parser based on simdjson bindings.
|
- [gemmaJSON](https://github.com/sainttttt/gemmaJSON): Nim JSON parser based on simdjson bindings.
|
||||||
- [simdjson-java](https://github.com/simdjson/simdjson-java): Java port.
|
- [simdjson-java](https://github.com/simdjson/simdjson-java): Java port.
|
||||||
|
- [mruby-fast-json](https://github.com/Asmod4n/mruby-fast-json): mruby binding with high API coverage.
|
||||||
|
- [simdjson-dart](https://github.com/xaldarof/simdjson-dart): Dart bindings for the simdjson project.
|
||||||
|
|
||||||
About simdjson
|
About simdjson
|
||||||
--------------
|
--------------
|
||||||
@@ -191,7 +201,7 @@ CPU's multiple execution cores.
|
|||||||
|
|
||||||
Our default front-end is called On-Demand, and we wrote a paper about it:
|
Our default front-end is called On-Demand, and we wrote a paper about it:
|
||||||
|
|
||||||
- John Keiser, Daniel Lemire, [On-Demand JSON: A Better Way to Parse Documents?](http://arxiv.org/abs/2312.17149), Software: Practice and Experience 54 (6), 2024.
|
- John Keiser, Daniel Lemire, [On-Demand JSON: A Better Way to Parse Documents?](https://arxiv.org/abs/2312.17149), Software: Practice and Experience 54 (6), 2024.
|
||||||
|
|
||||||
Some people [enjoy reading the first (2019) simdjson paper](https://arxiv.org/abs/1902.08318): A description of the design
|
Some people [enjoy reading the first (2019) simdjson paper](https://arxiv.org/abs/1902.08318): A description of the design
|
||||||
and implementation of simdjson is in our research article:
|
and implementation of simdjson is in our research article:
|
||||||
@@ -203,10 +213,31 @@ We have an in-depth paper focused on the UTF-8 validation:
|
|||||||
|
|
||||||
We also have an informal [blog post providing some background and context](https://branchfree.org/2019/02/25/paper-parsing-gigabytes-of-json-per-second/).
|
We also have an informal [blog post providing some background and context](https://branchfree.org/2019/02/25/paper-parsing-gigabytes-of-json-per-second/).
|
||||||
|
|
||||||
For the video inclined, <br />
|
For the video inclined, we had a talk at QCon San Francisco 2019<br />
|
||||||
[](http://www.youtube.com/watch?v=wlvKAT7SZIQ)<br />
|
[](https://www.youtube.com/watch?v=wlvKAT7SZIQ)<br />
|
||||||
(It was the best voted talk, we're kinda proud of it.)
|
(It was the best voted talk, we're kinda proud of it.)
|
||||||
|
|
||||||
|
We also had a CppCon 2025 talk. We show how C++26 reflection allows for one-line serialization (to_json(player)) or deserialization—without invasive macros or manual mapping—using nothing but the C++ standard library. Whether you’re a performance junkie or simply interested in the roadmap for the next decade of C++ development, watch our full talk!
|
||||||
|
|
||||||
|
[](https://www.youtube.com/watch?v=Mcgk3CxHYMs)<br />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Citing this work
|
||||||
|
-----------------
|
||||||
|
|
||||||
|
If you use simdjson in published research, please cite the software library. A suitable BibTeX entry is:
|
||||||
|
|
||||||
|
```bibtex
|
||||||
|
@misc{simdjson,
|
||||||
|
title={{The simdjson library: Parsing Gigabytes of JSON per Second}},
|
||||||
|
author={Daniel Lemire and Geoff Langdale and John Keiser and Paul Dreik and Francisco Thiesen and others},
|
||||||
|
year={2019},
|
||||||
|
howpublished={Software library},
|
||||||
|
note={https://github.com/simdjson/simdjson}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
Funding
|
Funding
|
||||||
-------
|
-------
|
||||||
|
|
||||||
@@ -227,6 +258,13 @@ Contributing to simdjson
|
|||||||
Head over to [CONTRIBUTING.md](CONTRIBUTING.md) for information on contributing to simdjson, and
|
Head over to [CONTRIBUTING.md](CONTRIBUTING.md) for information on contributing to simdjson, and
|
||||||
[HACKING.md](HACKING.md) for information on source, building, and architecture/design.
|
[HACKING.md](HACKING.md) for information on source, building, and architecture/design.
|
||||||
|
|
||||||
|
|
||||||
|
Stars
|
||||||
|
------
|
||||||
|
|
||||||
|
[](https://www.star-history.com/#simdjson/simdjson&Date)
|
||||||
|
|
||||||
|
|
||||||
License
|
License
|
||||||
-------
|
-------
|
||||||
|
|
||||||
@@ -234,7 +272,7 @@ This code is made available under the [Apache License 2.0](https://www.apache.or
|
|||||||
|
|
||||||
Under Windows, we build some tools using the windows/dirent_portable.h file (which is outside our library code): it is under the liberal (business-friendly) MIT license.
|
Under Windows, we build some tools using the windows/dirent_portable.h file (which is outside our library code): it is under the liberal (business-friendly) MIT license.
|
||||||
|
|
||||||
For compilers that do not support [C++17](https://en.wikipedia.org/wiki/C%2B%2B17), we bundle the string-view library which is published under the [Boost license](http://www.boost.org/LICENSE_1_0.txt). Like the Apache license, the Boost license is a permissive license allowing commercial redistribution.
|
For compilers that do not support [C++17](https://en.wikipedia.org/wiki/C%2B%2B17), we bundle the string-view library which is published under the [Boost license](https://www.boost.org/LICENSE_1_0.txt). Like the Apache license, the Boost license is a permissive license allowing commercial redistribution.
|
||||||
|
|
||||||
For efficient number serialization, we bundle Florian Loitsch's implementation of the Grisu2 algorithm for binary to decimal floating-point numbers. The implementation was slightly modified by JSON for Modern C++ library. Both Florian Loitsch's implementation and JSON for Modern C++ are provided under the MIT license.
|
For efficient number serialization, we bundle Florian Loitsch's implementation of the Grisu2 algorithm for binary to decimal floating-point numbers. The implementation was slightly modified by JSON for Modern C++ library. Both Florian Loitsch's implementation and JSON for Modern C++ are provided under the MIT license.
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
add_subdirectory(dom)
|
add_subdirectory(dom)
|
||||||
|
|
||||||
|
|
||||||
include_directories( . linux )
|
include_directories( . )
|
||||||
link_libraries(simdjson-windows-headers test-data)
|
link_libraries(simdjson-windows-headers test-data)
|
||||||
link_libraries(simdjson)
|
link_libraries(simdjson)
|
||||||
|
link_libraries(counters)
|
||||||
if(SIMDJSON_STATIC_REFLECTION)
|
if(SIMDJSON_STATIC_REFLECTION)
|
||||||
add_compile_definitions(SIMDJSON_STATIC_REFLECTION=1)
|
add_compile_definitions(SIMDJSON_STATIC_REFLECTION=1)
|
||||||
endif(SIMDJSON_STATIC_REFLECTION)
|
endif(SIMDJSON_STATIC_REFLECTION)
|
||||||
@@ -15,6 +16,7 @@ if (TARGET benchmark::benchmark)
|
|||||||
link_libraries(benchmark::benchmark)
|
link_libraries(benchmark::benchmark)
|
||||||
add_executable(bench_parse_call bench_parse_call.cpp)
|
add_executable(bench_parse_call bench_parse_call.cpp)
|
||||||
add_executable(bench_dom_api bench_dom_api.cpp)
|
add_executable(bench_dom_api bench_dom_api.cpp)
|
||||||
|
add_executable(bench_stream_formats bench_stream_formats.cpp)
|
||||||
if(SIMDJSON_EXCEPTIONS)
|
if(SIMDJSON_EXCEPTIONS)
|
||||||
add_executable(bench_ondemand bench_ondemand.cpp)
|
add_executable(bench_ondemand bench_ondemand.cpp)
|
||||||
if(TARGET yyjson)
|
if(TARGET yyjson)
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
# Accessor Performance Benchmarks (C++26)
|
||||||
|
|
||||||
|
These benchmarks compare the performance of runtime vs compile-time JSON accessors.
|
||||||
|
For the comparison to be meaningful, you must build simdjson with support for
|
||||||
|
C++26 reflexion. See the `p2996` repository in the main project directory.
|
||||||
|
|
||||||
|
## Files
|
||||||
|
|
||||||
|
- `accessor_benchmark.h` - Common benchmark framework and test data
|
||||||
|
- `runtime_accessors.h` - Runtime `at_path()` benchmarks
|
||||||
|
- `compile_time_accessors.h` - Compile-time `at_path_compiled()` benchmarks (requires C++26 reflection)
|
||||||
|
|
||||||
|
## Benchmarks
|
||||||
|
|
||||||
|
Each benchmark measures parsing + single field access:
|
||||||
|
|
||||||
|
1. **accessor_simple** - Simple field: `.name`
|
||||||
|
2. **accessor_nested** - Nested field: `.address.city`
|
||||||
|
3. **accessor_deep** - Deep nested field: `.address.coordinates.lat`
|
||||||
|
|
||||||
|
## Building (Linux/macOS)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cmake -B build -D SIMDJSON_STATIC_REFLECTION=ON -DSIMDJSON_DEVELOPER_MODE=ON
|
||||||
|
cmake --build build --target=bench_ondemand
|
||||||
|
```
|
||||||
|
|
||||||
|
The `SIMDJSON_STATIC_REFLECTION` will be made unnecessary once mainstream compilers
|
||||||
|
begin supporting C++26 sufficiently well.
|
||||||
|
|
||||||
|
## Running (Linux/macOS)
|
||||||
|
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Run all accessor benchmarks
|
||||||
|
./build/bench_ondemand --benchmark_filter="accessor"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Results
|
||||||
|
|
||||||
|
We find that compile-time accessors show performance improvements that scale with path depth:
|
||||||
|
- Simple fields: ~1.2x faster
|
||||||
|
- Nested fields: ~1.5x faster
|
||||||
|
- Deep nested fields: ~1.8x faster
|
||||||
|
|
||||||
|
The speedup comes from eliminating runtime path parsing and conversion overhead.
|
||||||
@@ -0,0 +1,132 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "json_benchmark/file_runner.h"
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace accessor_performance {
|
||||||
|
|
||||||
|
using namespace json_benchmark;
|
||||||
|
|
||||||
|
// Test JSON for accessor benchmarks
|
||||||
|
static const char* TEST_JSON = R"({
|
||||||
|
"name": "Alice",
|
||||||
|
"age": 30,
|
||||||
|
"email": "alice@example.com",
|
||||||
|
"address": {
|
||||||
|
"street": "123 Main St",
|
||||||
|
"city": "Boston",
|
||||||
|
"state": "MA",
|
||||||
|
"zip": 12345,
|
||||||
|
"coordinates": {
|
||||||
|
"lat": 42.3601,
|
||||||
|
"lon": -71.0589
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"scores": [95, 87, 92, 88, 91],
|
||||||
|
"preferences": {
|
||||||
|
"theme": "dark",
|
||||||
|
"notifications": {
|
||||||
|
"email": true,
|
||||||
|
"push": false,
|
||||||
|
"sms": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})";
|
||||||
|
|
||||||
|
// Struct definitions for compile-time validation
|
||||||
|
#if SIMDJSON_STATIC_REFLECTION
|
||||||
|
struct Coordinates {
|
||||||
|
double lat;
|
||||||
|
double lon;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Address {
|
||||||
|
std::string street;
|
||||||
|
std::string city;
|
||||||
|
std::string state;
|
||||||
|
int64_t zip;
|
||||||
|
Coordinates coordinates;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Notifications {
|
||||||
|
bool email;
|
||||||
|
bool push;
|
||||||
|
bool sms;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Preferences {
|
||||||
|
std::string theme;
|
||||||
|
Notifications notifications;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct TestData {
|
||||||
|
std::string name;
|
||||||
|
int64_t age;
|
||||||
|
std::string email;
|
||||||
|
Address address;
|
||||||
|
std::vector<int64_t> scores;
|
||||||
|
Preferences preferences;
|
||||||
|
};
|
||||||
|
#endif // SIMDJSON_STATIC_REFLECTION
|
||||||
|
|
||||||
|
// Single-access benchmark runner: measures ONE field access per iteration
|
||||||
|
template<typename I>
|
||||||
|
struct single_access_runner : public file_runner<I> {
|
||||||
|
std::string result_string;
|
||||||
|
int64_t result_int{};
|
||||||
|
double result_double{};
|
||||||
|
bool result_bool{};
|
||||||
|
|
||||||
|
bool setup(benchmark::State &state) {
|
||||||
|
this->json = simdjson::padded_string(TEST_JSON, strlen(TEST_JSON));
|
||||||
|
state.SetBytesProcessed(int64_t(state.iterations()) * int64_t(this->json.size()));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool before_run(benchmark::State &state) {
|
||||||
|
if (!file_runner<I>::before_run(state)) { return false; }
|
||||||
|
result_string.clear();
|
||||||
|
result_int = 0;
|
||||||
|
result_double = 0.0;
|
||||||
|
result_bool = false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool run(benchmark::State &) {
|
||||||
|
return this->implementation.run(this->json, result_string, result_int, result_double, result_bool);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename R>
|
||||||
|
bool diff(benchmark::State &state, single_access_runner<R> &reference) {
|
||||||
|
if (result_string != reference.result_string ||
|
||||||
|
result_int != reference.result_int ||
|
||||||
|
result_double != reference.result_double ||
|
||||||
|
result_bool != reference.result_bool) {
|
||||||
|
std::cerr << "Accessor benchmark results differ!" << std::endl;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t items_per_iteration() {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Benchmark template definitions
|
||||||
|
struct runtime_at_path_simple;
|
||||||
|
template<typename I> simdjson_inline static void accessor_simple(benchmark::State &state) {
|
||||||
|
run_json_benchmark<single_access_runner<I>, single_access_runner<runtime_at_path_simple>>(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
struct runtime_at_path_nested;
|
||||||
|
template<typename I> simdjson_inline static void accessor_nested(benchmark::State &state) {
|
||||||
|
run_json_benchmark<single_access_runner<I>, single_access_runner<runtime_at_path_nested>>(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
struct runtime_at_path_deep;
|
||||||
|
template<typename I> simdjson_inline static void accessor_deep(benchmark::State &state) {
|
||||||
|
run_json_benchmark<single_access_runner<I>, single_access_runner<runtime_at_path_deep>>(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace accessor_performance
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#if SIMDJSON_EXCEPTIONS && SIMDJSON_STATIC_REFLECTION
|
||||||
|
|
||||||
|
#include "accessor_benchmark.h"
|
||||||
|
|
||||||
|
namespace accessor_performance {
|
||||||
|
|
||||||
|
using namespace simdjson;
|
||||||
|
|
||||||
|
struct compile_time_at_path_simple {
|
||||||
|
ondemand::parser parser{};
|
||||||
|
|
||||||
|
bool run(simdjson::padded_string &json, std::string &result_str, int64_t&, double&, bool&) {
|
||||||
|
auto doc = parser.iterate(json);
|
||||||
|
std::string_view name;
|
||||||
|
auto r = ondemand::json_path::at_path_compiled<TestData, ".name">(doc);
|
||||||
|
if (r.get(name) != SUCCESS) return false;
|
||||||
|
result_str = name;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
struct compile_time_at_path_nested {
|
||||||
|
ondemand::parser parser{};
|
||||||
|
|
||||||
|
bool run(simdjson::padded_string &json, std::string &result_str, int64_t&, double&, bool&) {
|
||||||
|
auto doc = parser.iterate(json);
|
||||||
|
std::string_view city;
|
||||||
|
auto r = ondemand::json_path::at_path_compiled<TestData, ".address.city">(doc);
|
||||||
|
if (r.get(city) != SUCCESS) return false;
|
||||||
|
result_str = city;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
struct compile_time_at_path_deep {
|
||||||
|
ondemand::parser parser{};
|
||||||
|
|
||||||
|
bool run(simdjson::padded_string &json, std::string&, int64_t&, double &result_dbl, bool&) {
|
||||||
|
auto doc = parser.iterate(json);
|
||||||
|
double lat;
|
||||||
|
auto r = ondemand::json_path::at_path_compiled<TestData, ".address.coordinates.lat">(doc);
|
||||||
|
if (r.get(lat) != SUCCESS) return false;
|
||||||
|
result_dbl = lat;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
BENCHMARK_TEMPLATE(accessor_simple, compile_time_at_path_simple)->UseManualTime();
|
||||||
|
BENCHMARK_TEMPLATE(accessor_nested, compile_time_at_path_nested)->UseManualTime();
|
||||||
|
BENCHMARK_TEMPLATE(accessor_deep, compile_time_at_path_deep)->UseManualTime();
|
||||||
|
|
||||||
|
} // namespace accessor_performance
|
||||||
|
|
||||||
|
#endif // SIMDJSON_EXCEPTIONS && SIMDJSON_STATIC_REFLECTION
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#if SIMDJSON_EXCEPTIONS
|
||||||
|
|
||||||
|
#include "accessor_benchmark.h"
|
||||||
|
|
||||||
|
namespace accessor_performance {
|
||||||
|
|
||||||
|
using namespace simdjson;
|
||||||
|
|
||||||
|
struct runtime_at_path_simple {
|
||||||
|
ondemand::parser parser{};
|
||||||
|
|
||||||
|
bool run(simdjson::padded_string &json, std::string &result_str, int64_t&, double&, bool&) {
|
||||||
|
auto doc = parser.iterate(json);
|
||||||
|
std::string_view name;
|
||||||
|
if (doc.at_path(".name").get(name) != SUCCESS) return false;
|
||||||
|
result_str = name;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
struct runtime_at_path_nested {
|
||||||
|
ondemand::parser parser{};
|
||||||
|
|
||||||
|
bool run(simdjson::padded_string &json, std::string &result_str, int64_t&, double&, bool&) {
|
||||||
|
auto doc = parser.iterate(json);
|
||||||
|
std::string_view city;
|
||||||
|
if (doc.at_path(".address.city").get(city) != SUCCESS) return false;
|
||||||
|
result_str = city;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
struct runtime_at_path_deep {
|
||||||
|
ondemand::parser parser{};
|
||||||
|
|
||||||
|
bool run(simdjson::padded_string &json, std::string&, int64_t&, double &result_dbl, bool&) {
|
||||||
|
auto doc = parser.iterate(json);
|
||||||
|
double lat;
|
||||||
|
if (doc.at_path(".address.coordinates.lat").get(lat) != SUCCESS) return false;
|
||||||
|
result_dbl = lat;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
BENCHMARK_TEMPLATE(accessor_simple, runtime_at_path_simple)->UseManualTime();
|
||||||
|
BENCHMARK_TEMPLATE(accessor_nested, runtime_at_path_nested)->UseManualTime();
|
||||||
|
BENCHMARK_TEMPLATE(accessor_deep, runtime_at_path_deep)->UseManualTime();
|
||||||
|
|
||||||
|
} // namespace accessor_performance
|
||||||
|
|
||||||
|
#endif // SIMDJSON_EXCEPTIONS
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -124,6 +124,7 @@ SIMDJSON_POP_DISABLE_WARNINGS
|
|||||||
#include "kostya/boostjson.h"
|
#include "kostya/boostjson.h"
|
||||||
|
|
||||||
#include "large_random/simdjson_ondemand.h"
|
#include "large_random/simdjson_ondemand.h"
|
||||||
|
#include "large_random/simdjson_ondemand_ranges.h"
|
||||||
#if SIMDJSON_COMPETITION_ONDEMAND_UNORDERED
|
#if SIMDJSON_COMPETITION_ONDEMAND_UNORDERED
|
||||||
#include "large_random/simdjson_ondemand_unordered.h"
|
#include "large_random/simdjson_ondemand_unordered.h"
|
||||||
#endif // SIMDJSON_COMPETITION_ONDEMAND_UNORDERED
|
#endif // SIMDJSON_COMPETITION_ONDEMAND_UNORDERED
|
||||||
@@ -148,4 +149,9 @@ SIMDJSON_POP_DISABLE_WARNINGS
|
|||||||
#include "large_amazon_cellphones/simdjson_dom.h"
|
#include "large_amazon_cellphones/simdjson_dom.h"
|
||||||
#include "large_amazon_cellphones/simdjson_ondemand.h"
|
#include "large_amazon_cellphones/simdjson_ondemand.h"
|
||||||
|
|
||||||
|
#include "accessor_performance/runtime_accessors.h"
|
||||||
|
#if SIMDJSON_STATIC_REFLECTION
|
||||||
|
#include "accessor_performance/compile_time_accessors.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
BENCHMARK_MAIN();
|
BENCHMARK_MAIN();
|
||||||
|
|||||||
@@ -0,0 +1,216 @@
|
|||||||
|
#include <benchmark/benchmark.h>
|
||||||
|
#include <string>
|
||||||
|
#include "simdjson.h"
|
||||||
|
|
||||||
|
using namespace simdjson;
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
|
||||||
|
enum class stream_case {
|
||||||
|
ndjson_small,
|
||||||
|
ndjson_large,
|
||||||
|
rfc7464_small,
|
||||||
|
rfc7464_large,
|
||||||
|
comma_delimited_small,
|
||||||
|
comma_delimited_large
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr size_t TARGET_BYTES = 128 * 1000 * 1000;
|
||||||
|
constexpr size_t SMALL_PAYLOAD = 16;
|
||||||
|
constexpr size_t LARGE_PAYLOAD = 4096;
|
||||||
|
constexpr size_t BATCH_SIZE = 1 << 20;
|
||||||
|
|
||||||
|
struct stream_dataset {
|
||||||
|
padded_string json;
|
||||||
|
size_t count{};
|
||||||
|
};
|
||||||
|
|
||||||
|
std::string make_document(size_t id, size_t payload_size) {
|
||||||
|
return std::string{"{\"id\":"} + std::to_string(id) +
|
||||||
|
",\"name\":\"aaaaaaaa\",\"payload\":\"" +
|
||||||
|
std::string(payload_size, 'x') + "\",\"flag\":true}";
|
||||||
|
}
|
||||||
|
|
||||||
|
stream_dataset build_dataset(stream_case which) {
|
||||||
|
const bool small = which == stream_case::ndjson_small ||
|
||||||
|
which == stream_case::rfc7464_small ||
|
||||||
|
which == stream_case::comma_delimited_small;
|
||||||
|
const bool rfc = which == stream_case::rfc7464_small ||
|
||||||
|
which == stream_case::rfc7464_large;
|
||||||
|
const bool comma = which == stream_case::comma_delimited_small ||
|
||||||
|
which == stream_case::comma_delimited_large;
|
||||||
|
const size_t payload_size = small ? SMALL_PAYLOAD : LARGE_PAYLOAD;
|
||||||
|
const size_t count = TARGET_BYTES / (payload_size + 48);
|
||||||
|
std::string out;
|
||||||
|
out.reserve(count * (payload_size + 64));
|
||||||
|
for (size_t i = 0; i < count; i++) {
|
||||||
|
if (rfc) {
|
||||||
|
out += char(0x1E);
|
||||||
|
}
|
||||||
|
if (comma && i > 0) {
|
||||||
|
out += ',';
|
||||||
|
}
|
||||||
|
out += make_document(i, payload_size);
|
||||||
|
if (!comma) {
|
||||||
|
out += '\n';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {padded_string(out), count};
|
||||||
|
}
|
||||||
|
|
||||||
|
const stream_dataset &get_dataset(stream_case which) {
|
||||||
|
static const stream_dataset ndjson_small =
|
||||||
|
build_dataset(stream_case::ndjson_small);
|
||||||
|
static const stream_dataset ndjson_large =
|
||||||
|
build_dataset(stream_case::ndjson_large);
|
||||||
|
static const stream_dataset rfc_small =
|
||||||
|
build_dataset(stream_case::rfc7464_small);
|
||||||
|
static const stream_dataset rfc_large =
|
||||||
|
build_dataset(stream_case::rfc7464_large);
|
||||||
|
static const stream_dataset comma_small =
|
||||||
|
build_dataset(stream_case::comma_delimited_small);
|
||||||
|
static const stream_dataset comma_large =
|
||||||
|
build_dataset(stream_case::comma_delimited_large);
|
||||||
|
switch (which) {
|
||||||
|
case stream_case::ndjson_small:
|
||||||
|
return ndjson_small;
|
||||||
|
case stream_case::ndjson_large:
|
||||||
|
return ndjson_large;
|
||||||
|
case stream_case::rfc7464_small:
|
||||||
|
return rfc_small;
|
||||||
|
case stream_case::rfc7464_large:
|
||||||
|
return rfc_large;
|
||||||
|
case stream_case::comma_delimited_small:
|
||||||
|
return comma_small;
|
||||||
|
case stream_case::comma_delimited_large:
|
||||||
|
return comma_large;
|
||||||
|
}
|
||||||
|
return ndjson_small;
|
||||||
|
}
|
||||||
|
|
||||||
|
void set_counters(benchmark::State &state, const stream_dataset &dataset) {
|
||||||
|
state.SetBytesProcessed(int64_t(state.iterations()) * int64_t(dataset.json.size()));
|
||||||
|
state.SetItemsProcessed(int64_t(state.iterations()) * int64_t(dataset.count));
|
||||||
|
}
|
||||||
|
|
||||||
|
template <stream_case which, bool threaded = true>
|
||||||
|
static void bench_ondemand(benchmark::State &state) {
|
||||||
|
const auto &dataset = get_dataset(which);
|
||||||
|
ondemand::parser parser;
|
||||||
|
parser.threaded = threaded;
|
||||||
|
stream_format format = stream_format::whitespace_delimited;
|
||||||
|
if constexpr (which == stream_case::rfc7464_small ||
|
||||||
|
which == stream_case::rfc7464_large) {
|
||||||
|
format = stream_format::json_sequence;
|
||||||
|
} else if constexpr (which == stream_case::comma_delimited_small ||
|
||||||
|
which == stream_case::comma_delimited_large) {
|
||||||
|
format = stream_format::comma_delimited;
|
||||||
|
}
|
||||||
|
for (const auto _ : state) {
|
||||||
|
ondemand::document_stream docs;
|
||||||
|
auto error = parser.iterate_many(dataset.json, BATCH_SIZE, format).get(docs);
|
||||||
|
if (error) {
|
||||||
|
state.SkipWithError(error_message(error));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
uint64_t sum = 0;
|
||||||
|
for (auto doc : docs) {
|
||||||
|
ondemand::object obj;
|
||||||
|
if ((error = doc.get_object().get(obj))) {
|
||||||
|
state.SkipWithError(error_message(error));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
uint64_t id;
|
||||||
|
if ((error = obj["id"].get_uint64().get(id))) {
|
||||||
|
state.SkipWithError(error_message(error));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
sum += id;
|
||||||
|
}
|
||||||
|
benchmark::DoNotOptimize(sum);
|
||||||
|
}
|
||||||
|
set_counters(state, dataset);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <stream_case which>
|
||||||
|
static void bench_dom(benchmark::State &state) {
|
||||||
|
const auto &dataset = get_dataset(which);
|
||||||
|
dom::parser parser;
|
||||||
|
parser.threaded = true;
|
||||||
|
stream_format format = stream_format::whitespace_delimited;
|
||||||
|
if constexpr (which == stream_case::rfc7464_small ||
|
||||||
|
which == stream_case::rfc7464_large) {
|
||||||
|
format = stream_format::json_sequence;
|
||||||
|
} else if constexpr (which == stream_case::comma_delimited_small ||
|
||||||
|
which == stream_case::comma_delimited_large) {
|
||||||
|
format = stream_format::comma_delimited;
|
||||||
|
}
|
||||||
|
for (const auto _ : state) {
|
||||||
|
dom::document_stream docs;
|
||||||
|
auto error = parser.parse_many(dataset.json, BATCH_SIZE, format).get(docs);
|
||||||
|
if (error) {
|
||||||
|
state.SkipWithError(error_message(error));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
uint64_t sum = 0;
|
||||||
|
for (auto doc : docs) {
|
||||||
|
uint64_t id;
|
||||||
|
if ((error = doc["id"].get(id))) {
|
||||||
|
state.SkipWithError(error_message(error));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
sum += id;
|
||||||
|
}
|
||||||
|
benchmark::DoNotOptimize(sum);
|
||||||
|
}
|
||||||
|
set_counters(state, dataset);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
BENCHMARK(bench_ondemand<stream_case::ndjson_small>)
|
||||||
|
->UseRealTime()
|
||||||
|
->DisplayAggregatesOnly(true);
|
||||||
|
BENCHMARK(bench_ondemand<stream_case::ndjson_large>)
|
||||||
|
->UseRealTime()
|
||||||
|
->DisplayAggregatesOnly(true);
|
||||||
|
BENCHMARK(bench_ondemand<stream_case::rfc7464_small>)
|
||||||
|
->UseRealTime()
|
||||||
|
->DisplayAggregatesOnly(true);
|
||||||
|
BENCHMARK(bench_ondemand<stream_case::rfc7464_large>)
|
||||||
|
->UseRealTime()
|
||||||
|
->DisplayAggregatesOnly(true);
|
||||||
|
BENCHMARK(bench_ondemand<stream_case::comma_delimited_small>)
|
||||||
|
->UseRealTime()
|
||||||
|
->DisplayAggregatesOnly(true);
|
||||||
|
BENCHMARK(bench_ondemand<stream_case::comma_delimited_large>)
|
||||||
|
->UseRealTime()
|
||||||
|
->DisplayAggregatesOnly(true);
|
||||||
|
// Non-threaded comma_delimited for comparison
|
||||||
|
BENCHMARK(bench_ondemand<stream_case::comma_delimited_small, false>)
|
||||||
|
->UseRealTime()
|
||||||
|
->DisplayAggregatesOnly(true);
|
||||||
|
BENCHMARK(bench_ondemand<stream_case::comma_delimited_large, false>)
|
||||||
|
->UseRealTime()
|
||||||
|
->DisplayAggregatesOnly(true);
|
||||||
|
|
||||||
|
BENCHMARK(bench_dom<stream_case::ndjson_small>)
|
||||||
|
->UseRealTime()
|
||||||
|
->DisplayAggregatesOnly(true);
|
||||||
|
BENCHMARK(bench_dom<stream_case::ndjson_large>)
|
||||||
|
->UseRealTime()
|
||||||
|
->DisplayAggregatesOnly(true);
|
||||||
|
BENCHMARK(bench_dom<stream_case::rfc7464_small>)
|
||||||
|
->UseRealTime()
|
||||||
|
->DisplayAggregatesOnly(true);
|
||||||
|
BENCHMARK(bench_dom<stream_case::rfc7464_large>)
|
||||||
|
->UseRealTime()
|
||||||
|
->DisplayAggregatesOnly(true);
|
||||||
|
BENCHMARK(bench_dom<stream_case::comma_delimited_small>)
|
||||||
|
->UseRealTime()
|
||||||
|
->DisplayAggregatesOnly(true);
|
||||||
|
BENCHMARK(bench_dom<stream_case::comma_delimited_large>)
|
||||||
|
->UseRealTime()
|
||||||
|
->DisplayAggregatesOnly(true);
|
||||||
|
|
||||||
|
BENCHMARK_MAIN();
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
#include "event_counter.h"
|
#include <counters/event_counter.h>
|
||||||
|
using namespace counters;
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cctype>
|
#include <cctype>
|
||||||
@@ -25,7 +26,6 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "linux-perf-events.h"
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
#include <libgen.h>
|
#include <libgen.h>
|
||||||
#endif
|
#endif
|
||||||
@@ -204,12 +204,8 @@ struct feature_benchmarker {
|
|||||||
}
|
}
|
||||||
// Rate of 1-7-structural misses per 8-structural flip
|
// Rate of 1-7-structural misses per 8-structural flip
|
||||||
double struct1_7_miss_rate(BenchmarkStage stage) const {
|
double struct1_7_miss_rate(BenchmarkStage stage) const {
|
||||||
#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
|
||||||
return 1;
|
|
||||||
#else
|
|
||||||
if (!has_events()) { return 1; }
|
if (!has_events()) { return 1; }
|
||||||
return struct7_miss[stage].best.branch_misses() - struct7[stage].best.branch_misses() / double(struct7_miss.stats->blocks_with_1_structural_flipped);
|
return struct7_miss[stage].best.branch_misses() - struct7[stage].best.branch_misses() / double(struct7_miss.stats->blocks_with_1_structural_flipped);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
// Extra cost of an 8-15 structural block over a 1-7 structural block
|
// Extra cost of an 8-15 structural block over a 1-7 structural block
|
||||||
double struct8_15_cost(BenchmarkStage stage) const {
|
double struct8_15_cost(BenchmarkStage stage) const {
|
||||||
@@ -221,12 +217,8 @@ struct feature_benchmarker {
|
|||||||
}
|
}
|
||||||
// Rate of 8-15-structural misses per 8-structural flip
|
// Rate of 8-15-structural misses per 8-structural flip
|
||||||
double struct8_15_miss_rate(BenchmarkStage stage) const {
|
double struct8_15_miss_rate(BenchmarkStage stage) const {
|
||||||
#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
|
||||||
return 1;
|
|
||||||
#else
|
|
||||||
if (!has_events()) { return 1; }
|
if (!has_events()) { return 1; }
|
||||||
return double(struct15_miss[stage].best.branch_misses() - struct15[stage].best.branch_misses()) / double(struct15_miss.stats->blocks_with_8_structurals_flipped);
|
return double(struct15_miss[stage].best.branch_misses() - struct15[stage].best.branch_misses()) / double(struct15_miss.stats->blocks_with_8_structurals_flipped);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Extra cost of a 16+-structural block over an 8-15 structural block (actual varies based on # of structurals!)
|
// Extra cost of a 16+-structural block over an 8-15 structural block (actual varies based on # of structurals!)
|
||||||
@@ -239,12 +231,8 @@ struct feature_benchmarker {
|
|||||||
}
|
}
|
||||||
// Rate of 16-structural misses per 16-structural flip
|
// Rate of 16-structural misses per 16-structural flip
|
||||||
double struct16_miss_rate(BenchmarkStage stage) const {
|
double struct16_miss_rate(BenchmarkStage stage) const {
|
||||||
#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
|
||||||
return 1;
|
|
||||||
#else
|
|
||||||
if (!has_events()) { return 1; }
|
if (!has_events()) { return 1; }
|
||||||
return double(struct23_miss[stage].best.branch_misses() - struct23[stage].best.branch_misses()) / double(struct23_miss.stats->blocks_with_16_structurals_flipped);
|
return double(struct23_miss[stage].best.branch_misses() - struct23[stage].best.branch_misses()) / double(struct23_miss.stats->blocks_with_16_structurals_flipped);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -258,12 +246,8 @@ struct feature_benchmarker {
|
|||||||
}
|
}
|
||||||
// Rate of UTF-8 misses per UTF-8 flip
|
// Rate of UTF-8 misses per UTF-8 flip
|
||||||
double utf8_miss_rate(BenchmarkStage stage) const {
|
double utf8_miss_rate(BenchmarkStage stage) const {
|
||||||
#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
|
||||||
return 1;
|
|
||||||
#else
|
|
||||||
if (!has_events()) { return 1; }
|
if (!has_events()) { return 1; }
|
||||||
return double(utf8_miss[stage].best.branch_misses() - utf8[stage].best.branch_misses()) / double(utf8_miss.stats->blocks_with_utf8_flipped);
|
return double(utf8_miss[stage].best.branch_misses() - utf8[stage].best.branch_misses()) / double(utf8_miss.stats->blocks_with_utf8_flipped);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
// Extra cost of having escapes in a block
|
// Extra cost of having escapes in a block
|
||||||
double escape_cost(BenchmarkStage stage) const {
|
double escape_cost(BenchmarkStage stage) const {
|
||||||
@@ -275,12 +259,8 @@ struct feature_benchmarker {
|
|||||||
}
|
}
|
||||||
// Rate of escape misses per escape flip
|
// Rate of escape misses per escape flip
|
||||||
double escape_miss_rate(BenchmarkStage stage) const {
|
double escape_miss_rate(BenchmarkStage stage) const {
|
||||||
#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
|
||||||
return 1;
|
|
||||||
#else
|
|
||||||
if (!has_events()) { return 1; }
|
if (!has_events()) { return 1; }
|
||||||
return double(escape_miss[stage].best.branch_misses() - escape[stage].best.branch_misses()) / double(escape_miss.stats->blocks_with_escapes_flipped);
|
return double(escape_miss[stage].best.branch_misses() - escape[stage].best.branch_misses()) / double(escape_miss.stats->blocks_with_escapes_flipped);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -378,22 +358,6 @@ struct feature_benchmarker {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
|
||||||
void print_file_effectiveness(BenchmarkStage stage, const char* filename, const benchmarker& results, const feature_benchmarker& features) {
|
|
||||||
double actual = results[stage].best.elapsed_ns() / double(results.stats->blocks);
|
|
||||||
double calc = features.calc_expected(stage, results);
|
|
||||||
double calc_misses = features.calc_expected_misses(stage, results);
|
|
||||||
double calc_miss_cost = features.calc_expected_miss_cost(stage, results);
|
|
||||||
printf(" | %-8s ", benchmark_stage_name(stage));
|
|
||||||
printf("| %-15s ", filename);
|
|
||||||
printf("| %8.3g ", features.calc_expected_feature_cost(stage, results));
|
|
||||||
printf("| %8.3g ", calc_miss_cost);
|
|
||||||
printf("| %8.3g ", calc);
|
|
||||||
printf("| %8.3g ", actual);
|
|
||||||
printf("| %+8.3g ", actual - calc);
|
|
||||||
printf("| %13llu ", (long long unsigned)(calc_misses));
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
void print_file_effectiveness(BenchmarkStage stage, const char* filename, const benchmarker& results, const feature_benchmarker& features) {
|
void print_file_effectiveness(BenchmarkStage stage, const char* filename, const benchmarker& results, const feature_benchmarker& features) {
|
||||||
double actual = results[stage].best.elapsed_ns() / double(results.stats->blocks);
|
double actual = results[stage].best.elapsed_ns() / double(results.stats->blocks);
|
||||||
double calc = features.calc_expected(stage, results);
|
double calc = features.calc_expected(stage, results);
|
||||||
@@ -417,7 +381,6 @@ void print_file_effectiveness(BenchmarkStage stage, const char* filename, const
|
|||||||
}
|
}
|
||||||
printf("|\n");
|
printf("|\n");
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
// Read options
|
// Read options
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
#ifndef _BENCHMARK_H_
|
#ifndef _BENCHMARK_H_
|
||||||
#define _BENCHMARK_H_
|
#define _BENCHMARK_H_
|
||||||
|
|
||||||
#include "event_counter.h"
|
#include <counters/event_counter.h>
|
||||||
|
using namespace counters;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Prints the best number of operations per cycle where
|
* Prints the best number of operations per cycle where
|
||||||
|
|||||||
+4
-11
@@ -1,7 +1,8 @@
|
|||||||
#ifndef __BENCHMARKER_H
|
#ifndef __BENCHMARKER_H
|
||||||
#define __BENCHMARKER_H
|
#define __BENCHMARKER_H
|
||||||
|
|
||||||
#include "event_counter.h"
|
#include <counters/event_counter.h>
|
||||||
|
using namespace counters;
|
||||||
#include "simdjson.h"
|
#include "simdjson.h"
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
@@ -28,11 +29,9 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "linux-perf-events.h"
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
#include <libgen.h>
|
#include <libgen.h>
|
||||||
#endif
|
#endif
|
||||||
#include "simdjson.h"
|
|
||||||
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
|
||||||
@@ -423,18 +422,12 @@ struct benchmarker {
|
|||||||
stage.instructions() / static_cast<double>(stats->structurals),
|
stage.instructions() / static_cast<double>(stats->structurals),
|
||||||
stage.instructions() / static_cast<double>(stage.cycles())
|
stage.instructions() / static_cast<double>(stage.cycles())
|
||||||
);
|
);
|
||||||
#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
printf("%s%-13s: %7.0f branch misses (%6.2f%%)\n",
|
||||||
// NOTE: removed cycles/miss because it is a somewhat misleading stat
|
|
||||||
printf("%s%-13s: %7.0f branch misses (%6.2f%%) - %.0f cache misses (%6.2f%%) - %.2f cache references\n",
|
|
||||||
prefix,
|
prefix,
|
||||||
"Misses",
|
"Misses",
|
||||||
stage.branch_misses(),
|
stage.branch_misses(),
|
||||||
percent(stage.branch_misses(), all_stages_without_allocation.branch_misses()),
|
percent(stage.branch_misses(), all_stages_without_allocation.branch_misses())
|
||||||
stage.cache_misses(),
|
|
||||||
percent(stage.cache_misses(), all_stages_without_allocation.cache_misses()),
|
|
||||||
stage.cache_references()
|
|
||||||
);
|
);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
#include "event_counter.h"
|
#include <counters/event_counter.h>
|
||||||
|
using namespace counters;
|
||||||
#include <random>
|
#include <random>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
|||||||
@@ -44,7 +44,10 @@ struct yyjson_base {
|
|||||||
|
|
||||||
struct yyjson : yyjson_base {
|
struct yyjson : yyjson_base {
|
||||||
bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
|
bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
|
||||||
return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), result);
|
yyjson_doc *doc = yyjson_read(json.data(), json.size(), 0);
|
||||||
|
bool b = yyjson_base::run(doc, result);
|
||||||
|
yyjson_doc_free(doc);
|
||||||
|
return b;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
BENCHMARK_TEMPLATE(distinct_user_id, yyjson)->UseManualTime();
|
BENCHMARK_TEMPLATE(distinct_user_id, yyjson)->UseManualTime();
|
||||||
@@ -52,11 +55,15 @@ BENCHMARK_TEMPLATE(distinct_user_id, yyjson)->UseManualTime();
|
|||||||
#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
||||||
struct yyjson_insitu : yyjson_base {
|
struct yyjson_insitu : yyjson_base {
|
||||||
bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
|
bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
|
||||||
return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), result);
|
yyjson_doc *doc = yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0);
|
||||||
|
bool b = yyjson_base::run(doc, result);
|
||||||
|
yyjson_doc_free(doc);
|
||||||
|
return b;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
BENCHMARK_TEMPLATE(distinct_user_id, yyjson_insitu)->UseManualTime();
|
BENCHMARK_TEMPLATE(distinct_user_id, yyjson_insitu)->UseManualTime();
|
||||||
#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
||||||
|
|
||||||
} // namespace distinct_user_id
|
} // namespace distinct_user_id
|
||||||
|
|
||||||
#endif // SIMDJSON_COMPETITION_YYJSON
|
#endif // SIMDJSON_COMPETITION_YYJSON
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
include_directories( .. ../linux )
|
include_directories( .. )
|
||||||
link_libraries(simdjson-windows-headers test-data)
|
link_libraries(simdjson-windows-headers test-data)
|
||||||
link_libraries(simdjson)
|
link_libraries(simdjson)
|
||||||
|
link_libraries(counters)
|
||||||
|
|
||||||
add_executable(perfdiff perfdiff.cpp)
|
add_executable(perfdiff perfdiff.cpp)
|
||||||
add_executable(parse parse.cpp)
|
add_executable(parse parse.cpp)
|
||||||
add_executable(parse_stream parse_stream.cpp)
|
add_executable(parse_stream parse_stream.cpp)
|
||||||
add_executable(statisticalmodel statisticalmodel.cpp)
|
|
||||||
|
|
||||||
add_executable(parse_noutf8validation parse.cpp)
|
add_executable(parse_noutf8validation parse.cpp)
|
||||||
target_compile_definitions(parse_noutf8validation PRIVATE SIMDJSON_SKIPUTF8VALIDATION)
|
target_compile_definitions(parse_noutf8validation PRIVATE SIMDJSON_SKIPUTF8VALIDATION)
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
#include "event_counter.h"
|
#include <counters/event_counter.h>
|
||||||
|
using namespace counters;
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cctype>
|
#include <cctype>
|
||||||
@@ -24,7 +25,6 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "linux-perf-events.h"
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
#include <libgen.h>
|
#include <libgen.h>
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -1,207 +0,0 @@
|
|||||||
#include <iostream>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include "simdjson.h"
|
|
||||||
#ifdef __linux__
|
|
||||||
#include "linux-perf-events.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
size_t count_nonasciibytes(const uint8_t *input, size_t length) {
|
|
||||||
size_t count = 0;
|
|
||||||
for (size_t i = 0; i < length; i++) {
|
|
||||||
count += input[i] >> 7;
|
|
||||||
}
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t count_backslash(const uint8_t *input, size_t length) {
|
|
||||||
size_t count = 0;
|
|
||||||
for (size_t i = 0; i < length; i++) {
|
|
||||||
count += (input[i] == '\\') ? 1 : 0;
|
|
||||||
}
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct stat_s {
|
|
||||||
size_t integer_count;
|
|
||||||
size_t float_count;
|
|
||||||
size_t string_count;
|
|
||||||
size_t backslash_count;
|
|
||||||
size_t non_ascii_byte_count;
|
|
||||||
size_t object_count;
|
|
||||||
size_t array_count;
|
|
||||||
size_t null_count;
|
|
||||||
size_t true_count;
|
|
||||||
size_t false_count;
|
|
||||||
size_t byte_count;
|
|
||||||
size_t structural_indexes_count;
|
|
||||||
bool valid;
|
|
||||||
};
|
|
||||||
|
|
||||||
using stat_t = struct stat_s;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
simdjson_inline void simdjson_process_atom(stat_t &s,
|
|
||||||
simdjson::dom::element element) {
|
|
||||||
if (element.is<int64_t>()) {
|
|
||||||
s.integer_count++;
|
|
||||||
} else if(element.is<std::string_view>()) {
|
|
||||||
s.string_count++;
|
|
||||||
} else if(element.is<double>()) {
|
|
||||||
s.float_count++;
|
|
||||||
} else if (element.is<bool>()) {
|
|
||||||
bool v;
|
|
||||||
simdjson::error_code error;
|
|
||||||
if ((error = element.get(v))) { std::cerr << error << std::endl; abort(); }
|
|
||||||
if (v) {
|
|
||||||
s.true_count++;
|
|
||||||
} else {
|
|
||||||
s.false_count++;
|
|
||||||
}
|
|
||||||
} else if (element.is_null()) {
|
|
||||||
s.null_count++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void simdjson_recurse(stat_t &s, simdjson::dom::element element) {
|
|
||||||
simdjson::error_code error;
|
|
||||||
if (element.is<simdjson::dom::array>()) {
|
|
||||||
s.array_count++;
|
|
||||||
simdjson::dom::array array;
|
|
||||||
if ((error = element.get(array))) { std::cerr << error << std::endl; abort(); }
|
|
||||||
for (auto child : array) {
|
|
||||||
if (child.is<simdjson::dom::array>() || child.is<simdjson::dom::object>()) {
|
|
||||||
simdjson_recurse(s, child);
|
|
||||||
} else {
|
|
||||||
simdjson_process_atom(s, child);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (element.is<simdjson::dom::object>()) {
|
|
||||||
s.object_count++;
|
|
||||||
simdjson::dom::object object;
|
|
||||||
if ((error = element.get(object))) { std::cerr << error << std::endl; abort(); }
|
|
||||||
for (auto field : object) {
|
|
||||||
s.string_count++; // for key
|
|
||||||
if (field.value.is<simdjson::dom::array>() || field.value.is<simdjson::dom::object>()) {
|
|
||||||
simdjson_recurse(s, field.value);
|
|
||||||
} else {
|
|
||||||
simdjson_process_atom(s, field.value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
simdjson_process_atom(s, element);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stat_t simdjson_compute_stats(const simdjson::padded_string &p) {
|
|
||||||
stat_t answer{};
|
|
||||||
simdjson::dom::parser parser;
|
|
||||||
simdjson::dom::element doc;
|
|
||||||
auto error = parser.parse(p).get(doc);
|
|
||||||
if (error) {
|
|
||||||
answer.valid = false;
|
|
||||||
return answer;
|
|
||||||
}
|
|
||||||
answer.valid = true;
|
|
||||||
answer.backslash_count =
|
|
||||||
count_backslash(reinterpret_cast<const uint8_t *>(p.data()), p.size());
|
|
||||||
answer.non_ascii_byte_count = count_nonasciibytes(
|
|
||||||
reinterpret_cast<const uint8_t *>(p.data()), p.size());
|
|
||||||
answer.byte_count = p.size();
|
|
||||||
answer.structural_indexes_count = parser.implementation->n_structural_indexes;
|
|
||||||
simdjson_recurse(answer, doc);
|
|
||||||
return answer;
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
|
||||||
#ifndef _MSC_VER
|
|
||||||
int c;
|
|
||||||
while ((c = getopt(argc, argv, "")) != -1) {
|
|
||||||
switch (c) {
|
|
||||||
|
|
||||||
default:
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
int optind = 1;
|
|
||||||
#endif
|
|
||||||
if (optind >= argc) {
|
|
||||||
std::cerr << "Reads json, prints stats. " << std::endl;
|
|
||||||
std::cerr << "Usage: " << argv[0] << " <jsonfile>" << std::endl;
|
|
||||||
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
const char *filename = argv[optind];
|
|
||||||
if (optind + 1 < argc) {
|
|
||||||
std::cerr << "warning: ignoring everything after " << argv[optind + 1]
|
|
||||||
<< std::endl;
|
|
||||||
}
|
|
||||||
simdjson::padded_string p;
|
|
||||||
auto error = simdjson::padded_string::load(filename).get(p);
|
|
||||||
if (error) {
|
|
||||||
std::cerr << "Could not load the file " << filename << std::endl;
|
|
||||||
return EXIT_FAILURE;
|
|
||||||
}
|
|
||||||
stat_t s = simdjson_compute_stats(p);
|
|
||||||
if (!s.valid) {
|
|
||||||
std::cerr << "not a valid JSON" << std::endl;
|
|
||||||
return EXIT_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
printf("# integer_count float_count string_count backslash_count "
|
|
||||||
"non_ascii_byte_count object_count array_count null_count true_count "
|
|
||||||
"false_count byte_count structural_indexes_count ");
|
|
||||||
#ifdef __linux__
|
|
||||||
printf(" stage1_cycle_count stage1_instruction_count stage2_cycle_count "
|
|
||||||
" stage2_instruction_count stage3_cycle_count "
|
|
||||||
"stage3_instruction_count ");
|
|
||||||
#else
|
|
||||||
printf("(you are not under linux, so perf counters are disaabled)");
|
|
||||||
#endif
|
|
||||||
printf("\n");
|
|
||||||
printf("%zu %zu %zu %zu %zu %zu %zu %zu %zu %zu %zu %zu ", s.integer_count,
|
|
||||||
s.float_count, s.string_count, s.backslash_count,
|
|
||||||
s.non_ascii_byte_count, s.object_count, s.array_count, s.null_count,
|
|
||||||
s.true_count, s.false_count, s.byte_count, s.structural_indexes_count);
|
|
||||||
#ifdef __linux__
|
|
||||||
simdjson::dom::parser parser;
|
|
||||||
simdjson::error_code alloc_error = parser.allocate(p.size());
|
|
||||||
if (alloc_error) {
|
|
||||||
std::cerr << alloc_error << std::endl;
|
|
||||||
return EXIT_FAILURE;
|
|
||||||
}
|
|
||||||
const uint32_t iterations = p.size() < 1 * 1000 * 1000 ? 1000 : 50;
|
|
||||||
std::vector<int> evts;
|
|
||||||
evts.push_back(PERF_COUNT_HW_CPU_CYCLES);
|
|
||||||
evts.push_back(PERF_COUNT_HW_INSTRUCTIONS);
|
|
||||||
LinuxEvents<PERF_TYPE_HARDWARE> unified(evts);
|
|
||||||
unsigned long cy1 = 0, cy2 = 0;
|
|
||||||
unsigned long cl1 = 0, cl2 = 0;
|
|
||||||
std::vector<unsigned long long> results;
|
|
||||||
results.resize(evts.size());
|
|
||||||
for (uint32_t i = 0; i < iterations; i++) {
|
|
||||||
unified.start();
|
|
||||||
// The default template is simdjson::architecture::NATIVE.
|
|
||||||
bool isok = (parser.implementation->stage1((const uint8_t *)p.data(), p.size(), simdjson::stage1_mode::regular) == simdjson::SUCCESS);
|
|
||||||
unified.end(results);
|
|
||||||
|
|
||||||
cy1 += results[0];
|
|
||||||
cl1 += results[1];
|
|
||||||
|
|
||||||
unified.start();
|
|
||||||
isok = isok && (parser.implementation->stage2(parser.doc) == simdjson::SUCCESS);
|
|
||||||
unified.end(results);
|
|
||||||
|
|
||||||
cy2 += results[0];
|
|
||||||
cl2 += results[1];
|
|
||||||
if (!isok) {
|
|
||||||
std::cerr << "failure?" << std::endl;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
printf("%f %f %f %f ", static_cast<double>(cy1) / static_cast<double>(iterations), static_cast<double>(cl1) / static_cast<double>(iterations),
|
|
||||||
static_cast<double>(cy2) / static_cast<double>(iterations), static_cast<double>(cl2) / static_cast<double>(iterations));
|
|
||||||
#endif // __linux__
|
|
||||||
printf("\n");
|
|
||||||
return EXIT_SUCCESS;
|
|
||||||
}
|
|
||||||
@@ -1,201 +0,0 @@
|
|||||||
#ifndef __EVENT_COUNTER_H
|
|
||||||
#define __EVENT_COUNTER_H
|
|
||||||
|
|
||||||
#ifndef SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
|
||||||
#ifdef __aarch64__
|
|
||||||
// on ARM, we use just cycles and instructions
|
|
||||||
#define SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS 1
|
|
||||||
#else
|
|
||||||
// elsewhere, we try to use four counters.
|
|
||||||
#define SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS 0
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#include <cassert>
|
|
||||||
#include <cctype>
|
|
||||||
#ifndef _MSC_VER
|
|
||||||
#include <dirent.h>
|
|
||||||
#endif
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <cinttypes>
|
|
||||||
|
|
||||||
#include <cstdio>
|
|
||||||
#include <cstdlib>
|
|
||||||
#include <cstring>
|
|
||||||
|
|
||||||
#include <algorithm>
|
|
||||||
#include <chrono>
|
|
||||||
#include <cstring>
|
|
||||||
#include <fstream>
|
|
||||||
#include <iomanip>
|
|
||||||
#include <iostream>
|
|
||||||
#include <map>
|
|
||||||
#include <set>
|
|
||||||
#include <sstream>
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#ifdef __linux__
|
|
||||||
#include "linux-perf-events.h"
|
|
||||||
#include <libgen.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if __APPLE__ && __aarch64__
|
|
||||||
#include "apple/apple_arm_events.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "simdjson.h"
|
|
||||||
|
|
||||||
using std::string;
|
|
||||||
using std::vector;
|
|
||||||
using std::chrono::steady_clock;
|
|
||||||
using std::chrono::time_point;
|
|
||||||
using std::chrono::duration;
|
|
||||||
|
|
||||||
struct event_count {
|
|
||||||
duration<double> elapsed;
|
|
||||||
vector<unsigned long long> event_counts;
|
|
||||||
event_count() : elapsed(0), event_counts{0,0,0,0,0} {}
|
|
||||||
event_count(const duration<double> _elapsed, const vector<unsigned long long> _event_counts) : elapsed(_elapsed), event_counts(_event_counts) {}
|
|
||||||
event_count(const event_count& other): elapsed(other.elapsed), event_counts(other.event_counts) { }
|
|
||||||
|
|
||||||
// The types of counters (so we can read the getter more easily)
|
|
||||||
#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
|
||||||
enum event_counter_types {
|
|
||||||
CPU_CYCLES,
|
|
||||||
INSTRUCTIONS
|
|
||||||
};
|
|
||||||
#else
|
|
||||||
enum event_counter_types {
|
|
||||||
CPU_CYCLES,
|
|
||||||
INSTRUCTIONS,
|
|
||||||
BRANCH_MISSES,
|
|
||||||
CACHE_REFERENCES,
|
|
||||||
CACHE_MISSES
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
double elapsed_sec() const { return duration<double>(elapsed).count(); }
|
|
||||||
double elapsed_ns() const { return duration<double, std::nano>(elapsed).count(); }
|
|
||||||
double cycles() const { return static_cast<double>(event_counts[CPU_CYCLES]); }
|
|
||||||
double instructions() const { return static_cast<double>(event_counts[INSTRUCTIONS]); }
|
|
||||||
#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
|
||||||
double branch_misses() const { return static_cast<double>(event_counts[BRANCH_MISSES]); }
|
|
||||||
double cache_references() const { return static_cast<double>(event_counts[CACHE_REFERENCES]); }
|
|
||||||
double cache_misses() const { return static_cast<double>(event_counts[CACHE_MISSES]); }
|
|
||||||
#endif
|
|
||||||
event_count& operator=(const event_count& other) {
|
|
||||||
this->elapsed = other.elapsed;
|
|
||||||
this->event_counts = other.event_counts;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
event_count operator+(const event_count& other) const {
|
|
||||||
return event_count(elapsed+other.elapsed, {
|
|
||||||
event_counts[0]+other.event_counts[0],
|
|
||||||
event_counts[1]+other.event_counts[1],
|
|
||||||
event_counts[2]+other.event_counts[2],
|
|
||||||
event_counts[3]+other.event_counts[3],
|
|
||||||
event_counts[4]+other.event_counts[4],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
void operator+=(const event_count& other) {
|
|
||||||
*this = *this + other;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
struct event_aggregate {
|
|
||||||
int iterations = 0;
|
|
||||||
event_count total{};
|
|
||||||
event_count best{};
|
|
||||||
event_count worst{};
|
|
||||||
|
|
||||||
event_aggregate() {}
|
|
||||||
|
|
||||||
void operator<<(const event_count& other) {
|
|
||||||
if (iterations == 0 || other.elapsed < best.elapsed) {
|
|
||||||
best = other;
|
|
||||||
}
|
|
||||||
if (iterations == 0 || other.elapsed > worst.elapsed) {
|
|
||||||
worst = other;
|
|
||||||
}
|
|
||||||
iterations++;
|
|
||||||
total += other;
|
|
||||||
}
|
|
||||||
|
|
||||||
double elapsed_sec() const { return total.elapsed_sec() / iterations; }
|
|
||||||
double total_elapsed_ns() const { return total.elapsed_ns(); }
|
|
||||||
double elapsed_ns() const { return total.elapsed_ns() / iterations; }
|
|
||||||
double cycles() const { return total.cycles() / iterations; }
|
|
||||||
double instructions() const { return total.instructions() / iterations; }
|
|
||||||
#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
|
||||||
double branch_misses() const { return total.branch_misses() / iterations; }
|
|
||||||
double cache_references() const { return total.cache_references() / iterations; }
|
|
||||||
double cache_misses() const { return total.cache_misses() / iterations; }
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
struct event_collector {
|
|
||||||
event_count count{};
|
|
||||||
time_point<steady_clock> start_clock{};
|
|
||||||
|
|
||||||
#if defined(__linux__)
|
|
||||||
LinuxEvents<PERF_TYPE_HARDWARE> linux_events;
|
|
||||||
event_collector() : linux_events(vector<int>{
|
|
||||||
#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
|
||||||
PERF_COUNT_HW_CPU_CYCLES,
|
|
||||||
PERF_COUNT_HW_INSTRUCTIONS,
|
|
||||||
#else
|
|
||||||
PERF_COUNT_HW_CPU_CYCLES,
|
|
||||||
PERF_COUNT_HW_INSTRUCTIONS,
|
|
||||||
PERF_COUNT_HW_BRANCH_MISSES,
|
|
||||||
PERF_COUNT_HW_CACHE_REFERENCES,
|
|
||||||
PERF_COUNT_HW_CACHE_MISSES
|
|
||||||
#endif
|
|
||||||
}) {}
|
|
||||||
bool has_events() {
|
|
||||||
return linux_events.is_working();
|
|
||||||
}
|
|
||||||
#elif __APPLE__ && __aarch64__
|
|
||||||
AppleEvents apple_events;
|
|
||||||
performance_counters diff;
|
|
||||||
event_collector() : diff(0) {
|
|
||||||
apple_events.setup_performance_counters();
|
|
||||||
}
|
|
||||||
bool has_events() {
|
|
||||||
return apple_events.setup_performance_counters();
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
event_collector() {}
|
|
||||||
bool has_events() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
simdjson_inline void start() {
|
|
||||||
#if defined(__linux)
|
|
||||||
linux_events.start();
|
|
||||||
#elif __APPLE__ && __aarch64__
|
|
||||||
if(has_events()) { diff = apple_events.get_counters(); }
|
|
||||||
#endif
|
|
||||||
start_clock = steady_clock::now();
|
|
||||||
}
|
|
||||||
simdjson_inline event_count& end() {
|
|
||||||
time_point<steady_clock> end_clock = steady_clock::now();
|
|
||||||
#if defined(__linux)
|
|
||||||
linux_events.end(count.event_counts);
|
|
||||||
#elif __APPLE__ && __aarch64__
|
|
||||||
if(has_events()) {
|
|
||||||
performance_counters end = apple_events.get_counters();
|
|
||||||
diff = end - diff;
|
|
||||||
}
|
|
||||||
count.event_counts[0] = diff.cycles;
|
|
||||||
count.event_counts[1] = diff.instructions;
|
|
||||||
count.event_counts[2] = diff.missed_branches;
|
|
||||||
count.event_counts[3] = 0;
|
|
||||||
count.event_counts[4] = 0;
|
|
||||||
#endif
|
|
||||||
count.elapsed = end_clock - start_clock;
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@@ -36,18 +36,26 @@ struct yyjson_base {
|
|||||||
|
|
||||||
struct yyjson : yyjson_base {
|
struct yyjson : yyjson_base {
|
||||||
bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
|
bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
|
||||||
return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), find_id, result);
|
yyjson_doc *doc = yyjson_read(json.data(), json.size(), 0);
|
||||||
|
bool b = yyjson_base::run(doc, find_id, result);
|
||||||
|
yyjson_doc_free(doc);
|
||||||
|
return b;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
BENCHMARK_TEMPLATE(find_tweet, yyjson)->UseManualTime();
|
BENCHMARK_TEMPLATE(find_tweet, yyjson)->UseManualTime();
|
||||||
|
|
||||||
#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
||||||
struct yyjson_insitu : yyjson_base {
|
struct yyjson_insitu : yyjson_base {
|
||||||
bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
|
bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
|
||||||
return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), find_id, result);
|
yyjson_doc *doc = yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0);
|
||||||
|
bool b = yyjson_base::run(doc, find_id, result);
|
||||||
|
yyjson_doc_free(doc);
|
||||||
|
return b;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
BENCHMARK_TEMPLATE(find_tweet, yyjson_insitu)->UseManualTime();
|
BENCHMARK_TEMPLATE(find_tweet, yyjson_insitu)->UseManualTime();
|
||||||
#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
||||||
|
|
||||||
} // namespace find_tweet
|
} // namespace find_tweet
|
||||||
|
|
||||||
#endif // SIMDJSON_COMPETITION_YYJSON
|
#endif // SIMDJSON_COMPETITION_YYJSON
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
#ifndef BENCHMARK_HELPERS_H
|
#ifndef BENCHMARK_HELPERS_H
|
||||||
#define BENCHMARK_HELPERS_H
|
#define BENCHMARK_HELPERS_H
|
||||||
|
|
||||||
#include "event_counter.h"
|
#include <counters/event_counter.h>
|
||||||
|
using namespace counters;
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
|
|
||||||
event_collector collector;
|
event_collector collector;
|
||||||
|
|||||||
@@ -100,6 +100,7 @@ struct yyjson : yyjson2msgpack {
|
|||||||
std::string_view &result) {
|
std::string_view &result) {
|
||||||
yyjson_doc *doc = yyjson_read(json.data(), json.size(), 0);
|
yyjson_doc *doc = yyjson_read(json.data(), json.size(), 0);
|
||||||
result = to_msgpack(doc, reinterpret_cast<uint8_t*>(buffer));
|
result = to_msgpack(doc, reinterpret_cast<uint8_t*>(buffer));
|
||||||
|
yyjson_doc_free(doc);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -113,6 +114,7 @@ struct yyjson_insitu : yyjson2msgpack {
|
|||||||
yyjson_doc *doc =
|
yyjson_doc *doc =
|
||||||
yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0);
|
yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0);
|
||||||
result = to_msgpack(doc, reinterpret_cast<uint8_t*>(buffer));
|
result = to_msgpack(doc, reinterpret_cast<uint8_t*>(buffer));
|
||||||
|
yyjson_doc_free(doc);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -120,4 +122,4 @@ BENCHMARK_TEMPLATE(json2msgpack, yyjson_insitu)->UseManualTime();
|
|||||||
#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
||||||
} // namespace json2msgpack
|
} // namespace json2msgpack
|
||||||
|
|
||||||
#endif // SIMDJSON_COMPETITION_YYJSON
|
#endif // SIMDJSON_COMPETITION_YYJSON
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "simdjson.h"
|
#include "simdjson.h"
|
||||||
#include "event_counter.h"
|
#include <counters/event_counter.h>
|
||||||
|
using namespace counters;
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
namespace json_benchmark {
|
namespace json_benchmark {
|
||||||
@@ -58,11 +59,7 @@ template<typename B, typename R> static void run_json_benchmark(benchmark::State
|
|||||||
if (collector.has_events()) {
|
if (collector.has_events()) {
|
||||||
state.counters["instructions"] = events.instructions();
|
state.counters["instructions"] = events.instructions();
|
||||||
state.counters["cycles"] = events.cycles();
|
state.counters["cycles"] = events.cycles();
|
||||||
#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
|
||||||
state.counters["branch_miss"] = events.branch_misses();
|
state.counters["branch_miss"] = events.branch_misses();
|
||||||
state.counters["cache_miss"] = events.cache_misses();
|
|
||||||
state.counters["cache_ref"] = events.cache_references();
|
|
||||||
#endif
|
|
||||||
state.counters["instructions_per_byte"] = events.instructions() / double(bench.bytes_per_iteration());
|
state.counters["instructions_per_byte"] = events.instructions() / double(bench.bytes_per_iteration());
|
||||||
state.counters["instructions_per_cycle"] = events.instructions() / events.cycles();
|
state.counters["instructions_per_cycle"] = events.instructions() / events.cycles();
|
||||||
state.counters["cycles_per_byte"] = events.cycles() / double(bench.bytes_per_iteration());
|
state.counters["cycles_per_byte"] = events.cycles() / double(bench.bytes_per_iteration());
|
||||||
@@ -70,11 +67,7 @@ template<typename B, typename R> static void run_json_benchmark(benchmark::State
|
|||||||
|
|
||||||
state.counters["best_instructions"] = events.best.instructions();
|
state.counters["best_instructions"] = events.best.instructions();
|
||||||
state.counters["best_cycles"] = events.best.cycles();
|
state.counters["best_cycles"] = events.best.cycles();
|
||||||
#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
|
||||||
state.counters["best_branch_miss"] = events.best.branch_misses();
|
state.counters["best_branch_miss"] = events.best.branch_misses();
|
||||||
state.counters["best_cache_miss"] = events.best.cache_misses();
|
|
||||||
state.counters["best_cache_ref"] = events.best.cache_references();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
state.counters["best_instructions_per_byte"] = events.best.instructions() / double(bench.bytes_per_iteration());
|
state.counters["best_instructions_per_byte"] = events.best.instructions() / double(bench.bytes_per_iteration());
|
||||||
state.counters["best_instructions_per_cycle"] = events.best.instructions() / events.best.cycles();
|
state.counters["best_instructions_per_cycle"] = events.best.instructions() / events.best.cycles();
|
||||||
@@ -95,11 +88,7 @@ template<typename B, typename R> static void run_json_benchmark(benchmark::State
|
|||||||
if (collector.has_events()) {
|
if (collector.has_events()) {
|
||||||
label << " instructions=" << setw(12) << uint64_t(events.best.instructions()) << setw(0);
|
label << " instructions=" << setw(12) << uint64_t(events.best.instructions()) << setw(0);
|
||||||
label << " cycles=" << setw(12) << uint64_t(events.best.cycles()) << setw(0);
|
label << " cycles=" << setw(12) << uint64_t(events.best.cycles()) << setw(0);
|
||||||
#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
|
||||||
label << " branch_miss=" << setw(8) << uint64_t(events.best.branch_misses()) << setw(0);
|
label << " branch_miss=" << setw(8) << uint64_t(events.best.branch_misses()) << setw(0);
|
||||||
label << " cache_miss=" << setw(8) << uint64_t(events.best.cache_misses()) << setw(0);
|
|
||||||
label << " cache_ref=" << setw(10) << uint64_t(events.best.cache_references()) << setw(0);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
label << " items=" << setw(10) << bench.items_per_iteration() << setw(0);
|
label << " items=" << setw(10) << bench.items_per_iteration() << setw(0);
|
||||||
|
|||||||
@@ -49,18 +49,26 @@ struct yyjson_base {
|
|||||||
|
|
||||||
struct yyjson : yyjson_base {
|
struct yyjson : yyjson_base {
|
||||||
bool run(simdjson::padded_string &json, std::vector<point> &result) {
|
bool run(simdjson::padded_string &json, std::vector<point> &result) {
|
||||||
return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), result);
|
yyjson_doc *doc = yyjson_read(json.data(), json.size(), 0);
|
||||||
|
bool b = yyjson_base::run(doc, result);
|
||||||
|
yyjson_doc_free(doc);
|
||||||
|
return b;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
BENCHMARK_TEMPLATE(kostya, yyjson)->UseManualTime();
|
BENCHMARK_TEMPLATE(kostya, yyjson)->UseManualTime();
|
||||||
|
|
||||||
#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
||||||
struct yyjson_insitu : yyjson_base {
|
struct yyjson_insitu : yyjson_base {
|
||||||
bool run(simdjson::padded_string &json, std::vector<point> &result) {
|
bool run(simdjson::padded_string &json, std::vector<point> &result) {
|
||||||
return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), result);
|
yyjson_doc *doc = yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0);
|
||||||
|
bool b = yyjson_base::run(doc, result);
|
||||||
|
yyjson_doc_free(doc);
|
||||||
|
return b;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
BENCHMARK_TEMPLATE(kostya, yyjson_insitu)->UseManualTime();
|
BENCHMARK_TEMPLATE(kostya, yyjson_insitu)->UseManualTime();
|
||||||
#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
||||||
|
|
||||||
} // namespace kostya
|
} // namespace kostya
|
||||||
|
|
||||||
#endif // SIMDJSON_COMPETITION_YYJSON
|
#endif // SIMDJSON_COMPETITION_YYJSON
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "json_benchmark/string_runner.h"
|
#include "json_benchmark/string_runner.h"
|
||||||
|
#include <fstream>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#if SIMDJSON_EXCEPTIONS && SIMDJSON_SUPPORTS_RANGES
|
||||||
|
|
||||||
|
#include "large_random.h"
|
||||||
|
|
||||||
|
namespace large_random {
|
||||||
|
|
||||||
|
using namespace simdjson;
|
||||||
|
|
||||||
|
// Identical to simdjson_ondemand but uses get_range() for iteration.
|
||||||
|
// Demonstrates that the ranges wrapper has zero per-element overhead.
|
||||||
|
struct simdjson_ondemand_ranges {
|
||||||
|
static constexpr diff_flags DiffFlags = diff_flags::NONE;
|
||||||
|
|
||||||
|
ondemand::parser parser{};
|
||||||
|
|
||||||
|
bool run(simdjson::padded_string &json, std::vector<point> &result) {
|
||||||
|
auto doc = parser.iterate(json);
|
||||||
|
for (auto coord_result : ondemand::get_range(doc.get_array())) {
|
||||||
|
ondemand::object coord = coord_result;
|
||||||
|
result.emplace_back(json_benchmark::point{coord.find_field("x"), coord.find_field("y"), coord.find_field("z")});
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
BENCHMARK_TEMPLATE(large_random, simdjson_ondemand_ranges)->UseManualTime();
|
||||||
|
|
||||||
|
} // namespace large_random
|
||||||
|
|
||||||
|
#endif // SIMDJSON_EXCEPTIONS && SIMDJSON_SUPPORTS_RANGES
|
||||||
@@ -47,18 +47,26 @@ struct yyjson_base {
|
|||||||
|
|
||||||
struct yyjson : yyjson_base {
|
struct yyjson : yyjson_base {
|
||||||
bool run(simdjson::padded_string &json, std::vector<point> &result) {
|
bool run(simdjson::padded_string &json, std::vector<point> &result) {
|
||||||
return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), result);
|
yyjson_doc *doc = yyjson_read(json.data(), json.size(), 0);
|
||||||
|
bool b = yyjson_base::run(doc, result);
|
||||||
|
yyjson_doc_free(doc);
|
||||||
|
return b;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
BENCHMARK_TEMPLATE(large_random, yyjson)->UseManualTime();
|
BENCHMARK_TEMPLATE(large_random, yyjson)->UseManualTime();
|
||||||
|
|
||||||
#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
||||||
struct yyjson_insitu : yyjson_base {
|
struct yyjson_insitu : yyjson_base {
|
||||||
bool run(simdjson::padded_string &json, std::vector<point> &result) {
|
bool run(simdjson::padded_string &json, std::vector<point> &result) {
|
||||||
return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), result);
|
yyjson_doc *doc = yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0);
|
||||||
|
bool b = yyjson_base::run(doc, result);
|
||||||
|
yyjson_doc_free(doc);
|
||||||
|
return b;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
BENCHMARK_TEMPLATE(large_random, yyjson_insitu)->UseManualTime();
|
BENCHMARK_TEMPLATE(large_random, yyjson_insitu)->UseManualTime();
|
||||||
#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
||||||
|
|
||||||
} // namespace large_random
|
} // namespace large_random
|
||||||
|
|
||||||
#endif // SIMDJSON_COMPETITION_YYJSON
|
#endif // SIMDJSON_COMPETITION_YYJSON
|
||||||
|
|||||||
@@ -103,7 +103,12 @@ error_code Sax::RunNoExcept(const padded_string &json) noexcept {
|
|||||||
|
|
||||||
error_code Sax::Allocate(size_t new_capacity) {
|
error_code Sax::Allocate(size_t new_capacity) {
|
||||||
// string_capacity copied from document::allocate
|
// string_capacity copied from document::allocate
|
||||||
size_t string_capacity = SIMDJSON_ROUNDUP_N(5 * new_capacity / 3 + SIMDJSON_PADDING, 64);
|
// a document with only zero-length strings... could have capacity/3 string
|
||||||
|
// and we would need capacity/3 * 5 bytes on the string buffer
|
||||||
|
if(5 * (new_capacity / 3) + SIMDJSON_PADDING < SIMDJSON_PADDING) {
|
||||||
|
return CAPACITY; // overflow, only happen on legacy 32-bit systems with very large capacity
|
||||||
|
}
|
||||||
|
size_t string_capacity = SIMDJSON_ROUNDUP_N(5 * (new_capacity / 3) + SIMDJSON_PADDING, 64);
|
||||||
string_buf.reset(new (std::nothrow) uint8_t[string_capacity]);
|
string_buf.reset(new (std::nothrow) uint8_t[string_capacity]);
|
||||||
if (auto error = dom_parser.set_capacity(new_capacity)) { return error; }
|
if (auto error = dom_parser.set_capacity(new_capacity)) { return error; }
|
||||||
if (capacity == 0) { // set max depth the first time only
|
if (capacity == 0) { // set max depth the first time only
|
||||||
|
|||||||
@@ -1,105 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
#ifdef __linux__
|
|
||||||
|
|
||||||
#include <asm/unistd.h> // for __NR_perf_event_open
|
|
||||||
#include <linux/perf_event.h> // for perf event constants
|
|
||||||
#include <sys/ioctl.h> // for ioctl
|
|
||||||
#include <unistd.h> // for syscall
|
|
||||||
|
|
||||||
#include <cerrno> // for errno
|
|
||||||
#include <cstring> // for memset
|
|
||||||
#include <stdexcept>
|
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
template <int TYPE = PERF_TYPE_HARDWARE> class LinuxEvents {
|
|
||||||
int fd;
|
|
||||||
bool working;
|
|
||||||
perf_event_attr attribs{};
|
|
||||||
size_t num_events{};
|
|
||||||
std::vector<uint64_t> temp_result_vec{};
|
|
||||||
std::vector<uint64_t> ids{};
|
|
||||||
|
|
||||||
public:
|
|
||||||
explicit LinuxEvents(std::vector<int> config_vec) : fd(0), working(true) {
|
|
||||||
memset(&attribs, 0, sizeof(attribs));
|
|
||||||
attribs.type = TYPE;
|
|
||||||
attribs.size = sizeof(attribs);
|
|
||||||
attribs.disabled = 1;
|
|
||||||
attribs.exclude_kernel = 1;
|
|
||||||
attribs.exclude_hv = 1;
|
|
||||||
|
|
||||||
attribs.sample_period = 0;
|
|
||||||
attribs.read_format = PERF_FORMAT_GROUP | PERF_FORMAT_ID;
|
|
||||||
const int pid = 0; // the current process
|
|
||||||
const int cpu = -1; // all CPUs
|
|
||||||
const unsigned long flags = 0;
|
|
||||||
|
|
||||||
int group = -1; // no group
|
|
||||||
num_events = config_vec.size();
|
|
||||||
ids.resize(config_vec.size());
|
|
||||||
uint32_t i = 0;
|
|
||||||
for (auto config : config_vec) {
|
|
||||||
attribs.config = config;
|
|
||||||
int _fd = static_cast<int>(syscall(__NR_perf_event_open, &attribs, pid, cpu, group, flags));
|
|
||||||
if (_fd == -1) {
|
|
||||||
report_error("perf_event_open");
|
|
||||||
}
|
|
||||||
ioctl(_fd, PERF_EVENT_IOC_ID, &ids[i++]);
|
|
||||||
if (group == -1) {
|
|
||||||
group = _fd;
|
|
||||||
fd = _fd;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
temp_result_vec.resize(num_events * 2 + 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
~LinuxEvents() { if (fd != -1) { close(fd); } }
|
|
||||||
|
|
||||||
inline void start() {
|
|
||||||
if (fd != -1) {
|
|
||||||
if (ioctl(fd, PERF_EVENT_IOC_RESET, PERF_IOC_FLAG_GROUP) == -1) {
|
|
||||||
report_error("ioctl(PERF_EVENT_IOC_RESET)");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ioctl(fd, PERF_EVENT_IOC_ENABLE, PERF_IOC_FLAG_GROUP) == -1) {
|
|
||||||
report_error("ioctl(PERF_EVENT_IOC_ENABLE)");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void end(std::vector<unsigned long long> &results) {
|
|
||||||
if (fd != -1) {
|
|
||||||
if (ioctl(fd, PERF_EVENT_IOC_DISABLE, PERF_IOC_FLAG_GROUP) == -1) {
|
|
||||||
report_error("ioctl(PERF_EVENT_IOC_DISABLE)");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (read(fd, temp_result_vec.data(), temp_result_vec.size() * 8) == -1) {
|
|
||||||
report_error("read");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// our actual results are in slots 1,3,5, ... of this structure
|
|
||||||
for (uint32_t i = 1; i < temp_result_vec.size(); i += 2) {
|
|
||||||
results[i / 2] = temp_result_vec[i];
|
|
||||||
}
|
|
||||||
for (uint32_t i = 2; i < temp_result_vec.size(); i += 2) {
|
|
||||||
if(ids[i/2-1] != temp_result_vec[i]) {
|
|
||||||
report_error("event mismatch");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
bool is_working() {
|
|
||||||
return working;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
void report_error(const std::string &) {
|
|
||||||
working = false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
@@ -10,7 +10,7 @@ namespace partial_tweets {
|
|||||||
// {
|
// {
|
||||||
// "created_at": "Sun Aug 31 00:29:15 +0000 2014",
|
// "created_at": "Sun Aug 31 00:29:15 +0000 2014",
|
||||||
// "id": 505874924095815700,
|
// "id": 505874924095815700,
|
||||||
// "text": "@aym0566x \n\n名前:前田あゆみ\n第一印象:なんか怖っ!\n今の印象:とりあえずキモい。噛み合わない\n好きなところ:ぶすでキモいとこ😋✨✨\n思い出:んーーー、ありすぎ😊❤️\nLINE交換できる?:あぁ……ごめん✋\nトプ画をみて:照れますがな😘✨\n一言:お前は一生もんのダチ💖",
|
// "text": "@aym0566x ...",
|
||||||
// "in_reply_to_status_id": null,
|
// "in_reply_to_status_id": null,
|
||||||
// "user": {
|
// "user": {
|
||||||
// "id": 1186275104,
|
// "id": 1186275104,
|
||||||
|
|||||||
@@ -61,20 +61,34 @@ struct yyjson_base {
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct yyjson : yyjson_base {
|
struct yyjson : yyjson_base {
|
||||||
|
// The document owns the string memory that result's string_views point into,
|
||||||
|
// so it must outlive each run() (the verification diff happens after run()
|
||||||
|
// returns). Free it on the next run() / at destruction, not before the views
|
||||||
|
// are read.
|
||||||
|
yyjson_doc *doc{};
|
||||||
|
~yyjson() { if (doc != nullptr) { yyjson_doc_free(doc); } }
|
||||||
bool run(simdjson::padded_string &json, std::vector<tweet<std::string_view>> &result) {
|
bool run(simdjson::padded_string &json, std::vector<tweet<std::string_view>> &result) {
|
||||||
return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), result);
|
if (doc != nullptr) { yyjson_doc_free(doc); doc = nullptr; }
|
||||||
|
doc = yyjson_read(json.data(), json.size(), 0);
|
||||||
|
return yyjson_base::run(doc, result);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
BENCHMARK_TEMPLATE(partial_tweets, yyjson)->UseManualTime();
|
BENCHMARK_TEMPLATE(partial_tweets, yyjson)->UseManualTime();
|
||||||
|
|
||||||
#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
||||||
struct yyjson_insitu : yyjson_base {
|
struct yyjson_insitu : yyjson_base {
|
||||||
|
// See the note on yyjson above: the document must outlive result's views.
|
||||||
|
yyjson_doc *doc{};
|
||||||
|
~yyjson_insitu() { if (doc != nullptr) { yyjson_doc_free(doc); } }
|
||||||
bool run(simdjson::padded_string &json, std::vector<tweet<std::string_view>> &result) {
|
bool run(simdjson::padded_string &json, std::vector<tweet<std::string_view>> &result) {
|
||||||
return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), result);
|
if (doc != nullptr) { yyjson_doc_free(doc); doc = nullptr; }
|
||||||
|
doc = yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0);
|
||||||
|
return yyjson_base::run(doc, result);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
BENCHMARK_TEMPLATE(partial_tweets, yyjson_insitu)->UseManualTime();
|
BENCHMARK_TEMPLATE(partial_tweets, yyjson_insitu)->UseManualTime();
|
||||||
#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
|
||||||
|
|
||||||
} // namespace partial_tweets
|
} // namespace partial_tweets
|
||||||
|
|
||||||
#endif // SIMDJSON_COMPETITION_YYJSON
|
#endif // SIMDJSON_COMPETITION_YYJSON
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ CPMAddPackage(
|
|||||||
|
|
||||||
option(SIMDJSON_USE_RUST "Build the static_reflect benchmark" OFF)
|
option(SIMDJSON_USE_RUST "Build the static_reflect benchmark" OFF)
|
||||||
|
|
||||||
if(SIMDJSON_USER_RUST)
|
if(SIMDJSON_USE_RUST)
|
||||||
if(NOT WIN32)
|
if(NOT WIN32)
|
||||||
# We want the check whether Rust is available before trying to build a crate.
|
# We want the check whether Rust is available before trying to build a crate.
|
||||||
CPMAddPackage(
|
CPMAddPackage(
|
||||||
@@ -39,9 +39,9 @@ if(SIMDJSON_USER_RUST)
|
|||||||
message(STATUS "curl https://sh.rustup.rs -sSf | sh")
|
message(STATUS "curl https://sh.rustup.rs -sSf | sh")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
else(SIMDJSON_USER_RUST)
|
else(SIMDJSON_USE_RUST)
|
||||||
message(STATUS "We will not benchmark serde-benchmark." )
|
message(STATUS "We will not benchmark serde-benchmark." )
|
||||||
endif(SIMDJSON_USER_RUST)
|
endif(SIMDJSON_USE_RUST)
|
||||||
|
|
||||||
# Add the benchmark executable targets
|
# Add the benchmark executable targets
|
||||||
add_subdirectory(twitter_benchmark)
|
add_subdirectory(twitter_benchmark)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#ifndef BENCHMARK_HELPER_HPP
|
#ifndef BENCHMARK_HELPER_HPP
|
||||||
#define BENCHMARK_HELPER_HPP
|
#define BENCHMARK_HELPER_HPP
|
||||||
#include "event_counter.h"
|
#include <counters/event_counter.h>
|
||||||
|
using namespace counters;
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
|
|
||||||
inline event_collector &get_collector() {
|
inline event_collector &get_collector() {
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
add_executable(benchmark_serialization_citm_catalog benchmark_serialization_citm_catalog.cpp)
|
add_executable(benchmark_serialization_citm_catalog benchmark_serialization_citm_catalog.cpp)
|
||||||
|
add_executable(benchmark_parsing_citm benchmark_parsing_citm.cpp)
|
||||||
|
|
||||||
# Link with Rust benchmarking code if available
|
# Link with Rust benchmarking code if available
|
||||||
if(TARGET serde-benchmark)
|
if(TARGET serde-benchmark)
|
||||||
@@ -11,4 +12,29 @@ target_link_libraries(benchmark_serialization_citm_catalog PRIVATE simdjson::sim
|
|||||||
target_link_libraries(benchmark_serialization_citm_catalog PRIVATE reflectcpp)
|
target_link_libraries(benchmark_serialization_citm_catalog PRIVATE reflectcpp)
|
||||||
target_compile_definitions(benchmark_serialization_citm_catalog PRIVATE SIMDJSON_BENCH_CPP_REFLECT=1)
|
target_compile_definitions(benchmark_serialization_citm_catalog PRIVATE SIMDJSON_BENCH_CPP_REFLECT=1)
|
||||||
|
|
||||||
target_compile_definitions(benchmark_serialization_citm_catalog PRIVATE JSON_FILE="${BENCH_CITM_JSON}")
|
if(TARGET yyjson)
|
||||||
|
target_link_libraries(benchmark_serialization_citm_catalog PRIVATE yyjson)
|
||||||
|
target_compile_definitions(benchmark_serialization_citm_catalog PRIVATE SIMDJSON_COMPETITION_YYJSON)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
target_compile_definitions(benchmark_serialization_citm_catalog PRIVATE JSON_FILE="${BENCH_CITM_JSON}")
|
||||||
|
|
||||||
|
# Configuration for parsing benchmark
|
||||||
|
if(TARGET serde-benchmark)
|
||||||
|
target_link_libraries(benchmark_parsing_citm PRIVATE serde-benchmark)
|
||||||
|
target_compile_definitions(benchmark_parsing_citm PRIVATE SIMDJSON_RUST_VERSION="${Rust_VERSION}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
target_link_libraries(benchmark_parsing_citm PRIVATE simdjson::simdjson nlohmann_json)
|
||||||
|
|
||||||
|
if(TARGET rapidjson)
|
||||||
|
target_link_libraries(benchmark_parsing_citm PRIVATE rapidjson)
|
||||||
|
target_compile_definitions(benchmark_parsing_citm PRIVATE SIMDJSON_COMPETITION_RAPIDJSON)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(TARGET yyjson)
|
||||||
|
target_link_libraries(benchmark_parsing_citm PRIVATE yyjson)
|
||||||
|
target_compile_definitions(benchmark_parsing_citm PRIVATE SIMDJSON_COMPETITION_YYJSON)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
target_compile_definitions(benchmark_parsing_citm PRIVATE JSON_FILE="${BENCH_CITM_JSON}")
|
||||||
@@ -0,0 +1,563 @@
|
|||||||
|
#include <cassert>
|
||||||
|
#include <cstdlib>
|
||||||
|
#include <ctime>
|
||||||
|
#include <format>
|
||||||
|
#include <fstream>
|
||||||
|
#include <iostream>
|
||||||
|
#include <nlohmann/json.hpp>
|
||||||
|
#include <simdjson.h>
|
||||||
|
#include <string>
|
||||||
|
#include "citm_catalog_data.h"
|
||||||
|
#include "nlohmann_citm_catalog_data.h"
|
||||||
|
#include "../benchmark_utils/benchmark_helper.h"
|
||||||
|
|
||||||
|
#ifdef SIMDJSON_COMPETITION_RAPIDJSON
|
||||||
|
#include "rapidjson_citm_catalog_data.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef SIMDJSON_COMPETITION_YYJSON
|
||||||
|
#include "yyjson_citm_catalog_data.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef SIMDJSON_RUST_VERSION
|
||||||
|
#include "../serde-benchmark/serde_benchmark.h"
|
||||||
|
|
||||||
|
void bench_rust_parsing(const std::string &json_str) {
|
||||||
|
size_t input_volume = json_str.size();
|
||||||
|
printf("# input volume: %zu bytes\n", input_volume);
|
||||||
|
|
||||||
|
volatile bool result = true;
|
||||||
|
pretty_print(1, input_volume, "bench_rust_parsing",
|
||||||
|
bench([&json_str, &result]() {
|
||||||
|
serde_benchmark::CitmCatalog *catalog = serde_benchmark::citm_from_str(json_str.c_str(), json_str.size());
|
||||||
|
result = (catalog != nullptr);
|
||||||
|
if (catalog) {
|
||||||
|
serde_benchmark::free_citm(catalog);
|
||||||
|
}
|
||||||
|
if (!result) {
|
||||||
|
printf("parse error\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
template <class T> void bench_simdjson_static_reflection_parsing(const std::string &json_str) {
|
||||||
|
size_t input_volume = json_str.size();
|
||||||
|
printf("# input volume: %zu bytes\n", input_volume);
|
||||||
|
|
||||||
|
// Pre-allocate padded buffer outside the benchmark loop
|
||||||
|
std::string mutable_json = json_str;
|
||||||
|
simdjson::pad(mutable_json);
|
||||||
|
|
||||||
|
volatile bool result = true;
|
||||||
|
pretty_print(1, input_volume, "bench_simdjson_static_reflection_parsing",
|
||||||
|
bench([&mutable_json, &result]() {
|
||||||
|
simdjson::ondemand::parser parser;
|
||||||
|
simdjson::ondemand::document doc;
|
||||||
|
if(parser.iterate(mutable_json).get(doc)) {
|
||||||
|
result = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
T my_struct;
|
||||||
|
if(doc.get<T>().get(my_struct)) {
|
||||||
|
result = false;
|
||||||
|
}
|
||||||
|
if (!result) {
|
||||||
|
printf("parse error\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
#if SIMDJSON_STATIC_REFLECTION
|
||||||
|
template <class T> void bench_simdjson_from_parsing(const std::string &json_str) {
|
||||||
|
size_t input_volume = json_str.size();
|
||||||
|
printf("# input volume: %zu bytes\n", input_volume);
|
||||||
|
|
||||||
|
// Pre-allocate padded buffer outside the benchmark loop
|
||||||
|
simdjson::padded_string padded = simdjson::padded_string(json_str);
|
||||||
|
|
||||||
|
volatile bool result = true;
|
||||||
|
pretty_print(1, input_volume, "bench_simdjson_from_parsing",
|
||||||
|
bench([&padded, &result]() {
|
||||||
|
T my_struct;
|
||||||
|
auto err = simdjson::from(padded).get(my_struct);
|
||||||
|
if (err) {
|
||||||
|
result = false;
|
||||||
|
printf("parse error: %s\n", simdjson::error_message(err));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// nlohmann::json deserialization functions
|
||||||
|
void from_json(const nlohmann::json &j, CITMPrice &p) {
|
||||||
|
j.at("amount").get_to(p.amount);
|
||||||
|
j.at("audienceSubCategoryId").get_to(p.audienceSubCategoryId);
|
||||||
|
j.at("seatCategoryId").get_to(p.seatCategoryId);
|
||||||
|
}
|
||||||
|
|
||||||
|
void from_json(const nlohmann::json &j, CITMArea &a) {
|
||||||
|
j.at("areaId").get_to(a.areaId);
|
||||||
|
j.at("blockIds").get_to(a.blockIds);
|
||||||
|
}
|
||||||
|
|
||||||
|
void from_json(const nlohmann::json &j, CITMSeatCategory &s) {
|
||||||
|
j.at("areas").get_to(s.areas);
|
||||||
|
j.at("seatCategoryId").get_to(s.seatCategoryId);
|
||||||
|
}
|
||||||
|
|
||||||
|
void from_json(const nlohmann::json &j, CITMPerformance &p) {
|
||||||
|
j.at("id").get_to(p.id);
|
||||||
|
j.at("eventId").get_to(p.eventId);
|
||||||
|
if (j.contains("logo") && !j["logo"].is_null()) {
|
||||||
|
p.logo = j["logo"].get<std::string>();
|
||||||
|
}
|
||||||
|
if (j.contains("name") && !j["name"].is_null()) {
|
||||||
|
p.name = j["name"].get<std::string>();
|
||||||
|
}
|
||||||
|
j.at("prices").get_to(p.prices);
|
||||||
|
j.at("seatCategories").get_to(p.seatCategories);
|
||||||
|
if (j.contains("seatMapImage") && !j["seatMapImage"].is_null()) {
|
||||||
|
p.seatMapImage = j["seatMapImage"].get<std::string>();
|
||||||
|
}
|
||||||
|
j.at("start").get_to(p.start);
|
||||||
|
j.at("venueCode").get_to(p.venueCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
void from_json(const nlohmann::json &j, CITMEvent &e) {
|
||||||
|
j.at("id").get_to(e.id);
|
||||||
|
j.at("name").get_to(e.name);
|
||||||
|
if (j.contains("description") && !j["description"].is_null()) {
|
||||||
|
e.description = j["description"].get<std::string>();
|
||||||
|
}
|
||||||
|
if (j.contains("logo") && !j["logo"].is_null()) {
|
||||||
|
e.logo = j["logo"].get<std::string>();
|
||||||
|
}
|
||||||
|
j.at("subTopicIds").get_to(e.subTopicIds);
|
||||||
|
if (j.contains("subjectCode") && !j["subjectCode"].is_null()) {
|
||||||
|
e.subjectCode = j["subjectCode"].get<std::string>();
|
||||||
|
}
|
||||||
|
if (j.contains("subtitle") && !j["subtitle"].is_null()) {
|
||||||
|
e.subtitle = j["subtitle"].get<std::string>();
|
||||||
|
}
|
||||||
|
j.at("topicIds").get_to(e.topicIds);
|
||||||
|
}
|
||||||
|
|
||||||
|
void from_json(const nlohmann::json &j, CitmCatalog &c) {
|
||||||
|
j.at("events").get_to(c.events);
|
||||||
|
j.at("performances").get_to(c.performances);
|
||||||
|
}
|
||||||
|
|
||||||
|
CitmCatalog nlohmann_deserialize(const std::string &json_str) {
|
||||||
|
nlohmann::json j = nlohmann::json::parse(json_str);
|
||||||
|
return j.get<CitmCatalog>();
|
||||||
|
}
|
||||||
|
|
||||||
|
void bench_nlohmann_parsing(const std::string &json_str) {
|
||||||
|
size_t input_volume = json_str.size();
|
||||||
|
printf("# input volume: %zu bytes\n", input_volume);
|
||||||
|
|
||||||
|
volatile bool result = true;
|
||||||
|
pretty_print(1, input_volume, "bench_nlohmann_parsing",
|
||||||
|
bench([&json_str, &result]() {
|
||||||
|
try {
|
||||||
|
CitmCatalog data = nlohmann_deserialize(json_str);
|
||||||
|
result = true;
|
||||||
|
} catch (...) {
|
||||||
|
result = false;
|
||||||
|
printf("parse error\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef SIMDJSON_COMPETITION_RAPIDJSON
|
||||||
|
CitmCatalog rapidjson_deserialize(const std::string &json_str) {
|
||||||
|
rapidjson::Document doc;
|
||||||
|
doc.Parse(json_str.c_str());
|
||||||
|
|
||||||
|
if (doc.HasParseError()) {
|
||||||
|
throw std::runtime_error("RapidJSON parse error");
|
||||||
|
}
|
||||||
|
|
||||||
|
CitmCatalog catalog;
|
||||||
|
|
||||||
|
// Parse events
|
||||||
|
if (doc.HasMember("events") && doc["events"].IsObject()) {
|
||||||
|
for (auto& m : doc["events"].GetObject()) {
|
||||||
|
CITMEvent event;
|
||||||
|
const auto& e = m.value;
|
||||||
|
|
||||||
|
event.id = e["id"].GetUint64();
|
||||||
|
event.name = e["name"].GetString();
|
||||||
|
if (e.HasMember("description") && !e["description"].IsNull()) {
|
||||||
|
event.description = e["description"].GetString();
|
||||||
|
}
|
||||||
|
if (e.HasMember("logo") && !e["logo"].IsNull()) {
|
||||||
|
event.logo = e["logo"].GetString();
|
||||||
|
}
|
||||||
|
|
||||||
|
event.subTopicIds.clear();
|
||||||
|
for (auto& id : e["subTopicIds"].GetArray()) {
|
||||||
|
event.subTopicIds.push_back(id.GetUint64());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (e.HasMember("subjectCode") && !e["subjectCode"].IsNull()) {
|
||||||
|
event.subjectCode = e["subjectCode"].GetString();
|
||||||
|
}
|
||||||
|
if (e.HasMember("subtitle") && !e["subtitle"].IsNull()) {
|
||||||
|
event.subtitle = e["subtitle"].GetString();
|
||||||
|
}
|
||||||
|
|
||||||
|
event.topicIds.clear();
|
||||||
|
for (auto& id : e["topicIds"].GetArray()) {
|
||||||
|
event.topicIds.push_back(id.GetUint64());
|
||||||
|
}
|
||||||
|
|
||||||
|
catalog.events[m.name.GetString()] = event;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse performances
|
||||||
|
if (doc.HasMember("performances") && doc["performances"].IsArray()) {
|
||||||
|
for (auto& p : doc["performances"].GetArray()) {
|
||||||
|
CITMPerformance perf;
|
||||||
|
|
||||||
|
perf.id = p["id"].GetUint64();
|
||||||
|
perf.eventId = p["eventId"].GetUint64();
|
||||||
|
if (p.HasMember("logo") && !p["logo"].IsNull()) {
|
||||||
|
perf.logo = p["logo"].GetString();
|
||||||
|
}
|
||||||
|
if (p.HasMember("name") && !p["name"].IsNull()) {
|
||||||
|
perf.name = p["name"].GetString();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse prices
|
||||||
|
for (auto& price : p["prices"].GetArray()) {
|
||||||
|
CITMPrice pr;
|
||||||
|
pr.amount = price["amount"].GetUint64();
|
||||||
|
pr.audienceSubCategoryId = price["audienceSubCategoryId"].GetUint64();
|
||||||
|
pr.seatCategoryId = price["seatCategoryId"].GetUint64();
|
||||||
|
perf.prices.push_back(pr);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse seat categories
|
||||||
|
for (auto& sc : p["seatCategories"].GetArray()) {
|
||||||
|
CITMSeatCategory seatCat;
|
||||||
|
seatCat.seatCategoryId = sc["seatCategoryId"].GetUint64();
|
||||||
|
|
||||||
|
for (auto& area : sc["areas"].GetArray()) {
|
||||||
|
CITMArea ar;
|
||||||
|
ar.areaId = area["areaId"].GetUint64();
|
||||||
|
for (auto& block : area["blockIds"].GetArray()) {
|
||||||
|
ar.blockIds.push_back(block.GetUint64());
|
||||||
|
}
|
||||||
|
seatCat.areas.push_back(ar);
|
||||||
|
}
|
||||||
|
perf.seatCategories.push_back(seatCat);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (p.HasMember("seatMapImage") && !p["seatMapImage"].IsNull()) {
|
||||||
|
perf.seatMapImage = p["seatMapImage"].GetString();
|
||||||
|
}
|
||||||
|
perf.start = p["start"].GetUint64();
|
||||||
|
perf.venueCode = p["venueCode"].GetString();
|
||||||
|
|
||||||
|
catalog.performances.push_back(perf);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return catalog;
|
||||||
|
}
|
||||||
|
|
||||||
|
void bench_rapidjson_parsing(const std::string &json_str) {
|
||||||
|
size_t input_volume = json_str.size();
|
||||||
|
printf("# input volume: %zu bytes\n", input_volume);
|
||||||
|
|
||||||
|
volatile bool result = true;
|
||||||
|
pretty_print(1, input_volume, "bench_rapidjson_parsing",
|
||||||
|
bench([&json_str, &result]() {
|
||||||
|
try {
|
||||||
|
CitmCatalog data = rapidjson_deserialize(json_str);
|
||||||
|
result = true;
|
||||||
|
} catch (...) {
|
||||||
|
result = false;
|
||||||
|
printf("parse error\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef SIMDJSON_COMPETITION_YYJSON
|
||||||
|
CitmCatalog yyjson_deserialize(const std::string &json_str) {
|
||||||
|
yyjson_doc *doc = yyjson_read(json_str.c_str(), json_str.size(), 0);
|
||||||
|
if (!doc) {
|
||||||
|
throw std::runtime_error("YYJson parse error");
|
||||||
|
}
|
||||||
|
|
||||||
|
yyjson_val *root = yyjson_doc_get_root(doc);
|
||||||
|
CitmCatalog catalog;
|
||||||
|
|
||||||
|
// Parse events
|
||||||
|
yyjson_val *events = yyjson_obj_get(root, "events");
|
||||||
|
if (events) {
|
||||||
|
size_t idx, max;
|
||||||
|
yyjson_val *key, *val;
|
||||||
|
yyjson_obj_foreach(events, idx, max, key, val) {
|
||||||
|
CITMEvent event;
|
||||||
|
|
||||||
|
event.id = yyjson_get_uint(yyjson_obj_get(val, "id"));
|
||||||
|
const char* name = yyjson_get_str(yyjson_obj_get(val, "name"));
|
||||||
|
if (name) event.name = name;
|
||||||
|
|
||||||
|
yyjson_val *desc = yyjson_obj_get(val, "description");
|
||||||
|
if (desc && !yyjson_is_null(desc)) {
|
||||||
|
const char* str = yyjson_get_str(desc);
|
||||||
|
if (str) event.description = str;
|
||||||
|
}
|
||||||
|
|
||||||
|
yyjson_val *logo = yyjson_obj_get(val, "logo");
|
||||||
|
if (logo && !yyjson_is_null(logo)) {
|
||||||
|
const char* str = yyjson_get_str(logo);
|
||||||
|
if (str) event.logo = str;
|
||||||
|
}
|
||||||
|
|
||||||
|
yyjson_val *subTopics = yyjson_obj_get(val, "subTopicIds");
|
||||||
|
if (subTopics) {
|
||||||
|
size_t sidx, smax;
|
||||||
|
yyjson_val *sval;
|
||||||
|
yyjson_arr_foreach(subTopics, sidx, smax, sval) {
|
||||||
|
event.subTopicIds.push_back(yyjson_get_uint(sval));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
yyjson_val *subjectCode = yyjson_obj_get(val, "subjectCode");
|
||||||
|
if (subjectCode && !yyjson_is_null(subjectCode)) {
|
||||||
|
const char* str = yyjson_get_str(subjectCode);
|
||||||
|
if (str) event.subjectCode = str;
|
||||||
|
}
|
||||||
|
|
||||||
|
yyjson_val *subtitle = yyjson_obj_get(val, "subtitle");
|
||||||
|
if (subtitle && !yyjson_is_null(subtitle)) {
|
||||||
|
const char* str = yyjson_get_str(subtitle);
|
||||||
|
if (str) event.subtitle = str;
|
||||||
|
}
|
||||||
|
|
||||||
|
yyjson_val *topics = yyjson_obj_get(val, "topicIds");
|
||||||
|
if (topics) {
|
||||||
|
size_t tidx, tmax;
|
||||||
|
yyjson_val *tval;
|
||||||
|
yyjson_arr_foreach(topics, tidx, tmax, tval) {
|
||||||
|
event.topicIds.push_back(yyjson_get_uint(tval));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const char* keyStr = yyjson_get_str(key);
|
||||||
|
if (keyStr) {
|
||||||
|
catalog.events[keyStr] = event;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse performances
|
||||||
|
yyjson_val *performances = yyjson_obj_get(root, "performances");
|
||||||
|
if (performances) {
|
||||||
|
size_t idx, max;
|
||||||
|
yyjson_val *val;
|
||||||
|
yyjson_arr_foreach(performances, idx, max, val) {
|
||||||
|
CITMPerformance perf;
|
||||||
|
|
||||||
|
perf.id = yyjson_get_uint(yyjson_obj_get(val, "id"));
|
||||||
|
perf.eventId = yyjson_get_uint(yyjson_obj_get(val, "eventId"));
|
||||||
|
|
||||||
|
yyjson_val *logo = yyjson_obj_get(val, "logo");
|
||||||
|
if (logo && !yyjson_is_null(logo)) {
|
||||||
|
const char* str = yyjson_get_str(logo);
|
||||||
|
if (str) perf.logo = str;
|
||||||
|
}
|
||||||
|
|
||||||
|
yyjson_val *name = yyjson_obj_get(val, "name");
|
||||||
|
if (name && !yyjson_is_null(name)) {
|
||||||
|
const char* str = yyjson_get_str(name);
|
||||||
|
if (str) perf.name = str;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse prices
|
||||||
|
yyjson_val *prices = yyjson_obj_get(val, "prices");
|
||||||
|
if (prices) {
|
||||||
|
size_t pidx, pmax;
|
||||||
|
yyjson_val *pval;
|
||||||
|
yyjson_arr_foreach(prices, pidx, pmax, pval) {
|
||||||
|
CITMPrice price;
|
||||||
|
price.amount = yyjson_get_uint(yyjson_obj_get(pval, "amount"));
|
||||||
|
price.audienceSubCategoryId = yyjson_get_uint(yyjson_obj_get(pval, "audienceSubCategoryId"));
|
||||||
|
price.seatCategoryId = yyjson_get_uint(yyjson_obj_get(pval, "seatCategoryId"));
|
||||||
|
perf.prices.push_back(price);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse seat categories
|
||||||
|
yyjson_val *seatCats = yyjson_obj_get(val, "seatCategories");
|
||||||
|
if (seatCats) {
|
||||||
|
size_t scidx, scmax;
|
||||||
|
yyjson_val *scval;
|
||||||
|
yyjson_arr_foreach(seatCats, scidx, scmax, scval) {
|
||||||
|
CITMSeatCategory seatCat;
|
||||||
|
seatCat.seatCategoryId = yyjson_get_uint(yyjson_obj_get(scval, "seatCategoryId"));
|
||||||
|
|
||||||
|
yyjson_val *areas = yyjson_obj_get(scval, "areas");
|
||||||
|
if (areas) {
|
||||||
|
size_t aidx, amax;
|
||||||
|
yyjson_val *aval;
|
||||||
|
yyjson_arr_foreach(areas, aidx, amax, aval) {
|
||||||
|
CITMArea area;
|
||||||
|
area.areaId = yyjson_get_uint(yyjson_obj_get(aval, "areaId"));
|
||||||
|
|
||||||
|
yyjson_val *blocks = yyjson_obj_get(aval, "blockIds");
|
||||||
|
if (blocks) {
|
||||||
|
size_t bidx, bmax;
|
||||||
|
yyjson_val *bval;
|
||||||
|
yyjson_arr_foreach(blocks, bidx, bmax, bval) {
|
||||||
|
area.blockIds.push_back(yyjson_get_uint(bval));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
seatCat.areas.push_back(area);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
perf.seatCategories.push_back(seatCat);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
yyjson_val *seatMapImage = yyjson_obj_get(val, "seatMapImage");
|
||||||
|
if (seatMapImage && !yyjson_is_null(seatMapImage)) {
|
||||||
|
const char* str = yyjson_get_str(seatMapImage);
|
||||||
|
if (str) perf.seatMapImage = str;
|
||||||
|
}
|
||||||
|
|
||||||
|
perf.start = yyjson_get_uint(yyjson_obj_get(val, "start"));
|
||||||
|
const char* venueCode = yyjson_get_str(yyjson_obj_get(val, "venueCode"));
|
||||||
|
if (venueCode) perf.venueCode = venueCode;
|
||||||
|
|
||||||
|
catalog.performances.push_back(perf);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
yyjson_doc_free(doc);
|
||||||
|
return catalog;
|
||||||
|
}
|
||||||
|
|
||||||
|
void bench_yyjson_parsing(const std::string &json_str) {
|
||||||
|
size_t input_volume = json_str.size();
|
||||||
|
printf("# input volume: %zu bytes\n", input_volume);
|
||||||
|
|
||||||
|
volatile bool result = true;
|
||||||
|
pretty_print(1, input_volume, "bench_yyjson_parsing",
|
||||||
|
bench([&json_str, &result]() {
|
||||||
|
try {
|
||||||
|
CitmCatalog data = yyjson_deserialize(json_str);
|
||||||
|
result = true;
|
||||||
|
} catch (...) {
|
||||||
|
result = false;
|
||||||
|
printf("parse error\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
std::string read_file(std::string filename) {
|
||||||
|
printf("# Reading file %s\n", filename.c_str());
|
||||||
|
constexpr size_t read_size = 4096;
|
||||||
|
auto stream = std::ifstream(filename);
|
||||||
|
stream.exceptions(std::ios_base::badbit);
|
||||||
|
|
||||||
|
if (!stream) {
|
||||||
|
std::cerr << "Error: Failed to open file " << filename << std::endl;
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string out;
|
||||||
|
auto buf = std::string(read_size, '\0');
|
||||||
|
while (stream.read(&buf[0], read_size)) {
|
||||||
|
out.append(buf, 0, size_t(stream.gcount()));
|
||||||
|
}
|
||||||
|
out.append(buf, 0, size_t(stream.gcount()));
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Function to check if benchmark name matches any of the comma-separated filters
|
||||||
|
bool matches_filter(const std::string& benchmark_name, const std::string& filter) {
|
||||||
|
if (filter.empty()) return true;
|
||||||
|
|
||||||
|
// Split filter by comma
|
||||||
|
size_t start = 0;
|
||||||
|
size_t end = filter.find(',');
|
||||||
|
while (end != std::string::npos) {
|
||||||
|
std::string token = filter.substr(start, end - start);
|
||||||
|
if (benchmark_name.find(token) != std::string::npos) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
start = end + 1;
|
||||||
|
end = filter.find(',', start);
|
||||||
|
}
|
||||||
|
// Check last token
|
||||||
|
std::string token = filter.substr(start);
|
||||||
|
return benchmark_name.find(token) != std::string::npos;
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char *argv[]) {
|
||||||
|
// Get the JSON file path from preprocessor or use default
|
||||||
|
std::string filename;
|
||||||
|
#ifdef JSON_FILE
|
||||||
|
filename = JSON_FILE;
|
||||||
|
#else
|
||||||
|
filename = "jsonexamples/citm_catalog.json";
|
||||||
|
#endif
|
||||||
|
|
||||||
|
std::string json_str = read_file(filename);
|
||||||
|
|
||||||
|
// Parse command-line arguments for filter
|
||||||
|
std::string filter;
|
||||||
|
for (int i = 1; i < argc; i++) {
|
||||||
|
std::string arg = argv[i];
|
||||||
|
if (arg == "-f" && i + 1 < argc) {
|
||||||
|
filter = argv[i + 1];
|
||||||
|
printf("# Filter: %s\n", filter.c_str());
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If no filter provided, run all benchmarks
|
||||||
|
if (filter.empty()) {
|
||||||
|
printf("# Running all benchmarks (use -f <filter> to run specific ones)\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Benchmarking the parsing
|
||||||
|
if (matches_filter("nlohmann", filter)) {
|
||||||
|
bench_nlohmann_parsing(json_str);
|
||||||
|
}
|
||||||
|
#ifdef SIMDJSON_COMPETITION_RAPIDJSON
|
||||||
|
if (matches_filter("rapidjson", filter)) {
|
||||||
|
bench_rapidjson_parsing(json_str);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#ifdef SIMDJSON_COMPETITION_YYJSON
|
||||||
|
if (matches_filter("yyjson", filter)) {
|
||||||
|
bench_yyjson_parsing(json_str);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
if (matches_filter("simdjson_static_reflection", filter)) {
|
||||||
|
bench_simdjson_static_reflection_parsing<CitmCatalog>(json_str);
|
||||||
|
}
|
||||||
|
#if SIMDJSON_STATIC_REFLECTION
|
||||||
|
if (matches_filter("simdjson_from", filter)) {
|
||||||
|
bench_simdjson_from_parsing<CitmCatalog>(json_str);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#ifdef SIMDJSON_RUST_VERSION
|
||||||
|
if (matches_filter("rust", filter)) {
|
||||||
|
printf("# Note: Rust/Serde parsing test\n");
|
||||||
|
bench_rust_parsing(json_str);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return EXIT_SUCCESS;
|
||||||
|
}
|
||||||
+160
-22
@@ -11,6 +11,10 @@
|
|||||||
#include "nlohmann_citm_catalog_data.h"
|
#include "nlohmann_citm_catalog_data.h"
|
||||||
#include "../benchmark_utils/benchmark_helper.h"
|
#include "../benchmark_utils/benchmark_helper.h"
|
||||||
|
|
||||||
|
#ifdef SIMDJSON_COMPETITION_YYJSON
|
||||||
|
#include "yyjson_citm_catalog_data.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#if SIMDJSON_BENCH_CPP_REFLECT
|
#if SIMDJSON_BENCH_CPP_REFLECT
|
||||||
#include <rfl.hpp>
|
#include <rfl.hpp>
|
||||||
#include <rfl/json.hpp>
|
#include <rfl/json.hpp>
|
||||||
@@ -35,20 +39,15 @@ void bench_reflect_cpp(CitmCatalog &data) {
|
|||||||
#include "../serde-benchmark/serde_benchmark.h"
|
#include "../serde-benchmark/serde_benchmark.h"
|
||||||
|
|
||||||
void bench_rust(serde_benchmark::CitmCatalog *data) {
|
void bench_rust(serde_benchmark::CitmCatalog *data) {
|
||||||
const char * output = serde_benchmark::str_from_citm(data);
|
serde_benchmark::set_citm_data(data);
|
||||||
size_t output_volume = strlen(output);
|
size_t output_volume = serde_benchmark::serialize_citm_to_string();
|
||||||
printf("# output volume: %zu bytes\n", output_volume);
|
printf("# output volume: %zu bytes\n", output_volume);
|
||||||
|
|
||||||
volatile size_t measured_volume = 0;
|
volatile size_t measured_volume = 0;
|
||||||
pretty_print(1, output_volume, "bench_rust",
|
pretty_print(1, output_volume, "bench_rust",
|
||||||
bench([&data, &measured_volume, &output_volume]() {
|
bench([&measured_volume, &output_volume]() {
|
||||||
const char * output = serde_benchmark::str_from_citm(data);
|
measured_volume = serde_benchmark::serialize_citm_to_string();
|
||||||
measured_volume = strlen(output);
|
|
||||||
if (measured_volume != output_volume) {
|
|
||||||
printf("mismatch\n");
|
|
||||||
}
|
|
||||||
serde_benchmark::free_str(const_cast<char*>(output));
|
|
||||||
}));
|
}));
|
||||||
serde_benchmark::free_str(const_cast<char*>(output));
|
|
||||||
}
|
}
|
||||||
#endif // SIMDJSON_RUST_VERSION
|
#endif // SIMDJSON_RUST_VERSION
|
||||||
|
|
||||||
@@ -68,7 +67,55 @@ void bench_nlohmann(CitmCatalog &data) {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef SIMDJSON_COMPETITION_YYJSON
|
||||||
|
void bench_yyjson(CitmCatalog &data) {
|
||||||
|
std::string output = yyjson_serialize_citm(data);
|
||||||
|
size_t output_volume = output.size();
|
||||||
|
printf("# output volume: %zu bytes\n", output_volume);
|
||||||
|
|
||||||
|
volatile size_t measured_volume = 0;
|
||||||
|
pretty_print(1, output_volume, "bench_yyjson",
|
||||||
|
bench([&data, &measured_volume, &output_volume]() {
|
||||||
|
std::string output = yyjson_serialize_citm(data);
|
||||||
|
measured_volume = output.size();
|
||||||
|
if (measured_volume != output_volume) {
|
||||||
|
printf("mismatch\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Fair allocation variant: allocates fresh buffer each iteration (matches other libraries)
|
||||||
void bench_simdjson_static_reflection(CitmCatalog &data) {
|
void bench_simdjson_static_reflection(CitmCatalog &data) {
|
||||||
|
// First run to determine expected size
|
||||||
|
simdjson::builder::string_builder sb_init;
|
||||||
|
simdjson::builder::append(sb_init, data);
|
||||||
|
std::string_view p_init;
|
||||||
|
if(sb_init.view().get(p_init)) {
|
||||||
|
std::cerr << "Error!" << std::endl;
|
||||||
|
}
|
||||||
|
size_t output_volume = p_init.size();
|
||||||
|
printf("# output volume: %zu bytes\n", output_volume);
|
||||||
|
|
||||||
|
volatile size_t measured_volume = 0;
|
||||||
|
pretty_print(sizeof(data), output_volume, "bench_simdjson_static_reflection",
|
||||||
|
bench([&data, &measured_volume, &output_volume]() {
|
||||||
|
// Fresh allocation each iteration - fair comparison
|
||||||
|
simdjson::builder::string_builder sb;
|
||||||
|
simdjson::builder::append(sb, data);
|
||||||
|
std::string_view p;
|
||||||
|
if(sb.view().get(p)) {
|
||||||
|
std::cerr << "Error!" << std::endl;
|
||||||
|
}
|
||||||
|
measured_volume = sb.size();
|
||||||
|
if (measured_volume != output_volume) {
|
||||||
|
printf("mismatch\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Optimized variant: reuses buffer across iterations (shows API potential)
|
||||||
|
void bench_simdjson_static_reflection_reuse(CitmCatalog &data) {
|
||||||
simdjson::builder::string_builder sb;
|
simdjson::builder::string_builder sb;
|
||||||
simdjson::builder::append(sb, data);
|
simdjson::builder::append(sb, data);
|
||||||
std::string_view p;
|
std::string_view p;
|
||||||
@@ -80,7 +127,7 @@ void bench_simdjson_static_reflection(CitmCatalog &data) {
|
|||||||
printf("# output volume: %zu bytes\n", output_volume);
|
printf("# output volume: %zu bytes\n", output_volume);
|
||||||
|
|
||||||
volatile size_t measured_volume = 0;
|
volatile size_t measured_volume = 0;
|
||||||
pretty_print(sizeof(data), output_volume, "bench_simdjson_static_reflection",
|
pretty_print(sizeof(data), output_volume, "bench_simdjson_reuse_buffer",
|
||||||
bench([&data, &measured_volume, &output_volume, &sb]() {
|
bench([&data, &measured_volume, &output_volume, &sb]() {
|
||||||
sb.clear();
|
sb.clear();
|
||||||
simdjson::builder::append(sb, data);
|
simdjson::builder::append(sb, data);
|
||||||
@@ -95,25 +142,97 @@ void bench_simdjson_static_reflection(CitmCatalog &data) {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string read_file(const std::string &file_path, size_t read_size = 65536) {
|
#if SIMDJSON_STATIC_REFLECTION
|
||||||
|
// Fair allocation variant: allocates fresh string each iteration
|
||||||
|
void bench_simdjson_to(CitmCatalog &data) {
|
||||||
|
// First run to determine size
|
||||||
|
std::string output_init;
|
||||||
|
if (simdjson::error_code err = simdjson::builder::to_json(data, output_init); err) {
|
||||||
|
std::cerr << "Error in to_json initialization!" << simdjson::error_message(err) << std::endl;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
size_t output_volume = output_init.size();
|
||||||
|
printf("# output volume: %zu bytes\n", output_volume);
|
||||||
|
|
||||||
|
volatile size_t measured_volume = 0;
|
||||||
|
pretty_print(sizeof(data), output_volume, "bench_simdjson_to",
|
||||||
|
bench([&data, &measured_volume, &output_volume]() {
|
||||||
|
// Fresh allocation each iteration - fair comparison
|
||||||
|
std::string output;
|
||||||
|
if (simdjson::error_code err = simdjson::builder::to_json(data, output); err) {
|
||||||
|
std::cerr << "Error in to_json!" << simdjson::error_message(err) << std::endl;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
measured_volume = output.size();
|
||||||
|
if (measured_volume != output_volume) {
|
||||||
|
printf("mismatch\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Optimized variant: reuses pre-allocated string
|
||||||
|
void bench_simdjson_to_reuse(CitmCatalog &data) {
|
||||||
|
std::string output;
|
||||||
|
if (simdjson::error_code err = simdjson::builder::to_json(data, output); err) {
|
||||||
|
std::cerr << "Error in to_json initialization!" << simdjson::error_message(err) << std::endl;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
size_t output_volume = output.size();
|
||||||
|
printf("# output volume: %zu bytes\n", output_volume);
|
||||||
|
|
||||||
|
// Pre-allocate string with sufficient capacity to avoid reallocation
|
||||||
|
output.reserve(output_volume * 2);
|
||||||
|
|
||||||
|
volatile size_t measured_volume = 0;
|
||||||
|
pretty_print(sizeof(data), output_volume, "bench_simdjson_to_reuse",
|
||||||
|
bench([&data, &measured_volume, &output_volume, &output]() {
|
||||||
|
// Reuse the pre-allocated string - avoids allocation
|
||||||
|
if (simdjson::error_code err = simdjson::builder::to_json(data, output); err) {
|
||||||
|
std::cerr << "Error in to_json!" << simdjson::error_message(err) << std::endl;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
measured_volume = output.size();
|
||||||
|
if (measured_volume != output_volume) {
|
||||||
|
printf("mismatch\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
simdjson::padded_string read_file(const std::string &file_path, size_t read_size = 65536) {
|
||||||
std::ifstream stream(file_path, std::ios::binary);
|
std::ifstream stream(file_path, std::ios::binary);
|
||||||
if(!stream) {
|
if(!stream) {
|
||||||
std::cerr << "Could not open file '" << file_path << "'" << std::endl;
|
std::cerr << "Could not open file '" << file_path << "'" << std::endl;
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
stream.exceptions(std::ios_base::badbit);
|
stream.exceptions(std::ios_base::badbit);
|
||||||
std::string out;
|
simdjson::padded_string_builder builder;
|
||||||
std::string buf(read_size, '\0');
|
std::string buf(read_size, '\0');
|
||||||
while (stream.read(&buf[0], read_size)) {
|
while (stream.read(&buf[0], read_size)) {
|
||||||
out.append(buf, 0, size_t(stream.gcount()));
|
builder.append(buf.data(), size_t(stream.gcount()));
|
||||||
}
|
}
|
||||||
out.append(buf, 0, size_t(stream.gcount()));
|
builder.append(buf.data(), size_t(stream.gcount()));
|
||||||
return out;
|
return builder.convert();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Function to check if benchmark name contains filter substring
|
// Function to check if benchmark name matches any of the comma-separated filters
|
||||||
bool matches_filter(const std::string& benchmark_name, const std::string& filter) {
|
bool matches_filter(const std::string& benchmark_name, const std::string& filter) {
|
||||||
return filter.empty() || benchmark_name.find(filter) != std::string::npos;
|
if (filter.empty()) return true;
|
||||||
|
|
||||||
|
// Split filter by comma
|
||||||
|
size_t start = 0;
|
||||||
|
size_t end = filter.find(',');
|
||||||
|
while (end != std::string::npos) {
|
||||||
|
std::string token = filter.substr(start, end - start);
|
||||||
|
if (benchmark_name.find(token) != std::string::npos) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
start = end + 1;
|
||||||
|
end = filter.find(',', start);
|
||||||
|
}
|
||||||
|
// Check last token
|
||||||
|
std::string token = filter.substr(start);
|
||||||
|
return benchmark_name.find(token) != std::string::npos;
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
int main(int argc, char* argv[]) {
|
||||||
@@ -131,12 +250,12 @@ int main(int argc, char* argv[]) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Testing correctness of round-trip (serialization + deserialization)
|
// Testing correctness of round-trip (serialization + deserialization)
|
||||||
std::string json_str = read_file(JSON_FILE);
|
simdjson::padded_string json_str = read_file(JSON_FILE);
|
||||||
|
|
||||||
// Loading up the data into a structure.
|
// Loading up the data into a structure.
|
||||||
simdjson::ondemand::parser parser;
|
simdjson::ondemand::parser parser;
|
||||||
simdjson::ondemand::document doc;
|
simdjson::ondemand::document doc;
|
||||||
if(parser.iterate(simdjson::pad(json_str)).get(doc)) {
|
if(parser.iterate(json_str).get(doc)) {
|
||||||
std::cerr << "Error loading the document!" << std::endl;
|
std::cerr << "Error loading the document!" << std::endl;
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
@@ -147,18 +266,37 @@ int main(int argc, char* argv[]) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Benchmarking the serialization
|
// Benchmarking the serialization
|
||||||
|
// Note: simdjson benchmarks include both "fair" (fresh allocation) and "reuse" (buffer reuse) variants
|
||||||
|
// The "fair" variants allocate fresh memory each iteration, matching other libraries' behavior
|
||||||
|
// The "reuse" variants demonstrate the API's potential when buffer reuse is possible
|
||||||
|
|
||||||
if (matches_filter("nlohmann", filter)) {
|
if (matches_filter("nlohmann", filter)) {
|
||||||
bench_nlohmann(my_struct);
|
bench_nlohmann(my_struct);
|
||||||
}
|
}
|
||||||
|
#ifdef SIMDJSON_COMPETITION_YYJSON
|
||||||
|
if (matches_filter("yyjson", filter)) {
|
||||||
|
bench_yyjson(my_struct);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
if (matches_filter("simdjson_static_reflection", filter)) {
|
if (matches_filter("simdjson_static_reflection", filter)) {
|
||||||
bench_simdjson_static_reflection(my_struct);
|
bench_simdjson_static_reflection(my_struct);
|
||||||
}
|
}
|
||||||
|
if (matches_filter("simdjson_reuse", filter)) {
|
||||||
|
bench_simdjson_static_reflection_reuse(my_struct);
|
||||||
|
}
|
||||||
|
#if SIMDJSON_STATIC_REFLECTION
|
||||||
|
if (matches_filter("simdjson_to", filter)) {
|
||||||
|
bench_simdjson_to(my_struct);
|
||||||
|
}
|
||||||
|
if (matches_filter("simdjson_to_reuse", filter)) {
|
||||||
|
bench_simdjson_to_reuse(my_struct);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
#ifdef SIMDJSON_RUST_VERSION
|
#ifdef SIMDJSON_RUST_VERSION
|
||||||
if (matches_filter("rust", filter)) {
|
if (matches_filter("rust", filter)) {
|
||||||
printf("# WARNING: The Rust benchmark may not be directly comparable since it does not use an equivalent data structure.\n");
|
|
||||||
// Create a Rust-compatible CitmCatalog structure from the JSON string
|
// Create a Rust-compatible CitmCatalog structure from the JSON string
|
||||||
serde_benchmark::CitmCatalog* rust_data =
|
serde_benchmark::CitmCatalog* rust_data =
|
||||||
serde_benchmark::citm_from_str(json_str.c_str(), json_str.size());
|
serde_benchmark::citm_from_str(json_str.data(), json_str.size());
|
||||||
|
|
||||||
if (rust_data == nullptr) {
|
if (rust_data == nullptr) {
|
||||||
printf("# Failed to initialize Rust data structure\n");
|
printf("# Failed to initialize Rust data structure\n");
|
||||||
|
|||||||
@@ -4,79 +4,65 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
#include <optional>
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
struct Area {
|
// Price structure - field names must match JSON keys for reflection
|
||||||
int64_t id;
|
struct CITMPrice {
|
||||||
std::string name;
|
uint64_t amount;
|
||||||
int64_t parent;
|
uint64_t audienceSubCategoryId;
|
||||||
std::vector<int64_t> childAreas;
|
uint64_t seatCategoryId;
|
||||||
bool operator==(const Area &other) const = default;
|
bool operator==(const CITMPrice&) const = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct AudienceSubCategory {
|
struct CITMArea {
|
||||||
int64_t id;
|
uint64_t areaId;
|
||||||
std::string name;
|
std::vector<uint64_t> blockIds;
|
||||||
int64_t parent;
|
bool operator==(const CITMArea&) const = default;
|
||||||
bool operator==(const AudienceSubCategory &other) const = default;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Event {
|
struct CITMSeatCategory {
|
||||||
int64_t id;
|
std::vector<CITMArea> areas;
|
||||||
std::string name;
|
uint64_t seatCategoryId;
|
||||||
std::string description;
|
bool operator==(const CITMSeatCategory&) const = default;
|
||||||
int64_t subTopic;
|
|
||||||
int64_t topic;
|
|
||||||
std::vector<int64_t> audience;
|
|
||||||
bool operator==(const Event &other) const = default;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Performance {
|
struct CITMPerformance {
|
||||||
int64_t id;
|
uint64_t id;
|
||||||
std::string name;
|
uint64_t eventId;
|
||||||
int64_t event;
|
std::optional<std::string> logo;
|
||||||
std::string start;
|
std::optional<std::string> name;
|
||||||
int64_t venueCode;
|
std::vector<CITMPrice> prices;
|
||||||
bool operator==(const Performance &other) const = default;
|
std::vector<CITMSeatCategory> seatCategories;
|
||||||
|
std::optional<std::string> seatMapImage;
|
||||||
|
uint64_t start;
|
||||||
|
std::string venueCode;
|
||||||
|
bool operator==(const CITMPerformance&) const = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct SeatCategory {
|
struct CITMEvent {
|
||||||
int64_t id;
|
uint64_t id;
|
||||||
std::string name;
|
std::string name;
|
||||||
std::vector<int64_t> areas;
|
std::optional<std::string> description;
|
||||||
bool operator==(const SeatCategory &other) const = default;
|
std::optional<std::string> logo;
|
||||||
};
|
std::vector<uint64_t> subTopicIds;
|
||||||
|
std::optional<std::string> subjectCode;
|
||||||
struct SubTopic {
|
std::optional<std::string> subtitle;
|
||||||
int64_t id;
|
std::vector<uint64_t> topicIds;
|
||||||
std::string name;
|
bool operator==(const CITMEvent&) const = default;
|
||||||
int64_t parent;
|
|
||||||
bool operator==(const SubTopic &other) const = default;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct Topic {
|
|
||||||
int64_t id;
|
|
||||||
std::string name;
|
|
||||||
bool operator==(const Topic &other) const = default;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct Venue {
|
|
||||||
int64_t id;
|
|
||||||
std::string name;
|
|
||||||
int64_t address;
|
|
||||||
bool operator==(const Venue &other) const = default;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct CitmCatalog {
|
struct CitmCatalog {
|
||||||
std::map<std::string, Area> areas;
|
std::map<std::string, CITMEvent> events;
|
||||||
std::map<std::string, AudienceSubCategory> audienceSubCategory;
|
std::vector<CITMPerformance> performances;
|
||||||
std::map<std::string, Event> events;
|
bool operator==(const CitmCatalog&) const = default;
|
||||||
std::map<std::string, Performance> performances;
|
|
||||||
std::map<std::string, SeatCategory> seatCategory;
|
|
||||||
std::map<std::string, SubTopic> subTopic;
|
|
||||||
std::map<std::string, Topic> topic;
|
|
||||||
std::map<std::string, Venue> venue;
|
|
||||||
|
|
||||||
bool operator==(const CitmCatalog &other) const = default;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
// Type aliases
|
||||||
|
using Event = CITMEvent;
|
||||||
|
using Performance = CITMPerformance;
|
||||||
|
using Price = CITMPrice;
|
||||||
|
using SeatArea = CITMArea;
|
||||||
|
using SeatCategoryInfo = CITMSeatCategory;
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -8,164 +8,72 @@
|
|||||||
|
|
||||||
using json = nlohmann::json;
|
using json = nlohmann::json;
|
||||||
|
|
||||||
// ---- Area ----
|
// ---- CITMPrice ----
|
||||||
inline void to_json(json &j, const Area &a) {
|
inline void to_json(json &j, const CITMPrice &p) {
|
||||||
j = json{
|
j = json{
|
||||||
{"id", a.id},
|
{"amount", p.amount},
|
||||||
{"name", a.name},
|
{"audienceSubCategoryId", p.audienceSubCategoryId},
|
||||||
{"parent", a.parent},
|
{"seatCategoryId", p.seatCategoryId}
|
||||||
{"childAreas", a.childAreas}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
inline void from_json(const json &j, Area &a) {
|
|
||||||
j.at("id").get_to(a.id);
|
|
||||||
j.at("name").get_to(a.name);
|
|
||||||
j.at("parent").get_to(a.parent);
|
|
||||||
j.at("childAreas").get_to(a.childAreas);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---- AudienceSubCategory ----
|
// ---- CITMArea ----
|
||||||
inline void to_json(json &j, const AudienceSubCategory &asc) {
|
inline void to_json(json &j, const CITMArea &a) {
|
||||||
j = json{
|
j = json{
|
||||||
{"id", asc.id},
|
{"areaId", a.areaId},
|
||||||
{"name", asc.name},
|
{"blockIds", a.blockIds}
|
||||||
{"parent", asc.parent}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
inline void from_json(const json &j, AudienceSubCategory &asc) {
|
|
||||||
j.at("id").get_to(asc.id);
|
|
||||||
j.at("name").get_to(asc.name);
|
|
||||||
j.at("parent").get_to(asc.parent);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---- Event ----
|
// ---- CITMSeatCategory ----
|
||||||
inline void to_json(json &j, const Event &e) {
|
inline void to_json(json &j, const CITMSeatCategory &s) {
|
||||||
j = json{
|
j = json{
|
||||||
{"id", e.id},
|
{"areas", s.areas},
|
||||||
{"name", e.name},
|
{"seatCategoryId", s.seatCategoryId}
|
||||||
{"description", e.description},
|
|
||||||
{"subTopic", e.subTopic},
|
|
||||||
{"topic", e.topic},
|
|
||||||
{"audience", e.audience}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
inline void from_json(const json &j, Event &e) {
|
|
||||||
j.at("id").get_to(e.id);
|
|
||||||
j.at("name").get_to(e.name);
|
|
||||||
j.at("description").get_to(e.description);
|
|
||||||
j.at("subTopic").get_to(e.subTopic);
|
|
||||||
j.at("topic").get_to(e.topic);
|
|
||||||
j.at("audience").get_to(e.audience);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---- Performance ----
|
// ---- CITMPerformance ----
|
||||||
inline void to_json(json &j, const Performance &p) {
|
inline void to_json(json &j, const CITMPerformance &p) {
|
||||||
j = json{
|
j = json{
|
||||||
{"id", p.id},
|
{"id", p.id},
|
||||||
|
{"eventId", p.eventId},
|
||||||
|
{"logo", p.logo},
|
||||||
{"name", p.name},
|
{"name", p.name},
|
||||||
{"event", p.event},
|
{"prices", p.prices},
|
||||||
|
{"seatCategories", p.seatCategories},
|
||||||
|
{"seatMapImage", p.seatMapImage},
|
||||||
{"start", p.start},
|
{"start", p.start},
|
||||||
{"venueCode", p.venueCode}
|
{"venueCode", p.venueCode}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
inline void from_json(const json &j, Performance &p) {
|
|
||||||
j.at("id").get_to(p.id);
|
|
||||||
j.at("name").get_to(p.name);
|
|
||||||
j.at("event").get_to(p.event);
|
|
||||||
j.at("start").get_to(p.start);
|
|
||||||
j.at("venueCode").get_to(p.venueCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---- SeatCategory ----
|
// ---- CITMEvent ----
|
||||||
inline void to_json(json &j, const SeatCategory &sc) {
|
inline void to_json(json &j, const CITMEvent &e) {
|
||||||
j = json{
|
j = json{
|
||||||
{"id", sc.id},
|
{"id", e.id},
|
||||||
{"name", sc.name},
|
{"name", e.name},
|
||||||
{"areas", sc.areas}
|
{"description", e.description},
|
||||||
|
{"logo", e.logo},
|
||||||
|
{"subTopicIds", e.subTopicIds},
|
||||||
|
{"subjectCode", e.subjectCode},
|
||||||
|
{"subtitle", e.subtitle},
|
||||||
|
{"topicIds", e.topicIds}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
inline void from_json(const json &j, SeatCategory &sc) {
|
|
||||||
j.at("id").get_to(sc.id);
|
|
||||||
j.at("name").get_to(sc.name);
|
|
||||||
j.at("areas").get_to(sc.areas);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---- SubTopic ----
|
|
||||||
inline void to_json(json &j, const SubTopic &st) {
|
|
||||||
j = json{
|
|
||||||
{"id", st.id},
|
|
||||||
{"name", st.name},
|
|
||||||
{"parent", st.parent}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
inline void from_json(const json &j, SubTopic &st) {
|
|
||||||
j.at("id").get_to(st.id);
|
|
||||||
j.at("name").get_to(st.name);
|
|
||||||
j.at("parent").get_to(st.parent);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---- Topic ----
|
|
||||||
inline void to_json(json &j, const Topic &t) {
|
|
||||||
j = json{
|
|
||||||
{"id", t.id},
|
|
||||||
{"name", t.name}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
inline void from_json(const json &j, Topic &t) {
|
|
||||||
j.at("id").get_to(t.id);
|
|
||||||
j.at("name").get_to(t.name);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---- Venue ----
|
|
||||||
inline void to_json(json &j, const Venue &v) {
|
|
||||||
j = json{
|
|
||||||
{"id", v.id},
|
|
||||||
{"name", v.name},
|
|
||||||
{"address", v.address}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
inline void from_json(const json &j, Venue &v) {
|
|
||||||
j.at("id").get_to(v.id);
|
|
||||||
j.at("name").get_to(v.name);
|
|
||||||
j.at("address").get_to(v.address);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---- CitmCatalog ----
|
// ---- CitmCatalog ----
|
||||||
inline void to_json(json &j, const CitmCatalog &c) {
|
inline void to_json(json &j, const CitmCatalog &c) {
|
||||||
j = json{
|
j = json{
|
||||||
{"areas", c.areas},
|
|
||||||
{"audienceSubCategory", c.audienceSubCategory},
|
|
||||||
{"events", c.events},
|
{"events", c.events},
|
||||||
{"performances", c.performances},
|
{"performances", c.performances}
|
||||||
{"seatCategory", c.seatCategory},
|
|
||||||
{"subTopic", c.subTopic},
|
|
||||||
{"topic", c.topic},
|
|
||||||
{"venue", c.venue}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
inline void from_json(const json &j, CitmCatalog &c) {
|
|
||||||
j.at("areas").get_to(c.areas);
|
|
||||||
j.at("audienceSubCategory").get_to(c.audienceSubCategory);
|
|
||||||
j.at("events").get_to(c.events);
|
|
||||||
j.at("performances").get_to(c.performances);
|
|
||||||
j.at("seatCategory").get_to(c.seatCategory);
|
|
||||||
j.at("subTopic").get_to(c.subTopic);
|
|
||||||
j.at("topic").get_to(c.topic);
|
|
||||||
j.at("venue").get_to(c.venue);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Optional convenience functions for benchmarking
|
// Serialization function
|
||||||
inline std::string nlohmann_serialize(const CitmCatalog &catalog) {
|
inline std::string nlohmann_serialize(const CitmCatalog &catalog) {
|
||||||
json j = catalog;
|
json j = catalog;
|
||||||
return j.dump();
|
return j.dump();
|
||||||
}
|
}
|
||||||
inline bool nlohmann_deserialize(const std::string &json_in, CitmCatalog &catalog) {
|
|
||||||
try {
|
|
||||||
catalog = json::parse(json_in);
|
|
||||||
return false; // success
|
|
||||||
} catch(...) {
|
|
||||||
return true; // failure
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // NLOHMANN_CITM_CATALOG_DATA_H
|
#endif // NLOHMANN_CITM_CATALOG_DATA_H
|
||||||
@@ -0,0 +1,189 @@
|
|||||||
|
#ifndef RAPIDJSON_CITM_CATALOG_DATA_H
|
||||||
|
#define RAPIDJSON_CITM_CATALOG_DATA_H
|
||||||
|
|
||||||
|
#include "citm_catalog_data.h"
|
||||||
|
#include <rapidjson/document.h>
|
||||||
|
#include <rapidjson/writer.h>
|
||||||
|
#include <rapidjson/stringbuffer.h>
|
||||||
|
#include <rapidjson/error/en.h>
|
||||||
|
|
||||||
|
using namespace rapidjson;
|
||||||
|
|
||||||
|
// RapidJSON deserialization for CITM Catalog data
|
||||||
|
CitmCatalog rapidjson_deserialize_citm(const std::string& json_str) {
|
||||||
|
Document doc;
|
||||||
|
doc.Parse(json_str.c_str());
|
||||||
|
|
||||||
|
if (doc.HasParseError()) {
|
||||||
|
throw std::runtime_error("RapidJSON parse error");
|
||||||
|
}
|
||||||
|
|
||||||
|
CitmCatalog catalog;
|
||||||
|
|
||||||
|
// Parse events
|
||||||
|
if (doc.HasMember("events") && doc["events"].IsObject()) {
|
||||||
|
const Value& events = doc["events"];
|
||||||
|
for (auto it = events.MemberBegin(); it != events.MemberEnd(); ++it) {
|
||||||
|
Event event;
|
||||||
|
const Value& ev = it->value;
|
||||||
|
|
||||||
|
if (ev.HasMember("description") && ev["description"].IsString())
|
||||||
|
event.description = ev["description"].GetString();
|
||||||
|
if (ev.HasMember("id") && ev["id"].IsUint64())
|
||||||
|
event.id = ev["id"].GetUint64();
|
||||||
|
if (ev.HasMember("logo") && ev["logo"].IsString())
|
||||||
|
event.logo = ev["logo"].GetString();
|
||||||
|
if (ev.HasMember("name") && ev["name"].IsString())
|
||||||
|
event.name = ev["name"].GetString();
|
||||||
|
if (ev.HasMember("subjectCode") && ev["subjectCode"].IsString())
|
||||||
|
event.subjectCode = ev["subjectCode"].GetString();
|
||||||
|
if (ev.HasMember("subtitle") && ev["subtitle"].IsString())
|
||||||
|
event.subtitle = ev["subtitle"].GetString();
|
||||||
|
|
||||||
|
if (ev.HasMember("topicIds") && ev["topicIds"].IsArray()) {
|
||||||
|
const Value& topics = ev["topicIds"];
|
||||||
|
for (SizeType j = 0; j < topics.Size(); j++) {
|
||||||
|
if (topics[j].IsUint64())
|
||||||
|
event.topicIds.push_back(topics[j].GetUint64());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ev.HasMember("subTopicIds") && ev["subTopicIds"].IsArray()) {
|
||||||
|
const Value& subtopics = ev["subTopicIds"];
|
||||||
|
for (SizeType j = 0; j < subtopics.Size(); j++) {
|
||||||
|
if (subtopics[j].IsUint64())
|
||||||
|
event.subTopicIds.push_back(subtopics[j].GetUint64());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
catalog.events[it->name.GetString()] = event;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse performances
|
||||||
|
if (doc.HasMember("performances") && doc["performances"].IsArray()) {
|
||||||
|
const Value& performances = doc["performances"];
|
||||||
|
for (SizeType i = 0; i < performances.Size(); i++) {
|
||||||
|
Performance perf;
|
||||||
|
const Value& p = performances[i];
|
||||||
|
|
||||||
|
if (p.HasMember("id") && p["id"].IsUint64())
|
||||||
|
perf.id = p["id"].GetUint64();
|
||||||
|
if (p.HasMember("eventId") && p["eventId"].IsUint64())
|
||||||
|
perf.eventId = p["eventId"].GetUint64();
|
||||||
|
if (p.HasMember("start") && p["start"].IsUint64())
|
||||||
|
perf.start = p["start"].GetUint64();
|
||||||
|
if (p.HasMember("venueCode") && p["venueCode"].IsString())
|
||||||
|
perf.venueCode = p["venueCode"].GetString();
|
||||||
|
if (p.HasMember("name") && p["name"].IsString())
|
||||||
|
perf.name = p["name"].GetString();
|
||||||
|
|
||||||
|
catalog.performances.push_back(perf);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse other string maps
|
||||||
|
auto parseStringMap = [&doc](const char* key, std::map<std::string, std::string>& target) {
|
||||||
|
if (doc.HasMember(key) && doc[key].IsObject()) {
|
||||||
|
const Value& obj = doc[key];
|
||||||
|
for (auto it = obj.MemberBegin(); it != obj.MemberEnd(); ++it) {
|
||||||
|
if (it->value.IsString()) {
|
||||||
|
target[it->name.GetString()] = it->value.GetString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return catalog;
|
||||||
|
}
|
||||||
|
|
||||||
|
// RapidJSON serialization for CITM Catalog data
|
||||||
|
std::string rapidjson_serialize_citm(const CitmCatalog& catalog) {
|
||||||
|
Document doc;
|
||||||
|
doc.SetObject();
|
||||||
|
Document::AllocatorType& allocator = doc.GetAllocator();
|
||||||
|
|
||||||
|
// Serialize events
|
||||||
|
Value events_obj(kObjectType);
|
||||||
|
for (const auto& [key, event] : catalog.events) {
|
||||||
|
Value event_obj(kObjectType);
|
||||||
|
|
||||||
|
if (event.description) {
|
||||||
|
Value desc;
|
||||||
|
desc.SetString(event.description->c_str(), allocator);
|
||||||
|
event_obj.AddMember("description", desc, allocator);
|
||||||
|
}
|
||||||
|
|
||||||
|
event_obj.AddMember("id", event.id, allocator);
|
||||||
|
|
||||||
|
if (event.logo) {
|
||||||
|
Value logo;
|
||||||
|
logo.SetString(event.logo->c_str(), allocator);
|
||||||
|
event_obj.AddMember("logo", logo, allocator);
|
||||||
|
}
|
||||||
|
|
||||||
|
Value name;
|
||||||
|
name.SetString(event.name.c_str(), allocator);
|
||||||
|
event_obj.AddMember("name", name, allocator);
|
||||||
|
|
||||||
|
if (event.subjectCode) {
|
||||||
|
Value subject;
|
||||||
|
subject.SetString(event.subjectCode->c_str(), allocator);
|
||||||
|
event_obj.AddMember("subjectCode", subject, allocator);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (event.subtitle) {
|
||||||
|
Value subtitle;
|
||||||
|
subtitle.SetString(event.subtitle->c_str(), allocator);
|
||||||
|
event_obj.AddMember("subtitle", subtitle, allocator);
|
||||||
|
}
|
||||||
|
|
||||||
|
Value topicIds(kArrayType);
|
||||||
|
for (uint64_t id : event.topicIds) {
|
||||||
|
topicIds.PushBack(id, allocator);
|
||||||
|
}
|
||||||
|
event_obj.AddMember("topicIds", topicIds, allocator);
|
||||||
|
|
||||||
|
Value subTopicIds(kArrayType);
|
||||||
|
for (uint64_t id : event.subTopicIds) {
|
||||||
|
subTopicIds.PushBack(id, allocator);
|
||||||
|
}
|
||||||
|
event_obj.AddMember("subTopicIds", subTopicIds, allocator);
|
||||||
|
|
||||||
|
Value key_val;
|
||||||
|
key_val.SetString(key.c_str(), allocator);
|
||||||
|
events_obj.AddMember(key_val, event_obj, allocator);
|
||||||
|
}
|
||||||
|
doc.AddMember("events", events_obj, allocator);
|
||||||
|
|
||||||
|
// Serialize performances
|
||||||
|
Value performances_array(kArrayType);
|
||||||
|
for (const auto& perf : catalog.performances) {
|
||||||
|
Value perf_obj(kObjectType);
|
||||||
|
perf_obj.AddMember("id", perf.id, allocator);
|
||||||
|
perf_obj.AddMember("eventId", perf.eventId, allocator);
|
||||||
|
perf_obj.AddMember("start", perf.start, allocator);
|
||||||
|
|
||||||
|
Value venue;
|
||||||
|
venue.SetString(perf.venueCode.c_str(), allocator);
|
||||||
|
perf_obj.AddMember("venueCode", venue, allocator);
|
||||||
|
|
||||||
|
if (perf.name) {
|
||||||
|
Value name;
|
||||||
|
name.SetString(perf.name->c_str(), allocator);
|
||||||
|
perf_obj.AddMember("name", name, allocator);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
performances_array.PushBack(perf_obj, allocator);
|
||||||
|
}
|
||||||
|
doc.AddMember("performances", performances_array, allocator);
|
||||||
|
|
||||||
|
StringBuffer buffer;
|
||||||
|
Writer<StringBuffer> writer(buffer);
|
||||||
|
doc.Accept(writer);
|
||||||
|
|
||||||
|
return buffer.GetString();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // RAPIDJSON_CITM_CATALOG_DATA_H
|
||||||
@@ -0,0 +1,231 @@
|
|||||||
|
#ifndef YYJSON_CITM_CATALOG_DATA_H
|
||||||
|
#define YYJSON_CITM_CATALOG_DATA_H
|
||||||
|
|
||||||
|
#include "citm_catalog_data.h"
|
||||||
|
#include <yyjson.h>
|
||||||
|
#include <string>
|
||||||
|
#include <stdexcept>
|
||||||
|
|
||||||
|
// yyjson deserialization for CITM Catalog data
|
||||||
|
// Matches C++ CitmCatalog struct (only events + performances)
|
||||||
|
CitmCatalog yyjson_deserialize_citm(const std::string &json_str) {
|
||||||
|
CitmCatalog catalog;
|
||||||
|
|
||||||
|
yyjson_doc *doc = yyjson_read(json_str.c_str(), json_str.size(), 0);
|
||||||
|
if (!doc) {
|
||||||
|
throw std::runtime_error("yyjson parse error");
|
||||||
|
}
|
||||||
|
|
||||||
|
yyjson_val *root = yyjson_doc_get_root(doc);
|
||||||
|
if (!root) {
|
||||||
|
yyjson_doc_free(doc);
|
||||||
|
return catalog;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse events
|
||||||
|
yyjson_val *events_val = yyjson_obj_get(root, "events");
|
||||||
|
if (events_val && yyjson_is_obj(events_val)) {
|
||||||
|
size_t idx, max;
|
||||||
|
yyjson_val *key, *val;
|
||||||
|
yyjson_obj_foreach(events_val, idx, max, key, val) {
|
||||||
|
CITMEvent event;
|
||||||
|
|
||||||
|
yyjson_val *v;
|
||||||
|
v = yyjson_obj_get(val, "description");
|
||||||
|
if (v && yyjson_is_str(v)) event.description = yyjson_get_str(v);
|
||||||
|
|
||||||
|
v = yyjson_obj_get(val, "id");
|
||||||
|
if (v && yyjson_is_uint(v)) event.id = yyjson_get_uint(v);
|
||||||
|
|
||||||
|
v = yyjson_obj_get(val, "logo");
|
||||||
|
if (v && yyjson_is_str(v)) event.logo = yyjson_get_str(v);
|
||||||
|
|
||||||
|
v = yyjson_obj_get(val, "name");
|
||||||
|
if (v && yyjson_is_str(v)) event.name = yyjson_get_str(v);
|
||||||
|
|
||||||
|
v = yyjson_obj_get(val, "subjectCode");
|
||||||
|
if (v && yyjson_is_str(v)) event.subjectCode = yyjson_get_str(v);
|
||||||
|
|
||||||
|
v = yyjson_obj_get(val, "subtitle");
|
||||||
|
if (v && yyjson_is_str(v)) event.subtitle = yyjson_get_str(v);
|
||||||
|
|
||||||
|
// Parse topicIds array
|
||||||
|
v = yyjson_obj_get(val, "topicIds");
|
||||||
|
if (v && yyjson_is_arr(v)) {
|
||||||
|
size_t arr_idx, arr_max;
|
||||||
|
yyjson_val *arr_val;
|
||||||
|
yyjson_arr_foreach(v, arr_idx, arr_max, arr_val) {
|
||||||
|
if (yyjson_is_uint(arr_val))
|
||||||
|
event.topicIds.push_back(yyjson_get_uint(arr_val));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse subTopicIds array
|
||||||
|
v = yyjson_obj_get(val, "subTopicIds");
|
||||||
|
if (v && yyjson_is_arr(v)) {
|
||||||
|
size_t arr_idx, arr_max;
|
||||||
|
yyjson_val *arr_val;
|
||||||
|
yyjson_arr_foreach(v, arr_idx, arr_max, arr_val) {
|
||||||
|
if (yyjson_is_uint(arr_val))
|
||||||
|
event.subTopicIds.push_back(yyjson_get_uint(arr_val));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (yyjson_is_str(key))
|
||||||
|
catalog.events[yyjson_get_str(key)] = event;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse performances (simplified - full parsing would need prices/seatCategories)
|
||||||
|
yyjson_val *performances_val = yyjson_obj_get(root, "performances");
|
||||||
|
if (performances_val && yyjson_is_arr(performances_val)) {
|
||||||
|
size_t idx, max;
|
||||||
|
yyjson_val *perf_val;
|
||||||
|
yyjson_arr_foreach(performances_val, idx, max, perf_val) {
|
||||||
|
CITMPerformance perf;
|
||||||
|
|
||||||
|
yyjson_val *v;
|
||||||
|
v = yyjson_obj_get(perf_val, "id");
|
||||||
|
if (v && yyjson_is_uint(v)) perf.id = yyjson_get_uint(v);
|
||||||
|
|
||||||
|
v = yyjson_obj_get(perf_val, "eventId");
|
||||||
|
if (v && yyjson_is_uint(v)) perf.eventId = yyjson_get_uint(v);
|
||||||
|
|
||||||
|
v = yyjson_obj_get(perf_val, "start");
|
||||||
|
if (v && yyjson_is_uint(v)) perf.start = yyjson_get_uint(v);
|
||||||
|
|
||||||
|
v = yyjson_obj_get(perf_val, "venueCode");
|
||||||
|
if (v && yyjson_is_str(v)) perf.venueCode = yyjson_get_str(v);
|
||||||
|
|
||||||
|
v = yyjson_obj_get(perf_val, "name");
|
||||||
|
if (v && yyjson_is_str(v)) perf.name = yyjson_get_str(v);
|
||||||
|
|
||||||
|
v = yyjson_obj_get(perf_val, "logo");
|
||||||
|
if (v && yyjson_is_str(v)) perf.logo = yyjson_get_str(v);
|
||||||
|
|
||||||
|
v = yyjson_obj_get(perf_val, "seatMapImage");
|
||||||
|
if (v && yyjson_is_str(v)) perf.seatMapImage = yyjson_get_str(v);
|
||||||
|
|
||||||
|
// Note: prices and seatCategories parsing omitted for brevity
|
||||||
|
// The serialization benchmark uses data loaded by simdjson
|
||||||
|
|
||||||
|
catalog.performances.push_back(perf);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
yyjson_doc_free(doc);
|
||||||
|
return catalog;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Helper to add optional string field
|
||||||
|
static inline void yyjson_add_optional_str(yyjson_mut_doc *doc, yyjson_mut_val *obj,
|
||||||
|
const char *key, const std::optional<std::string> &val) {
|
||||||
|
if (val.has_value()) {
|
||||||
|
yyjson_mut_obj_add_str(doc, obj, key, val->c_str());
|
||||||
|
} else {
|
||||||
|
yyjson_mut_obj_add_null(doc, obj, key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// yyjson serialization for CITM Catalog data
|
||||||
|
// Matches C++ CitmCatalog struct exactly (only events + performances)
|
||||||
|
std::string yyjson_serialize_citm(const CitmCatalog &catalog) {
|
||||||
|
yyjson_mut_doc *doc = yyjson_mut_doc_new(NULL);
|
||||||
|
yyjson_mut_val *root = yyjson_mut_obj(doc);
|
||||||
|
yyjson_mut_doc_set_root(doc, root);
|
||||||
|
|
||||||
|
// Create events object
|
||||||
|
yyjson_mut_val *events_obj = yyjson_mut_obj(doc);
|
||||||
|
for (const auto& [key, event] : catalog.events) {
|
||||||
|
yyjson_mut_val *event_obj = yyjson_mut_obj(doc);
|
||||||
|
|
||||||
|
yyjson_add_optional_str(doc, event_obj, "description", event.description);
|
||||||
|
yyjson_mut_obj_add_uint(doc, event_obj, "id", event.id);
|
||||||
|
yyjson_add_optional_str(doc, event_obj, "logo", event.logo);
|
||||||
|
// name is not optional in CITMEvent
|
||||||
|
yyjson_mut_obj_add_str(doc, event_obj, "name", event.name.c_str());
|
||||||
|
|
||||||
|
// Add subTopicIds array
|
||||||
|
yyjson_mut_val *subtopic_ids = yyjson_mut_arr(doc);
|
||||||
|
for (uint64_t id : event.subTopicIds) {
|
||||||
|
yyjson_mut_arr_add_uint(doc, subtopic_ids, id);
|
||||||
|
}
|
||||||
|
yyjson_mut_obj_add_val(doc, event_obj, "subTopicIds", subtopic_ids);
|
||||||
|
|
||||||
|
yyjson_add_optional_str(doc, event_obj, "subjectCode", event.subjectCode);
|
||||||
|
yyjson_add_optional_str(doc, event_obj, "subtitle", event.subtitle);
|
||||||
|
|
||||||
|
// Add topicIds array
|
||||||
|
yyjson_mut_val *topic_ids = yyjson_mut_arr(doc);
|
||||||
|
for (uint64_t id : event.topicIds) {
|
||||||
|
yyjson_mut_arr_add_uint(doc, topic_ids, id);
|
||||||
|
}
|
||||||
|
yyjson_mut_obj_add_val(doc, event_obj, "topicIds", topic_ids);
|
||||||
|
|
||||||
|
yyjson_mut_obj_add_val(doc, events_obj, key.c_str(), event_obj);
|
||||||
|
}
|
||||||
|
yyjson_mut_obj_add_val(doc, root, "events", events_obj);
|
||||||
|
|
||||||
|
// Create performances array
|
||||||
|
yyjson_mut_val *performances_array = yyjson_mut_arr(doc);
|
||||||
|
for (const auto& perf : catalog.performances) {
|
||||||
|
yyjson_mut_val *perf_obj = yyjson_mut_obj(doc);
|
||||||
|
|
||||||
|
yyjson_mut_obj_add_uint(doc, perf_obj, "eventId", perf.eventId);
|
||||||
|
yyjson_mut_obj_add_uint(doc, perf_obj, "id", perf.id);
|
||||||
|
yyjson_add_optional_str(doc, perf_obj, "logo", perf.logo);
|
||||||
|
yyjson_add_optional_str(doc, perf_obj, "name", perf.name);
|
||||||
|
|
||||||
|
// Add prices array
|
||||||
|
yyjson_mut_val *prices_array = yyjson_mut_arr(doc);
|
||||||
|
for (const auto& price : perf.prices) {
|
||||||
|
yyjson_mut_val *price_obj = yyjson_mut_obj(doc);
|
||||||
|
yyjson_mut_obj_add_uint(doc, price_obj, "amount", price.amount);
|
||||||
|
yyjson_mut_obj_add_uint(doc, price_obj, "audienceSubCategoryId", price.audienceSubCategoryId);
|
||||||
|
yyjson_mut_obj_add_uint(doc, price_obj, "seatCategoryId", price.seatCategoryId);
|
||||||
|
yyjson_mut_arr_append(prices_array, price_obj);
|
||||||
|
}
|
||||||
|
yyjson_mut_obj_add_val(doc, perf_obj, "prices", prices_array);
|
||||||
|
|
||||||
|
// Add seatCategories array
|
||||||
|
yyjson_mut_val *seat_cats_array = yyjson_mut_arr(doc);
|
||||||
|
for (const auto& seatCat : perf.seatCategories) {
|
||||||
|
yyjson_mut_val *seat_cat_obj = yyjson_mut_obj(doc);
|
||||||
|
|
||||||
|
// Add areas array
|
||||||
|
yyjson_mut_val *areas_array = yyjson_mut_arr(doc);
|
||||||
|
for (const auto& area : seatCat.areas) {
|
||||||
|
yyjson_mut_val *area_obj = yyjson_mut_obj(doc);
|
||||||
|
yyjson_mut_obj_add_uint(doc, area_obj, "areaId", area.areaId);
|
||||||
|
|
||||||
|
yyjson_mut_val *block_ids = yyjson_mut_arr(doc);
|
||||||
|
for (uint64_t blockId : area.blockIds) {
|
||||||
|
yyjson_mut_arr_add_uint(doc, block_ids, blockId);
|
||||||
|
}
|
||||||
|
yyjson_mut_obj_add_val(doc, area_obj, "blockIds", block_ids);
|
||||||
|
yyjson_mut_arr_append(areas_array, area_obj);
|
||||||
|
}
|
||||||
|
yyjson_mut_obj_add_val(doc, seat_cat_obj, "areas", areas_array);
|
||||||
|
yyjson_mut_obj_add_uint(doc, seat_cat_obj, "seatCategoryId", seatCat.seatCategoryId);
|
||||||
|
yyjson_mut_arr_append(seat_cats_array, seat_cat_obj);
|
||||||
|
}
|
||||||
|
yyjson_mut_obj_add_val(doc, perf_obj, "seatCategories", seat_cats_array);
|
||||||
|
|
||||||
|
yyjson_add_optional_str(doc, perf_obj, "seatMapImage", perf.seatMapImage);
|
||||||
|
yyjson_mut_obj_add_uint(doc, perf_obj, "start", perf.start);
|
||||||
|
yyjson_mut_obj_add_str(doc, perf_obj, "venueCode", perf.venueCode.c_str());
|
||||||
|
|
||||||
|
yyjson_mut_arr_append(performances_array, perf_obj);
|
||||||
|
}
|
||||||
|
yyjson_mut_obj_add_val(doc, root, "performances", performances_array);
|
||||||
|
|
||||||
|
// Write to string
|
||||||
|
char *json_output = yyjson_mut_write(doc, 0, NULL);
|
||||||
|
std::string result(json_output);
|
||||||
|
free(json_output);
|
||||||
|
yyjson_mut_doc_free(doc);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // YYJSON_CITM_CATALOG_DATA_H
|
||||||
@@ -5,405 +5,165 @@ extern crate libc;
|
|||||||
use libc::{c_char, size_t};
|
use libc::{c_char, size_t};
|
||||||
use serde::{Serialize, Deserialize};
|
use serde::{Serialize, Deserialize};
|
||||||
use std::{collections::HashMap, ffi::CString, ptr, slice};
|
use std::{collections::HashMap, ffi::CString, ptr, slice};
|
||||||
use serde::de::{self, Deserializer};
|
|
||||||
/******************************************************/
|
|
||||||
/******************************************************/
|
|
||||||
/**
|
|
||||||
* Warning: the C++ code may not generate the same JSON.
|
|
||||||
*/
|
|
||||||
/******************************************************/
|
|
||||||
/******************************************************/
|
|
||||||
|
|
||||||
// This has no equivalent in C++:
|
//==============================================================================
|
||||||
#[derive(Serialize, Deserialize)]
|
// Twitter Benchmark Structures
|
||||||
pub struct Metadata {
|
// These match the C++ TwitterData structures exactly
|
||||||
result_type: String,
|
//==============================================================================
|
||||||
iso_language_code: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
pub struct User {
|
pub struct User {
|
||||||
id: i64,
|
id: u64,
|
||||||
id_str: String,
|
|
||||||
name: String,
|
name: String,
|
||||||
screen_name: String,
|
screen_name: String,
|
||||||
location: String,
|
location: String,
|
||||||
description: String,
|
description: String,
|
||||||
// C++ does not have those:
|
|
||||||
// url: Option<String>,
|
|
||||||
//protected: bool,
|
|
||||||
//listed_count: i64,
|
|
||||||
//created_at: String,
|
|
||||||
//favourites_count: i64,
|
|
||||||
//utc_offset: Option<i64>,
|
|
||||||
//time_zone: Option<String>,
|
|
||||||
//geo_enabled: bool,
|
|
||||||
verified: bool,
|
verified: bool,
|
||||||
followers_count: i64,
|
followers_count: u64,
|
||||||
friends_count: i64,
|
friends_count: u64,
|
||||||
statuses_count: i64,
|
statuses_count: u64,
|
||||||
// C++ does not have those:
|
|
||||||
//lang: String,
|
|
||||||
//profile_background_color: String,
|
|
||||||
//profile_background_image_url: String,
|
|
||||||
//profile_background_image_url_https: String,
|
|
||||||
//profile_background_tile: bool,
|
|
||||||
//profile_image_url: String,
|
|
||||||
//profile_image_url_https: String,
|
|
||||||
//profile_banner_url: Option<String>,
|
|
||||||
//profile_link_color: String,
|
|
||||||
//profile_sidebar_border_color: String,
|
|
||||||
//profile_sidebar_fill_color: String,
|
|
||||||
//profile_text_color: String,
|
|
||||||
//profile_use_background_image: bool,
|
|
||||||
//default_profile: bool,
|
|
||||||
//default_profile_image: bool,
|
|
||||||
//following: bool,
|
|
||||||
//follow_request_sent: bool,
|
|
||||||
//notifications: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
|
||||||
pub struct Hashtag {
|
|
||||||
text: String,
|
|
||||||
|
|
||||||
// C++ has those but D. Lemire does not know what they are, they don't appear in the JSON:
|
|
||||||
// int64_t indices_start;
|
|
||||||
// int64_t indices_end;
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
|
||||||
pub struct Url {
|
|
||||||
url: String,
|
|
||||||
expanded_url: String,
|
|
||||||
display_url: String,
|
|
||||||
// C++ has those but D. Lemire does not know what they are, they don't appear in the JSON:
|
|
||||||
// int64_t indices_start;
|
|
||||||
// int64_t indices_end;
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
|
||||||
pub struct UserMention {
|
|
||||||
id: i64,
|
|
||||||
name: String,
|
|
||||||
screen_name: String,
|
|
||||||
// Not in the C++ equivalent:
|
|
||||||
//id_str: String,
|
|
||||||
//indices: Vec<i64>,
|
|
||||||
// C++ has those but D. Lemire does not know what they are, they don't appear in the JSON:
|
|
||||||
// int64_t indices_start;
|
|
||||||
// int64_t indices_end;
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
|
||||||
pub struct Entities {
|
|
||||||
hashtags: Vec<Hashtag>,
|
|
||||||
urls: Vec<Url>,
|
|
||||||
user_mentions: Vec<UserMention>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
pub struct Status {
|
pub struct Status {
|
||||||
created_at: String,
|
created_at: String,
|
||||||
id: i64,
|
id: u64,
|
||||||
text: String,
|
text: String,
|
||||||
user: User,
|
user: User,
|
||||||
entities: Entities,
|
retweet_count: u64,
|
||||||
retweet_count: i64,
|
favorite_count: u64,
|
||||||
favorite_count: i64,
|
|
||||||
favorited: bool,
|
|
||||||
retweeted: bool,
|
|
||||||
// None of these are in the C++ equivalent:
|
|
||||||
/*
|
|
||||||
metadata: Metadata,
|
|
||||||
id_str: String,
|
|
||||||
source: String,
|
|
||||||
truncated: bool,
|
|
||||||
in_reply_to_status_id: Option<i64>,
|
|
||||||
in_reply_to_status_id_str: Option<String>,
|
|
||||||
in_reply_to_user_id: Option<i64>,
|
|
||||||
in_reply_to_user_id_str: Option<String>,
|
|
||||||
in_reply_to_screen_name: Option<String>,
|
|
||||||
geo: Option<String>,
|
|
||||||
coordinates: Option<String>,
|
|
||||||
place: Option<String>,
|
|
||||||
contributors: Option<String>,
|
|
||||||
lang: String,
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
pub struct TwitterData {
|
pub struct TwitterData {
|
||||||
statuses: Vec<Status>,
|
statuses: Vec<Status>,
|
||||||
}
|
}
|
||||||
|
static mut TWITTER_DATA: *mut TwitterData = std::ptr::null_mut();
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub unsafe extern "C" fn twitter_from_str(raw_input: *const c_char, raw_input_length: size_t) -> *mut TwitterData {
|
pub unsafe extern "C" fn twitter_from_str(raw_input: *const c_char, raw_input_length: size_t) -> *mut TwitterData {
|
||||||
let input = std::str::from_utf8_unchecked(slice::from_raw_parts(raw_input as *const u8, raw_input_length));
|
let input = std::str::from_utf8_unchecked(slice::from_raw_parts(raw_input as *const u8, raw_input_length));
|
||||||
match serde_json::from_str(&input) {
|
match serde_json::from_str(&input) {
|
||||||
Ok(result) => Box::into_raw(Box::new(result)),
|
Ok(result) => Box::into_raw(Box::new(result)),
|
||||||
Err(_) => std::ptr::null_mut(),
|
Err(_) => std::ptr::null_mut(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub unsafe extern "C" fn str_from_twitter(raw: *mut TwitterData) -> *const c_char {
|
pub unsafe extern "C" fn set_twitter_data(raw: *mut TwitterData) {
|
||||||
let twitter_thing = { &*raw };
|
TWITTER_DATA = raw;
|
||||||
let serialized = serde_json::to_string(&twitter_thing).unwrap();
|
|
||||||
return std::ffi::CString::new(serialized.as_str()).unwrap().into_raw()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub unsafe extern "C" fn serialize_twitter_to_string() -> usize {
|
||||||
|
if TWITTER_DATA.is_null() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
let data = &*TWITTER_DATA;
|
||||||
|
serde_json::to_string(data).unwrap().len()
|
||||||
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub unsafe extern "C" fn free_twitter(raw: *mut TwitterData) {
|
pub unsafe extern "C" fn free_twitter(raw: *mut TwitterData) {
|
||||||
if raw.is_null() {
|
if raw.is_null() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
drop(Box::from_raw(raw))
|
||||||
drop(Box::from_raw(raw))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub unsafe extern fn free_string(ptr: *const c_char) {
|
pub unsafe extern fn free_string(ptr: *const c_char) {
|
||||||
let _ = std::ffi::CString::from_raw(ptr as *mut _);
|
let _ = std::ffi::CString::from_raw(ptr as *mut _);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Functions associated with the CitmCatalog benchmark
|
//==============================================================================
|
||||||
|
// CITM Catalog Benchmark Structures
|
||||||
|
// These match the C++ CitmCatalog structures EXACTLY for fair comparison
|
||||||
|
//==============================================================================
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
/// Matches C++ CITMPrice struct exactly
|
||||||
pub struct Area {
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||||
pub id: i64,
|
pub struct CITMPrice {
|
||||||
pub name: Option<String>, // Changed to Option
|
pub amount: u64,
|
||||||
pub parent: i64,
|
#[serde(rename = "audienceSubCategoryId")]
|
||||||
#[serde(rename = "childAreas")]
|
pub audience_sub_category_id: u64,
|
||||||
pub child_areas: Vec<i64>,
|
#[serde(rename = "seatCategoryId")]
|
||||||
|
pub seat_category_id: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
/// Matches C++ CITMArea struct exactly
|
||||||
pub struct AudienceSubCategory {
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||||
pub id: i64,
|
pub struct CITMArea {
|
||||||
pub name: Option<String>, // Changed to Option
|
#[serde(rename = "areaId")]
|
||||||
pub parent: i64,
|
pub area_id: u64,
|
||||||
|
#[serde(rename = "blockIds")]
|
||||||
|
pub block_ids: Vec<u64>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug)]
|
/// Matches C++ CITMSeatCategory struct exactly
|
||||||
pub struct Event {
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||||
#[serde(default)]
|
pub struct CITMSeatCategory {
|
||||||
pub description: Option<String>,
|
pub areas: Vec<CITMArea>,
|
||||||
pub id: i64,
|
#[serde(rename = "seatCategoryId")]
|
||||||
|
pub seat_category_id: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Matches C++ CITMPerformance struct exactly
|
||||||
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||||
|
pub struct CITMPerformance {
|
||||||
|
pub id: u64,
|
||||||
|
#[serde(rename = "eventId")]
|
||||||
|
pub event_id: u64,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub logo: Option<String>,
|
pub logo: Option<String>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub name: Option<String>,
|
pub name: Option<String>,
|
||||||
|
pub prices: Vec<CITMPrice>,
|
||||||
|
#[serde(rename = "seatCategories")]
|
||||||
|
pub seat_categories: Vec<CITMSeatCategory>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub subTopicIds: Vec<i64>,
|
#[serde(rename = "seatMapImage")]
|
||||||
|
pub seat_map_image: Option<String>,
|
||||||
|
pub start: u64,
|
||||||
|
#[serde(rename = "venueCode")]
|
||||||
|
pub venue_code: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Matches C++ CITMEvent struct exactly
|
||||||
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||||
|
pub struct CITMEvent {
|
||||||
|
pub id: u64,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub subjectCode: Option<String>,
|
pub name: Option<String>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub description: Option<String>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub logo: Option<String>,
|
||||||
|
#[serde(default)]
|
||||||
|
#[serde(rename = "subTopicIds")]
|
||||||
|
pub sub_topic_ids: Vec<u64>,
|
||||||
|
#[serde(default)]
|
||||||
|
#[serde(rename = "subjectCode")]
|
||||||
|
pub subject_code: Option<String>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub subtitle: Option<String>,
|
pub subtitle: Option<String>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub topicIds: Vec<i64>,
|
#[serde(rename = "topicIds")]
|
||||||
// Add a catch-all for any other fields
|
pub topic_ids: Vec<u64>,
|
||||||
#[serde(flatten)]
|
|
||||||
pub extra: HashMap<String, serde_json::Value>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug)]
|
|
||||||
pub struct Performance {
|
|
||||||
#[serde(default)]
|
|
||||||
pub id: i64,
|
|
||||||
|
|
||||||
#[serde(default)]
|
|
||||||
pub name: Option<String>,
|
|
||||||
|
|
||||||
#[serde(default)]
|
|
||||||
pub event: i64,
|
|
||||||
|
|
||||||
// This is the key fix - accept any JSON value type for timestamps
|
|
||||||
// This allows both string dates and integer timestamps (line 3511)
|
|
||||||
#[serde(default)]
|
|
||||||
pub start: serde_json::Value,
|
|
||||||
|
|
||||||
#[serde(rename = "venueCode")]
|
|
||||||
pub venue_code: String,
|
|
||||||
|
|
||||||
// Add a catch-all for any other fields
|
|
||||||
#[serde(flatten)]
|
|
||||||
pub extra: HashMap<String, serde_json::Value>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
|
||||||
pub struct SeatCategory {
|
|
||||||
pub id: i64,
|
|
||||||
pub name: Option<String>, // Changed to Option
|
|
||||||
pub areas: Vec<i64>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
|
||||||
pub struct SubTopic {
|
|
||||||
pub id: i64,
|
|
||||||
pub name: Option<String>, // Changed to Option
|
|
||||||
pub parent: i64,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
|
||||||
pub struct Topic {
|
|
||||||
pub id: i64,
|
|
||||||
pub name: Option<String>, // Changed to Option
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
|
||||||
pub struct Venue {
|
|
||||||
pub id: i64,
|
|
||||||
pub name: Option<String>, // Changed to Option
|
|
||||||
pub address: i64,
|
|
||||||
}
|
|
||||||
|
|
||||||
// Custom deserializers
|
|
||||||
fn deserialize_string_to_area<'de, D>(deserializer: D) -> Result<HashMap<String, Area>, D::Error>
|
|
||||||
where D: Deserializer<'de> {
|
|
||||||
let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
|
|
||||||
let mut result = HashMap::new();
|
|
||||||
|
|
||||||
for (id, name) in string_map {
|
|
||||||
let id_num = id.parse::<i64>().unwrap_or(0);
|
|
||||||
result.insert(id.clone(), Area {
|
|
||||||
id: id_num,
|
|
||||||
name: Some(name),
|
|
||||||
parent: 0,
|
|
||||||
child_areas: Vec::new(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(result)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn deserialize_string_to_audience_subcategory<'de, D>(deserializer: D) -> Result<HashMap<String, AudienceSubCategory>, D::Error>
|
|
||||||
where D: Deserializer<'de> {
|
|
||||||
let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
|
|
||||||
let mut result = HashMap::new();
|
|
||||||
|
|
||||||
for (id, name) in string_map {
|
|
||||||
let id_num = id.parse::<i64>().unwrap_or(0);
|
|
||||||
result.insert(id.clone(), AudienceSubCategory {
|
|
||||||
id: id_num,
|
|
||||||
name: Some(name),
|
|
||||||
parent: 0,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(result)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn deserialize_string_to_seat_category<'de, D>(deserializer: D) -> Result<HashMap<String, SeatCategory>, D::Error>
|
|
||||||
where D: Deserializer<'de> {
|
|
||||||
let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
|
|
||||||
let mut result = HashMap::new();
|
|
||||||
|
|
||||||
for (id, name) in string_map {
|
|
||||||
let id_num = id.parse::<i64>().unwrap_or(0);
|
|
||||||
result.insert(id.clone(), SeatCategory {
|
|
||||||
id: id_num,
|
|
||||||
name: Some(name),
|
|
||||||
areas: Vec::new(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(result)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn deserialize_string_to_subtopic<'de, D>(deserializer: D) -> Result<HashMap<String, SubTopic>, D::Error>
|
|
||||||
where D: Deserializer<'de> {
|
|
||||||
let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
|
|
||||||
let mut result = HashMap::new();
|
|
||||||
|
|
||||||
for (id, name) in string_map {
|
|
||||||
let id_num = id.parse::<i64>().unwrap_or(0);
|
|
||||||
result.insert(id.clone(), SubTopic {
|
|
||||||
id: id_num,
|
|
||||||
name: Some(name),
|
|
||||||
parent: 0,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(result)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn deserialize_string_to_topic<'de, D>(deserializer: D) -> Result<HashMap<String, Topic>, D::Error>
|
|
||||||
where D: Deserializer<'de> {
|
|
||||||
let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
|
|
||||||
let mut result = HashMap::new();
|
|
||||||
|
|
||||||
for (id, name) in string_map {
|
|
||||||
let id_num = id.parse::<i64>().unwrap_or(0);
|
|
||||||
result.insert(id.clone(), Topic {
|
|
||||||
id: id_num,
|
|
||||||
name: Some(name),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(result)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn deserialize_string_to_venue<'de, D>(deserializer: D) -> Result<HashMap<String, Venue>, D::Error>
|
|
||||||
where D: Deserializer<'de> {
|
|
||||||
let string_map: HashMap<String, String> = HashMap::deserialize(deserializer)?;
|
|
||||||
let mut result = HashMap::new();
|
|
||||||
|
|
||||||
for (id, name) in string_map {
|
|
||||||
result.insert(id.clone(), Venue {
|
|
||||||
id: 0,
|
|
||||||
name: Some(name),
|
|
||||||
address: 0,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(result)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Matches C++ CitmCatalog struct exactly - ONLY events and performances
|
||||||
|
/// This is the key fix: we serialize only what C++ serializes
|
||||||
#[derive(Serialize, Deserialize, Debug)]
|
#[derive(Serialize, Deserialize, Debug)]
|
||||||
pub struct CitmCatalog {
|
pub struct CitmCatalog {
|
||||||
#[serde(rename = "areaNames")]
|
pub events: HashMap<String, CITMEvent>,
|
||||||
pub area_names: HashMap<String, String>,
|
pub performances: Vec<CITMPerformance>,
|
||||||
|
|
||||||
#[serde(rename = "audienceSubCategoryNames")]
|
|
||||||
pub audience_subcategory_names: HashMap<String, String>,
|
|
||||||
|
|
||||||
#[serde(default)]
|
|
||||||
#[serde(rename = "blockNames")]
|
|
||||||
pub block_names: HashMap<String, String>,
|
|
||||||
|
|
||||||
pub events: HashMap<String, Event>,
|
|
||||||
|
|
||||||
#[serde(default)]
|
|
||||||
pub performances: Vec<Performance>,
|
|
||||||
|
|
||||||
#[serde(rename = "seatCategoryNames")]
|
|
||||||
pub seat_category_names: HashMap<String, String>,
|
|
||||||
|
|
||||||
#[serde(rename = "subTopicNames")]
|
|
||||||
pub subtopic_names: HashMap<String, String>,
|
|
||||||
|
|
||||||
#[serde(default)]
|
|
||||||
#[serde(rename = "subjectNames")]
|
|
||||||
pub subject_names: HashMap<String, String>,
|
|
||||||
|
|
||||||
#[serde(rename = "topicNames")]
|
|
||||||
pub topic_names: HashMap<String, String>,
|
|
||||||
|
|
||||||
#[serde(rename = "topicSubTopics")]
|
|
||||||
pub topic_subtopics: HashMap<String, Vec<i64>>,
|
|
||||||
|
|
||||||
#[serde(rename = "venueNames")]
|
|
||||||
pub venue_names: HashMap<String, String>,
|
|
||||||
|
|
||||||
// Catch-all for other fields
|
|
||||||
#[serde(flatten)]
|
|
||||||
pub extra: HashMap<String, serde_json::Value>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static mut CITM_DATA: *mut CitmCatalog = std::ptr::null_mut();
|
||||||
|
|
||||||
/// Creates a CitmCatalog from a JSON string (UTF-8 encoded).
|
/// Creates a CitmCatalog from a JSON string (UTF-8 encoded).
|
||||||
|
/// Only extracts events and performances to match C++ behavior.
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub unsafe extern "C" fn citm_from_str(
|
pub unsafe extern "C" fn citm_from_str(
|
||||||
raw_input: *const c_char,
|
raw_input: *const c_char,
|
||||||
@@ -414,7 +174,6 @@ pub unsafe extern "C" fn citm_from_str(
|
|||||||
return ptr::null_mut();
|
return ptr::null_mut();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Convert the raw pointer + length into a Rust slice
|
|
||||||
let bytes = slice::from_raw_parts(raw_input as *const u8, raw_input_length);
|
let bytes = slice::from_raw_parts(raw_input as *const u8, raw_input_length);
|
||||||
let input_str = match std::str::from_utf8(bytes) {
|
let input_str = match std::str::from_utf8(bytes) {
|
||||||
Ok(s) => s,
|
Ok(s) => s,
|
||||||
@@ -424,12 +183,23 @@ pub unsafe extern "C" fn citm_from_str(
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Try deserializing the input string into CitmCatalog
|
// Parse the full JSON to extract only events and performances
|
||||||
match serde_json::from_str::<CitmCatalog>(input_str) {
|
match serde_json::from_str::<serde_json::Value>(input_str) {
|
||||||
Ok(catalog) => Box::into_raw(Box::new(catalog)),
|
Ok(full_json) => {
|
||||||
|
// Extract only the fields we need (matching C++ behavior)
|
||||||
|
let events: HashMap<String, CITMEvent> = full_json.get("events")
|
||||||
|
.and_then(|v| serde_json::from_value(v.clone()).ok())
|
||||||
|
.unwrap_or_default();
|
||||||
|
|
||||||
|
let performances: Vec<CITMPerformance> = full_json.get("performances")
|
||||||
|
.and_then(|v| serde_json::from_value(v.clone()).ok())
|
||||||
|
.unwrap_or_default();
|
||||||
|
|
||||||
|
let catalog = CitmCatalog { events, performances };
|
||||||
|
Box::into_raw(Box::new(catalog))
|
||||||
|
},
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("Error deserializing JSON: {}", e);
|
eprintln!("Error deserializing JSON: {}", e);
|
||||||
eprintln!("JSON snippet (first 200 chars): {:.200}...", input_str);
|
|
||||||
ptr::null_mut()
|
ptr::null_mut()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -437,30 +207,17 @@ pub unsafe extern "C" fn citm_from_str(
|
|||||||
|
|
||||||
/// Serializes a CitmCatalog into a JSON string (UTF-8).
|
/// Serializes a CitmCatalog into a JSON string (UTF-8).
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub unsafe extern "C" fn str_from_citm(raw_catalog: *mut CitmCatalog) -> *mut c_char {
|
pub unsafe extern "C" fn set_citm_data(raw: *mut CitmCatalog) {
|
||||||
if raw_catalog.is_null() {
|
CITM_DATA = raw;
|
||||||
eprintln!("Error: Catalog pointer is null");
|
}
|
||||||
return ptr::null_mut();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fix: Actually serialize the catalog
|
#[no_mangle]
|
||||||
let catalog = &*raw_catalog;
|
pub unsafe extern "C" fn serialize_citm_to_string() -> usize {
|
||||||
|
if CITM_DATA.is_null() {
|
||||||
match serde_json::to_string(catalog) {
|
return 0;
|
||||||
Ok(serialized) => {
|
|
||||||
match CString::new(serialized) {
|
|
||||||
Ok(cstr) => cstr.into_raw(),
|
|
||||||
Err(e) => {
|
|
||||||
eprintln!("Error creating CString: {}", e);
|
|
||||||
ptr::null_mut()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Err(e) => {
|
|
||||||
eprintln!("Error serializing catalog to JSON: {}", e);
|
|
||||||
ptr::null_mut()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
let data = &*CITM_DATA;
|
||||||
|
return serde_json::to_string(data).unwrap().len();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Frees the CitmCatalog pointer.
|
/// Frees the CitmCatalog pointer.
|
||||||
@@ -475,8 +232,120 @@ pub unsafe extern "C" fn free_citm(raw_catalog: *mut CitmCatalog) {
|
|||||||
pub extern "C" fn free_str(ptr: *mut c_char) {
|
pub extern "C" fn free_str(ptr: *mut c_char) {
|
||||||
if !ptr.is_null() {
|
if !ptr.is_null() {
|
||||||
unsafe {
|
unsafe {
|
||||||
// Convert back into a CString, which automatically frees the memory
|
|
||||||
let _ = CString::from_raw(ptr);
|
let _ = CString::from_raw(ptr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//==============================================================================
|
||||||
|
// FFI Overhead Measurement Functions
|
||||||
|
// These allow measuring the actual FFI overhead vs pure Rust serialization
|
||||||
|
//==============================================================================
|
||||||
|
|
||||||
|
/// Result structure for FFI overhead measurement
|
||||||
|
#[repr(C)]
|
||||||
|
pub struct FfiOverheadResult {
|
||||||
|
/// Time in nanoseconds for pure serde_json::to_string() (no FFI overhead)
|
||||||
|
pub pure_serde_ns: u64,
|
||||||
|
/// Time in nanoseconds for serde + CString conversion
|
||||||
|
pub serde_plus_cstring_ns: u64,
|
||||||
|
/// Number of iterations performed
|
||||||
|
pub iterations: u64,
|
||||||
|
/// Output size in bytes (for verification)
|
||||||
|
pub output_size: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Prevents compiler from optimizing away the value
|
||||||
|
/// Works on stable Rust (unlike std::hint::black_box which is unstable)
|
||||||
|
#[inline(never)]
|
||||||
|
fn black_box<T>(dummy: T) -> T {
|
||||||
|
unsafe {
|
||||||
|
let ret = std::ptr::read_volatile(&dummy);
|
||||||
|
std::mem::forget(dummy);
|
||||||
|
ret
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Measures FFI overhead for Twitter serialization.
|
||||||
|
/// Performs `iterations` serializations entirely in Rust and returns timing data.
|
||||||
|
/// This allows comparing against per-call FFI overhead.
|
||||||
|
#[no_mangle]
|
||||||
|
pub unsafe extern "C" fn measure_twitter_ffi_overhead(
|
||||||
|
raw: *mut TwitterData,
|
||||||
|
iterations: u64
|
||||||
|
) -> FfiOverheadResult {
|
||||||
|
use std::time::Instant;
|
||||||
|
|
||||||
|
let twitter_data = &*raw;
|
||||||
|
let output_size: u64;
|
||||||
|
|
||||||
|
// Warm-up run
|
||||||
|
let warmup = serde_json::to_string(&twitter_data).unwrap();
|
||||||
|
output_size = warmup.len() as u64;
|
||||||
|
|
||||||
|
// Measure pure serde_json::to_string() - no CString conversion
|
||||||
|
let start_pure = Instant::now();
|
||||||
|
for _ in 0..iterations {
|
||||||
|
let serialized = serde_json::to_string(&twitter_data).unwrap();
|
||||||
|
// Prevent optimization from eliminating the work
|
||||||
|
black_box(&serialized);
|
||||||
|
}
|
||||||
|
let pure_serde_ns = start_pure.elapsed().as_nanos() as u64;
|
||||||
|
|
||||||
|
// Measure serde + CString conversion (but not FFI return)
|
||||||
|
let start_cstring = Instant::now();
|
||||||
|
for _ in 0..iterations {
|
||||||
|
let serialized = serde_json::to_string(&twitter_data).unwrap();
|
||||||
|
let cstring = CString::new(serialized).unwrap();
|
||||||
|
// Prevent optimization from eliminating the work
|
||||||
|
black_box(&cstring);
|
||||||
|
}
|
||||||
|
let serde_plus_cstring_ns = start_cstring.elapsed().as_nanos() as u64;
|
||||||
|
|
||||||
|
FfiOverheadResult {
|
||||||
|
pure_serde_ns,
|
||||||
|
serde_plus_cstring_ns,
|
||||||
|
iterations,
|
||||||
|
output_size,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Measures FFI overhead for CITM serialization.
|
||||||
|
#[no_mangle]
|
||||||
|
pub unsafe extern "C" fn measure_citm_ffi_overhead(
|
||||||
|
raw: *mut CitmCatalog,
|
||||||
|
iterations: u64
|
||||||
|
) -> FfiOverheadResult {
|
||||||
|
use std::time::Instant;
|
||||||
|
|
||||||
|
let catalog = &*raw;
|
||||||
|
let output_size: u64;
|
||||||
|
|
||||||
|
// Warm-up run
|
||||||
|
let warmup = serde_json::to_string(&catalog).unwrap();
|
||||||
|
output_size = warmup.len() as u64;
|
||||||
|
|
||||||
|
// Measure pure serde_json::to_string() - no CString conversion
|
||||||
|
let start_pure = Instant::now();
|
||||||
|
for _ in 0..iterations {
|
||||||
|
let serialized = serde_json::to_string(&catalog).unwrap();
|
||||||
|
black_box(&serialized);
|
||||||
|
}
|
||||||
|
let pure_serde_ns = start_pure.elapsed().as_nanos() as u64;
|
||||||
|
|
||||||
|
// Measure serde + CString conversion
|
||||||
|
let start_cstring = Instant::now();
|
||||||
|
for _ in 0..iterations {
|
||||||
|
let serialized = serde_json::to_string(&catalog).unwrap();
|
||||||
|
let cstring = CString::new(serialized).unwrap();
|
||||||
|
black_box(&cstring);
|
||||||
|
}
|
||||||
|
let serde_plus_cstring_ns = start_cstring.elapsed().as_nanos() as u64;
|
||||||
|
|
||||||
|
FfiOverheadResult {
|
||||||
|
pure_serde_ns,
|
||||||
|
serde_plus_cstring_ns,
|
||||||
|
iterations,
|
||||||
|
output_size,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
/* Generated with cbindgen:0.28.0 */
|
/* Generated with cbindgen:0.28.0 */
|
||||||
|
|
||||||
/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */
|
/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */
|
||||||
|
/* Note: FfiOverheadResult and measurement functions added manually */
|
||||||
|
|
||||||
#include <cstdarg>
|
#include <cstdarg>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
@@ -17,11 +18,25 @@ struct CitmCatalog;
|
|||||||
|
|
||||||
struct TwitterData;
|
struct TwitterData;
|
||||||
|
|
||||||
|
/// Result structure for FFI overhead measurement
|
||||||
|
struct FfiOverheadResult {
|
||||||
|
/// Time in nanoseconds for pure serde_json::to_string() (no FFI overhead)
|
||||||
|
uint64_t pure_serde_ns;
|
||||||
|
/// Time in nanoseconds for serde + CString conversion
|
||||||
|
uint64_t serde_plus_cstring_ns;
|
||||||
|
/// Number of iterations performed
|
||||||
|
uint64_t iterations;
|
||||||
|
/// Output size in bytes (for verification)
|
||||||
|
uint64_t output_size;
|
||||||
|
};
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
||||||
TwitterData *twitter_from_str(const char *raw_input, size_t raw_input_length);
|
TwitterData *twitter_from_str(const char *raw_input, size_t raw_input_length);
|
||||||
|
|
||||||
const char *str_from_twitter(TwitterData *raw);
|
void set_twitter_data(TwitterData *raw);
|
||||||
|
|
||||||
|
size_t serialize_twitter_to_string();
|
||||||
|
|
||||||
void free_twitter(TwitterData *raw);
|
void free_twitter(TwitterData *raw);
|
||||||
|
|
||||||
@@ -30,14 +45,22 @@ void free_string(const char *ptr);
|
|||||||
/// Creates a CitmCatalog from a JSON string (UTF-8 encoded).
|
/// Creates a CitmCatalog from a JSON string (UTF-8 encoded).
|
||||||
CitmCatalog *citm_from_str(const char *raw_input, uintptr_t raw_input_length);
|
CitmCatalog *citm_from_str(const char *raw_input, uintptr_t raw_input_length);
|
||||||
|
|
||||||
/// Serializes a CitmCatalog into a JSON string (UTF-8).
|
void set_citm_data(CitmCatalog *raw);
|
||||||
char *str_from_citm(CitmCatalog *raw_catalog);
|
|
||||||
|
size_t serialize_citm_to_string();
|
||||||
|
|
||||||
/// Frees the CitmCatalog pointer.
|
/// Frees the CitmCatalog pointer.
|
||||||
void free_citm(CitmCatalog *raw_catalog);
|
void free_citm(CitmCatalog *raw_catalog);
|
||||||
|
|
||||||
void free_str(char *ptr);
|
void free_str(char *ptr);
|
||||||
|
|
||||||
|
/// Measures FFI overhead for Twitter serialization.
|
||||||
|
/// Performs `iterations` serializations entirely in Rust and returns timing data.
|
||||||
|
FfiOverheadResult measure_twitter_ffi_overhead(TwitterData *raw, uint64_t iterations);
|
||||||
|
|
||||||
|
/// Measures FFI overhead for CITM serialization.
|
||||||
|
FfiOverheadResult measure_citm_ffi_overhead(CitmCatalog *raw, uint64_t iterations);
|
||||||
|
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
|
|
||||||
} // namespace serde_benchmark
|
} // namespace serde_benchmark
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
use std::fs;
|
||||||
|
|
||||||
|
// Include the lib.rs content directly
|
||||||
|
include!("../lib.rs");
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
// Read the Twitter JSON file
|
||||||
|
let json_str = fs::read_to_string("/Users/random_person/Desktop/simdjson/build/jsonexamples/twitter.json")
|
||||||
|
.expect("Failed to read file");
|
||||||
|
|
||||||
|
// Parse it
|
||||||
|
let data: TwitterData = serde_json::from_str(&json_str)
|
||||||
|
.expect("Failed to parse JSON");
|
||||||
|
|
||||||
|
// Serialize it back
|
||||||
|
let output = serde_json::to_string(&data)
|
||||||
|
.expect("Failed to serialize");
|
||||||
|
|
||||||
|
// Write to file for comparison
|
||||||
|
fs::write("rust_output.json", &output)
|
||||||
|
.expect("Failed to write output");
|
||||||
|
|
||||||
|
println!("Output size: {} bytes", output.len());
|
||||||
|
println!("Written to rust_output.json");
|
||||||
|
|
||||||
|
// Also write pretty version for easier inspection
|
||||||
|
let pretty = serde_json::to_string_pretty(&data)
|
||||||
|
.expect("Failed to serialize pretty");
|
||||||
|
fs::write("rust_output_pretty.json", &pretty)
|
||||||
|
.expect("Failed to write pretty output");
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
use std::fs;
|
||||||
|
|
||||||
|
// Import from the parent lib.rs
|
||||||
|
include!("../lib.rs");
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
// Read the Twitter JSON file
|
||||||
|
let json_str = fs::read_to_string("/Users/random_person/Desktop/simdjson/build/jsonexamples/twitter.json")
|
||||||
|
.expect("Failed to read file");
|
||||||
|
|
||||||
|
// Parse it
|
||||||
|
let data: TwitterData = serde_json::from_str(&json_str)
|
||||||
|
.expect("Failed to parse JSON");
|
||||||
|
|
||||||
|
// Serialize it back (compact)
|
||||||
|
let output = serde_json::to_vec(&data)
|
||||||
|
.expect("Failed to serialize");
|
||||||
|
|
||||||
|
let output_str = String::from_utf8(output.clone()).unwrap();
|
||||||
|
|
||||||
|
// Write to file for comparison
|
||||||
|
fs::write("rust_output_test.json", &output)
|
||||||
|
.expect("Failed to write output");
|
||||||
|
|
||||||
|
println!("Output size: {} bytes", output.len());
|
||||||
|
|
||||||
|
// Count statuses
|
||||||
|
println!("Number of statuses: {}", data.statuses.len());
|
||||||
|
|
||||||
|
// Check what fields are in the first status
|
||||||
|
if let Some(first) = data.statuses.first() {
|
||||||
|
// Let's serialize just the first status to see what fields are included
|
||||||
|
let first_json = serde_json::to_string_pretty(first).unwrap();
|
||||||
|
println!("First status (pretty):\n{}", first_json);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,14 +1,32 @@
|
|||||||
|
|
||||||
# Add executable targets
|
# Add executable targets
|
||||||
add_executable(benchmark_serialization_twitter benchmark_serialization_twitter.cpp)
|
add_executable(benchmark_serialization_twitter benchmark_serialization_twitter.cpp)
|
||||||
|
add_executable(benchmark_parsing_twitter benchmark_parsing_twitter.cpp)
|
||||||
|
|
||||||
if(TARGET serde-benchmark)
|
if(TARGET serde-benchmark)
|
||||||
message(STATUS "serde-benchmark target was created. Linking benchmarks and serde-benchmark.")
|
message(STATUS "serde-benchmark target was created. Linking benchmarks and serde-benchmark.")
|
||||||
target_link_libraries(benchmark_serialization_twitter PRIVATE serde-benchmark)
|
target_link_libraries(benchmark_serialization_twitter PRIVATE serde-benchmark)
|
||||||
|
target_link_libraries(benchmark_parsing_twitter PRIVATE serde-benchmark)
|
||||||
target_compile_definitions(benchmark_serialization_twitter PRIVATE SIMDJSON_RUST_VERSION="${Rust_VERSION}")
|
target_compile_definitions(benchmark_serialization_twitter PRIVATE SIMDJSON_RUST_VERSION="${Rust_VERSION}")
|
||||||
|
target_compile_definitions(benchmark_parsing_twitter PRIVATE SIMDJSON_RUST_VERSION="${Rust_VERSION}")
|
||||||
endif()
|
endif()
|
||||||
target_link_libraries(benchmark_serialization_twitter PRIVATE simdjson::simdjson nlohmann_json)
|
target_link_libraries(benchmark_serialization_twitter PRIVATE simdjson::simdjson nlohmann_json)
|
||||||
target_link_libraries(benchmark_serialization_twitter PRIVATE reflectcpp)
|
target_link_libraries(benchmark_serialization_twitter PRIVATE reflectcpp)
|
||||||
target_compile_definitions(benchmark_serialization_twitter PRIVATE SIMDJSON_BENCH_CPP_REFLECT=1)
|
target_compile_definitions(benchmark_serialization_twitter PRIVATE SIMDJSON_BENCH_CPP_REFLECT=1)
|
||||||
|
|
||||||
target_compile_definitions(benchmark_serialization_twitter PRIVATE JSON_FILE="${EXAMPLE_JSON}")
|
target_link_libraries(benchmark_parsing_twitter PRIVATE simdjson::simdjson nlohmann_json)
|
||||||
|
|
||||||
|
if(TARGET rapidjson)
|
||||||
|
target_link_libraries(benchmark_parsing_twitter PRIVATE rapidjson)
|
||||||
|
target_compile_definitions(benchmark_parsing_twitter PRIVATE SIMDJSON_COMPETITION_RAPIDJSON)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(TARGET yyjson)
|
||||||
|
target_link_libraries(benchmark_parsing_twitter PRIVATE yyjson)
|
||||||
|
target_compile_definitions(benchmark_parsing_twitter PRIVATE SIMDJSON_COMPETITION_YYJSON)
|
||||||
|
target_link_libraries(benchmark_serialization_twitter PRIVATE yyjson)
|
||||||
|
target_compile_definitions(benchmark_serialization_twitter PRIVATE SIMDJSON_COMPETITION_YYJSON)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
target_compile_definitions(benchmark_serialization_twitter PRIVATE JSON_FILE="${EXAMPLE_JSON}")
|
||||||
|
target_compile_definitions(benchmark_parsing_twitter PRIVATE JSON_FILE="${EXAMPLE_JSON}")
|
||||||
@@ -0,0 +1,232 @@
|
|||||||
|
#include <cassert>
|
||||||
|
#include <cstdlib>
|
||||||
|
#include <ctime>
|
||||||
|
#include <format>
|
||||||
|
#include <fstream>
|
||||||
|
#include <iostream>
|
||||||
|
#include <nlohmann/json.hpp>
|
||||||
|
#include <simdjson.h>
|
||||||
|
#include <string>
|
||||||
|
#include "twitter_data.h"
|
||||||
|
#include "nlohmann_twitter_data.h"
|
||||||
|
#include "../benchmark_utils/benchmark_helper.h"
|
||||||
|
#ifdef SIMDJSON_COMPETITION_RAPIDJSON
|
||||||
|
#include "rapidjson_twitter_data.h"
|
||||||
|
#endif
|
||||||
|
#ifdef SIMDJSON_COMPETITION_YYJSON
|
||||||
|
#include "yyjson_twitter_data.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef SIMDJSON_RUST_VERSION
|
||||||
|
#include "../serde-benchmark/serde_benchmark.h"
|
||||||
|
|
||||||
|
void bench_rust_parsing(const std::string &json_str) {
|
||||||
|
size_t input_volume = json_str.size();
|
||||||
|
printf("# input volume: %zu bytes\n", input_volume);
|
||||||
|
|
||||||
|
volatile bool result = true;
|
||||||
|
pretty_print(1, input_volume, "bench_rust_parsing",
|
||||||
|
bench([&json_str, &result]() {
|
||||||
|
serde_benchmark::TwitterData *td = serde_benchmark::twitter_from_str(json_str.c_str(), json_str.size());
|
||||||
|
result = (td != nullptr);
|
||||||
|
if (td) {
|
||||||
|
serde_benchmark::free_twitter(td);
|
||||||
|
}
|
||||||
|
if (!result) {
|
||||||
|
printf("parse error\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// OPTIMIZED VERSION: Reuses parser across iterations
|
||||||
|
template <class T>
|
||||||
|
void bench_simdjson_static_reflection_parsing(const std::string &json_str) {
|
||||||
|
size_t input_volume = json_str.size();
|
||||||
|
printf("# input volume: %zu bytes\n", input_volume);
|
||||||
|
|
||||||
|
// Pre-allocate padded buffer outside the benchmark loop
|
||||||
|
simdjson::padded_string padded = simdjson::padded_string(json_str);
|
||||||
|
|
||||||
|
// CRITICAL: Create parser OUTSIDE the loop for reuse
|
||||||
|
simdjson::ondemand::parser parser;
|
||||||
|
|
||||||
|
volatile bool result = true;
|
||||||
|
pretty_print(1, input_volume, "bench_simdjson_static_reflection_parsing",
|
||||||
|
bench([&padded, &result, &parser]() {
|
||||||
|
// Reuse the same parser instance
|
||||||
|
simdjson::ondemand::document doc;
|
||||||
|
if(parser.iterate(padded).get(doc)) {
|
||||||
|
result = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
T my_struct;
|
||||||
|
if(doc.get<T>().get(my_struct)) {
|
||||||
|
result = false;
|
||||||
|
}
|
||||||
|
if (!result) {
|
||||||
|
printf("parse error\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
#if SIMDJSON_STATIC_REFLECTION
|
||||||
|
template <class T>
|
||||||
|
void bench_simdjson_from_parsing(const std::string &json_str) {
|
||||||
|
size_t input_volume = json_str.size();
|
||||||
|
printf("# input volume: %zu bytes\n", input_volume);
|
||||||
|
|
||||||
|
// Pre-allocate padded buffer outside the benchmark loop
|
||||||
|
simdjson::padded_string padded = simdjson::padded_string(json_str);
|
||||||
|
|
||||||
|
volatile bool result = true;
|
||||||
|
pretty_print(1, input_volume, "bench_simdjson_from_parsing",
|
||||||
|
bench([&padded, &result]() {
|
||||||
|
T my_struct;
|
||||||
|
auto err = simdjson::from(padded).get(my_struct);
|
||||||
|
if (err) {
|
||||||
|
result = false;
|
||||||
|
printf("parse error: %s\n", simdjson::error_message(err));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void bench_nlohmann_parsing(const std::string &json_str) {
|
||||||
|
size_t input_volume = json_str.size();
|
||||||
|
printf("# input volume: %zu bytes\n", input_volume);
|
||||||
|
|
||||||
|
volatile bool result = true;
|
||||||
|
pretty_print(1, input_volume, "bench_nlohmann_parsing",
|
||||||
|
bench([&json_str, &result]() {
|
||||||
|
try {
|
||||||
|
TwitterData data = nlohmann_deserialize(json_str);
|
||||||
|
result = true;
|
||||||
|
} catch (...) {
|
||||||
|
result = false;
|
||||||
|
printf("parse error\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef SIMDJSON_COMPETITION_RAPIDJSON
|
||||||
|
void bench_rapidjson_parsing(const std::string &json_str) {
|
||||||
|
size_t input_volume = json_str.size();
|
||||||
|
printf("# input volume: %zu bytes\n", input_volume);
|
||||||
|
|
||||||
|
volatile bool result = true;
|
||||||
|
pretty_print(1, input_volume, "bench_rapidjson_parsing",
|
||||||
|
bench([&json_str, &result]() {
|
||||||
|
try {
|
||||||
|
TwitterData data = rapidjson_deserialize(json_str);
|
||||||
|
result = true;
|
||||||
|
} catch (...) {
|
||||||
|
result = false;
|
||||||
|
printf("parse error\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef SIMDJSON_COMPETITION_YYJSON
|
||||||
|
void bench_yyjson_parsing(const std::string &json_str) {
|
||||||
|
size_t input_volume = json_str.size();
|
||||||
|
printf("# input volume: %zu bytes\n", input_volume);
|
||||||
|
|
||||||
|
volatile bool result = true;
|
||||||
|
pretty_print(1, input_volume, "bench_yyjson_parsing",
|
||||||
|
bench([&json_str, &result]() {
|
||||||
|
try {
|
||||||
|
TwitterData data = yyjson_deserialize(json_str);
|
||||||
|
result = true;
|
||||||
|
} catch (...) {
|
||||||
|
result = false;
|
||||||
|
printf("parse error\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
std::string read_file(std::string filename) {
|
||||||
|
printf("# Reading file %s\n", filename.c_str());
|
||||||
|
constexpr size_t read_size = 4096;
|
||||||
|
auto stream = std::ifstream(filename.c_str());
|
||||||
|
stream.exceptions(std::ios_base::badbit);
|
||||||
|
std::string out;
|
||||||
|
std::string buf(read_size, '\0');
|
||||||
|
while (stream.read(&buf[0], read_size)) {
|
||||||
|
out.append(buf, 0, size_t(stream.gcount()));
|
||||||
|
}
|
||||||
|
out.append(buf, 0, size_t(stream.gcount()));
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Function to check if benchmark name matches any of the comma-separated filters
|
||||||
|
bool matches_filter(const std::string& benchmark_name, const std::string& filter) {
|
||||||
|
if (filter.empty()) return true;
|
||||||
|
|
||||||
|
// Split filter by comma
|
||||||
|
size_t start = 0;
|
||||||
|
size_t end = filter.find(',');
|
||||||
|
while (end != std::string::npos) {
|
||||||
|
std::string token = filter.substr(start, end - start);
|
||||||
|
if (benchmark_name.find(token) != std::string::npos) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
start = end + 1;
|
||||||
|
end = filter.find(',', start);
|
||||||
|
}
|
||||||
|
// Check last token
|
||||||
|
std::string token = filter.substr(start);
|
||||||
|
return benchmark_name.find(token) != std::string::npos;
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char* argv[]) {
|
||||||
|
std::string filter;
|
||||||
|
|
||||||
|
// Parse command-line arguments
|
||||||
|
for (int i = 1; i < argc; ++i) {
|
||||||
|
if (strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "--filter") == 0) {
|
||||||
|
if (i + 1 < argc) {
|
||||||
|
filter = argv[++i];
|
||||||
|
} else {
|
||||||
|
std::cerr << "Error: -f/--filter requires an argument" << std::endl;
|
||||||
|
return EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load the JSON data
|
||||||
|
std::string json_str = read_file(JSON_FILE);
|
||||||
|
|
||||||
|
// Benchmarking the parsing
|
||||||
|
if (matches_filter("nlohmann", filter)) {
|
||||||
|
bench_nlohmann_parsing(json_str);
|
||||||
|
}
|
||||||
|
#ifdef SIMDJSON_COMPETITION_RAPIDJSON
|
||||||
|
if (matches_filter("rapidjson", filter)) {
|
||||||
|
bench_rapidjson_parsing(json_str);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#ifdef SIMDJSON_COMPETITION_YYJSON
|
||||||
|
if (matches_filter("yyjson", filter)) {
|
||||||
|
bench_yyjson_parsing(json_str);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
if (matches_filter("simdjson_static_reflection", filter)) {
|
||||||
|
bench_simdjson_static_reflection_parsing<TwitterData>(json_str);
|
||||||
|
}
|
||||||
|
#if SIMDJSON_STATIC_REFLECTION
|
||||||
|
if (matches_filter("simdjson_from", filter)) {
|
||||||
|
bench_simdjson_from_parsing<TwitterData>(json_str);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#ifdef SIMDJSON_RUST_VERSION
|
||||||
|
if (matches_filter("rust", filter)) {
|
||||||
|
printf("# Note: Rust/Serde parsing test\n");
|
||||||
|
bench_rust_parsing(json_str);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return EXIT_SUCCESS;
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
#include <chrono>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
#include <format>
|
#include <format>
|
||||||
@@ -10,6 +11,9 @@
|
|||||||
#include "twitter_data.h"
|
#include "twitter_data.h"
|
||||||
#include "nlohmann_twitter_data.h"
|
#include "nlohmann_twitter_data.h"
|
||||||
#include "../benchmark_utils/benchmark_helper.h"
|
#include "../benchmark_utils/benchmark_helper.h"
|
||||||
|
#ifdef SIMDJSON_COMPETITION_YYJSON
|
||||||
|
#include "yyjson_twitter_data.h"
|
||||||
|
#endif
|
||||||
#if SIMDJSON_BENCH_CPP_REFLECT
|
#if SIMDJSON_BENCH_CPP_REFLECT
|
||||||
#include <rfl.hpp>
|
#include <rfl.hpp>
|
||||||
#include <rfl/json.hpp>
|
#include <rfl/json.hpp>
|
||||||
@@ -35,19 +39,49 @@ void bench_reflect_cpp(TwitterData &data) {
|
|||||||
|
|
||||||
|
|
||||||
void bench_rust(serde_benchmark::TwitterData *data) {
|
void bench_rust(serde_benchmark::TwitterData *data) {
|
||||||
const char * output = serde_benchmark::str_from_twitter(data);
|
serde_benchmark::set_twitter_data(data);
|
||||||
size_t output_volume = strlen(output);
|
size_t output_volume = serde_benchmark::serialize_twitter_to_string();
|
||||||
printf("# output volume: %zu bytes\n", output_volume);
|
printf("# output volume: %zu bytes\n", output_volume);
|
||||||
|
|
||||||
volatile size_t measured_volume = 0;
|
volatile size_t measured_volume = 0;
|
||||||
pretty_print(1, output_volume, "bench_rust",
|
pretty_print(1, output_volume, "bench_rust",
|
||||||
bench([&data, &measured_volume, &output_volume]() {
|
bench([&measured_volume, &output_volume]() {
|
||||||
const char * output = serde_benchmark::str_from_twitter(data);
|
measured_volume = serde_benchmark::serialize_twitter_to_string();
|
||||||
serde_benchmark::free_string(output);
|
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Fair allocation variant: allocates fresh buffer each iteration (matches other libraries)
|
||||||
template <class T> void bench_simdjson_static_reflection(T &data) {
|
template <class T> void bench_simdjson_static_reflection(T &data) {
|
||||||
|
// First run to determine expected size
|
||||||
|
simdjson::builder::string_builder sb_init;
|
||||||
|
simdjson::builder::append(sb_init, data);
|
||||||
|
std::string_view p_init;
|
||||||
|
if(sb_init.view().get(p_init)) {
|
||||||
|
std::cerr << "Error!" << std::endl;
|
||||||
|
}
|
||||||
|
size_t output_volume = p_init.size();
|
||||||
|
printf("# output volume: %zu bytes\n", output_volume);
|
||||||
|
|
||||||
|
volatile size_t measured_volume = 0;
|
||||||
|
pretty_print(sizeof(data), output_volume, "bench_simdjson_static_reflection",
|
||||||
|
bench([&data, &measured_volume, &output_volume]() {
|
||||||
|
// Fresh allocation each iteration - fair comparison
|
||||||
|
simdjson::builder::string_builder sb;
|
||||||
|
simdjson::builder::append(sb, data);
|
||||||
|
std::string_view p;
|
||||||
|
if(sb.view().get(p)) {
|
||||||
|
std::cerr << "Error!" << std::endl;
|
||||||
|
}
|
||||||
|
measured_volume = sb.size();
|
||||||
|
if (measured_volume != output_volume) {
|
||||||
|
printf("mismatch\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Optimized variant: reuses buffer across iterations (shows API potential)
|
||||||
|
template <class T> void bench_simdjson_static_reflection_reuse(T &data) {
|
||||||
simdjson::builder::string_builder sb;
|
simdjson::builder::string_builder sb;
|
||||||
simdjson::builder::append(sb, data);
|
simdjson::builder::append(sb, data);
|
||||||
std::string_view p;
|
std::string_view p;
|
||||||
@@ -59,7 +93,7 @@ template <class T> void bench_simdjson_static_reflection(T &data) {
|
|||||||
printf("# output volume: %zu bytes\n", output_volume);
|
printf("# output volume: %zu bytes\n", output_volume);
|
||||||
|
|
||||||
volatile size_t measured_volume = 0;
|
volatile size_t measured_volume = 0;
|
||||||
pretty_print(sizeof(data), output_volume, "bench_simdjson_static_reflection",
|
pretty_print(sizeof(data), output_volume, "bench_simdjson_reuse_buffer",
|
||||||
bench([&data, &measured_volume, &output_volume, &sb]() {
|
bench([&data, &measured_volume, &output_volume, &sb]() {
|
||||||
sb.clear();
|
sb.clear();
|
||||||
simdjson::builder::append(sb, data);
|
simdjson::builder::append(sb, data);
|
||||||
@@ -74,6 +108,63 @@ template <class T> void bench_simdjson_static_reflection(T &data) {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if SIMDJSON_STATIC_REFLECTION
|
||||||
|
// Fair allocation variant: allocates fresh string each iteration
|
||||||
|
template <class T> void bench_simdjson_to(T &data) {
|
||||||
|
// First run to determine size
|
||||||
|
std::string output_init;
|
||||||
|
if (simdjson::error_code err = simdjson::builder::to_json(data, output_init); err) {
|
||||||
|
std::cerr << "Error in to_json initialization!" << simdjson::error_message(err) << std::endl;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
size_t output_volume = output_init.size();
|
||||||
|
printf("# output volume: %zu bytes\n", output_volume);
|
||||||
|
|
||||||
|
volatile size_t measured_volume = 0;
|
||||||
|
pretty_print(sizeof(data), output_volume, "bench_simdjson_to",
|
||||||
|
bench([&data, &measured_volume, &output_volume]() {
|
||||||
|
// Fresh allocation each iteration - fair comparison
|
||||||
|
std::string output;
|
||||||
|
if (simdjson::error_code err = simdjson::builder::to_json(data, output); err) {
|
||||||
|
std::cerr << "Error in to_json!" << simdjson::error_message(err) << std::endl;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
measured_volume = output.size();
|
||||||
|
if (measured_volume != output_volume) {
|
||||||
|
printf("mismatch\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Optimized variant: reuses pre-allocated string
|
||||||
|
template <class T> void bench_simdjson_to_reuse(T &data) {
|
||||||
|
std::string output;
|
||||||
|
if (simdjson::error_code err = simdjson::builder::to_json(data, output); err) {
|
||||||
|
std::cerr << "Error in to_json initialization!" << simdjson::error_message(err) << std::endl;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
size_t output_volume = output.size();
|
||||||
|
printf("# output volume: %zu bytes\n", output_volume);
|
||||||
|
|
||||||
|
// Pre-allocate string with sufficient capacity to avoid reallocation
|
||||||
|
output.reserve(output_volume * 2);
|
||||||
|
|
||||||
|
volatile size_t measured_volume = 0;
|
||||||
|
pretty_print(sizeof(data), output_volume, "bench_simdjson_to_reuse",
|
||||||
|
bench([&data, &measured_volume, &output_volume, &output]() {
|
||||||
|
// Reuse the pre-allocated string - avoids allocation
|
||||||
|
if (simdjson::error_code err = simdjson::builder::to_json(data, output); err) {
|
||||||
|
std::cerr << "Error in to_json!" << simdjson::error_message(err) << std::endl;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
measured_volume = output.size();
|
||||||
|
if (measured_volume != output_volume) {
|
||||||
|
printf("mismatch\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void bench_nlohmann(TwitterData &data) {
|
void bench_nlohmann(TwitterData &data) {
|
||||||
std::string output = nlohmann_serialize(data);
|
std::string output = nlohmann_serialize(data);
|
||||||
size_t output_volume = output.size();
|
size_t output_volume = output.size();
|
||||||
@@ -90,28 +181,61 @@ void bench_nlohmann(TwitterData &data) {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef SIMDJSON_COMPETITION_YYJSON
|
||||||
|
void bench_yyjson(TwitterData &data) {
|
||||||
|
std::string output = yyjson_serialize(data);
|
||||||
|
size_t output_volume = output.size();
|
||||||
|
printf("# output volume: %zu bytes\n", output_volume);
|
||||||
|
|
||||||
|
volatile size_t measured_volume = 0;
|
||||||
|
pretty_print(1, output_volume, "bench_yyjson",
|
||||||
|
bench([&data, &measured_volume, &output_volume]() {
|
||||||
|
std::string output = yyjson_serialize(data);
|
||||||
|
measured_volume = output.size();
|
||||||
|
if (measured_volume != output_volume) {
|
||||||
|
printf("mismatch\n");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp) {
|
size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp) {
|
||||||
((std::string *)userp)->append((char *)contents, size * nmemb);
|
((std::string *)userp)->append((char *)contents, size * nmemb);
|
||||||
return size * nmemb;
|
return size * nmemb;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string read_file(std::string filename) {
|
simdjson::padded_string read_file(std::string filename) {
|
||||||
printf("# Reading file %s\n", filename.c_str());
|
printf("# Reading file %s\n", filename.c_str());
|
||||||
constexpr size_t read_size = 4096;
|
constexpr size_t read_size = 4096;
|
||||||
auto stream = std::ifstream(filename.c_str());
|
auto stream = std::ifstream(filename.c_str());
|
||||||
stream.exceptions(std::ios_base::badbit);
|
stream.exceptions(std::ios_base::badbit);
|
||||||
std::string out;
|
simdjson::padded_string_builder builder;
|
||||||
std::string buf(read_size, '\0');
|
std::string buf(read_size, '\0');
|
||||||
while (stream.read(&buf[0], read_size)) {
|
while (stream.read(&buf[0], read_size)) {
|
||||||
out.append(buf, 0, size_t(stream.gcount()));
|
builder.append(buf.data(), size_t(stream.gcount()));
|
||||||
}
|
}
|
||||||
out.append(buf, 0, size_t(stream.gcount()));
|
builder.append(buf.data(), size_t(stream.gcount()));
|
||||||
return out;
|
return builder.convert();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Function to check if benchmark name contains filter substring
|
// Function to check if benchmark name matches any of the comma-separated filters
|
||||||
bool matches_filter(const std::string& benchmark_name, const std::string& filter) {
|
bool matches_filter(const std::string& benchmark_name, const std::string& filter) {
|
||||||
return filter.empty() || benchmark_name.find(filter) != std::string::npos;
|
if (filter.empty()) return true;
|
||||||
|
|
||||||
|
// Split filter by comma
|
||||||
|
size_t start = 0;
|
||||||
|
size_t end = filter.find(',');
|
||||||
|
while (end != std::string::npos) {
|
||||||
|
std::string token = filter.substr(start, end - start);
|
||||||
|
if (benchmark_name.find(token) != std::string::npos) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
start = end + 1;
|
||||||
|
end = filter.find(',', start);
|
||||||
|
}
|
||||||
|
// Check last token
|
||||||
|
std::string token = filter.substr(start);
|
||||||
|
return benchmark_name.find(token) != std::string::npos;
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
int main(int argc, char* argv[]) {
|
||||||
@@ -129,12 +253,12 @@ int main(int argc, char* argv[]) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Testing correctness of round-trip (serialization + deserialization)
|
// Testing correctness of round-trip (serialization + deserialization)
|
||||||
std::string json_str = read_file(JSON_FILE);
|
simdjson::padded_string json_str = read_file(JSON_FILE);
|
||||||
|
|
||||||
// Loading up the data into a structure.
|
// Loading up the data into a structure.
|
||||||
simdjson::ondemand::parser parser;
|
simdjson::ondemand::parser parser;
|
||||||
simdjson::ondemand::document doc;
|
simdjson::ondemand::document doc;
|
||||||
if(parser.iterate(simdjson::pad(json_str)).get(doc)) {
|
if(parser.iterate(json_str).get(doc)) {
|
||||||
std::cerr << "Error loading the document!" << std::endl;
|
std::cerr << "Error loading the document!" << std::endl;
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
@@ -145,18 +269,41 @@ int main(int argc, char* argv[]) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Benchmarking the serialization
|
// Benchmarking the serialization
|
||||||
|
// Note: simdjson benchmarks include both "fair" (fresh allocation) and "reuse" (buffer reuse) variants
|
||||||
|
// The "fair" variants allocate fresh memory each iteration, matching other libraries' behavior
|
||||||
|
// The "reuse" variants demonstrate the API's potential when buffer reuse is possible
|
||||||
|
|
||||||
if (matches_filter("nlohmann", filter)) {
|
if (matches_filter("nlohmann", filter)) {
|
||||||
bench_nlohmann(my_struct);
|
bench_nlohmann(my_struct);
|
||||||
}
|
}
|
||||||
|
#ifdef SIMDJSON_COMPETITION_YYJSON
|
||||||
|
if (matches_filter("yyjson", filter)) {
|
||||||
|
bench_yyjson(my_struct);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
if (matches_filter("simdjson_static_reflection", filter)) {
|
if (matches_filter("simdjson_static_reflection", filter)) {
|
||||||
bench_simdjson_static_reflection(my_struct);
|
bench_simdjson_static_reflection(my_struct);
|
||||||
}
|
}
|
||||||
|
if (matches_filter("simdjson_reuse", filter)) {
|
||||||
|
bench_simdjson_static_reflection_reuse(my_struct);
|
||||||
|
}
|
||||||
|
#if SIMDJSON_STATIC_REFLECTION
|
||||||
|
if (matches_filter("simdjson_to", filter)) {
|
||||||
|
bench_simdjson_to(my_struct);
|
||||||
|
}
|
||||||
|
if (matches_filter("simdjson_to_reuse", filter)) {
|
||||||
|
bench_simdjson_to_reuse(my_struct);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
#ifdef SIMDJSON_RUST_VERSION
|
#ifdef SIMDJSON_RUST_VERSION
|
||||||
if (matches_filter("rust", filter)) {
|
if (matches_filter("rust", filter)) {
|
||||||
printf("# WARNING: The Rust benchmark may not be directly comparable since it does not use an equivalent data structure.\n");
|
serde_benchmark::TwitterData * td = serde_benchmark::twitter_from_str(json_str.data(), json_str.size());
|
||||||
serde_benchmark::TwitterData * td = serde_benchmark::twitter_from_str(json_str.c_str(), json_str.size());
|
if (td == nullptr) {
|
||||||
bench_rust(td);
|
printf("# Failed to parse Twitter data for Rust benchmark\n");
|
||||||
serde_benchmark::free_twitter(td);
|
} else {
|
||||||
|
bench_rust(td);
|
||||||
|
serde_benchmark::free_twitter(td);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if SIMDJSON_BENCH_CPP_REFLECT
|
#if SIMDJSON_BENCH_CPP_REFLECT
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
#include "twitter_data.h"
|
#include "twitter_data.h"
|
||||||
#include <nlohmann/json.hpp>
|
#include <nlohmann/json.hpp>
|
||||||
|
|
||||||
|
// Serialization functions for nlohmann
|
||||||
void to_json(nlohmann::json &j, const User &u) {
|
void to_json(nlohmann::json &j, const User &u) {
|
||||||
j = nlohmann::json{{"id", u.id},
|
j = nlohmann::json{{"id", u.id},
|
||||||
{"name", u.name},
|
{"name", u.name},
|
||||||
@@ -16,101 +17,54 @@ void to_json(nlohmann::json &j, const User &u) {
|
|||||||
{"statuses_count", u.statuses_count}};
|
{"statuses_count", u.statuses_count}};
|
||||||
}
|
}
|
||||||
|
|
||||||
void to_json(nlohmann::json &j, const Hashtag &h) {
|
|
||||||
j = nlohmann::json{{"text", h.text},
|
|
||||||
{"indices_start", h.indices_start},
|
|
||||||
{"indices_end", h.indices_end}};
|
|
||||||
}
|
|
||||||
|
|
||||||
void to_json(nlohmann::json &j, const Url &u) {
|
|
||||||
j = nlohmann::json{{"url", u.url},
|
|
||||||
{"expanded_url", u.expanded_url},
|
|
||||||
{"display_url", u.display_url},
|
|
||||||
{"indices_start", u.indices_start},
|
|
||||||
{"indices_end", u.indices_end}};
|
|
||||||
}
|
|
||||||
|
|
||||||
void to_json(nlohmann::json &j, const UserMention &um) {
|
|
||||||
j = nlohmann::json{{"id", um.id},
|
|
||||||
{"name", um.name},
|
|
||||||
{"screen_name", um.screen_name},
|
|
||||||
{"indices_start", um.indices_start},
|
|
||||||
{"indices_end", um.indices_end}};
|
|
||||||
}
|
|
||||||
|
|
||||||
void to_json(nlohmann::json &j, const Entities &e) {
|
|
||||||
j = nlohmann::json{{"hashtags", e.hashtags},
|
|
||||||
{"urls", e.urls},
|
|
||||||
{"user_mentions", e.user_mentions}};
|
|
||||||
}
|
|
||||||
|
|
||||||
void to_json(nlohmann::json &j, const Status &s) {
|
void to_json(nlohmann::json &j, const Status &s) {
|
||||||
j = nlohmann::json{{"created_at", s.created_at},
|
j = nlohmann::json{{"created_at", s.created_at},
|
||||||
{"id", s.id},
|
{"id", s.id},
|
||||||
{"text", s.text},
|
{"text", s.text},
|
||||||
{"user", s.user},
|
{"user", s.user},
|
||||||
{"entities", s.entities},
|
|
||||||
{"retweet_count", s.retweet_count},
|
{"retweet_count", s.retweet_count},
|
||||||
{"favorite_count", s.favorite_count},
|
{"favorite_count", s.favorite_count}};
|
||||||
{"favorited", s.favorited},
|
|
||||||
{"retweeted", s.retweeted}};
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
std::string nlohmann_serialize(const std::vector<Hashtag>& v) {
|
|
||||||
nlohmann::json a = nlohmann::json::array();
|
|
||||||
for(const Hashtag & h : v) {
|
|
||||||
a.push_back(nlohmann::json{{"text", h.text},
|
|
||||||
{"indices_start", h.indices_start},
|
|
||||||
{"indices_end", h.indices_end}});
|
|
||||||
}
|
|
||||||
return a.dump();
|
|
||||||
}
|
|
||||||
std::string nlohmann_serialize(const std::vector<Url>& v) {
|
|
||||||
nlohmann::json a = nlohmann::json::array();
|
|
||||||
for(const Url & u : v) {
|
|
||||||
a.push_back(nlohmann::json{{"url", u.url},
|
|
||||||
{"expanded_url", u.expanded_url},
|
|
||||||
{"display_url", u.display_url},
|
|
||||||
{"indices_start", u.indices_start},
|
|
||||||
{"indices_end", u.indices_end}});
|
|
||||||
}
|
|
||||||
return a.dump();
|
|
||||||
}
|
|
||||||
std::string nlohmann_serialize(const std::vector<UserMention>& v) {
|
|
||||||
nlohmann::json a = nlohmann::json::array();
|
|
||||||
for(const UserMention & um : v) {
|
|
||||||
a.push_back(nlohmann::json{{"id", um.id},
|
|
||||||
{"name", um.name},
|
|
||||||
{"screen_name", um.screen_name},
|
|
||||||
{"indices_start", um.indices_start},
|
|
||||||
{"indices_end", um.indices_end}});
|
|
||||||
}
|
|
||||||
return a.dump();
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string nlohmann_serialize(const std::vector<Status>& v) {
|
|
||||||
nlohmann::json a = nlohmann::json::array();
|
|
||||||
for(const Status & s : v) {
|
|
||||||
a.push_back(nlohmann::json{{"created_at", s.created_at},
|
|
||||||
{"id", s.id},
|
|
||||||
{"text", s.text},
|
|
||||||
{"user", s.user},
|
|
||||||
{"entities", s.entities},
|
|
||||||
{"retweet_count", s.retweet_count},
|
|
||||||
{"favorite_count", s.favorite_count},
|
|
||||||
{"favorited", s.favorited},
|
|
||||||
{"retweeted", s.retweeted}});
|
|
||||||
}
|
|
||||||
return a.dump();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void to_json(nlohmann::json &j, const TwitterData &t) {
|
void to_json(nlohmann::json &j, const TwitterData &t) {
|
||||||
j = nlohmann::json{{"statuses", t.statuses}};
|
j = nlohmann::json{{"statuses", t.statuses}};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Deserialization functions for nlohmann
|
||||||
|
void from_json(const nlohmann::json &j, User &u) {
|
||||||
|
j.at("id").get_to(u.id);
|
||||||
|
j.at("name").get_to(u.name);
|
||||||
|
j.at("screen_name").get_to(u.screen_name);
|
||||||
|
j.at("location").get_to(u.location);
|
||||||
|
j.at("description").get_to(u.description);
|
||||||
|
j.at("verified").get_to(u.verified);
|
||||||
|
j.at("followers_count").get_to(u.followers_count);
|
||||||
|
j.at("friends_count").get_to(u.friends_count);
|
||||||
|
j.at("statuses_count").get_to(u.statuses_count);
|
||||||
|
}
|
||||||
|
|
||||||
|
void from_json(const nlohmann::json &j, Status &s) {
|
||||||
|
j.at("created_at").get_to(s.created_at);
|
||||||
|
j.at("id").get_to(s.id);
|
||||||
|
j.at("text").get_to(s.text);
|
||||||
|
j.at("user").get_to(s.user);
|
||||||
|
j.at("retweet_count").get_to(s.retweet_count);
|
||||||
|
j.at("favorite_count").get_to(s.favorite_count);
|
||||||
|
}
|
||||||
|
|
||||||
|
void from_json(const nlohmann::json &j, TwitterData &t) {
|
||||||
|
j.at("statuses").get_to(t.statuses);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Helper functions for benchmarking
|
||||||
std::string nlohmann_serialize(const TwitterData &data) {
|
std::string nlohmann_serialize(const TwitterData &data) {
|
||||||
return nlohmann_serialize(data.statuses);
|
nlohmann::json j = data;
|
||||||
|
return j.dump();
|
||||||
|
}
|
||||||
|
|
||||||
|
TwitterData nlohmann_deserialize(const std::string &json_str) {
|
||||||
|
nlohmann::json j = nlohmann::json::parse(json_str);
|
||||||
|
return j.get<TwitterData>();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // NLOHMANN_TWITTER_DATA_H
|
#endif // NLOHMANN_TWITTER_DATA_H
|
||||||
@@ -0,0 +1,142 @@
|
|||||||
|
#ifndef RAPIDJSON_TWITTER_DATA_H
|
||||||
|
#define RAPIDJSON_TWITTER_DATA_H
|
||||||
|
|
||||||
|
#include "twitter_data.h"
|
||||||
|
#include <rapidjson/document.h>
|
||||||
|
#include <rapidjson/writer.h>
|
||||||
|
#include <rapidjson/stringbuffer.h>
|
||||||
|
#include <rapidjson/error/en.h>
|
||||||
|
|
||||||
|
using namespace rapidjson;
|
||||||
|
|
||||||
|
// RapidJSON deserialization for simplified Twitter data
|
||||||
|
TwitterData rapidjson_deserialize(const std::string& json_str) {
|
||||||
|
Document doc;
|
||||||
|
doc.Parse(json_str.c_str());
|
||||||
|
|
||||||
|
if (doc.HasParseError()) {
|
||||||
|
throw std::runtime_error("RapidJSON parse error");
|
||||||
|
}
|
||||||
|
|
||||||
|
TwitterData data;
|
||||||
|
|
||||||
|
if (!doc.HasMember("statuses") || !doc["statuses"].IsArray()) {
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
const Value& statuses = doc["statuses"];
|
||||||
|
data.statuses.reserve(statuses.Size());
|
||||||
|
|
||||||
|
for (SizeType i = 0; i < statuses.Size(); i++) {
|
||||||
|
const Value& status_json = statuses[i];
|
||||||
|
Status status;
|
||||||
|
|
||||||
|
// Parse status fields
|
||||||
|
if (status_json.HasMember("created_at") && status_json["created_at"].IsString())
|
||||||
|
status.created_at = status_json["created_at"].GetString();
|
||||||
|
if (status_json.HasMember("id") && status_json["id"].IsUint64())
|
||||||
|
status.id = status_json["id"].GetUint64();
|
||||||
|
if (status_json.HasMember("text") && status_json["text"].IsString())
|
||||||
|
status.text = status_json["text"].GetString();
|
||||||
|
if (status_json.HasMember("retweet_count") && status_json["retweet_count"].IsUint64())
|
||||||
|
status.retweet_count = status_json["retweet_count"].GetUint64();
|
||||||
|
if (status_json.HasMember("favorite_count") && status_json["favorite_count"].IsUint64())
|
||||||
|
status.favorite_count = status_json["favorite_count"].GetUint64();
|
||||||
|
|
||||||
|
// Parse user
|
||||||
|
if (status_json.HasMember("user") && status_json["user"].IsObject()) {
|
||||||
|
const Value& user_json = status_json["user"];
|
||||||
|
User user;
|
||||||
|
|
||||||
|
if (user_json.HasMember("id") && user_json["id"].IsUint64())
|
||||||
|
user.id = user_json["id"].GetUint64();
|
||||||
|
if (user_json.HasMember("name") && user_json["name"].IsString())
|
||||||
|
user.name = user_json["name"].GetString();
|
||||||
|
if (user_json.HasMember("screen_name") && user_json["screen_name"].IsString())
|
||||||
|
user.screen_name = user_json["screen_name"].GetString();
|
||||||
|
if (user_json.HasMember("location") && user_json["location"].IsString())
|
||||||
|
user.location = user_json["location"].GetString();
|
||||||
|
if (user_json.HasMember("description") && user_json["description"].IsString())
|
||||||
|
user.description = user_json["description"].GetString();
|
||||||
|
if (user_json.HasMember("verified") && user_json["verified"].IsBool())
|
||||||
|
user.verified = user_json["verified"].GetBool();
|
||||||
|
if (user_json.HasMember("followers_count") && user_json["followers_count"].IsUint64())
|
||||||
|
user.followers_count = user_json["followers_count"].GetUint64();
|
||||||
|
if (user_json.HasMember("friends_count") && user_json["friends_count"].IsUint64())
|
||||||
|
user.friends_count = user_json["friends_count"].GetUint64();
|
||||||
|
if (user_json.HasMember("statuses_count") && user_json["statuses_count"].IsUint64())
|
||||||
|
user.statuses_count = user_json["statuses_count"].GetUint64();
|
||||||
|
|
||||||
|
status.user = user;
|
||||||
|
}
|
||||||
|
|
||||||
|
data.statuses.push_back(status);
|
||||||
|
}
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
// RapidJSON serialization for simplified Twitter data
|
||||||
|
std::string rapidjson_serialize(const TwitterData& data) {
|
||||||
|
Document doc;
|
||||||
|
doc.SetObject();
|
||||||
|
Document::AllocatorType& allocator = doc.GetAllocator();
|
||||||
|
|
||||||
|
Value statuses_array(kArrayType);
|
||||||
|
|
||||||
|
for (const auto& status : data.statuses) {
|
||||||
|
Value status_obj(kObjectType);
|
||||||
|
|
||||||
|
Value created_at;
|
||||||
|
created_at.SetString(status.created_at.c_str(), allocator);
|
||||||
|
status_obj.AddMember("created_at", created_at, allocator);
|
||||||
|
|
||||||
|
status_obj.AddMember("id", status.id, allocator);
|
||||||
|
|
||||||
|
Value text;
|
||||||
|
text.SetString(status.text.c_str(), allocator);
|
||||||
|
status_obj.AddMember("text", text, allocator);
|
||||||
|
|
||||||
|
// Add user
|
||||||
|
Value user_obj(kObjectType);
|
||||||
|
user_obj.AddMember("id", status.user.id, allocator);
|
||||||
|
|
||||||
|
Value name;
|
||||||
|
name.SetString(status.user.name.c_str(), allocator);
|
||||||
|
user_obj.AddMember("name", name, allocator);
|
||||||
|
|
||||||
|
Value screen_name;
|
||||||
|
screen_name.SetString(status.user.screen_name.c_str(), allocator);
|
||||||
|
user_obj.AddMember("screen_name", screen_name, allocator);
|
||||||
|
|
||||||
|
Value location;
|
||||||
|
location.SetString(status.user.location.c_str(), allocator);
|
||||||
|
user_obj.AddMember("location", location, allocator);
|
||||||
|
|
||||||
|
Value description;
|
||||||
|
description.SetString(status.user.description.c_str(), allocator);
|
||||||
|
user_obj.AddMember("description", description, allocator);
|
||||||
|
|
||||||
|
user_obj.AddMember("verified", status.user.verified, allocator);
|
||||||
|
user_obj.AddMember("followers_count", status.user.followers_count, allocator);
|
||||||
|
user_obj.AddMember("friends_count", status.user.friends_count, allocator);
|
||||||
|
user_obj.AddMember("statuses_count", status.user.statuses_count, allocator);
|
||||||
|
|
||||||
|
status_obj.AddMember("user", user_obj, allocator);
|
||||||
|
|
||||||
|
status_obj.AddMember("retweet_count", status.retweet_count, allocator);
|
||||||
|
status_obj.AddMember("favorite_count", status.favorite_count, allocator);
|
||||||
|
|
||||||
|
statuses_array.PushBack(status_obj, allocator);
|
||||||
|
}
|
||||||
|
|
||||||
|
doc.AddMember("statuses", statuses_array, allocator);
|
||||||
|
|
||||||
|
StringBuffer buffer;
|
||||||
|
Writer<StringBuffer> writer(buffer);
|
||||||
|
doc.Accept(writer);
|
||||||
|
|
||||||
|
return buffer.GetString();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // RAPIDJSON_TWITTER_DATA_H
|
||||||
@@ -4,68 +4,31 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
// Simplified Twitter structures for benchmarking
|
||||||
|
|
||||||
struct User {
|
struct User {
|
||||||
int64_t id;
|
uint64_t id;
|
||||||
std::string id_str;
|
|
||||||
std::string name;
|
std::string name;
|
||||||
std::string screen_name;
|
std::string screen_name;
|
||||||
std::string location;
|
std::string location;
|
||||||
std::string description;
|
std::string description;
|
||||||
bool verified;
|
bool verified;
|
||||||
int64_t followers_count;
|
uint64_t followers_count;
|
||||||
int64_t friends_count;
|
uint64_t friends_count;
|
||||||
int64_t statuses_count;
|
uint64_t statuses_count;
|
||||||
bool operator<=>(const User &other) const = default;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct Hashtag {
|
|
||||||
std::string text;
|
|
||||||
int64_t indices_start;
|
|
||||||
int64_t indices_end;
|
|
||||||
bool operator<=>(const Hashtag &other) const = default;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct Url {
|
|
||||||
std::string url;
|
|
||||||
std::string expanded_url;
|
|
||||||
std::string display_url;
|
|
||||||
int64_t indices_start;
|
|
||||||
int64_t indices_end;
|
|
||||||
bool operator<=>(const Url &other) const = default;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct UserMention {
|
|
||||||
int64_t id;
|
|
||||||
std::string name;
|
|
||||||
std::string screen_name;
|
|
||||||
int64_t indices_start;
|
|
||||||
int64_t indices_end;
|
|
||||||
bool operator<=>(const UserMention &other) const = default;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct Entities {
|
|
||||||
std::vector<Hashtag> hashtags;
|
|
||||||
std::vector<Url> urls;
|
|
||||||
std::vector<UserMention> user_mentions;
|
|
||||||
bool operator==(const Entities &other) const = default;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Status {
|
struct Status {
|
||||||
std::string created_at;
|
std::string created_at;
|
||||||
int64_t id;
|
uint64_t id;
|
||||||
std::string text;
|
std::string text;
|
||||||
User user;
|
User user;
|
||||||
Entities entities;
|
uint64_t retweet_count;
|
||||||
int64_t retweet_count;
|
uint64_t favorite_count;
|
||||||
int64_t favorite_count;
|
|
||||||
bool favorited;
|
|
||||||
bool retweeted;
|
|
||||||
bool operator==(const Status &other) const = default;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct TwitterData {
|
struct TwitterData {
|
||||||
std::vector<Status> statuses;
|
std::vector<Status> statuses;
|
||||||
bool operator==(const TwitterData &other) const = default;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif // TWITTER_DATA_H
|
||||||
@@ -0,0 +1,145 @@
|
|||||||
|
#ifndef YYJSON_TWITTER_DATA_H
|
||||||
|
#define YYJSON_TWITTER_DATA_H
|
||||||
|
|
||||||
|
#include "twitter_data.h"
|
||||||
|
#include <yyjson.h>
|
||||||
|
#include <string>
|
||||||
|
#include <stdexcept>
|
||||||
|
|
||||||
|
// yyjson deserialization for simplified Twitter data
|
||||||
|
TwitterData yyjson_deserialize(const std::string &json_str) {
|
||||||
|
TwitterData data;
|
||||||
|
|
||||||
|
yyjson_doc *doc = yyjson_read(json_str.c_str(), json_str.size(), 0);
|
||||||
|
if (!doc) {
|
||||||
|
throw std::runtime_error("yyjson parse error");
|
||||||
|
}
|
||||||
|
|
||||||
|
yyjson_val *root = yyjson_doc_get_root(doc);
|
||||||
|
if (!root) {
|
||||||
|
yyjson_doc_free(doc);
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get statuses array
|
||||||
|
yyjson_val *statuses_val = yyjson_obj_get(root, "statuses");
|
||||||
|
if (!statuses_val || !yyjson_is_arr(statuses_val)) {
|
||||||
|
yyjson_doc_free(doc);
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t idx, max;
|
||||||
|
yyjson_val *status_val;
|
||||||
|
yyjson_arr_foreach(statuses_val, idx, max, status_val) {
|
||||||
|
Status status;
|
||||||
|
|
||||||
|
// Parse status fields
|
||||||
|
yyjson_val *val;
|
||||||
|
|
||||||
|
val = yyjson_obj_get(status_val, "created_at");
|
||||||
|
if (val && yyjson_is_str(val)) status.created_at = yyjson_get_str(val);
|
||||||
|
|
||||||
|
val = yyjson_obj_get(status_val, "id");
|
||||||
|
if (val && yyjson_is_uint(val)) status.id = yyjson_get_uint(val);
|
||||||
|
|
||||||
|
val = yyjson_obj_get(status_val, "text");
|
||||||
|
if (val && yyjson_is_str(val)) status.text = yyjson_get_str(val);
|
||||||
|
|
||||||
|
val = yyjson_obj_get(status_val, "retweet_count");
|
||||||
|
if (val && yyjson_is_uint(val)) status.retweet_count = yyjson_get_uint(val);
|
||||||
|
|
||||||
|
val = yyjson_obj_get(status_val, "favorite_count");
|
||||||
|
if (val && yyjson_is_uint(val)) status.favorite_count = yyjson_get_uint(val);
|
||||||
|
|
||||||
|
// Parse user
|
||||||
|
yyjson_val *user_val = yyjson_obj_get(status_val, "user");
|
||||||
|
if (user_val && yyjson_is_obj(user_val)) {
|
||||||
|
User user;
|
||||||
|
|
||||||
|
val = yyjson_obj_get(user_val, "id");
|
||||||
|
if (val && yyjson_is_uint(val)) user.id = yyjson_get_uint(val);
|
||||||
|
|
||||||
|
val = yyjson_obj_get(user_val, "name");
|
||||||
|
if (val && yyjson_is_str(val)) user.name = yyjson_get_str(val);
|
||||||
|
|
||||||
|
val = yyjson_obj_get(user_val, "screen_name");
|
||||||
|
if (val && yyjson_is_str(val)) user.screen_name = yyjson_get_str(val);
|
||||||
|
|
||||||
|
val = yyjson_obj_get(user_val, "location");
|
||||||
|
if (val && yyjson_is_str(val)) user.location = yyjson_get_str(val);
|
||||||
|
|
||||||
|
val = yyjson_obj_get(user_val, "description");
|
||||||
|
if (val && yyjson_is_str(val)) user.description = yyjson_get_str(val);
|
||||||
|
|
||||||
|
val = yyjson_obj_get(user_val, "verified");
|
||||||
|
if (val && yyjson_is_bool(val)) user.verified = yyjson_get_bool(val);
|
||||||
|
|
||||||
|
val = yyjson_obj_get(user_val, "followers_count");
|
||||||
|
if (val && yyjson_is_uint(val)) user.followers_count = yyjson_get_uint(val);
|
||||||
|
|
||||||
|
val = yyjson_obj_get(user_val, "friends_count");
|
||||||
|
if (val && yyjson_is_uint(val)) user.friends_count = yyjson_get_uint(val);
|
||||||
|
|
||||||
|
val = yyjson_obj_get(user_val, "statuses_count");
|
||||||
|
if (val && yyjson_is_uint(val)) user.statuses_count = yyjson_get_uint(val);
|
||||||
|
|
||||||
|
status.user = user;
|
||||||
|
}
|
||||||
|
|
||||||
|
data.statuses.push_back(status);
|
||||||
|
}
|
||||||
|
|
||||||
|
yyjson_doc_free(doc);
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
// yyjson serialization for simplified Twitter data
|
||||||
|
std::string yyjson_serialize(const TwitterData &data) {
|
||||||
|
yyjson_mut_doc *doc = yyjson_mut_doc_new(NULL);
|
||||||
|
yyjson_mut_val *root = yyjson_mut_obj(doc);
|
||||||
|
yyjson_mut_doc_set_root(doc, root);
|
||||||
|
|
||||||
|
// Create statuses array
|
||||||
|
yyjson_mut_val *statuses_array = yyjson_mut_arr(doc);
|
||||||
|
|
||||||
|
for (const auto& status : data.statuses) {
|
||||||
|
yyjson_mut_val *status_obj = yyjson_mut_obj(doc);
|
||||||
|
|
||||||
|
// Add status fields
|
||||||
|
yyjson_mut_obj_add_str(doc, status_obj, "created_at", status.created_at.c_str());
|
||||||
|
yyjson_mut_obj_add_uint(doc, status_obj, "id", status.id);
|
||||||
|
yyjson_mut_obj_add_str(doc, status_obj, "text", status.text.c_str());
|
||||||
|
|
||||||
|
// User object
|
||||||
|
yyjson_mut_val *user_obj = yyjson_mut_obj(doc);
|
||||||
|
yyjson_mut_obj_add_uint(doc, user_obj, "id", status.user.id);
|
||||||
|
yyjson_mut_obj_add_str(doc, user_obj, "name", status.user.name.c_str());
|
||||||
|
yyjson_mut_obj_add_str(doc, user_obj, "screen_name", status.user.screen_name.c_str());
|
||||||
|
yyjson_mut_obj_add_str(doc, user_obj, "location", status.user.location.c_str());
|
||||||
|
yyjson_mut_obj_add_str(doc, user_obj, "description", status.user.description.c_str());
|
||||||
|
yyjson_mut_obj_add_bool(doc, user_obj, "verified", status.user.verified);
|
||||||
|
yyjson_mut_obj_add_uint(doc, user_obj, "followers_count", status.user.followers_count);
|
||||||
|
yyjson_mut_obj_add_uint(doc, user_obj, "friends_count", status.user.friends_count);
|
||||||
|
yyjson_mut_obj_add_uint(doc, user_obj, "statuses_count", status.user.statuses_count);
|
||||||
|
yyjson_mut_obj_add_val(doc, status_obj, "user", user_obj);
|
||||||
|
|
||||||
|
// Other fields
|
||||||
|
yyjson_mut_obj_add_uint(doc, status_obj, "retweet_count", status.retweet_count);
|
||||||
|
yyjson_mut_obj_add_uint(doc, status_obj, "favorite_count", status.favorite_count);
|
||||||
|
|
||||||
|
yyjson_mut_arr_append(statuses_array, status_obj);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add statuses array to root
|
||||||
|
yyjson_mut_obj_add_val(doc, root, "statuses", statuses_array);
|
||||||
|
|
||||||
|
// Write to string
|
||||||
|
char *json_output = yyjson_mut_write(doc, 0, NULL);
|
||||||
|
std::string result(json_output);
|
||||||
|
free(json_output);
|
||||||
|
yyjson_mut_doc_free(doc);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // YYJSON_TWITTER_DATA_H
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user