Moving it to 0.6.1.

.appveyor.yml

@@ -4,34 +4,24 @@ configuration: Release
 image: Visual Studio 2019
 platform: x64
 
-cache:
-  - C:\dependencies -> dependencies\CMakeLists.txt
-
 environment:
-  # Forward slash is used because this is used in CMake as is
-  simdjson_DEPENDENCY_CACHE_DIR: C:/dependencies
-
   matrix:
     - job_name: VS2019
-      CMAKE_ARGS: -A %Platform%
+      CMAKE_ARGS:  -A %Platform%
     - job_name: VS2019ARM
       CMAKE_ARGS: -A ARM64 -DCMAKE_CROSSCOMPILING=1 -D SIMDJSON_GOOGLE_BENCHMARKS=OFF # Does Google Benchmark builds under VS ARM?
     - job_name: VS2017 (Static, No Threads)
       image: Visual Studio 2017
-      CMAKE_ARGS: -A %Platform% -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_ENABLE_THREADS=OFF
-      CTEST_ARGS: -LE explicitonly
+      CMAKE_ARGS:  -A %Platform% -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_ENABLE_THREADS=OFF
+      CTEST_ARGS: -E checkperf
     - job_name: VS2019 (Win32)
       platform: Win32
-      CMAKE_ARGS: -A %Platform% -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_ENABLE_THREADS=ON # This should be the default. Testing anyway.
-      CTEST_ARGS: -LE explicitonly
-    - job_name: VS2019 (Win32, No Exceptions)
-      platform: Win32
-      CMAKE_ARGS: -A %Platform% -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_ENABLE_THREADS=ON -DSIMDJSON_EXCEPTIONS=OFF
-      CTEST_ARGS: -LE explicitonly
+      CMAKE_ARGS:  -A %Platform% -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_ENABLE_THREADS=ON # This should be the default. Testing anyway.
+      CTEST_ARGS: -E "checkperf|ondemand_basictests"
     - job_name: VS2015
       image: Visual Studio 2015
-      CMAKE_ARGS: -A %Platform% -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_ENABLE_THREADS=OFF
-      CTEST_ARGS: -LE explicitonly
+      CMAKE_ARGS:  -A %Platform% -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_ENABLE_THREADS=OFF
+      CTEST_ARGS: -E checkperf
 
 build_script:
   - mkdir build

.circleci/config.yml

@@ -61,19 +61,6 @@ executors:
 
 # 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
@@ -87,9 +74,7 @@ commands:
   cmake_build_cache:
     steps:
       - cmake_prep
-      - dependency_restore
       - run: cmake $CMAKE_FLAGS -DCMAKE_INSTALL_PREFIX:PATH=destination -B build . 
-      - dependency_cache # dependencies are produced in the configure step
 
   cmake_build:
     steps:
@@ -103,14 +88,7 @@ commands:
           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
+          ctest $CTEST_FLAGS -LE acceptance -E checkperf
 
   cmake_test_all:
     steps:
@@ -119,9 +97,9 @@ commands:
           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 &&
+          SIMDJSON_FORCE_IMPLEMENTATION=haswell ctest $CTEST_FLAGS -L per_implementation -E checkperf &&
+          SIMDJSON_FORCE_IMPLEMENTATION=westmere ctest $CTEST_FLAGS -L per_implementation -E checkperf &&
+          SIMDJSON_FORCE_IMPLEMENTATION=fallback ctest $CTEST_FLAGS -L per_implementation -E checkperf &&
           ctest $CTEST_FLAGS -LE "acceptance|per_implementation" # Everything we haven't run yet, run now.
 
 
@@ -151,16 +129,6 @@ jobs:
     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
@@ -191,23 +159,14 @@ jobs:
   sanitize-gcc10:
     description: Build and run tests on GCC 10 and AVX 2 with a cmake sanitize build
     executor: gcc10
-    environment: { CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, BUILD_FLAGS: "", CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    environment: { CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, BUILD_FLAGS: "", CTEST_FLAGS: --output-on-failure -E checkperf }
     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: -DSIMDJSON_BUILD_STATIC=OFF -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: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE_THREADS=ON, BUILD_FLAGS: "", 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: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE_THREADS=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    environment: { CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -E checkperf }
     steps: [ cmake_test ]
+
   # dynamic
   dynamic-gcc10:
     description: Build and run tests on GCC 10 and AVX 2 with a cmake dynamic build
@@ -262,12 +221,12 @@ jobs:
   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: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, BUILD_FLAGS: "", CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    environment: {  CXXFLAGS: -march=haswell, CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, BUILD_FLAGS: "", CTEST_FLAGS: --output-on-failure -E checkperf }
     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: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    environment: { CXXFLAGS: -march=haswell, CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -E checkperf }
     steps: [ cmake_test ]
 
 workflows:
@@ -286,8 +245,6 @@ workflows:
       # full single-implementation tests
       - sanitize-gcc10
       - sanitize-clang10
-      - threadsanitize-gcc10
-      - threadsanitize-clang10
       - dynamic-gcc10
       - dynamic-clang10
       - unthreaded-gcc10
@@ -309,8 +266,4 @@ workflows:
       # testing "just the library"
       - justlib-gcc10
 
-      # testing asserts
-      - assert-gcc10
-      - assert-clang10
-
       # TODO add windows: https://circleci.com/docs/2.0/configuration-reference/#windows

.cirrus.yml

@@ -6,11 +6,6 @@ task:
 
   env:
     ASSUME_ALWAYS_YES: YES
-    simdjson_DEPENDENCY_CACHE_DIR: $HOME/.dep_cache
-  dep_cache:
-    folder: $HOME/.dep_cache
-    reupload_on_changes: false
-    fingerprint_script: cat dependencies/CMakeLists.txt
   setup_script:
     - pkg update -f
     - pkg install bash
@@ -23,4 +18,4 @@ task:
     - make
   test_script:
     - cd build
-    - ctest --output-on-failure -LE explicitonly
+    - ctest --output-on-failure -E checkperf

.dockerignore

@@ -1,7 +1,7 @@
 *
 !.git
 !Makefile
-!amalgamate.py
+!amalgamate.sh
 !benchmark
 !dependencies
 !include
@@ -12,4 +12,4 @@
 !src
 !style
 !tests
-!tools
+!tools

.drone.yml

@@ -9,10 +9,10 @@ steps:
     CXX: g++
     BUILD_FLAGS: -- -j
     CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly 
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf 
   commands:
-    - scripts/addcmakeppa.sh "$(env -i sh -c '. /etc/os-release; echo $VERSION_CODENAME')"
-    - apt-get install -y g++ cmake gcc git
+    - apt-get update -qq
+    - apt-get install -y g++ cmake gcc
     - mkdir build
     - cd build
     - cmake $CMAKE_FLAGS ..
@@ -30,10 +30,10 @@ steps:
     CXX: clang++-6.0
     BUILD_FLAGS: -- -j
     CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly 
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf 
   commands:
-    - scripts/addcmakeppa.sh "$(env -i sh -c '. /etc/os-release; echo $VERSION_CODENAME')"
-    - apt-get install -y clang++-6.0 cmake git
+    - apt-get update -qq
+    - apt-get install -y clang++-6.0 cmake
     - mkdir build
     - cd build
     - cmake $CMAKE_FLAGS ..
@@ -51,11 +51,10 @@ steps:
     CXX: g++
     BUILD_FLAGS: -- -j
     CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=haswell;westmere;fallback
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
   commands:
-    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
     - apt-get update -qq
-    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y cmake
     - mkdir build
     - cd build
     - cmake $CMAKE_FLAGS ..
@@ -78,7 +77,7 @@ steps:
     CXX: clang++-6.0
     BUILD_FLAGS: -- -j
     CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=haswell;westmere;fallback
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
   commands:
     - mkdir build
     - cd build
@@ -101,11 +100,10 @@ steps:
     CXX: g++
     BUILD_FLAGS: -- -j
     CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
   commands:
-    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
     - apt-get update -qq
-    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y cmake
     - mkdir build
     - cd build
     - cmake $CMAKE_FLAGS ..
@@ -124,7 +122,7 @@ steps:
     CXX: clang++-9
     CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
     BUILD_FLAGS: -- -j
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
   commands:
     - mkdir build
     - cd build
@@ -143,11 +141,10 @@ steps:
     CXX: g++
     BUILD_FLAGS: -- -j
     CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=haswell;westmere;fallback
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
   commands:
-    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
     - apt-get update -qq
-    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y cmake
     - mkdir build
     - cd build
     - cmake $CMAKE_FLAGS ..
@@ -170,7 +167,7 @@ steps:
     CXX: clang++-9
     CMAKE_FLAGS: -DSIMDJSON_SANITIZE=ON -DSIMDJSON_IMPLEMENTATION=haswell;westmere;fallback
     BUILD_FLAGS: -- -j
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
   commands:
     - mkdir build
     - cd build
@@ -183,27 +180,6 @@ steps:
     - ASAN_OPTIONS="detect_leaks=0" ctest $CTEST_FLAGS -LE "acceptance|per_implementation" # Everything we haven't run yet, run now.
 ---
 kind: pipeline
-name: cpp20-clang11-libcpp
-platform: { os: linux, arch: amd64 }
-steps:
-- name: Build and Test
-  image: pauldreik/llvm-11
-  user: root
-  environment:
-    CC: clang-11
-    CXX: clang++-11
-    CMAKE_FLAGS: -GNinja
-    BUILD_FLAGS:
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
-    CXXFLAGS: -std=c++20 -stdlib=libc++
-  commands:
-    - mkdir build
-    - cd build
-    - cmake $CMAKE_FLAGS ..
-    - cmake --build . $BUILD_FLAGS
-    - ctest $CTEST_FLAGS
----
-kind: pipeline
 name: arm64-gcc8
 platform: { os: linux, arch: arm64 }
 steps:
@@ -214,11 +190,10 @@ steps:
     CXX: g++
     BUILD_FLAGS: -- -j
     CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=arm64;fallback
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
   commands:
-    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
     - apt-get update -qq
-    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y cmake
     - mkdir build
     - cd build
     - cmake $CMAKE_FLAGS ..
@@ -233,17 +208,16 @@ name: arm64-clang6
 platform: { os: linux, arch: arm64 }
 steps:
 - name: Build and Test
-  image: debian:buster-backports
+  image: ubuntu:18.04
   environment:
     CC: clang-6.0
     CXX: clang++-6.0
     CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
     BUILD_FLAGS: -- -j
-    CTEST_FLAGS: -j4 --output-on-failure  -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure  -E checkperf
   commands:
-    - apt-get -qq update
-    - apt-get -t buster-backports install -y cmake
-    - apt-get install -y clang-6.0 git
+    - apt-get update -qq
+    - apt-get install -y clang cmake git
     - mkdir build
     - cd build
     - cmake $CMAKE_FLAGS ..
@@ -261,11 +235,10 @@ steps:
     CXX: g++
     BUILD_FLAGS: -- -j
     CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
   commands:
-    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
     - apt-get update -qq
-    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y cmake
     - mkdir build
     - cd build
     - cmake $CMAKE_FLAGS ..
@@ -277,17 +250,16 @@ name: arm64-dynamic-clang6
 platform: { os: linux, arch: arm64 }
 steps:
 - name: Build and Test
-  image: debian:buster-backports
+  image: ubuntu:18.04
   environment:
     CC: clang-6.0
     CXX: clang++-6.0
     CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
     BUILD_FLAGS: -- -j
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
   commands:
-    - apt-get -qq update
-    - apt-get -t buster-backports install -y cmake
-    - apt-get install -y clang-6.0 git
+    - apt-get update -qq
+    - apt-get install -y clang cmake git
     - mkdir build
     - cd build
     - cmake $CMAKE_FLAGS ..
@@ -303,14 +275,12 @@ steps:
   environment:
     BUILD_FLAGS: -- -j
     CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=arm64;fallback
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
     CC: gcc
     CXX: g++
   commands:
-    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
     - apt-get update -qq
-    - apt-get -t buster-backports install -y cmake
-    - apt-get install -y libstdc++6
+    - apt-get install -y cmake libstdc++6
     - mkdir build
     - cd build
     - cmake $CMAKE_FLAGS ..
@@ -325,17 +295,16 @@ name: arm64-sanitize-clang6
 platform: { os: linux, arch: arm64 }
 steps:
 - name: Build and Test
-  image: debian:buster-backports
+  image: ubuntu:18.04
   environment:
     CC: clang-6.0
     CXX: clang++-6.0
     CMAKE_FLAGS: -DSIMDJSON_SANITIZE=ON -DSIMDJSON_IMPLEMENTATION=arm64;fallback
     BUILD_FLAGS: -- -j
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
   commands:
-    - apt-get -qq update
-    - apt-get -t buster-backports install -y cmake
-    - apt-get install -y clang-6.0 git
+    - apt-get update -qq
+    - apt-get install -y clang cmake git
     - mkdir build
     - cd build
     - cmake $CMAKE_FLAGS ..
@@ -357,9 +326,11 @@ steps:
     CXX: clang++-9
     BUILD_FLAGS: -- -j 4
     CMAKE_FLAGS: -GNinja -DSIMDJSON_BUILD_STATIC=ON
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
     CXXFLAGS: -stdlib=libc++
   commands:
+    - apt-get update -qq
+    - apt-get install -y cmake
     - mkdir build
     - cd build
     - cmake $CMAKE_FLAGS ..
@@ -378,30 +349,11 @@ steps:
     CXX: clang++-9
     BUILD_FLAGS: -- -j
     CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
-    CXXFLAGS: -stdlib=libc++
-  commands:
-    - mkdir build
-    - cd build
-    - cmake $CMAKE_FLAGS ..
-    - cmake --build . $BUILD_FLAGS
-    - ctest $CTEST_FLAGS
----
-kind: pipeline
-name: libcpp-clang7
-platform: { os: linux, arch: amd64 }
-steps:
-- name: Build and Test
-  image: conanio/clang7
-  user: root
-  environment:
-    CC: clang-7
-    CXX: clang++-7
-    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
     CXXFLAGS: -stdlib=libc++
   commands:
+    - apt-get update -qq
+    - apt-get install -y cmake
     - mkdir build
     - cd build
     - cmake $CMAKE_FLAGS ..
@@ -419,11 +371,10 @@ steps:
     CXX: g++
     BUILD_FLAGS: -- -j
     CMAKE_FLAGS: -DSIMDJSON_EXCEPTIONS=OFF
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
   commands:
-    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
     - apt-get update -qq
-    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y cmake
     - mkdir build
     - cd build
     - cmake $CMAKE_FLAGS ..
@@ -442,7 +393,7 @@ steps:
     DEBIAN_FRONTEND: noninteractive
     ASAN_OPTIONS: detect_leaks=0
   commands:
-    - apt-get -qq update
+    - apt-get update -qq
     - apt-get install -q -y clang cmake git wget zip ninja-build
     - wget --quiet https://dl.bintray.com/pauldreik/simdjson-fuzz-corpus/corpus/corpus.tar
     - tar xf corpus.tar && rm corpus.tar

.github/ISSUE_TEMPLATE/bug_report.md

@@ -18,7 +18,7 @@ Before submitting an issue, please ensure that you have read the documentation:
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-Note that a compiler warning is not a bug.
+Note that a compiler warning is not a bug. 
 
 **To Reproduce**
 Steps to reproduce the behaviour: provide a code sample if possible.
@@ -32,10 +32,10 @@ Note that a stack trace from your own program is not enough.
  - Compiler [e.g. Apple clang version 11.0.3 (clang-1103.0.32.59) x86_64-apple-darwin19.4.0]
  - Version [e.g. 22]
 
-We support up-to-date 64-bit ARM and x64 FreeBSD, macOS, Windows and Linux systems. Please ensure that your configuration is supported before labelling the issue as a bug. In particular, we do not support legacy 32-bit systems.
+We support up-to-date 64-bit ARM and x64 FreeBSD, macOS, Windows and Linux systems. Please ensure that your configuration is supported before labelling the issue as a bug. In particular, we do not support legacy 32-bit systems. 
 
 **Indicate whether you are willing or able to provide a bug fix as a pull request**
 
-If you plan to contribute to simdjson, please read our
+If you plan to contribute to simdjson, please read our 
 * CONTRIBUTING guide: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md and our
 * HACKING guide: https://github.com/simdjson/simdjson/blob/master/HACKING.md

.github/ISSUE_TEMPLATE/feature_request.md

@@ -32,6 +32,6 @@ A clear and concise description of any alternative solutions or features you've
 Add any other context or screenshots about the feature request here.
 
 ** Are you willing to contribute code or documentation toward this new feature? **
-If you plan to contribute to simdjson, please read our
+If you plan to contribute to simdjson, please read our 
 * CONTRIBUTING guide: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md and our
 * HACKING guide: https://github.com/simdjson/simdjson/blob/master/HACKING.md

.github/ISSUE_TEMPLATE/standard-issue-template.md

@@ -27,6 +27,6 @@ Is your issue:
 4. A documentation issue? Can you suggest an improvement?
 
 
-If you plan to contribute to simdjson, please read our
+If you plan to contribute to simdjson, please read our 
 * CONTRIBUTING guide: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md and our
 * HACKING guide: https://github.com/simdjson/simdjson/blob/master/HACKING.md

.github/pull_request_template.md

@@ -1,8 +0,0 @@
-
-
-Our tests check whether you have introduced trailing white space. If such a test fails, please check the "artifacts button" above, which if you click it gives a link to a downloadable file to help you identify the issue. You can also run scripts/remove_trailing_whitespace.sh locally if you have a bash shell and the sed command available on your system.
-
-If you plan to contribute to simdjson, please read our
-
-CONTRIBUTING guide: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md and our
-HACKING guide: https://github.com/simdjson/simdjson/blob/master/HACKING.md

.github/workflows/alpine.yml

@@ -1,25 +1,12 @@
 name: Alpine Linux
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
+'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-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
       - name: start docker
         run: |
           docker run -w /src -dit --name alpine -v $PWD:/src alpine:latest
@@ -37,4 +24,4 @@ jobs:
           ./alpine.sh cmake --build build_for_alpine
       - name: test
         run: |
-          ./alpine.sh bash -c "cd build_for_alpine && ctest  -LE explicitonly"
+          ./alpine.sh bash -c "cd build_for_alpine && ctest"

.github/workflows/fix-trailing-whitespace.yml

@@ -1,37 +0,0 @@
-name: Detect trailing whitespace
-
-on:
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  whitespace:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Remove whitespace and check the diff
-        run: |
-          set -eu
-          scripts/remove_trailing_whitespace.sh
-          git diff >whitespace.patch
-          cat whitespace.patch
-          if [ $(wc -c <whitespace.patch) -ne 0 ] ; then
-             echo " !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! "
-             echo "You have trailing whitespace, please download the artifact"
-             echo "and apply with git apply <whitespace.patch or"
-             echo "run scripts/remove_trailing_whitespace.sh locally."
-             echo " !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! "
-             exit 1
-          else
-             echo "no trailing whitespace found, good!"
-          fi
-      - name: Archive whitespace patch
-        uses: actions/upload-artifact@v2
-        if: always()
-        with:
-          name: whitespace-patch
-          path: |
-            whitespace.patch
-          if-no-files-found: ignore
-

.github/workflows/fuzzers.yml

@@ -5,28 +5,20 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
   schedule:
     - cron: 23 */8 * * *
 
 jobs:
-  build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
+  build:    
     runs-on: ubuntu-latest
     env:
-      # fuzzers that change behaviour with SIMDJSON_FORCE_IMPLEMENTATION
-      defaultimplfuzzers: atpointer dump dump_raw_tape element minify parser print_json
-      # fuzzers that loop over the implementations themselves, or don't need to switch.
-      implfuzzers: implementations minifyimpl ndjson ondemand padded utf8
+      # fuzzers that use the default implementation
+      defaultimplfuzzers: atpointer dump dump_raw_tape element minify  parser print_json
+      # fuzzers that loop over the implementations themselves
+      implfuzzers: implementations minifyimpl utf8
       implementations: haswell westmere fallback
       UBSAN_OPTIONS: halt_on_error=1
       MAXLEN: -max_len=4000
-      CLANGVERSION: 11
-      # which optimization level to use for the sanitizer build (see build_fuzzer.variants.sh)
-      OPTLEVEL: -O3
 
     steps:
     - name: Install packages necessary for building
@@ -35,15 +27,10 @@ jobs:
         sudo apt-get install --quiet ninja-build valgrind zip unzip
         wget https://apt.llvm.org/llvm.sh
         chmod +x llvm.sh
-        sudo ./llvm.sh $CLANGVERSION
+        sudo ./llvm.sh 10
 
     - uses: actions/checkout@v1
 
-    - uses: actions/cache@v2
-      with:
-        path: dependencies/.cache
-        key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-
     - name: Create and prepare the initial seed corpus
       run: |
         fuzz/build_corpus.sh
@@ -64,7 +51,7 @@ jobs:
         clang++ --version
 
     - name: Build all the variants
-      run: CLANGSUFFIX=-$CLANGVERSION fuzz/build_fuzzer_variants.sh
+      run: fuzz/build_fuzzer_variants.sh
 
     - name: Explore fast (release build, default implementation)
       run: |
@@ -84,7 +71,7 @@ jobs:
           others=$(find out -type d -not -name $fuzzer -not -name out -not -name cmin)
           for implementation in $implementations; do
             export SIMDJSON_FORCE_IMPLEMENTATION=$implementation
-            build-sanitizers$OPTLEVEL/fuzz/fuzz_$fuzzer out/$fuzzer $others seedcorpus -max_total_time=20 $MAXLEN
+            build-sanitizers/fuzz/fuzz_$fuzzer out/$fuzzer $others seedcorpus -max_total_time=20 $MAXLEN
           done
           echo now have $(ls out/$fuzzer |wc -l) files in corpus        
         done
@@ -95,7 +82,7 @@ jobs:
         for fuzzer in $implfuzzers; do
           # get input from everyone else (corpus cross pollination)
           others=$(find out -type d -not -name $fuzzer -not -name out -not -name cmin)
-          build-sanitizers$OPTLEVEL/fuzz/fuzz_$fuzzer out/$fuzzer $others seedcorpus -max_total_time=20 $MAXLEN
+          build-sanitizers/fuzz/fuzz_$fuzzer out/$fuzzer $others seedcorpus -max_total_time=20 $MAXLEN
           echo now have $(ls out/$fuzzer |wc -l) files in corpus
         done
 
@@ -162,3 +149,4 @@ jobs:
           leak-*
           timeout-*
         if-no-files-found: ignore
+

.github/workflows/mingw-ci.yml

@@ -1,12 +1,6 @@
 name: MinGW32-CI
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+on: [push, pull_request]
 
 # Important: scoop will either install 32-bit GCC or 64-bit GCC, not both.
 
@@ -15,9 +9,6 @@ on:
 
 jobs:
   ci:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
     name: windows-gcc
     runs-on: windows-2016
 
@@ -35,12 +26,6 @@ jobs:
           path: |
             C:\ProgramData\scoop
           key: scoop32 # static key: should be good forever
-
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-
       - name: Setup Windows # This should almost never run if the cache works.
         if: steps.cache.outputs.cache-hit != 'true'
         shell: powershell
@@ -64,5 +49,5 @@ jobs:
           mkdir build32
           cd build32
           cmake -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_ENABLE_THREADS=OFF ..
-          cmake --build . --target acceptance_tests --verbose
-          ctest -L acceptance --output-on-failure
+          cmake --build . --target parse_many_test jsoncheck basictests ondemand_basictests numberparsingcheck stringparsingcheck errortests integer_tests pointercheck --verbose
+          ctest -R "(parse_many_test|jsoncheck|basictests|stringparsingcheck|numberparsingcheck|errortests|integer_tests|pointercheck)"  --output-on-failure

.github/workflows/mingw64-ci.yml

@@ -1,12 +1,6 @@
 name: MinGW64-CI
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+on: [push, pull_request]
 
 # Important: scoop will either install 32-bit GCC or 64-bit GCC, not both.
 
@@ -15,9 +9,6 @@ on:
 
 jobs:
   ci:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
     name: windows-gcc
     runs-on: windows-2016
 
@@ -35,12 +26,6 @@ jobs:
           path: |
             C:\ProgramData\scoop
           key: scoop64 # static key: should be good forever
-
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-
       - name: Setup Windows # This should almost never run if the cache works.
         if: steps.cache.outputs.cache-hit != 'true'
         shell: powershell
@@ -64,11 +49,11 @@ jobs:
           mkdir build64
           cd build64
           cmake -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_ENABLE_THREADS=OFF ..
-          cmake --build . --target acceptance_tests --verbose
-          ctest -L acceptance --output-on-failure
+          cmake --build . --target parse_many_test jsoncheck basictests ondemand_basictests numberparsingcheck stringparsingcheck errortests integer_tests pointercheck --verbose
+          ctest -R "(parse_many_test|jsoncheck|basictests|stringparsingcheck|numberparsingcheck|errortests|integer_tests|pointercheck)"  --output-on-failure
           cd ..
           mkdir build64debug
           cd build64debug
           cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_ENABLE_THREADS=OFF ..
-          cmake --build . --target acceptance_tests --verbose
-          ctest -L acceptance --output-on-failure
+          cmake --build . --target parse_many_test jsoncheck basictests ondemand_basictests numberparsingcheck stringparsingcheck errortests integer_tests pointercheck --verbose
+          ctest -R "(parse_many_test|jsoncheck|basictests|stringparsingcheck|numberparsingcheck|errortests|integer_tests|pointercheck)"  --output-on-failure

.github/workflows/msys2-clang.yml

@@ -1,54 +0,0 @@
-name: MSYS2-CLANG-CI
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  windows-mingw:
-    name: ${{ matrix.msystem }}
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - msystem: "MINGW64"
-            install: mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-clang
-            type: Release
-          - msystem: "MINGW32"
-            install: mingw-w64-i686-cmake mingw-w64-i686-ninja mingw-w64-i686-clang
-            type: Release
-          - msystem: "MINGW64"
-            install: mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-clang
-            type: Debug
-          - msystem: "MINGW32"
-            install: mingw-w64-i686-cmake mingw-w64-i686-ninja mingw-w64-i686-clang
-            type: Debug
-    env:
-      CMAKE_GENERATOR: Ninja
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - uses: msys2/setup-msys2@v2
-        with:
-          update: true
-          msystem: ${{ matrix.msystem }}
-          install: ${{ matrix.install }}
-      - name: Build and Test
-        run: |
-          mkdir build
-          cd build
-          cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_DO_NOT_USE_THREADS_NO_MATTER_WHAT=ON ..
-          cmake --build . --verbose
-          ctest -j4 --output-on-failure -LE explicitonly

.github/workflows/msys2.yml

@@ -1,18 +1,9 @@
 name: MSYS2-CI
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+on: [push, pull_request]
 
 jobs:
   windows-mingw:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
     name: ${{ matrix.msystem }}
     runs-on: windows-latest
     defaults:
@@ -39,10 +30,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
       - uses: msys2/setup-msys2@v2
         with:
           update: true
@@ -54,4 +41,4 @@ jobs:
           cd build
           cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_DO_NOT_USE_THREADS_NO_MATTER_WHAT=ON ..
           cmake --build . --verbose
-          ctest -j4 --output-on-failure -LE explicitonly
+          ctest -j4 --output-on-failure -E checkperf

.github/workflows/power-fuzz.yml

@@ -1,65 +0,0 @@
-name: short fuzz on the power arch
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  armv7_job:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    # The host should always be Linux
-    runs-on: ubuntu-20.04
-    name: Build on ubuntu-20.04 ppc64le
-    steps:
-      - uses: actions/checkout@v2.1.0
-      - uses: uraimo/run-on-arch-action@v2.0.5
-        name: Run commands
-        id: runcmd
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        with:
-          arch: ppc64le
-          distro: buster
-
-          # Not required, but speeds up builds by storing container images in
-          # a GitHub package registry.
-          githubToken: ${{ github.token }}
-
-          run: |
-            export CLANGSUFFIX="-7"
-            apt-get -qq update
-            apt-get install -q -y clang-7 libfuzzer-7-dev cmake git wget zip ninja-build
-            mkdir -p build ; cd build
-            cmake .. -GNinja \
-                  -DCMAKE_CXX_COMPILER=clang++$CLANGSUFFIX \
-                  -DCMAKE_C_COMPILER=clang$CLANGSUFFIX \
-                  -DSIMDJSON_BUILD_STATIC=Off \
-                  -DENABLE_FUZZING=On \
-                  -DSIMDJSON_COMPETITION=OFF \
-                  -DSIMDJSON_GOOGLE_BENCHMARKS=OFF \
-                  -DSIMDJSON_DISABLE_DEPRECATED_API=On \
-                  -DSIMDJSON_FUZZ_LDFLAGS=-lFuzzer \
-                  -DCMAKE_CXX_FLAGS="-fsanitize=fuzzer-no-link -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION=" \
-                  -DCMAKE_C_FLAGS="-fsanitize=fuzzer-no-link" \
-                  -DCMAKE_BUILD_TYPE=Release \
-                  -DSIMDJSON_FUZZ_LINKMAIN=Off
-            cd ..
-            builddir=build
-            cmake --build $builddir
-            wget --quiet https://dl.bintray.com/pauldreik/simdjson-fuzz-corpus/corpus/corpus.tar
-            tar xf corpus.tar && rm corpus.tar
-            fuzzernames=$(cmake --build $builddir --target print_all_fuzzernames |tail -n1)
-            for fuzzer in $fuzzernames ; do
-               exe=$builddir/fuzz/$fuzzer
-               shortname=$(echo $fuzzer |cut -f2- -d_)
-               echo found fuzzer $shortname with executable $exe
-               mkdir -p out/$shortname
-               others=$(find out -type d -not -name $shortname -not -name out -not -name cmin)
-               $exe -max_total_time=20  -max_len=4000 out/$shortname $others
-               echo "*************************************************************************"
-            done
-            echo "all is good, no errors found in any of these fuzzers: $fuzzernames"

.github/workflows/ubuntu18-checkperf.yml

@@ -1,25 +1,16 @@
 name: Performance check on Ubuntu 18.04 CI (GCC 7)
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+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-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v1.0
         with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+          cmake-version: '3.9.x'
       - name: Use cmake
         run: |
           mkdir build &&
@@ -27,3 +18,4 @@ jobs:
           cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
           cmake --build . --target checkperf  &&
           ctest --output-on-failure -R checkperf  ubuntu18-checkperf.yml
+

.github/workflows/ubuntu18-threadsani.yml

@@ -1,30 +0,0 @@
-name: Ubuntu 18.04 CI (GCC 7) with Thread Sanitizer
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake
-        run: |
-          mkdir build &&
-          cd build &&
-          cmake  -DSIMDJSON_SANITIZE_THREADS=ON ..  &&
-          cmake --build . --target document_stream_tests --target parse_many_test  &&
-          ctest --output-on-failure  -R parse_many_test  &&
-          ctest --output-on-failure  -R document_stream_tests

.github/workflows/ubuntu18.yml

@@ -1,31 +1,22 @@
 name: Ubuntu 18.04 CI (GCC 7)
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+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-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v1.0
         with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+          cmake-version: '3.9.x'
       - name: Use cmake
         run: |
           mkdir build &&
           cd build &&
           cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
           cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
+          ctest -j --output-on-failure -E checkperf   &&
           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

.github/workflows/ubuntu20-checkperf.yml

@@ -1,29 +1,20 @@
 name: Performance check on Ubuntu 20.04 CI (GCC 9)
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+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-20.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v1.0
         with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+          cmake-version: '3.9.x'
       - name: Use cmake
         run: |
           mkdir build &&
           cd build &&
-          cmake  -DCMAKE_CXX_FLAGS="-Werror=old-style-cast -pedantic -Wpedantic" -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
+          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
           cmake --build . --target checkperf  &&
-          ctest --output-on-failure -R checkperf
+          ctest --output-on-failure -R checkperf 

.github/workflows/ubuntu20-noexcept.yml

@@ -1,34 +0,0 @@
-name: Ubuntu 20.04 CI (GCC 9) without exceptions
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake
-        run: |
-          mkdir build &&
-          cd build &&
-          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_EXCEPTIONS=OFF -DSIMDJSON_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
-          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 &&
-          mkdir 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 .

.github/workflows/ubuntu20-nothread.yml

@@ -1,34 +0,0 @@
-name: Ubuntu 20.04 CI (GCC 9) without threads
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake
-        run: |
-          mkdir build &&
-          cd build &&
-          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_ENABLE_THREADS=OFF -DSIMDJSON_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
-          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 &&
-          mkdir 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 .

.github/workflows/ubuntu20-threadsani.yml

@@ -1,30 +0,0 @@
-name: Ubuntu 20.04 CI (GCC 9) with Thread Sanitizer
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake
-        run: |
-          mkdir build &&
-          cd build &&
-          cmake  -DSIMDJSON_SANITIZE_THREADS=ON ..  &&
-          cmake --build . --target document_stream_tests --target parse_many_test  &&
-          ctest --output-on-failure  -R parse_many_test  &&
-          ctest --output-on-failure  -R document_stream_tests

.github/workflows/ubuntu20.yml

@@ -1,33 +1,22 @@
 name: Ubuntu 20.04 CI (GCC 9)
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+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-20.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v1.0
         with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+          cmake-version: '3.9.x'
       - name: Use cmake
         run: |
           mkdir build &&
           cd build &&
           cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
           cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
-          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 && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../build/destination .. &&  cmake --build .
+          ctest -j --output-on-failure -E checkperf   &&
+          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

.github/workflows/vs15-ci.yml

@@ -1,46 +0,0 @@
-name: VS15-CI
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  ci:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    name: windows-vs15
-    runs-on: windows-2016
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - {gen: Visual Studio 15 2017, arch: Win32, static: ON}
-          - {gen: Visual Studio 15 2017, arch: Win32, static: OFF}
-          - {gen: Visual Studio 15 2017, arch: x64, static: ON}
-          - {gen: Visual Studio 15 2017, arch: x64, static: OFF}
-    steps:
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: Configure
-      run: |
-        cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_BUILD_STATIC=${{matrix.static}} -B build
-    - name: Build Debug
-      run: cmake --build build --config Debug --verbose
-    - name: Build Release
-      run: cmake --build build --config Release --verbose
-    - name: Run tests
-      run: |
-        cd build
-        ctest -C Release  -LE explicitonly  --output-on-failure
-    - name: Install
-      run: |
-        cmake --install build --config Release
-    - name: Test Installation
-      run: |
-        cmake -G "${{matrix.gen}}" -A ${{matrix.arch}}  -B build_install_test tests/installation_tests/find
-        cmake --build build_install_test --config Release

.github/workflows/vs16-ci.yml

@@ -1,46 +1,26 @@
 name: VS16-CI
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+on: [push, pull_request]
 
 jobs:
   ci:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
     name: windows-vs16
     runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - {gen: Visual Studio 16 2019, arch: Win32, static: ON}
-          - {gen: Visual Studio 16 2019, arch: Win32, static: OFF}
-          - {gen: Visual Studio 16 2019, arch: x64, static: ON}
-          - {gen: Visual Studio 16 2019, arch: x64, static: OFF}
     steps:
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: Configure
-      run: |
-        cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_BUILD_STATIC=${{matrix.static}} -B build
-    - name: Build Debug
-      run: cmake --build build --config Debug --verbose
-    - name: Build Release
-      run: cmake --build build --config Release --verbose
-    - name: Run tests
-      run: |
-        cd build
-        ctest -C Release  -LE explicitonly  --output-on-failure
-    - name: Install
-      run: |
-        cmake --install build --config Release
-    - name: Test Installation
-      run: |
-        cmake -G "${{matrix.gen}}" -A ${{matrix.arch}}  -B build_install_test tests/installation_tests/find
-        cmake --build build_install_test --config Release
+    - uses: actions/checkout@v2
+    - name: 'Run CMake with VS16'
+      uses: lukka/run-cmake@v2
+      with:
+        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
+        buildDirectory: "${{ github.workspace }}/../../_temp/windows"
+        cmakeBuildType: Release   
+        buildWithCMake: true
+        cmakeGenerator: VS16Win64 
+        cmakeAppendedArgs: -DSIMDJSON_COMPETITION=OFF
+        buildWithCMakeArgs: --config Release  
+        
+    - name: 'Run CTest'
+      run: ctest -C Release  -E checkperf  --output-on-failure 
+      working-directory: "${{ github.workspace }}/../../_temp/windows"
+  

.github/workflows/vs16-clang-ci.yml

@@ -1,37 +1,25 @@
 name: VS16-CLANG-CI
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+on: [push, pull_request]
 
 jobs:
   ci:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
     name: windows-vs16
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/cache@v2
-      with:
-        path: dependencies/.cache
-        key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-    - name: 'Run CMake with VS16 Clang'
-      uses: lukka/run-cmake@v3
+    - name: 'Run CMake with VS16'
+      uses: lukka/run-cmake@v2
       with:
         cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
         cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
         buildDirectory: "${{ github.workspace }}/../../_temp/windows"
-        cmakeBuildType: Release
+        cmakeBuildType: Release   
         buildWithCMake: true
+        cmakeGenerator: VS16Win64 
         cmakeAppendedArgs:  -T ClangCL -DSIMDJSON_COMPETITION=OFF  -DSIMDJSON_BUILD_STATIC=ON
-        buildWithCMakeArgs: --config Release
-    
+        buildWithCMakeArgs: --config Release  
+        
     - name: 'Run CTest'
-      run: ctest -C Release -LE explicitonly  --output-on-failure
+      run: ctest -C Release -E checkperf  --output-on-failure 
       working-directory: "${{ github.workspace }}/../../_temp/windows"

.github/workflows/vs16-ninja-ci.yml

@@ -1,51 +1,26 @@
 name: VS16-Ninja-CI
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+on: [push, pull_request]
 
 jobs:
   ci:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
     name: windows-vs16
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/cache@v2
-      with:
-        path: dependencies/.cache
-        key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
     - name: 'Run CMake with VS16'
       uses: lukka/run-cmake@v2
       with:
         cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
         cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
         buildDirectory: "${{ github.workspace }}/../../_temp/windows"
-        cmakeBuildType: Release
+        cmakeBuildType: Release   
         buildWithCMake: true
+        cmakeGenerator: VS16Win64 
         cmakeAppendedArgs:  -G Ninja -DSIMDJSON_COMPETITION=OFF   -DSIMDJSON_BUILD_STATIC=ON
-        buildWithCMakeArgs: --config Release
+        buildWithCMakeArgs: --config Release  
+        
     - name: 'Run CTest'
-      run: ctest -C Release  -LE explicitonly  --output-on-failure
+      run: ctest -C Release  -E checkperf  --output-on-failure 
       working-directory: "${{ github.workspace }}/../../_temp/windows"
-    - name: 'Install with CMake'
-      uses: lukka/run-cmake@v3
-      with:
-        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
-        buildWithCMakeArgs: '--target install'
-    - name: 'Test Installation with CMake'
-      uses: lukka/run-cmake@v3
-      with:
-        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
-        cmakeListsTxtPath: '${{ github.workspace }}/tests/installation_tests/find/CMakeLists.txt'
-        cmakeBuildType: Release
-        buildWithCMake: true
-        buildDirectory: '${{ github.workspace }}/tests/installation_tests/find/buildDirectory'
-        cmakeAppendedArgs:  -G Ninja
-        buildWithCMakeArgs: '--config Release --verbose'
+  

.github/workflows/vs16-noexcept-ci.yml

@@ -1,36 +0,0 @@
-name: VS16-NoExcept-CI
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  ci:
-    name: windows-vs16
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v2
-      with:
-        path: dependencies/.cache
-        key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-    - name: 'Run CMake with VS16'
-      uses: lukka/run-cmake@v3
-      with:
-        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
-        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
-        buildDirectory: "${{ github.workspace }}/../../_temp/windows"
-        cmakeBuildType: Release
-        buildWithCMake: true
-        cmakeGenerator: VS16Win64
-        cmakeAppendedArgs: -DSIMDJSON_COMPETITION=OFF  -DSIMDJSON_EXCEPTIONS=OFF
-        buildWithCMakeArgs: --config Release
-
-    - name: 'Run CTest'
-      run: ctest -C Release  -LE explicitonly  --output-on-failure
-      working-directory: "${{ github.workspace }}/../../_temp/windows"
-

.gitignore

@@ -96,4 +96,3 @@ objs
 
 # Generated docs
 /doc/api
-*.orig

.gitmodules

@@ -0,0 +1,42 @@
+[submodule "scalarvssimd/rapidjson"]
+	path = dependencies/rapidjson
+	url = https://github.com/Tencent/rapidjson.git
+[submodule "dependencies/sajson"]
+	path = dependencies/sajson
+	url = https://github.com/chadaustin/sajson.git
+[submodule "dependencies/json11"]
+	path = dependencies/json11
+	url = https://github.com/dropbox/json11.git
+[submodule "dependencies/fastjson"]
+	path = dependencies/fastjson
+	url = https://github.com/mikeando/fastjson.git
+[submodule "dependencies/gason"]
+	path = dependencies/gason
+	url = https://github.com/vivkin/gason.git
+[submodule "dependencies/ujson4c"]
+	path = dependencies/ujson4c
+	url = https://github.com/esnme/ujson4c.git
+[submodule "dependencies/jsmn"]
+	path = dependencies/jsmn
+	url = https://github.com/zserge/jsmn.git
+[submodule "dependencies/cJSON"]
+	path = dependencies/cJSON
+	url = https://github.com/DaveGamble/cJSON.git
+[submodule "dependencies/jsoncpp"]
+	path = dependencies/jsoncpp
+	url = https://github.com/open-source-parsers/jsoncpp.git
+[submodule "dependencies/json"]
+	path = dependencies/json
+	url = https://github.com/nlohmann/json.git
+[submodule "dependencies/benchmark"]
+	path = dependencies/benchmark
+	url = https://github.com/google/benchmark.git
+[submodule "dependencies/cxxopts"]
+	path = dependencies/cxxopts
+	url = https://github.com/jarro2783/cxxopts
+[submodule "dependencies/boost.json"]
+	path = dependencies/boost.json
+	url = https://github.com/CPPAlliance/json.git
+[submodule "dependencies/yyjson"]
+	path = dependencies/yyjson
+	url = https://github.com/ibireme/yyjson.git

.travis.yml

@@ -1,188 +1,30 @@
 language: cpp
+sudo: false
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - gcc-7
+      - g++-7
+      - clang-format
+      - python
+branches:
+  only:
+    - master
 
-dist: bionic
+script: 
+   - export CXX=g++-7
+   - export CC=gcc-7
+   - make
+   - make test 
+   - make everything
+   - make amalgamate
+   - make clean
+   - make SANITIZEGOLD=1 test
+   - make clean
+   - ARCHFLAGS="-march=nehalem" make 
+   - ARCHFLAGS="-march=nehalem" make test
+   - ARCHFLAGS="-march=nehalem" make everything
+   - ./style/run-clang-format.py -r include/ benchmark/ src/ tests/
 
-arch:
-  - ppc64le
-
-cache:
-  directories:
-    - $HOME/.dep_cache
-
-env:
-  global:
-    - simdjson_DEPENDENCY_CACHE_DIR=$HOME/.dep_cache
-
-matrix:
-  include:
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-8
-      env:
-        - COMPILER="CC=gcc-8 && CXX=g++-8"
-      compiler: gcc-8
-
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-9
-      env:
-        - COMPILER="CC=gcc-9 && CXX=g++-9"
-      compiler: gcc-9
-
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-10
-      env:
-        - COMPILER="CC=gcc-10 && CXX=g++-10"
-      compiler: gcc-10
-
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-10
-      env:
-        - COMPILER="CC=gcc-10 && CXX=g++-10"
-        - SANITIZE="on"
-      compiler: gcc-10-sanitize
-
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-10
-      env:
-        - COMPILER="CC=gcc-10 && CXX=g++-10"
-        - STATIC="on"
-      compiler: gcc-10-static
-
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-bionic-6.0
-          packages:
-            - clang-6.0
-      env:
-        - COMPILER="CC=clang-6.0 && CXX=clang++-6.0"
-      compiler: clang-6
-
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-bionic-7
-          packages:
-            - clang-7
-      env:
-        - COMPILER="CC=clang-7 && CXX=clang++-7"
-      compiler: clang-7
-
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-bionic-8
-          packages:
-            - clang-8
-      env:
-        - COMPILER="CC=clang-8 && CXX=clang++-8"
-      compiler: clang-8
-
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-bionic-9
-          packages:
-            - clang-9
-      env:
-        - COMPILER="CC=clang-9 && CXX=clang++-9"
-      compiler: clang-9
-
-    - os: linux
-      addons:
-        apt:
-          packages:
-            - clang-10
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-      env:
-        - COMPILER="CC=clang-10 && CXX=clang++-10"
-      compiler: clang-10
-
-    - os: linux
-      addons:
-        apt:
-          packages:
-            - clang-10
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-      env:
-        - COMPILER="CC=clang-10 && CXX=clang++-10"
-        - STATIC="on"
-      compiler: clang-10-static
-
-    - os: linux
-      addons:
-        apt:
-          packages:
-            - clang-10
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-      env:
-        - COMPILER="CC=clang-10 && CXX=clang++-10"
-        - SANITIZE="on"
-      compiler: clang-10-sanitize
-
-before_install:
-  - eval "${COMPILER}"
-
-install:
-  - wget -q -O - "https://raw.githubusercontent.com/simdjson/debian-ppa/master/key.gpg" | sudo apt-key add -
-  - sudo apt-add-repository "deb https://raw.githubusercontent.com/simdjson/debian-ppa/master simdjson main"
-  - sudo apt-get -qq update
-  - sudo apt-get purge cmake cmake-data
-  - sudo apt-get -t simdjson -y install cmake
-  - export CMAKE_CXX_FLAGS="-maltivec -mcpu=power9 -mtune=power9"
-  - export CMAKE_C_FLAGS="${CMAKE_CXX_FLAGS}"
-  - export CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DSIMDJSON_IMPLEMENTATION=ppc64;fallback";
-  - if [[ "${SANITIZE}" == "on" ]]; then
-      export CMAKE_FLAGS="${CMAKE_FLAGS} -DSIMDJSON_SANITIZE=ON";
-      export ASAN_OPTIONS="detect_leaks=0";
-    fi
-  - if [[ "${STATIC}" == "on" ]]; then
-      export CMAKE_FLAGS="${CMAKE_FLAGS} -DSIMDJSON_BUILD_STATIC=ON";
-    fi
-  - export CTEST_FLAGS="-j4 --output-on-failure -LE explicitonly"
-
-script:
-  - mkdir build
-  - cd build
-  - cmake $CMAKE_FLAGS ..
-  - cmake --build . -- -j2
-  - SIMDJSON_FORCE_IMPLEMENTATION=ppc64 ctest $CTEST_FLAGS -L per_implementation
-  - SIMDJSON_FORCE_IMPLEMENTATION=fallback ctest $CTEST_FLAGS -L per_implementation
-  - ctest $CTEST_FLAGS -LE "acceptance|per_implementation"

CMakeLists.txt

@@ -1,18 +1,16 @@
-cmake_minimum_required(VERSION 3.13)
-# CMP0025: Compiler id for Apple Clang is now AppleClang.
-# https://cmake.org/cmake/help/v3.17/policy/CMP0025.html
-cmake_policy(SET CMP0025 NEW)
+cmake_minimum_required(VERSION 3.9) # CMP0069 NEW
+
 project(simdjson
   DESCRIPTION "Parsing gigabytes of JSON per second"
   LANGUAGES CXX C
 )
 
 set(PROJECT_VERSION_MAJOR 0)
-set(PROJECT_VERSION_MINOR 9)
-set(PROJECT_VERSION_PATCH 7)
-set(SIMDJSON_SEMANTIC_VERSION "0.9.7" CACHE STRING "simdjson semantic version")
-set(SIMDJSON_LIB_VERSION "8.0.0" CACHE STRING "simdjson library version")
-set(SIMDJSON_LIB_SOVERSION "8" CACHE STRING "simdjson library soversion")
+set(PROJECT_VERSION_MINOR 6)
+set(PROJECT_VERSION_PATCH 1)
+set(SIMDJSON_SEMANTIC_VERSION "0.6.1" CACHE STRING "simdjson semantic version")
+set(SIMDJSON_LIB_VERSION "4.0.0" CACHE STRING "simdjson library version")
+set(SIMDJSON_LIB_SOVERSION "4" CACHE STRING "simdjson library soversion")
 set(SIMDJSON_GITHUB_REPOSITORY https://github.com/simdjson/simdjson)
 
 include(GNUInstallDirs)
@@ -45,21 +43,6 @@ if(NOT(SIMDJSON_JUST_LIBRARY))
 endif()
 install(FILES singleheader/simdjson.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
-option(SIMDJSON_ENABLE_THREADS "Link with thread support" ON)
-include(CMakePackageConfigHelpers)
-configure_package_config_file("${PROJECT_SOURCE_DIR}/cmake/simdjson-config.cmake.in"
-      "${PROJECT_BINARY_DIR}/simdjson-config.cmake"
-      INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/simdjson"
-      NO_SET_AND_CHECK_MACRO
-      NO_CHECK_REQUIRED_COMPONENTS_MACRO)
-write_basic_package_version_file(
-      "${PROJECT_BINARY_DIR}/simdjson-config-version.cmake"
-      VERSION ${SIMDJSON_SEMANTIC_VERSION}
-      COMPATIBILITY SameMinorVersion)
-install(FILES "${PROJECT_BINARY_DIR}/simdjson-config.cmake"
-              "${PROJECT_BINARY_DIR}/simdjson-config-version.cmake"
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/simdjson")
-
 #
 # Compile tools / tests / benchmarks
 #

CONTRIBUTING.md

@@ -42,7 +42,6 @@ We have few hard rules, but we have some:
 - Calls to `abort()` are forbidden in the core library. This follows from the [Writing R Extensions](https://cran.r-project.org/doc/manuals/R-exts.html) manual which states that "Under no circumstances should your compiled code ever call abort or exit".
 - All source code files (.h, .cpp) must be ASCII.
 - All C macros introduced in public headers need to be prefixed with either `SIMDJSON_` or `simdjson_`.
-- We avoid trailing white space characters within lines. That is, your lines of code should not terminate with unnecessary spaces. Generally, please avoid making unnecessary changes to white-space characters when contributing code.
 
 Tools, tests and benchmarks are not held to these same strict rules.
 
@@ -70,8 +69,6 @@ Pull requests are always invited. However, we ask that you follow these guidelin
 - Changes should be focused and minimal. You should change as few lines of code as possible. Please do not reformat or touch files needlessly.
 - New features must be accompanied of new tests, in general.
 - Your code should pass our continuous-integration tests. It is your responsability to ensure that your proposal pass the tests. We do not merge pull requests that would break our build.
-   - An exception to this would be changes to non-code files, such as documentation and assets, or trivial changes to code, such as comments, where it is encouraged to explicitly ask for skipping a CI run using the `[skip ci]` prefix in your Pull Request title **and** in the first line of the most recent commit in a push. Example for such a commit: `[skip ci] Fixed typo in power_of_ten's docs`
-   This benefits the project in such a way that the CI pipeline is not burdened by running jobs on changes that don't change any behavior in the code, which reduces wait times for other Pull Requests that do change behavior and require testing.
 
 If the benefits of your proposed code remain unclear, we may choose to discard your code: that is not an insult, we frequently discard our own code. We may also consider various alternatives and choose another path. Again, that is not an insult or a sign that you have wasted your time.
 

CONTRIBUTORS

@@ -35,6 +35,5 @@ Matjaž Ostroveršnik
 Nong Li
 Furkan Taşkale
 Brendan Knapp
-Danila Kutenin
 # if you have contributed to the project and your name does not 
 # appear in this list, please let us know!

Dockerfile

@@ -41,7 +41,7 @@
 #
 # Next you can test it as follows:
 #
-# docker run -it -v $(pwd):/project:Z   simdjson sh -c "cd dockerbuild && ctest . --output-on-failure -LE explicitonly"
+# docker run -it -v $(pwd):/project:Z   simdjson sh -c "cd dockerbuild && ctest . --output-on-failure -E checkperf"
 #
 # The run the complete tests requires you to have built all of simdjson.
 #

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = simdjson
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "0.9.7"
+PROJECT_NUMBER         = "0.6.1"
 
 # 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

HACKING.md

@@ -48,7 +48,7 @@ simdjson's source structure, from the top level, looks like this:
   implementations).
   * simdjson.cpp: A "main source" that includes all implementation files from src/. This is
     equivalent to the distributed simdjson.cpp.
-  * arm64/|fallback/|haswell/|ppc64/|westmere/: Architecture-specific implementations. All functions are
+  * arm64/|fallback/|haswell/|westmere/: Architecture-specific implementations. All functions are
     Each architecture defines its own namespace, e.g. simdjson::haswell.
   * generic/: Generic implementations of the simdjson parser. These files may be included and
     compiled multiple times, from whichever architectures use them. They assume they are already
@@ -67,7 +67,7 @@ Other important files and directories:
 * **.circleci:** Definitions for Circle 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/amalgamate.py:** Generates `singleheader/simdjson.h` and `singleheader/simdjson.cpp` for release (python script).
+* **singleheader/amalgamate.sh:** Generates `singleheader/simdjson.h` and `singleheader/simdjson.cpp` for release (bash script). 
 * **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
   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, unnnecessary system calls. We recommend checking the performance as follows:
@@ -169,13 +169,12 @@ systematically regenerated on releases. To ensure you have the latest code, you
 mkdir build
 cd build
 cmake ..
-cmake --build . # needed, because currently dependencies do not work fully for the amalgamate target
 cmake --build . --target amalgamate
 ```
 
-You need to have python3 installed on your system.
+You need to have a working bash on your system.
 
-The amalgamator script `amalgamate.py` generates singleheader/simdjson.h by
+The amalgamator script is `amalgamate.sh` generates singleheader/simdjson.h by
 reading through include/simdjson.h, copy/pasting each header file into the amalgamated file at the
 point it gets included (but only once per header). singleheader/simdjson.cpp is generated from
 src/simdjson.cpp the same way, except files under generic/ may be included and copy/pasted multiple
@@ -252,7 +251,7 @@ We assume you have a common 64-bit Windows PC with at least Visual Studio 2019.
 - Install [CMake](https://cmake.org/download/). When you install it, make sure to ask that `cmake` be made available from the command line. Please choose a recent version of cmake.
 - Create a subdirectory within simdjson, such as `build`.
 - Using a shell, go to this newly created directory. You can start a shell directly from GitHub Desktop (Repository > Open in Command Prompt).
-- Type `cmake  ..` in the shell while in the `build` repository.
+- Type `cmake  ..` in the shell while in the `build` repository. 
 - This last command (`cmake ...`) created a Visual Studio solution file in the newly created directory (e.g., `simdjson.sln`). Open this file in Visual Studio. You should now be able to build the project and run the tests. For example, in the `Solution Explorer` window (available from the `View` menu), right-click `ALL_BUILD` and select `Build`. To test the code, still in the `Solution Explorer` window, select `RUN_TESTS` and select `Build`.
 
 

README.md

@@ -3,7 +3,7 @@
 [![Ubuntu 20.04 CI](https://github.com/simdjson/simdjson/workflows/Ubuntu%2020.04%20CI%20(GCC%209)/badge.svg)](https://simdjson.org/plots.html)
 ![VS16-CI](https://github.com/simdjson/simdjson/workflows/VS16-CI/badge.svg)
 ![MinGW64-CI](https://github.com/simdjson/simdjson/workflows/MinGW64-CI/badge.svg)
-[![][license img]][license]  [![Doxygen Documentation](https://img.shields.io/badge/docs-doxygen-green.svg)](https://simdjson.org/api/0.9.0/index.html)
+[![][license img]][license]  [![Doxygen Documentation](https://img.shields.io/badge/docs-doxygen-green.svg)](https://simdjson.org/api/0.6.0/index.html)
 
 simdjson : Parsing gigabytes of JSON per second
 ===============================================
@@ -11,11 +11,12 @@ simdjson : Parsing gigabytes of JSON per second
 <img src="images/logo.png" width="10%" style="float: right">
 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
-to parse JSON 4x  faster than RapidJSON and 25x faster than JSON for Modern C++.
+to parse JSON 2.5x  faster than RapidJSON and 25x faster than JSON for Modern C++.
 
-* **Fast:** Over 4x faster than commonly used production-grade JSON parsers.
+* **Fast:** Over 2.5x faster than commonly used production-grade JSON parsers.
 * **Record Breaking Features:** Minify JSON  at 6 GB/s, validate UTF-8  at 13 GB/s,  NDJSON at 3.5 GB/s.
 * **Easy:** First-class, easy to use and carefully documented APIs.
+* **Beyond DOM:** Try the new On Demand API for twice the speed (>4GB/s).
 * **Strict:** Full JSON and UTF-8 validation, lossless parsing. Performance with no compromises.
 * **Automatic:** Selects a CPU-tailored parser at runtime. No configuration needed.
 * **Reliable:** From memory allocation to error handling, simdjson's design avoids surprises.
@@ -27,7 +28,6 @@ Table of Contents
 -----------------
 
 * [Quick Start](#quick-start)
-  * [On Demand](#on-demand)
 * [Documentation](#documentation)
 * [Performance results](#performance-results)
 * [Real-world usage](#real-world-usage)
@@ -40,29 +40,23 @@ Table of Contents
 Quick Start
 -----------
 
+          
 The simdjson library is easily consumable with a single .h and .cpp file.
 
-0. Prerequisites: `g++` (version 7 or better) or `clang++` (version 6 or better), and a 64-bit
-   system with a command-line shell (e.g., Linux, macOS, freeBSD). We also support programming
-   environments like Visual Studio and Xcode, but different steps are needed.
-1. Pull [simdjson.h](singleheader/simdjson.h) and [simdjson.cpp](singleheader/simdjson.cpp) into a
-   directory, along with the sample file [twitter.json](jsonexamples/twitter.json).
-
+0. Prerequisites: `g++` (version 7 or better) or `clang++` (version 6 or better), and a 64-bit system with a command-line shell (e.g., Linux, macOS, freeBSD). We also support programming environnements like Visual Studio and Xcode, but different steps are needed.
+1. Pull [simdjson.h](singleheader/simdjson.h) and [simdjson.cpp](singleheader/simdjson.cpp) into a directory, along with the sample file [twitter.json](jsonexamples/twitter.json).
    ```
    wget https://raw.githubusercontent.com/simdjson/simdjson/master/singleheader/simdjson.h https://raw.githubusercontent.com/simdjson/simdjson/master/singleheader/simdjson.cpp https://raw.githubusercontent.com/simdjson/simdjson/master/jsonexamples/twitter.json
    ```
 2. Create `quickstart.cpp`:
 
-```c++
-#include "simdjson.h"
-using namespace simdjson;
-int main(void) {
-    ondemand::parser parser;
-    padded_string json = padded_string::load("twitter.json");
-    ondemand::document tweets = parser.iterate(json);
-    std::cout << uint64_t(tweets["search_metadata"]["count"]) << " results." << std::endl;
-}
-
+   ```c++
+   #include "simdjson.h"
+   int main(void) {
+     simdjson::dom::parser parser;
+     simdjson::dom::element tweets = parser.load("twitter.json");
+     std::cout << tweets["search_metadata"]["count"] << " results." << std::endl;
+   }
    ```
 3. `c++ -o quickstart quickstart.cpp simdjson.cpp`
 4. `./quickstart`
@@ -79,31 +73,59 @@ Usage documentation is available:
 * [Performance](doc/performance.md) shows some more advanced scenarios and how to tune for them.
 * [Implementation Selection](doc/implementation-selection.md) describes runtime CPU detection and
   how you can work with it.
-* [API](https://simdjson.org/api/0.9.0/annotated.html) contains the automatically generated API documentation.
+* [API](https://simdjson.org/api/0.6.0/annotated.html) contains the automatically generated API documentation.
 
 Performance results
 -------------------
 
-The simdjson library uses three-quarters less instructions than state-of-the-art parser [RapidJSON](https://rapidjson.org). To our knowledge, simdjson is the first fully-validating JSON parser
+The simdjson library uses three-quarters less instructions than state-of-the-art parser [RapidJSON](https://rapidjson.org) and
+fifty percent less than sajson. To our knowledge, simdjson is the first fully-validating JSON parser
 to run at [gigabytes per second](https://en.wikipedia.org/wiki/Gigabyte) (GB/s) on commodity processors. It can parse millions of JSON documents per second on a single core.
 
 The following figure represents parsing speed in GB/s for parsing various files
-on an Intel Skylake processor (3.4 GHz) using the GNU GCC 10 compiler (with the -O3 flag).
-We compare against the best and fastest C++ libraries on benchmarks that load and process the data.
+on an Intel Skylake processor (3.4 GHz) using the GNU GCC 9 compiler (with the -O3 flag).
+We compare against the best and fastest C++ libraries.
 The simdjson library offers full unicode ([UTF-8](https://en.wikipedia.org/wiki/UTF-8)) validation and exact
-number parsing.
+number parsing. The RapidJSON library is tested in two modes: fast and
+exact number parsing. The sajson library offers fast (but not exact)
+number parsing and partial unicode validation. In this data set, the file
+sizes range from 65KB (github_events) all the way to 3.3GB (gsoc-2018).
+Many files are mostly made of numbers: canada, mesh.pretty, mesh, random
+and numbers: in such instances, we see lower JSON parsing speeds due to the
+high cost of number parsing. The simdjson library uses exact number parsing which
+is particular taxing.
+
+<img src="doc/gbps.png" width="90%">
+
+On a Skylake processor, the parsing speeds (in GB/s) of various processors on the twitter.json file are as follows, using again GNU GCC 9.1 (with the -O3 flag). The popular JSON for Modern C++ library is particularly slow: it obviously trades parsing speed for other desirable features.
+
+| parser                                | GB/s |
+| ------------------------------------- | ---- |
+| simdjson                              | 2.5  |
+| RapidJSON UTF8-validation             | 0.29 |
+| RapidJSON UTF8-valid., exact numbers  | 0.28 |
+| RapidJSON insitu, UTF8-validation     | 0.41 |
+| RapidJSON insitu, UTF8-valid., exact  | 0.39 |
+| sajson (insitu, dynamic)              | 0.62 |
+| sajson (insitu, static)               | 0.88 |
+| dropbox                               | 0.13 |
+| fastjson                              | 0.27 |
+| gason                                 | 0.59 |
+| ultrajson                             | 0.34 |
+| jsmn                                  | 0.25 |
+| cJSON                                 | 0.31 |
+| JSON for Modern C++ (nlohmann/json)   | 0.11 |
 
-<img src="doc/rome.png" width="60%">
 
 The simdjson library offers high speed whether it processes tiny files (e.g., 300 bytes)
 or larger files (e.g., 3MB). The following plot presents parsing
 speed for [synthetic files over various sizes generated with a script](https://github.com/simdjson/simdjson_experiments_vldb2019/blob/master/experiments/growing/gen.py) on a 3.4 GHz Skylake processor (GNU GCC 9, -O3).
-
-<img src="doc/growing.png" width="60%">
+<img src="doc/growing.png" width="90%">
 
 [All our experiments are reproducible](https://github.com/simdjson/simdjson_experiments_vldb2019).
 
 
+You can go beyond 4 GB/s with our new [On Demand API](https://github.com/simdjson/simdjson/blob/master/doc/ondemand.md).
 For NDJSON files, we can exceed 3 GB/s with [our  multithreaded parsing functions](https://github.com/simdjson/simdjson/blob/master/doc/parse_many.md).
 
 
@@ -126,7 +148,6 @@ We distinguish between "bindings" (which just wrap the C++ code) and a port to a
 - [ZippyJSON](https://github.com/michaeleisel/zippyjson): Swift bindings for the simdjson project.
 - [libpy_simdjson](https://github.com/gerrymanoim/libpy_simdjson/): high-speed Python bindings for simdjson using [libpy](https://github.com/quantopian/libpy).
 - [pysimdjson](https://github.com/TkTech/pysimdjson): Python bindings for the simdjson project.
-- [cysimdjson](https://github.com/TeskaLabs/cysimdjson): high-speed Python bindings for the simdjson project.
 - [simdjson-rs](https://github.com/simd-lite): Rust port.
 - [simdjson-rust](https://github.com/SunDoge/simdjson-rust): Rust wrapper (bindings).
 - [SimdJsonSharp](https://github.com/EgorBo/SimdJsonSharp): C# version for .NET Core (bindings and full port).
@@ -147,7 +168,7 @@ instructions, reducing branch misprediction, and reducing data dependency to tak
 CPU's multiple execution cores.
 
 Some people [enjoy reading our 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: 
 - Geoff Langdale, Daniel Lemire, [Parsing Gigabytes of JSON per Second](https://arxiv.org/abs/1902.08318), VLDB Journal 28 (6), 2019.
 
 We have an in-depth paper focused on the UTF-8 validation:

benchmark/CMakeLists.txt

@@ -1,7 +1,13 @@
 include_directories( . linux )
 link_libraries(simdjson-windows-headers test-data)
-link_libraries(simdjson simdjson-flags)
 
+
+if (TARGET benchmark::benchmark)
+  add_executable(bench_sax bench_sax.cpp)
+  target_link_libraries(bench_sax simdjson-internal-flags simdjson-include-source benchmark::benchmark)
+endif (TARGET benchmark::benchmark)
+
+link_libraries(simdjson simdjson-flags)
 add_executable(benchfeatures benchfeatures.cpp)
 add_executable(get_corpus_benchmark get_corpus_benchmark.cpp)
 add_executable(perfdiff perfdiff.cpp)
@@ -16,26 +22,29 @@ target_compile_definitions(parse_nonumberparsing PRIVATE SIMDJSON_SKIPNUMBERPARS
 add_executable(parse_nostringparsing parse.cpp)
 target_compile_definitions(parse_nostringparsing PRIVATE SIMDJSON_SKIPSTRINGPARSING)
 
+if (TARGET competition-all)
+  add_executable(distinctuseridcompetition distinctuseridcompetition.cpp)
+  target_link_libraries(distinctuseridcompetition competition-core)
+
+  add_executable(minifiercompetition minifiercompetition.cpp)
+  target_link_libraries(minifiercompetition competition-core)
+
+  add_executable(parseandstatcompetition parseandstatcompetition.cpp)
+  target_link_libraries(parseandstatcompetition competition-core)
+
+  add_executable(parsingcompetition parsingcompetition.cpp)
+  target_link_libraries(parsingcompetition competition-core)
+
+  add_executable(allparsingcompetition parsingcompetition.cpp)
+  target_link_libraries(allparsingcompetition competition-all)
+  target_compile_definitions(allparsingcompetition PRIVATE ALLPARSER)
+endif()
+
 if (TARGET benchmark::benchmark)
   link_libraries(benchmark::benchmark)
   add_executable(bench_parse_call bench_parse_call.cpp)
   add_executable(bench_dom_api bench_dom_api.cpp)
-  if(SIMDJSON_EXCEPTIONS)
-    add_executable(bench_ondemand bench_ondemand.cpp)
-    if(TARGET yyjson)
-      target_link_libraries(bench_ondemand PRIVATE yyjson)
-    endif()
-    if(TARGET rapidjson)
-      target_link_libraries(bench_ondemand PRIVATE rapidjson)
-    endif()
-    if(TARGET sajson)
-      target_link_libraries(bench_ondemand PRIVATE sajson)
-    endif()
-    if(TARGET nlohmann_json)
-      target_link_libraries(bench_ondemand PRIVATE nlohmann_json)
-    endif()
-  endif()
+  add_executable(bench_ondemand bench_ondemand.cpp)
 endif()
 
-# deliberately disabling.
-# include(checkperf.cmake)
+include(checkperf.cmake)

benchmark/bench_dom_api.cpp

@@ -8,8 +8,8 @@ using namespace std;
 
 const padded_string EMPTY_ARRAY("[]", 2);
 
-static const char *TWITTER_JSON = SIMDJSON_BENCHMARK_DATA_DIR "twitter.json";
-static const char *NUMBERS_JSON = SIMDJSON_BENCHMARK_DATA_DIR "numbers.json";
+const char *TWITTER_JSON = SIMDJSON_BENCHMARK_DATA_DIR "twitter.json";
+const char *NUMBERS_JSON = SIMDJSON_BENCHMARK_DATA_DIR "numbers.json";
 
 static void recover_one_string(State& state) {
   dom::parser parser;
@@ -87,8 +87,8 @@ static void serialize_big_string_to_string(State& state) {
   std::vector<char> content;
   content.push_back('\"');
   for(size_t i = 0 ; i < 100000; i ++) {
-    content.push_back('0' + char(i%10)); // we add what looks like a long list of digits
-  }
+    content.push_back('0' + char(i%10)); // we add what looks like a long list of digits 
+  } 
   content.push_back('\"');
   dom::element doc;
   simdjson::error_code error;
@@ -139,7 +139,7 @@ static void serialize_twitter_to_string(State& state) {
   }
   // we validate the result
   {
-    auto serial = simdjson::to_string(doc);
+    auto serial = simdjson::to_string(doc); 
     dom::element doc2; // we parse the stringify output
     if ((error = parser.parse(serial).get(doc2))) { throw std::runtime_error("serialization error"); }
     auto serial2 = simdjson::to_string(doc2); // we stringify again
@@ -211,7 +211,7 @@ static void numbers_scan(State& state) {
     }
     benchmark::DoNotOptimize(container.data());
     benchmark::ClobberMemory();
-  }
+  }  
 }
 BENCHMARK(numbers_scan);
 
@@ -236,7 +236,7 @@ static void numbers_size_scan(State& state) {
     if(pos != container.size()) { cerr << "bad count" << endl; }
     benchmark::DoNotOptimize(container.data());
     benchmark::ClobberMemory();
-  }
+  }  
 }
 BENCHMARK(numbers_size_scan);
 
@@ -315,7 +315,7 @@ static void numbers_load_scan(State& state) {
     }
     benchmark::DoNotOptimize(container.data());
     benchmark::ClobberMemory();
-  }
+  }  
 }
 BENCHMARK(numbers_load_scan);
 
@@ -341,7 +341,7 @@ static void numbers_load_size_scan(State& state) {
     if(pos != container.size()) { cerr << "bad count" << endl; }
     benchmark::DoNotOptimize(container.data());
     benchmark::ClobberMemory();
-  }
+  }  
 }
 BENCHMARK(numbers_load_size_scan);
 
@@ -360,7 +360,7 @@ static void numbers_exceptions_scan(State& state) {
     }
     benchmark::DoNotOptimize(container.data());
     benchmark::ClobberMemory();
-  }
+  }  
 }
 BENCHMARK(numbers_exceptions_scan);
 
@@ -378,7 +378,7 @@ static void numbers_exceptions_size_scan(State& state) {
     if(pos != container.size()) { cerr << "bad count" << endl; }
     benchmark::DoNotOptimize(container.data());
     benchmark::ClobberMemory();
-  }
+  }  
 }
 BENCHMARK(numbers_exceptions_size_scan);
 
@@ -437,7 +437,7 @@ static void numbers_exceptions_load_scan(State& state) {
     }
     benchmark::DoNotOptimize(container.data());
     benchmark::ClobberMemory();
-  }
+  }  
 }
 BENCHMARK(numbers_exceptions_load_scan);
 
@@ -456,7 +456,7 @@ static void numbers_exceptions_load_size_scan(State& state) {
     if(pos != container.size()) { cerr << "bad count" << endl; }
     benchmark::DoNotOptimize(container.data());
     benchmark::ClobberMemory();
-  }
+  }  
 }
 BENCHMARK(numbers_exceptions_load_size_scan);
 
@@ -472,7 +472,6 @@ static void twitter_count(State& state) {
 }
 BENCHMARK(twitter_count);
 
-#ifndef SIMDJSON_DISABLE_DEPRECATED_API
 SIMDJSON_PUSH_DISABLE_WARNINGS
 SIMDJSON_DISABLE_DEPRECATED_WARNING
 static void iterator_twitter_count(State& state) {
@@ -492,7 +491,6 @@ static void iterator_twitter_count(State& state) {
 }
 BENCHMARK(iterator_twitter_count);
 SIMDJSON_POP_DISABLE_WARNINGS
-#endif // SIMDJSON_DISABLE_DEPRECATED_API
 
 static void twitter_default_profile(State& state) {
   // Count unique users with a default profile.
@@ -503,7 +501,7 @@ static void twitter_default_profile(State& state) {
     for (dom::object tweet : doc["statuses"]) {
       dom::object user = tweet["user"];
       if (user["default_profile"]) {
-        default_users.emplace(user["screen_name"]);
+        default_users.insert(user["screen_name"]);
       }
     }
     if (default_users.size() != 86) { return; }
@@ -522,8 +520,8 @@ static void twitter_image_sizes(State& state) {
       dom::array media;
       if (not (error = tweet["entities"]["media"].get(media))) {
         for (dom::object image : media) {
-          for (auto size : image["sizes"].get_object()) {
-             image_sizes.emplace(size.value["w"], size.value["h"]);
+          for (auto size : image["sizes"].get<dom::object>()) {
+            image_sizes.insert({ size.value["w"], size.value["h"] });
           }
         }
       }
@@ -577,11 +575,8 @@ static void error_code_twitter_default_profile(State& state) noexcept {
 }
 BENCHMARK(error_code_twitter_default_profile);
 
-#ifndef SIMDJSON_DISABLE_DEPRECATED_API
-
 SIMDJSON_PUSH_DISABLE_WARNINGS
 SIMDJSON_DISABLE_DEPRECATED_WARNING
-
 static void iterator_twitter_default_profile(State& state) {
   // Count unique users with a default profile.
   padded_string json;
@@ -607,7 +602,7 @@ static void iterator_twitter_default_profile(State& state) {
 
             // default_users.insert(user["screen_name"]);
             if (!(iter.move_to_key("screen_name") && iter.is_string())) { return; }
-            default_users.emplace(iter.get_string(), iter.get_string_length());
+            default_users.insert(string_view(iter.get_string(), iter.get_string_length()));
           }
           if (!iter.up()) { return; } // back to user
         }
@@ -620,10 +615,8 @@ static void iterator_twitter_default_profile(State& state) {
     if (default_users.size() != 86) { return; }
   }
 }
-
 SIMDJSON_POP_DISABLE_WARNINGS
 BENCHMARK(iterator_twitter_default_profile);
-#endif // SIMDJSON_DISABLE_DEPRECATED_API
 
 static void error_code_twitter_image_sizes(State& state) noexcept {
   // Count unique image sizes
@@ -645,7 +638,7 @@ static void error_code_twitter_image_sizes(State& state) noexcept {
             uint64_t width, height;
             if ((error = size.value["w"].get(width))) { return; }
             if ((error = size.value["h"].get(height))) { return; }
-            image_sizes.emplace(width, height);
+            image_sizes.insert({ width, height });
           }
         }
       }
@@ -655,8 +648,6 @@ static void error_code_twitter_image_sizes(State& state) noexcept {
 }
 BENCHMARK(error_code_twitter_image_sizes);
 
-#ifndef SIMDJSON_DISABLE_DEPRECATED_API
-
 SIMDJSON_PUSH_DISABLE_WARNINGS
 SIMDJSON_DISABLE_DEPRECATED_WARNING
 static void iterator_twitter_image_sizes(State& state) {
@@ -699,7 +690,7 @@ static void iterator_twitter_image_sizes(State& state) {
                     if (!(iter.move_to_key("h")) && !iter.is_integer()) { return; }
                     uint64_t height = iter.get_integer();
                     if (!iter.up()) { return; } // back to size
-                    image_sizes.emplace(width, height);
+                    image_sizes.insert({ width, height });
 
                   } while (iter.next()); // next size
                   if (!iter.up()) { return; } // back to sizes
@@ -711,7 +702,7 @@ static void iterator_twitter_image_sizes(State& state) {
             if (!iter.up()) { return; } // back to entities
           }
           if (!iter.up()) { return; } // back to status
-        }
+        } 
       } while (iter.next()); // next status
     }
 
@@ -720,9 +711,6 @@ static void iterator_twitter_image_sizes(State& state) {
 }
 BENCHMARK(iterator_twitter_image_sizes);
 
-#endif // SIMDJSON_DISABLE_DEPRECATED_API
-
-#ifndef SIMDJSON_DISABLE_DEPRECATED_API
 static void print_json(State& state) noexcept {
   // Prints the number of results in twitter.json
   dom::parser parser;
@@ -739,7 +727,6 @@ static void print_json(State& state) noexcept {
   }
 }
 BENCHMARK(print_json);
-#endif // SIMDJSON_DISABLE_DEPRECATED_API
 SIMDJSON_POP_DISABLE_WARNINGS
 
-BENCHMARK_MAIN();
+BENCHMARK_MAIN();

benchmark/bench_ondemand.cpp

@@ -1,72 +1,26 @@
 #include "simdjson.h"
-
+#include <iostream>
+#include <sstream>
+#include <random>
+#include <vector>
 SIMDJSON_PUSH_DISABLE_ALL_WARNINGS
-
-#ifdef SIMDJSON_COMPETITION_YYJSON
-#include "yyjson.h"
-#endif
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-#include "rapidjson/document.h"
-#include "rapidjson/reader.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/writer.h"
-#endif
-
-#ifdef SIMDJSON_COMPETITION_SAJSON
-#include "sajson.h"
-#endif
-
-#ifdef SIMDJSON_COMPETITION_NLOHMANN_JSON
-#include <nlohmann/json.hpp>
-#endif
-
-// This has to be last, for reasons I don't yet understand
 #include <benchmark/benchmark.h>
-
 SIMDJSON_POP_DISABLE_WARNINGS
 
-#include "partial_tweets/simdjson_dom.h"
-#include "partial_tweets/simdjson_ondemand.h"
-#include "partial_tweets/yyjson.h"
-#include "partial_tweets/sajson.h"
-#include "partial_tweets/rapidjson.h"
-#include "partial_tweets/nlohmann_json.h"
+#include "partial_tweets/ondemand.h"
+#include "partial_tweets/iter.h"
+#include "partial_tweets/dom.h"
 
-#include "large_random/simdjson_dom.h"
-#include "large_random/simdjson_ondemand.h"
-#include "large_random/simdjson_ondemand_unordered.h"
-#include "large_random/yyjson.h"
-#include "large_random/sajson.h"
-#include "large_random/rapidjson.h"
-#include "large_random/nlohmann_json.h"
+#include "largerandom/ondemand.h"
+#include "largerandom/iter.h"
+#include "largerandom/dom.h"
 
-#include "kostya/simdjson_dom.h"
-#include "kostya/simdjson_ondemand.h"
-#include "kostya/yyjson.h"
-#include "kostya/sajson.h"
-#include "kostya/rapidjson.h"
-#include "kostya/nlohmann_json.h"
+#include "kostya/ondemand.h"
+#include "kostya/iter.h"
+#include "kostya/dom.h"
 
-#include "distinct_user_id/simdjson_dom.h"
-#include "distinct_user_id/simdjson_ondemand.h"
-#include "distinct_user_id/yyjson.h"
-#include "distinct_user_id/sajson.h"
-#include "distinct_user_id/rapidjson.h"
-#include "distinct_user_id/nlohmann_json.h"
+#include "distinctuserid/ondemand.h"
+#include "distinctuserid/dom.h"
 
-#include "find_tweet/simdjson_dom.h"
-#include "find_tweet/simdjson_ondemand.h"
-#include "find_tweet/yyjson.h"
-#include "find_tweet/sajson.h"
-#include "find_tweet/rapidjson.h"
-#include "find_tweet/nlohmann_json.h"
-
-#include "top_tweet/simdjson_dom.h"
-#include "top_tweet/simdjson_ondemand.h"
-#include "top_tweet/yyjson.h"
-#include "top_tweet/sajson.h"
-#include "top_tweet/rapidjson.h"
-#include "top_tweet/nlohmann_json.h"
 
 BENCHMARK_MAIN();

benchmark/bench_parse_call.cpp

@@ -111,7 +111,6 @@ BENCHMARK(parse_gsoc)->Repetitions(10)->ComputeStatistics("max", [](const std::v
 
 
 
-#ifndef SIMDJSON_DISABLE_DEPRECATED_API
 SIMDJSON_PUSH_DISABLE_WARNINGS
 SIMDJSON_DISABLE_DEPRECATED_WARNING
 static void json_parse(State& state) {
@@ -124,8 +123,6 @@ static void json_parse(State& state) {
 }
 SIMDJSON_POP_DISABLE_WARNINGS
 BENCHMARK(json_parse);
-#endif // SIMDJSON_DISABLE_DEPRECATED_API
-
 static void parser_parse_error_code(State& state) {
   dom::parser parser;
   if (parser.allocate(EMPTY_ARRAY.length())) { return; }
@@ -154,7 +151,6 @@ BENCHMARK(parser_parse_exception);
 
 #endif // SIMDJSON_EXCEPTIONS
 
-#ifndef SIMDJSON_DISABLE_DEPRECATED_API
 SIMDJSON_PUSH_DISABLE_WARNINGS
 SIMDJSON_DISABLE_DEPRECATED_WARNING
 static void build_parsed_json(State& state) {
@@ -166,8 +162,6 @@ static void build_parsed_json(State& state) {
 SIMDJSON_POP_DISABLE_WARNINGS
 
 BENCHMARK(build_parsed_json);
-#endif
-
 static void document_parse_error_code(State& state) {
   for (simdjson_unused auto _ : state) {
     dom::parser parser;

benchmark/bench_sax.cpp

@@ -0,0 +1,14 @@
+#include "simdjson.h"
+#include "simdjson.cpp"
+#include <iostream>
+#include <sstream>
+#include <random>
+#include <vector>
+SIMDJSON_PUSH_DISABLE_ALL_WARNINGS
+#include <benchmark/benchmark.h>
+SIMDJSON_POP_DISABLE_WARNINGS
+
+#include "partial_tweets/sax.h"
+#include "largerandom/sax.h"
+
+BENCHMARK_MAIN();

benchmark/benchfeatures.cpp

@@ -63,8 +63,8 @@ void print_usage(ostream& out) {
   out << "-s STAGE   - Stop after the given stage." << endl;
   out << "             -s stage1 - Stop after find_structural_bits." << endl;
   out << "             -s all    - Run all stages." << endl;
-  out << "-a ARCH    - Use the parser with the designated architecture (HASWELL, WESTMERE," << endl;
-  out << "             PPC64 or ARM64). By default, detects best supported architecture." << endl;
+  out << "-a ARCH    - Use the parser with the designated architecture (HASWELL, WESTMERE" << endl;
+  out << "             or ARM64). By default, detects best supported architecture." << endl;
 }
 
 void exit_usage(string message) {
@@ -99,11 +99,11 @@ struct option_struct {
       case 'a': {
           auto impl = simdjson::available_implementations[optarg];
           if(impl && impl->supported_by_runtime_system()) {
-            simdjson::active_implementation = impl;
-          } else {
+            simdjson::active_implementation = impl; 
+          } else { 
             std::cerr << "implementation " << optarg << " not found or not supported " << std::endl;
           }
-        }
+        } 
         break;
       case 's':
         if (!strcmp(optarg, "stage1")) {

benchmark/benchmarker.h

@@ -228,7 +228,7 @@ struct progress_bar {
 /**
  * The speed at which we can allocate memory is strictly system specific.
  * It depends on the OS and the runtime library. It is subject to various
- * system-specific knobs. It is not something that we can reasonably
+ * system-specific knobs. It is not something that we can reasonably 
  * benchmark with crude timings.
  * If someone wants to optimize how simdjson allocate memory, then it will
  * almost surely require a distinct benchmarking tool. What is meant by
@@ -315,13 +315,13 @@ struct benchmarker {
     // We always allocate at least 64KB. Smaller allocations may actually be slower under some systems.
     error_code error = parser.allocate(json.size() < 65536 ? 65536 : json.size());
     if (error) {
-      exit_error(string("Unable to allocate_stage ") + to_string(json.size()) + " bytes for the JSON text: " + error_message(error));
+      exit_error(string("Unable to allocate_stage ") + to_string(json.size()) + " bytes for the JSON result: " + error_message(error));
     }
     event_count allocate_count = collector.end();
     allocate_stage << allocate_count;
     // Run it once to get hot buffers
     if(hotbuffers) {
-      auto result = parser.parse(reinterpret_cast<const uint8_t *>(json.data()), json.size());
+      auto result = parser.parse((const uint8_t *)json.data(), json.size());
       if (result.error()) {
         exit_error(string("Failed to parse ") + filename + string(":") + error_message(result.error()));
       }
@@ -331,7 +331,7 @@ struct benchmarker {
 
     // Stage 1 (find structurals)
     collector.start();
-    error = parser.implementation->stage1(reinterpret_cast<const uint8_t *>(json.data()), json.size(), false);
+    error = parser.implementation->stage1((const uint8_t *)json.data(), json.size(), false);
     event_count stage1_count = collector.end();
     stage1 << stage1_count;
     if (error) {
@@ -367,7 +367,7 @@ struct benchmarker {
 
   void run_loop(size_t iterations) {
     dom::parser parser;
-    auto firstresult = parser.parse(reinterpret_cast<const uint8_t *>(json.data()), json.size());
+    auto firstresult = parser.parse((const uint8_t *)json.data(), json.size());
     if (firstresult.error()) {
       exit_error(string("Failed to parse ") + filename + string(":") + error_message(firstresult.error()));
     }
@@ -375,7 +375,7 @@ struct benchmarker {
     collector.start();
     // some users want something closer to "number of documents per second"
     for(size_t i = 0; i < iterations; i++) {
-      auto result = parser.parse(reinterpret_cast<const uint8_t *>(json.data()), json.size());
+      auto result = parser.parse((const uint8_t *)json.data(), json.size());
       if (result.error()) {
         exit_error(string("Failed to parse ") + filename + string(":") + error_message(result.error()));
       }
@@ -446,7 +446,7 @@ struct benchmarker {
 
   void print(bool tabbed_output) const {
     if (tabbed_output) {
-      char* filename_copy = reinterpret_cast<char*>(malloc(strlen(filename)+1));
+      char* filename_copy = (char*)malloc(strlen(filename)+1);
       SIMDJSON_PUSH_DISABLE_WARNINGS
       SIMDJSON_DISABLE_DEPRECATED_WARNING // Validated CRT_SECURE safe here
       strcpy(filename_copy, filename);

benchmark/checkperf.cmake

@@ -7,7 +7,7 @@
 
 # Clone the repository if it's not there
 find_package(Git QUIET)
-if (Git_FOUND AND (GIT_VERSION_STRING VERSION_GREATER  "2.1.4") AND (NOT CMAKE_GENERATOR MATCHES Ninja) AND (NOT MSVC) ) # We use "-C" which requires a recent git
+if (SIMDJSON_IS_UNDER_GIT AND SIMDJSON_GIT AND Git_FOUND AND (GIT_VERSION_STRING VERSION_GREATER  "2.1.4") AND (NOT CMAKE_GENERATOR MATCHES Ninja) ) # We use "-C" which requires a recent git
   message(STATUS "Git is available and it is recent. We are enabling checkperf targets.")
   # sync_git_repository(myrepo ...) creates two targets:
   # myrepo - if the repo does not exist, creates and syncs it against the origin branch
@@ -89,13 +89,13 @@ if (Git_FOUND AND (GIT_VERSION_STRING VERSION_GREATER  "2.1.4") AND (NOT CMAKE_G
     # COMMAND ECHO $<TARGET_FILE:perfdiff> \"$<TARGET_FILE:parse> -t ${SIMDJSON_CHECKPERF_ARGS}\" \"${CHECKPERF_PARSE} -t ${SIMDJSON_CHECKPERF_ARGS}\" }
     COMMAND $<TARGET_FILE:perfdiff> $<TARGET_FILE:parse> ${CHECKPERF_PARSE} -H -t ${SIMDJSON_CHECKPERF_ARGS}
   )
-  set_property(TEST checkperf APPEND PROPERTY LABELS per_implementation explicitonly)
+  set_property(TEST checkperf APPEND PROPERTY LABELS per_implementation)
   set_property(TEST checkperf APPEND PROPERTY DEPENDS parse perfdiff ${SIMDJSON_USER_CMAKECACHE})
   set_property(TEST checkperf PROPERTY RUN_SERIAL TRUE)
 else()
   if (CMAKE_GENERATOR MATCHES Ninja)
    message(STATUS "We disable the checkperf targets under Ninja.")
-  else()
+  else() 
    message(STATUS "Either git is unavailable or else it is too old. We are disabling checkperf targets.")
   endif()
 endif ()

benchmark/distinct_user_id/distinct_user_id.h

@@ -1,53 +0,0 @@
-
-#pragma once
-
-#include "json_benchmark/file_runner.h"
-#include <vector>
-
-namespace distinct_user_id {
-
-using namespace json_benchmark;
-
-template<typename I>
-struct runner : public file_runner<I> {
-  std::vector<uint64_t> result{};
-
-  bool setup(benchmark::State &state) {
-    return this->load_json(state, TWITTER_JSON);
-  }
-
-  bool before_run(benchmark::State &state) {
-    if (!file_runner<I>::before_run(state)) { return false; }
-    result.clear();
-    return true;
-  }
-
-  bool run(benchmark::State &) {
-    return this->implementation.run(this->json, result);
-  }
-
-  bool after_run(benchmark::State &state) {
-    if (!file_runner<I>::after_run(state)) { return false; }
-    std::sort(result.begin(), result.end());
-    auto last = std::unique(result.begin(), result.end());
-    result.erase(last, result.end());
-    return true;
-  }
-
-  template<typename R>
-  bool diff(benchmark::State &state, runner<R> &reference) {
-    return diff_results(state, result, reference.result, diff_flags::NONE);
-  }
-
-  size_t items_per_iteration() {
-    return result.size();
-  }
-};
-
-struct simdjson_dom;
-
-template<typename I> simdjson_really_inline static void distinct_user_id(benchmark::State &state) {
-  run_json_benchmark<runner<I>, runner<simdjson_dom>>(state);
-}
-
-} // namespace distinct_user_id

benchmark/distinct_user_id/nlohmann_json.h

@@ -1,27 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_NLOHMANN_JSON
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-struct nlohmann_json {
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    auto root = nlohmann::json::parse(json.data(), json.data() + json.size());
-    for (auto tweet : root["statuses"]) {
-      result.push_back(tweet["user"]["id"]);
-      if (tweet.contains("retweeted_status")) {
-        result.push_back(tweet["retweeted_status"]["user"]["id"]);
-      }
-    }
-
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(distinct_user_id, nlohmann_json)->UseManualTime();
-
-} // namespace distinct_user_id
-
-#endif // SIMDJSON_COMPETITION_NLOHMANN_JSON

benchmark/distinct_user_id/rapidjson.h

@@ -1,58 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-using namespace rapidjson;
-
-struct rapidjson_base {
-  Document doc{};
-
-  bool run(Document &root, std::vector<uint64_t> &result) {
-    if (root.HasParseError()) { printf("parse error\n"); return false; }
-    if (!root.IsObject()) { printf("root is not an object\n"); return false; }
-    auto statuses = root.FindMember("statuses");
-    if (statuses == root.MemberEnd() || !statuses->value.IsArray()) { printf("statuses is not an array\n"); return false; }
-    for (auto &tweet : statuses->value.GetArray()) {
-      if (!tweet.IsObject()) { return false; }
-      auto user = tweet.FindMember("user");
-      if (user == tweet.MemberEnd() || !user->value.IsObject()) { printf("user is not an object\n"); return false; }
-      auto id = user->value.FindMember("id");
-      if (id == user->value.MemberEnd() || !id->value.IsUint64()) { printf("id is not an int\n"); return false; }
-      result.push_back(id->value.GetUint64());
-
-      auto retweet = tweet.FindMember("retweeted_status");
-      if (retweet != tweet.MemberEnd()) {
-        if (!retweet->value.IsObject()) { printf("retweet is not an object\n"); return false; }
-        user = retweet->value.FindMember("user");
-        if (user == retweet->value.MemberEnd() || !user->value.IsObject()) { printf("rewtweet.user is not an object\n"); return false; }
-        id = user->value.FindMember("id");
-        if (id == user->value.MemberEnd() || !id->value.IsUint64()) { printf("retweet.id is not an int\n"); return false; }
-        result.push_back(id->value.GetUint64());
-      }
-    }
-
-    return true;
-  }
-};
-
-struct rapidjson : rapidjson_base {
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    return rapidjson_base::run(doc.Parse<kParseValidateEncodingFlag>(json.data()), result);
-  }
-};
-BENCHMARK_TEMPLATE(distinct_user_id, rapidjson)->UseManualTime();
-
-struct rapidjson_insitu : rapidjson_base {
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    return rapidjson_base::run(doc.ParseInsitu<kParseValidateEncodingFlag>(json.data()), result);
-  }
-};
-BENCHMARK_TEMPLATE(distinct_user_id, rapidjson_insitu)->UseManualTime();
-
-} // namespace partial_tweets
-
-#endif // SIMDJSON_COMPETITION_RAPIDJSON

benchmark/distinct_user_id/sajson.h

@@ -1,80 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_SAJSON
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-struct sajson {
-  size_t ast_buffer_size{0};
-  size_t *ast_buffer{nullptr};
-  simdjson_really_inline std::string_view get_string_view(const ::sajson::value &obj, std::string_view key) {
-    auto val = obj.get_value_of_key({key.data(), key.length()});
-    if (val.get_type() != ::sajson::TYPE_STRING) { throw "field is not a string"; }
-    return { val.as_cstring(), val.get_string_length() };
-  }
-  simdjson_really_inline uint64_t get_str_uint64(const ::sajson::value &obj, std::string_view key) {
-    // Since sajson only supports 53-bit numbers, and IDs in twitter.json can be > 53 bits, we read the corresponding id_str and parse that.
-    auto val = obj.get_value_of_key({key.data(), key.length()});
-    if (val.get_type() != ::sajson::TYPE_STRING) { throw "field not a string"; }
-    auto str = val.as_cstring();
-    char *endptr;
-    uint64_t result = strtoull(str, &endptr, 10);
-    if (endptr != &str[val.get_string_length()]) { throw "field is a string, but not an integer string"; }
-    return result;
-  }
-
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    using namespace sajson;
-    if (!ast_buffer) {
-      ast_buffer_size = json.size();
-      ast_buffer = (size_t *)std::malloc(ast_buffer_size * sizeof(size_t));
-    }
-    auto doc = parse(
-      bounded_allocation(ast_buffer, ast_buffer_size),
-      mutable_string_view(json.size(), json.data())
-    );
-    if (!doc.is_valid()) { return false; }
-
-    auto root = doc.get_root();
-    if (root.get_type() != TYPE_OBJECT) { return false; }
-    auto statuses = root.get_value_of_key({"statuses", strlen("statuses")});
-    if (statuses.get_type() != TYPE_ARRAY) { return false; }
-
-    for (size_t i=0; i<statuses.get_length(); i++) {
-      auto tweet = statuses.get_array_element(i);
-
-      // get tweet.user.id
-      if (tweet.get_type() != TYPE_OBJECT) { return false; }
-      auto user = tweet.get_value_of_key({"user", strlen("user")});
-      if (user.get_type() != TYPE_OBJECT) { return false; }
-      result.push_back(get_str_uint64(user, "id_str"));
-
-      // get tweet.retweeted_status.user.id
-      auto retweet = tweet.get_value_of_key({"retweeted_status", strlen("retweeted_status")});
-      switch (retweet.get_type()) {
-        case TYPE_OBJECT: {
-          auto retweet_user = retweet.get_value_of_key({"user", strlen("user")});
-          if (retweet_user.get_type() != TYPE_OBJECT) { return false; }
-          result.push_back(get_str_uint64(retweet_user, "id_str"));
-          break;
-        }
-        // TODO distinguish null and missing. null is bad. missing is fine.
-        case TYPE_NULL:
-          break;
-        default:
-          return false;
-      }
-    }
-
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(distinct_user_id, sajson)->UseManualTime();
-
-} // namespace distinct_user_id
-
-#endif // SIMDJSON_COMPETITION_SAJSON
-

benchmark/distinct_user_id/simdjson_dom.h

@@ -1,36 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-using namespace simdjson;
-
-struct simdjson_dom {
-  dom::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    // Walk the document, parsing as we go
-    auto doc = parser.parse(json);
-    for (dom::object tweet : doc["statuses"]) {
-      // We believe that all statuses have a matching
-      // user, and we are willing to throw when they do not.
-      result.push_back(tweet["user"]["id"]);
-      // Not all tweets have a "retweeted_status", but when they do
-      // we want to go and find the user within.
-      auto retweet = tweet["retweeted_status"];
-      if (retweet.error() != NO_SUCH_FIELD) {
-        result.push_back(retweet["user"]["id"]);
-      }
-    }
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(distinct_user_id, simdjson_dom)->UseManualTime();
-
-} // namespace distinct_user_id
-
-#endif // SIMDJSON_EXCEPTIONS

benchmark/distinct_user_id/simdjson_ondemand.h

@@ -1,37 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-using namespace simdjson;
-
-struct simdjson_ondemand {
-  ondemand::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    // Walk the document, parsing as we go
-    auto doc = parser.iterate(json);
-    for (ondemand::object tweet : doc.find_field("statuses")) {
-      // We believe that all statuses have a matching
-      // user, and we are willing to throw when they do not.
-      result.push_back(tweet.find_field("user").find_field("id"));
-      // Not all tweets have a "retweeted_status", but when they do
-      // we want to go and find the user within.
-      auto retweet = tweet.find_field("retweeted_status");
-      if (!retweet.error()) {
-        result.push_back(retweet.find_field("user").find_field("id"));
-      }
-    }
-
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(distinct_user_id, simdjson_ondemand)->UseManualTime();
-
-} // namespace distinct_user_id
-
-#endif // SIMDJSON_EXCEPTIONS

benchmark/distinct_user_id/yyjson.h

@@ -1,61 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_YYJSON
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-struct yyjson_base {
-  bool run(yyjson_doc *doc, std::vector<uint64_t> &result) {
-    if (!doc) { return false; }
-    yyjson_val *root = yyjson_doc_get_root(doc);
-    if (!yyjson_is_obj(root)) { return false; }
-    yyjson_val *statuses = yyjson_obj_get(root, "statuses");
-    if (!yyjson_is_arr(statuses)) { return false; }
-
-    // Walk the document, parsing the tweets as we go
-    size_t tweet_idx, tweets_max;
-    yyjson_val *tweet;
-    yyjson_arr_foreach(statuses, tweet_idx, tweets_max, tweet) {
-      auto user = yyjson_obj_get(tweet, "user");
-      if (!yyjson_is_obj(user)) { return false; }
-      auto id = yyjson_obj_get(user, "id");
-      if (!yyjson_is_uint(id)) { return false; }
-      result.push_back(yyjson_get_uint(id));
-
-      // Not all tweets have a "retweeted_status", but when they do
-      // we want to go and find the user within.
-      auto retweet = yyjson_obj_get(tweet, "retweeted_status");
-      if (retweet) {
-        if (!yyjson_is_obj(retweet)) { return false; }
-        user = yyjson_obj_get(retweet, "user");
-        if (!yyjson_is_obj(user)) { return false; }
-        id = yyjson_obj_get(user, "id");
-        if (!yyjson_is_uint(id)) { return false; }
-        result.push_back(yyjson_get_sint(id));
-      }
-    }
-
-    return true;
-  }
-
-};
-
-struct yyjson : yyjson_base {
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), result);
-  }
-};
-BENCHMARK_TEMPLATE(distinct_user_id, yyjson)->UseManualTime();
-
-struct yyjson_insitu : yyjson_base {
-  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);
-  }
-};
-BENCHMARK_TEMPLATE(distinct_user_id, yyjson_insitu)->UseManualTime();
-
-} // namespace distinct_user_id
-
-#endif // SIMDJSON_COMPETITION_YYJSON

benchmark/distinctuserid/distinctuserid.h

@@ -0,0 +1,52 @@
+
+#pragma once
+#include <vector>
+#include <cstdint>
+#include "event_counter.h"
+#include "json_benchmark.h"
+
+
+bool equals(const char *s1, const char *s2) { return strcmp(s1, s2) == 0; }
+
+void remove_duplicates(std::vector<int64_t> &v) {
+  std::sort(v.begin(), v.end());
+  auto last = std::unique(v.begin(), v.end());
+  v.erase(last, v.end());
+}
+
+//
+// Interface
+//
+
+namespace distinct_user_id {
+template<typename T> static void DistinctUserID(benchmark::State &state);
+} // namespace 
+
+//
+// Implementation
+//
+
+#include "dom.h"
+
+
+namespace distinct_user_id {
+
+using namespace simdjson;
+
+template<typename T> static void DistinctUserID(benchmark::State &state) {
+  //
+  // Load the JSON file
+  //
+  constexpr const char *TWITTER_JSON = SIMDJSON_BENCHMARK_DATA_DIR "twitter.json";
+  error_code error;
+  padded_string json;
+  if ((error = padded_string::load(TWITTER_JSON).get(json))) {
+    std::cerr << error << std::endl;
+    state.SkipWithError("error loading");
+    return;
+  }
+
+  JsonBenchmark<T, Dom>(state, json);
+}
+
+} // namespace distinct_user_id

benchmark/distinctuserid/dom.h

@@ -0,0 +1,89 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "distinctuserid.h"
+
+namespace distinct_user_id {
+
+using namespace simdjson;
+
+
+simdjson_really_inline void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::element element);
+void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::array array) {
+  for (auto child : array) {
+    simdjson_recurse(v, child);
+  }
+}
+void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::object object) {
+  for (auto [key, value] : object) {
+    if((key.size() == 4) && (memcmp(key.data(), "user", 4) == 0)) {
+      // we are in an object under the key "user"
+      simdjson::error_code error;
+      simdjson::dom::object child_object;
+      simdjson::dom::object child_array;
+      if (not (error = value.get(child_object))) {
+        for (auto [child_key, child_value] : child_object) {
+          if((child_key.size() == 2) && (memcmp(child_key.data(), "id", 2) == 0)) {
+            int64_t x;
+            if (not (error = child_value.get(x))) {
+              v.push_back(x);
+            }
+          }
+          simdjson_recurse(v, child_value);
+        }
+      } else if (not (error = value.get(child_array))) {
+        simdjson_recurse(v, child_array);
+      }
+      // end of: we are in an object under the key "user"
+    } else {
+      simdjson_recurse(v, value);
+    }
+  }
+}
+simdjson_really_inline void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::element element) {
+  simdjson_unused simdjson::error_code error;
+  simdjson::dom::array array;
+  simdjson::dom::object object;
+  if (not (error = element.get(array))) {
+    simdjson_recurse(v, array);
+  } else if (not (error = element.get(object))) {
+    simdjson_recurse(v, object);
+  }
+}
+
+
+
+
+
+class Dom {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+  simdjson_really_inline const std::vector<int64_t> &Result() { return ids; }
+  simdjson_really_inline size_t ItemCount() { return ids.size(); }
+
+private:
+  dom::parser parser{};
+  std::vector<int64_t> ids{};
+
+};
+void print_vec(const std::vector<int64_t> &v) {
+  for (auto i : v) {
+    std::cout << i << " ";
+  }
+  std::cout << std::endl;
+}
+
+simdjson_really_inline bool Dom::Run(const padded_string &json) {
+  ids.clear();
+  dom::element doc = parser.parse(json);
+  simdjson_recurse(ids, doc);
+  remove_duplicates(ids);
+  return true;
+}
+
+BENCHMARK_TEMPLATE(DistinctUserID, Dom);
+
+} // namespace distinct_user_id
+
+#endif // SIMDJSON_EXCEPTIONS

benchmark/distinctuserid/ondemand.h

@@ -0,0 +1,67 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "distinctuserid.h"
+
+namespace distinct_user_id {
+
+using namespace simdjson;
+using namespace simdjson::builtin;
+
+
+class OnDemand {
+public:
+  OnDemand() { 
+    if(!displayed_implementation) {
+      std::cout << "On Demand implementation: " << builtin_implementation()->name() << std::endl; 
+      displayed_implementation = true;
+    }
+  } 
+  simdjson_really_inline bool Run(const padded_string &json);
+  simdjson_really_inline const std::vector<int64_t> &Result() { return ids; }
+  simdjson_really_inline size_t ItemCount() { return ids.size(); }
+
+private:
+  ondemand::parser parser{};
+  std::vector<int64_t> ids{};
+
+  static inline bool displayed_implementation = false;
+};
+
+simdjson_really_inline bool OnDemand::Run(const padded_string &json) {
+  ids.clear();
+  // Walk the document, parsing as we go
+  auto doc = parser.iterate(json);
+  for (ondemand::object tweet : doc["statuses"]) {
+      // We believe that all statuses have a matching
+      // user, and we are willing to throw when they do not:
+      //
+      // You might think that you do not need the braces, but
+      // you do, otherwise you will get the wrong answer. That is
+      // because you can only have one active object or array 
+      // at a time. 
+      {
+        ondemand::object user = tweet["user"];
+        int64_t id = user["id"]; 
+        ids.push_back(id);
+      }
+      // Not all tweets have a "retweeted_status", but when they do 
+      // we want to go and find the user within.
+      auto retweet = tweet["retweeted_status"];
+      if(!retweet.error()) {
+          ondemand::object retweet_content = retweet;
+          ondemand::object reuser = retweet_content["user"];
+          int64_t rid = reuser["id"]; 
+          ids.push_back(rid);
+      }
+  }
+  remove_duplicates(ids);
+  return true;
+}
+
+BENCHMARK_TEMPLATE(DistinctUserID, OnDemand);
+
+} // namespace distinct_user_id
+
+#endif // SIMDJSON_EXCEPTIONS

benchmark/distinctuseridcompetition.cpp

@@ -0,0 +1,406 @@
+#include "simdjson.h"
+#include <algorithm>
+#include <cstring>
+#include <unistd.h>
+#include <vector>
+
+#include "benchmark.h"
+
+SIMDJSON_PUSH_DISABLE_ALL_WARNINGS
+
+// #define RAPIDJSON_SSE2 // bad for performance
+// #define RAPIDJSON_SSE42 // bad for performance
+#include "rapidjson/document.h"
+#include "rapidjson/reader.h"
+#include "rapidjson/stringbuffer.h"
+#include "rapidjson/writer.h"
+
+#include "sajson.h"
+
+SIMDJSON_POP_DISABLE_WARNINGS
+
+using namespace rapidjson;
+
+bool equals(const char *s1, const char *s2) { return strcmp(s1, s2) == 0; }
+
+void remove_duplicates(std::vector<int64_t> &v) {
+  std::sort(v.begin(), v.end());
+  auto last = std::unique(v.begin(), v.end());
+  v.erase(last, v.end());
+}
+
+void print_vec(const std::vector<int64_t> &v) {
+  for (auto i : v) {
+    std::cout << i << " ";
+  }
+  std::cout << std::endl;
+}
+
+// clang-format off
+
+// simdjson_recurse below can be implemented like so but it is slow:
+/*void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::element element) {
+  error_code error;
+  if (element.is_array()) {
+    dom::array array;
+    error = element.get(array);
+    for (auto child : array) {
+      if (child.is<simdjson::dom::array>() || child.is<simdjson::dom::object>()) {
+        simdjson_recurse(v, child);
+      }
+    }
+  } else if (element.is_object()) {
+    int64_t id;
+    error = element["user"]["id"].get(id);
+    if(!error) {
+      v.push_back(id);
+    }
+    for (auto [key, value] : object) {
+      if (value.is<simdjson::dom::array>() || value.is<simdjson::dom::object>()) {
+        simdjson_recurse(v, value);
+      }
+    }
+  }
+}*/
+// clang-format on
+
+
+simdjson_really_inline void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::element element);
+void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::array array) {
+  for (auto child : array) {
+    simdjson_recurse(v, child);
+  }
+}
+void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::object object) {
+  for (auto [key, value] : object) {
+    if((key.size() == 4) && (memcmp(key.data(), "user", 4) == 0)) {
+      // we are in an object under the key "user"
+      simdjson::error_code error;
+      simdjson::dom::object child_object;
+      simdjson::dom::object child_array;
+      if (not (error = value.get(child_object))) {
+        for (auto [child_key, child_value] : child_object) {
+          if((child_key.size() == 2) && (memcmp(child_key.data(), "id", 2) == 0)) {
+            int64_t x;
+            if (not (error = child_value.get(x))) {
+              v.push_back(x);
+            }
+          }
+          simdjson_recurse(v, child_value);
+        }
+      } else if (not (error = value.get(child_array))) {
+        simdjson_recurse(v, child_array);
+      }
+      // end of: we are in an object under the key "user"
+    } else {
+      simdjson_recurse(v, value);
+    }
+  }
+}
+simdjson_really_inline void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::element element) {
+  simdjson_unused simdjson::error_code error;
+  simdjson::dom::array array;
+  simdjson::dom::object object;
+  if (not (error = element.get(array))) {
+    simdjson_recurse(v, array);
+  } else if (not (error = element.get(object))) {
+    simdjson_recurse(v, object);
+  }
+}
+
+simdjson_really_inline std::vector<int64_t>
+simdjson_just_dom(simdjson::dom::element doc) {
+  std::vector<int64_t> answer;
+  simdjson_recurse(answer, doc);
+  remove_duplicates(answer);
+  return answer;
+}
+
+simdjson_really_inline std::vector<int64_t>
+simdjson_compute_stats(const simdjson::padded_string &p) {
+  std::vector<int64_t> answer;
+  simdjson::dom::parser parser;
+  simdjson::dom::element doc;
+  auto error = parser.parse(p).get(doc);
+  if (!error) {
+    simdjson_recurse(answer, doc);
+    remove_duplicates(answer);
+  }
+  return answer;
+}
+
+simdjson_really_inline simdjson::error_code
+simdjson_just_parse(const simdjson::padded_string &p) {
+  simdjson::dom::parser parser;
+  return parser.parse(p).error();
+}
+
+void sajson_traverse(std::vector<int64_t> &answer, const sajson::value &node) {
+  using namespace sajson;
+  switch (node.get_type()) {
+  case TYPE_ARRAY: {
+    auto length = node.get_length();
+    for (size_t i = 0; i < length; ++i) {
+      sajson_traverse(answer, node.get_array_element(i));
+    }
+    break;
+  }
+  case TYPE_OBJECT: {
+    auto length = node.get_length();
+    // sajson has O(log n) find_object_key, but we still visit each node anyhow
+    // because we need to visit all values.
+    for (auto i = 0u; i < length; ++i) {
+      auto key = node.get_object_key(i); // expected: sajson::string
+      bool found_user =
+          (key.length() == 4) && (memcmp(key.data(), "user", 4) == 0);
+      if (found_user) {                             // found a user!!!
+        auto user_value = node.get_object_value(i); // get the value
+        if (user_value.get_type() ==
+            TYPE_OBJECT) { // the value should be an object
+          // now we know that we only need one value
+          auto user_value_length = user_value.get_length();
+          auto right_index =
+              user_value.find_object_key(sajson::string("id", 2));
+          if (right_index < user_value_length) {
+            auto v = user_value.get_object_value(right_index);
+            if (v.get_type() == TYPE_INTEGER) { // check that it is an integer
+              answer.push_back(v.get_integer_value()); // record it!
+            } else if (v.get_type() == TYPE_DOUBLE) {
+              answer.push_back((int64_t)v.get_double_value()); // record it!
+            }
+          }
+        }
+      }
+      sajson_traverse(answer, node.get_object_value(i));
+    }
+    break;
+  }
+  case TYPE_NULL:
+  case TYPE_FALSE:
+  case TYPE_TRUE:
+  case TYPE_STRING:
+  case TYPE_DOUBLE:
+  case TYPE_INTEGER:
+    break;
+  default:
+    assert(false && "unknown node type");
+  }
+}
+
+simdjson_really_inline std::vector<int64_t>
+sasjon_just_dom(sajson::document &d) {
+  std::vector<int64_t> answer;
+  sajson_traverse(answer, d.get_root());
+  remove_duplicates(answer);
+  return answer;
+}
+
+simdjson_really_inline std::vector<int64_t>
+sasjon_compute_stats(const simdjson::padded_string &p) {
+  std::vector<int64_t> answer;
+  char *buffer = (char *)malloc(p.size());
+  memcpy(buffer, p.data(), p.size());
+  auto d = sajson::parse(sajson::dynamic_allocation(),
+                         sajson::mutable_string_view(p.size(), buffer));
+  if (!d.is_valid()) {
+    free(buffer);
+    return answer;
+  }
+  sajson_traverse(answer, d.get_root());
+  free(buffer);
+  remove_duplicates(answer);
+  return answer;
+}
+
+simdjson_really_inline bool
+sasjon_just_parse(const simdjson::padded_string &p) {
+  char *buffer = (char *)malloc(p.size());
+  memcpy(buffer, p.data(), p.size());
+  auto d = sajson::parse(sajson::dynamic_allocation(),
+                         sajson::mutable_string_view(p.size(), buffer));
+  bool answer = !d.is_valid();
+  free(buffer);
+  return answer;
+}
+
+void rapid_traverse(std::vector<int64_t> &answer, const rapidjson::Value &v) {
+  switch (v.GetType()) {
+  case kObjectType:
+    for (Value::ConstMemberIterator m = v.MemberBegin(); m != v.MemberEnd();
+         ++m) {
+      bool found_user = (m->name.GetStringLength() == 4) &&
+                        (memcmp(m->name.GetString(), "user", 4) == 0);
+      if (found_user) {
+        const rapidjson::Value &child = m->value;
+        if (child.GetType() == kObjectType) {
+          for (Value::ConstMemberIterator k = child.MemberBegin();
+               k != child.MemberEnd(); ++k) {
+            if (equals(k->name.GetString(), "id")) {
+              const rapidjson::Value &val = k->value;
+              if (val.GetType() == kNumberType) {
+                answer.push_back(val.GetInt64());
+              }
+            }
+          }
+        }
+      }
+      rapid_traverse(answer, m->value);
+    }
+    break;
+  case kArrayType:
+    for (Value::ConstValueIterator i = v.Begin(); i != v.End();
+         ++i) { // v.Size();
+      rapid_traverse(answer, *i);
+    }
+    break;
+  case kNullType:
+  case kFalseType:
+  case kTrueType:
+  case kStringType:
+  case kNumberType:
+  default:
+    break;
+  }
+}
+
+simdjson_really_inline std::vector<int64_t>
+rapid_just_dom(rapidjson::Document &d) {
+  std::vector<int64_t> answer;
+  rapid_traverse(answer, d);
+  remove_duplicates(answer);
+  return answer;
+}
+
+simdjson_really_inline std::vector<int64_t>
+rapid_compute_stats(const simdjson::padded_string &p) {
+  std::vector<int64_t> answer;
+  char *buffer = (char *)malloc(p.size() + 1);
+  memcpy(buffer, p.data(), p.size());
+  buffer[p.size()] = '\0';
+  rapidjson::Document d;
+  d.ParseInsitu<kParseValidateEncodingFlag>(buffer);
+  if (d.HasParseError()) {
+    free(buffer);
+    return answer;
+  }
+  rapid_traverse(answer, d);
+  free(buffer);
+  remove_duplicates(answer);
+  return answer;
+}
+
+simdjson_really_inline bool
+rapid_just_parse(const simdjson::padded_string &p) {
+  char *buffer = (char *)malloc(p.size() + 1);
+  memcpy(buffer, p.data(), p.size());
+  buffer[p.size()] = '\0';
+  rapidjson::Document d;
+  d.ParseInsitu<kParseValidateEncodingFlag>(buffer);
+  bool answer = d.HasParseError();
+  free(buffer);
+  return answer;
+}
+
+int main(int argc, char *argv[]) {
+  bool verbose = false;
+  bool just_data = false;
+
+  int c;
+  while ((c = getopt(argc, argv, "vt")) != -1)
+    switch (c) {
+    case 't':
+      just_data = true;
+      break;
+    case 'v':
+      verbose = true;
+      break;
+    default:
+      abort();
+    }
+  if (optind >= argc) {
+    std::cerr
+        << "Using different parsers, we compute the content statistics of "
+           "JSON documents."
+        << std::endl;
+    std::cerr << "Usage: " << argv[0] << " <jsonfile>" << std::endl;
+    std::cerr << "Or " << argv[0] << " -v <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;
+  }
+  // Gigabyte: https://en.wikipedia.org/wiki/Gigabyte
+  if (verbose) {
+    std::cout << "Input has ";
+    if (p.size() > 1000 * 1000)
+      std::cout << p.size() / (1000 * 1000) << " MB ";
+    else if (p.size() > 1000)
+      std::cout << p.size() / 1000 << " KB ";
+    else
+      std::cout << p.size() << " B ";
+    std::cout << std::endl;
+  }
+  std::vector<int64_t> s1 = simdjson_compute_stats(p);
+  if (verbose) {
+    printf("simdjson: ");
+    print_vec(s1);
+  }
+  std::vector<int64_t> s2 = rapid_compute_stats(p);
+  if (verbose) {
+    printf("rapid:    ");
+    print_vec(s2);
+  }
+  std::vector<int64_t> s3 = sasjon_compute_stats(p);
+  if (verbose) {
+    printf("sasjon:   ");
+    print_vec(s3);
+  }
+  assert(s1 == s2);
+  assert(s1 == s3);
+  size_t size = s1.size();
+
+  int repeat = 500;
+  size_t volume = p.size();
+  if (just_data) {
+    printf(
+        "name cycles_per_byte cycles_per_byte_err  gb_per_s gb_per_s_err \n");
+  }
+  BEST_TIME("simdjson ", simdjson_compute_stats(p).size(), size, , repeat,
+            volume, !just_data);
+  BEST_TIME("rapid  ", rapid_compute_stats(p).size(), size, , repeat, volume,
+            !just_data);
+  BEST_TIME("sasjon  ", sasjon_compute_stats(p).size(), size, , repeat, volume,
+            !just_data);
+  BEST_TIME("simdjson (just parse)  ", simdjson_just_parse(p), simdjson::error_code::SUCCESS, , repeat,
+            volume, !just_data);
+  BEST_TIME("rapid  (just parse) ", rapid_just_parse(p), false, , repeat,
+            volume, !just_data);
+  BEST_TIME("sasjon (just parse) ", sasjon_just_parse(p), false, , repeat,
+            volume, !just_data);
+  simdjson::dom::parser parser;
+  simdjson::dom::element doc;
+  error = parser.parse(p).get(doc);
+  BEST_TIME("simdjson (just dom)  ", simdjson_just_dom(doc).size(), size,
+            , repeat, volume, !just_data);
+  char *buffer = (char *)malloc(p.size() + 1);
+  buffer[p.size()] = '\0';
+  memcpy(buffer, p.data(), p.size());
+  rapidjson::Document drapid;
+  drapid.ParseInsitu<kParseValidateEncodingFlag>(buffer);
+  BEST_TIME("rapid  (just dom) ", rapid_just_dom(drapid).size(), size, , repeat,
+            volume, !just_data);
+  memcpy(buffer, p.data(), p.size());
+  auto dsasjon = sajson::parse(sajson::dynamic_allocation(),
+                               sajson::mutable_string_view(p.size(), buffer));
+  BEST_TIME("sasjon (just dom) ", sasjon_just_dom(dsasjon).size(), size, ,
+            repeat, volume, !just_data);
+  free(buffer);
+}

benchmark/find_tweet/find_tweet.h

@@ -1,40 +0,0 @@
-
-#pragma once
-
-#include "json_benchmark/file_runner.h"
-
-namespace find_tweet {
-
-using namespace json_benchmark;
-
-template<typename I>
-struct runner : public file_runner<I> {
-  typename I::StringType result;
-
-  bool setup(benchmark::State &state) {
-    return this->load_json(state, TWITTER_JSON);
-  }
-
-  bool before_run(benchmark::State &state) {
-    if (!file_runner<I>::before_run(state)) { return false; }
-    result = "";
-    return true;
-  }
-
-  bool run(benchmark::State &) {
-    return this->implementation.run(this->json, 505874901689851904ULL, result);
-  }
-
-  template<typename R>
-  bool diff(benchmark::State &state, runner<R> &reference) {
-    return diff_results(state, result, reference.result, diff_flags::NONE);
-  }
-};
-
-struct simdjson_dom;
-
-template<typename I> simdjson_really_inline static void find_tweet(benchmark::State &state) {
-  run_json_benchmark<runner<I>, runner<simdjson_dom>>(state);
-}
-
-} // namespace find_tweet

benchmark/find_tweet/nlohmann_json.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_NLOHMANN_JSON
-
-#include "find_tweet.h"
-
-namespace find_tweet {
-
-struct nlohmann_json {
-  using StringType=std::string;
-
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string &result) {
-    auto root = nlohmann::json::parse(json.data(), json.data() + json.size());
-    for (auto tweet : root["statuses"]) {
-      if (tweet["id"] == find_id) {
-        result = tweet["text"];
-        return true;
-      }
-    }
-
-    return false;
-  }
-};
-
-BENCHMARK_TEMPLATE(find_tweet, nlohmann_json)->UseManualTime();
-
-} // namespace find_tweet
-
-#endif // SIMDJSON_COMPETITION_NLOHMANN_JSON

benchmark/find_tweet/rapidjson.h

@@ -1,52 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-
-#include "find_tweet.h"
-
-namespace find_tweet {
-
-using namespace rapidjson;
-
-struct rapidjson_base {
-  using StringType=std::string_view;
-
-  Document doc{};
-
-  bool run(Document &root, uint64_t find_id, std::string_view &result) {
-    if (root.HasParseError() || !root.IsObject()) { return false; }
-    auto statuses = root.FindMember("statuses");
-    if (statuses == root.MemberEnd() || !statuses->value.IsArray()) { return false; }
-    for (auto &tweet : statuses->value.GetArray()) {
-      if (!tweet.IsObject()) { return false; }
-      auto id = tweet.FindMember("id");
-      if (id == tweet.MemberEnd() || !id->value.IsUint64()) { return false; }
-      if (id->value.GetUint64() == find_id) {
-        auto text = tweet.FindMember("text");
-        if (text == tweet.MemberEnd() || !text->value.IsString()) { return false; }
-        result = { text->value.GetString(), text->value.GetStringLength() };
-        return true;
-      }
-    }
-
-    return false;
-  }
-};
-
-struct rapidjson : rapidjson_base {
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
-    return rapidjson_base::run(doc.Parse<kParseValidateEncodingFlag>(json.data()), find_id, result);
-  }
-};
-BENCHMARK_TEMPLATE(find_tweet, rapidjson)->UseManualTime();
-
-struct rapidjson_insitu : rapidjson_base {
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
-    return rapidjson_base::run(doc.ParseInsitu<kParseValidateEncodingFlag>(json.data()), find_id, result);
-  }
-};
-BENCHMARK_TEMPLATE(find_tweet, rapidjson_insitu)->UseManualTime();
-
-} // namespace partial_tweets
-
-#endif // SIMDJSON_COMPETITION_RAPIDJSON

benchmark/find_tweet/sajson.h

@@ -1,66 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_SAJSON
-
-#include "find_tweet.h"
-
-namespace find_tweet {
-
-struct sajson {
-  using StringType=std::string_view;
-
-  size_t ast_buffer_size{0};
-  size_t *ast_buffer{nullptr};
-  simdjson_really_inline std::string_view get_string_view(const ::sajson::value &obj, std::string_view key) {
-    auto val = obj.get_value_of_key({key.data(), key.length()});
-    if (val.get_type() != ::sajson::TYPE_STRING) { throw "field is not a string"; }
-    return { val.as_cstring(), val.get_string_length() };
-  }
-  simdjson_really_inline uint64_t get_str_uint64(const ::sajson::value &obj, std::string_view key) {
-    // Since sajson only supports 53-bit numbers, and IDs in twitter.json can be > 53 bits, we read the corresponding id_str and parse that.
-    auto val = obj.get_value_of_key({key.data(), key.length()});
-    if (val.get_type() != ::sajson::TYPE_STRING) { throw "field not a string"; }
-    auto str = val.as_cstring();
-    char *endptr;
-    uint64_t result = strtoull(str, &endptr, 10);
-    if (endptr != &str[val.get_string_length()]) { throw "field is a string, but not an integer string"; }
-    return result;
-  }
-
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
-    if (!ast_buffer) {
-      ast_buffer_size = json.size();
-      ast_buffer = (size_t *)std::malloc(ast_buffer_size * sizeof(size_t));
-    }
-    auto doc = ::sajson::parse(
-      ::sajson::bounded_allocation(ast_buffer, ast_buffer_size),
-      ::sajson::mutable_string_view(json.size(), json.data())
-    );
-    if (!doc.is_valid()) { return false; }
-
-    auto root = doc.get_root();
-    if (root.get_type() != ::sajson::TYPE_OBJECT) { printf("a\n"); return false; }
-    auto statuses = root.get_value_of_key({"statuses", strlen("statuses")});
-    if (statuses.get_type() != ::sajson::TYPE_ARRAY) { return false; }
-
-    for (size_t i=0; i<statuses.get_length(); i++) {
-      auto tweet = statuses.get_array_element(i);
-      if (tweet.get_type() != ::sajson::TYPE_OBJECT) { printf("b\n"); return false; }
-      // TODO if there is a way to get the raw string, it might be faster to iota find_id and then
-      // compare it to each id_str, instead of parsing each int and comparing to find_id.
-      if (get_str_uint64(tweet, "id_str") == find_id) {
-        result = get_string_view(tweet, "text");
-        return true;
-      }
-    }
-
-    return false;
-  }
-};
-
-BENCHMARK_TEMPLATE(find_tweet, sajson)->UseManualTime();
-
-} // namespace find_tweet
-
-#endif // SIMDJSON_COMPETITION_SAJSON
-

benchmark/find_tweet/simdjson_dom.h

@@ -1,33 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "find_tweet.h"
-
-namespace find_tweet {
-
-using namespace simdjson;
-
-struct simdjson_dom {
-  using StringType=std::string_view;
-
-  dom::parser parser{};
-
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
-    result = "";
-    auto doc = parser.parse(json);
-    for (auto tweet : doc["statuses"]) {
-      if (uint64_t(tweet["id"]) == find_id) {
-        result = tweet["text"];
-        return true;
-      }
-    }
-    return false;
-  }
-};
-
-BENCHMARK_TEMPLATE(find_tweet, simdjson_dom)->UseManualTime();
-
-} // namespace find_tweet
-
-#endif // SIMDJSON_EXCEPTIONS

benchmark/find_tweet/simdjson_ondemand.h

@@ -1,33 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "find_tweet.h"
-
-namespace find_tweet {
-
-using namespace simdjson;
-
-struct simdjson_ondemand {
-  using StringType=std::string_view;
-
-  ondemand::parser parser{};
-
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
-    // Walk the document, parsing as we go
-    auto doc = parser.iterate(json);
-    for (auto tweet : doc.find_field("statuses")) {
-      if (uint64_t(tweet.find_field("id")) == find_id) {
-        result = tweet.find_field("text");
-        return true;
-      }
-    }
-    return false;
-  }
-};
-
-BENCHMARK_TEMPLATE(find_tweet, simdjson_ondemand)->UseManualTime();
-
-} // namespace find_tweet
-
-#endif // SIMDJSON_EXCEPTIONS

benchmark/find_tweet/yyjson.h

@@ -1,53 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_YYJSON
-
-#include "find_tweet.h"
-
-namespace find_tweet {
-
-struct yyjson_base {
-  using StringType=std::string_view;
-
-  bool run(yyjson_doc *doc, uint64_t find_id, std::string_view &result) {
-    if (!doc) { return false; }
-    yyjson_val *root = yyjson_doc_get_root(doc);
-    if (!yyjson_is_obj(root)) { return false; }
-    yyjson_val *statuses = yyjson_obj_get(root, "statuses");
-    if (!yyjson_is_arr(statuses)) { return false; }
-
-    // Walk the document, parsing the tweets as we go
-    size_t tweet_idx, tweets_max;
-    yyjson_val *tweet;
-    yyjson_arr_foreach(statuses, tweet_idx, tweets_max, tweet) {
-      if (!yyjson_is_obj(tweet)) { return false; }
-      auto id = yyjson_obj_get(tweet, "id");
-      if (!yyjson_is_uint(id)) { return false; }
-      if (yyjson_get_uint(id) == find_id) {
-        auto text = yyjson_obj_get(tweet, "text");
-        if (yyjson_is_str(id)) { return false; }
-        result = { yyjson_get_str(text), yyjson_get_len(text) };
-        return true;
-      }
-    }
-    return false;
-  }
-};
-
-struct yyjson : yyjson_base {
-  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);
-  }
-};
-BENCHMARK_TEMPLATE(find_tweet, yyjson)->UseManualTime();
-
-struct yyjson_insitu : yyjson_base {
-  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);
-  }
-};
-BENCHMARK_TEMPLATE(find_tweet, yyjson_insitu)->UseManualTime();
-
-} // namespace find_tweet
-
-#endif // SIMDJSON_COMPETITION_YYJSON

benchmark/get_corpus_benchmark.cpp

@@ -9,7 +9,7 @@ simdjson_never_inline
 double bench(std::string filename, simdjson::padded_string& p) {
   std::chrono::time_point<std::chrono::steady_clock> start_clock =
       std::chrono::steady_clock::now();
-  simdjson::padded_string::load(filename).value_unsafe().swap(p);
+  simdjson::padded_string::load(filename).first.swap(p);
   std::chrono::time_point<std::chrono::steady_clock> end_clock =
       std::chrono::steady_clock::now();
   std::chrono::duration<double> elapsed = end_clock - start_clock;
@@ -29,7 +29,7 @@ int main(int argc, char *argv[]) {
               << std::endl;
   }
   simdjson::padded_string p;
-  bench(filename, p);
+  bench(filename, p); 
   double meanval = 0;
   double maxval = 0;
   double minval = 10000;

benchmark/json_benchmark.h

@@ -0,0 +1,80 @@
+#pragma once
+
+template<typename B, typename R> static void JsonBenchmark(benchmark::State &state, const simdjson::padded_string &json) {
+  event_collector collector(true);
+  event_aggregate events;
+
+  // Warmup and equality check (make sure the data is right!)
+  B bench;
+  if (!bench.Run(json)) { state.SkipWithError("warmup tweet reading failed"); return; }
+  {
+    R reference;
+    if (!reference.Run(json)) { state.SkipWithError("reference tweet reading failed"); return; }
+    if (bench.Result() != reference.Result()) { state.SkipWithError("results are not the same"); return; }
+  }
+
+  // Run the benchmark
+  for (simdjson_unused auto _ : state) {
+    collector.start();
+
+    if (!bench.Run(json)) { state.SkipWithError("tweet reading failed"); return; }
+
+    events << collector.end();
+  }
+
+  state.SetBytesProcessed(json.size() * state.iterations());
+  state.SetItemsProcessed(bench.ItemCount() * state.iterations());
+  state.counters["best_bytes_per_sec"] = benchmark::Counter(double(json.size()) / events.best.elapsed_sec());
+  state.counters["best_items_per_sec"] = benchmark::Counter(double(bench.ItemCount()) / events.best.elapsed_sec());
+
+  state.counters["docs_per_sec"] = benchmark::Counter(1.0, benchmark::Counter::kIsIterationInvariantRate);
+  state.counters["best_docs_per_sec"] = benchmark::Counter(1.0 / events.best.elapsed_sec());
+
+  if (collector.has_events()) {
+    state.counters["instructions"] = events.instructions();
+    state.counters["cycles"]       = events.cycles();
+    state.counters["branch_miss"]  = events.branch_misses();
+    state.counters["cache_miss"]   = events.cache_misses();
+    state.counters["cache_ref"]    = events.cache_references();
+
+    state.counters["instructions_per_byte"]  = events.instructions() / double(json.size());
+    state.counters["instructions_per_cycle"] = events.instructions() / events.cycles();
+    state.counters["cycles_per_byte"]        = events.cycles()       / double(json.size());
+    state.counters["frequency"]              = benchmark::Counter(events.cycles(), benchmark::Counter::kIsIterationInvariantRate);
+
+    state.counters["best_instructions"] = events.best.instructions();
+    state.counters["best_cycles"]       = events.best.cycles();
+    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();
+
+    state.counters["best_instructions_per_byte"]  = events.best.instructions() / double(json.size());
+    state.counters["best_instructions_per_cycle"] = events.best.instructions() / events.best.cycles();
+    state.counters["best_cycles_per_byte"]        = events.best.cycles()       / double(json.size());
+    state.counters["best_frequency"]              = events.best.cycles()       / events.best.elapsed_sec();
+  }
+  state.counters["bytes"] = benchmark::Counter(double(json.size()));
+  state.counters["items"] = benchmark::Counter(double(bench.ItemCount()));
+
+  // Build the label
+  using namespace std;
+  stringstream label;
+  label << fixed << setprecision(2);
+  label << "[best:";
+  label << " throughput="     << setw(6)  << (double(json.size()) / 1000000000.0     / events.best.elapsed_sec()) << " GB/s";
+  label << " doc_throughput=" << setw(6)  << uint64_t(1.0                            / events.best.elapsed_sec()) << " docs/s";
+
+  if (collector.has_events()) {
+    label << " instructions=" << setw(12) << uint64_t(events.best.instructions())     << setw(0);
+    label << " cycles="       << setw(12) << uint64_t(events.best.cycles())           << 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);
+  }
+
+  label << " items=" << setw(10) << bench.ItemCount() << setw(0);
+  label << " avg_time=" << setw(10) << uint64_t(events.elapsed_ns()) << setw(0) << " ns";
+  label << "]";
+
+  state.SetLabel(label.str());
+}

benchmark/json_benchmark/constants.h

@@ -1,8 +0,0 @@
-#pragma once
-
-namespace json_benchmark {
-
-static constexpr const char *TWITTER_JSON = SIMDJSON_BENCHMARK_DATA_DIR "twitter.json";
-static constexpr const char *NUMBERS_JSON = SIMDJSON_BENCHMARK_DATA_DIR "numbers.json";
-
-}

benchmark/json_benchmark/diff_results.h

@@ -1,92 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <sstream>
-#include <limits>
-
-namespace json_benchmark {
-
-enum class diff_flags {
-  NONE = 0,
-  IMPRECISE_FLOATS = 1
-};
-
-template<typename T, typename U>
-static bool diff_results(benchmark::State &state, const T &result, const U &reference, diff_flags flags);
-
-template<typename T, typename U>
-struct result_differ {
-  static bool diff(benchmark::State &state, const T &result, const U &reference, diff_flags flags) {
-    if (result != reference) {
-      std::stringstream str;
-      str << "result incorrect: " << result << " ... reference: " << reference;
-      state.SkipWithError(str.str().data());
-      return false;
-    }
-    return true;
-  }
-};
-
-template<typename T, typename U>
-struct result_differ<std::vector<T>, std::vector<U>> {
-  static bool diff(benchmark::State &state, const std::vector<T> &result, const std::vector<U> &reference, diff_flags flags) {
-    auto result_iter = result.begin();
-    auto reference_iter = reference.begin();
-    while (result_iter != result.end() && reference_iter != reference.end()) {
-      if (!diff_results(state, *result_iter, *reference_iter, flags)) { return false; }
-      result_iter++;
-      reference_iter++;
-    }
-    if (result_iter != result.end()) {
-      std::stringstream str;
-      str << "extra results (got " << result.size() << ", expected " << reference.size() << "): first extra element: " << *result_iter;
-      state.SkipWithError(str.str().data());
-      return false;
-    } else if (reference_iter != reference.end()) {
-      std::stringstream str;
-      str << "missing results (got " << result.size() << ", expected " << reference.size() << "): first missing element: " << *reference_iter;
-      state.SkipWithError(str.str().data());
-      return false;
-    }
-    return true;
-  }
-};
-
-template<>
-struct result_differ<double, double> {
-  static bool diff(benchmark::State &state, const double &result, const double &reference, diff_flags flags) {
-    bool different;
-    if (int(flags) & int(diff_flags::IMPRECISE_FLOATS)) {
-      different = f64_ulp_dist(result, reference) > 1;
-    } else {
-      different = result != reference;
-    }
-    if (different) {
-      std::stringstream str;
-      // We print it out using full precision.
-      constexpr auto precision = std::numeric_limits<double>::max_digits10;
-      str << std::setprecision(precision);
-      str << "incorrect double result: " << std::endl;
-      str << "   result: " << std::left << std::setw(precision+2) << result    << " (hexfloat " << std::hexfloat << result    << ")" << std::defaultfloat << std::endl;
-      str << "reference: " << std::left << std::setw(precision+2) << reference << " (hexfloat " << std::hexfloat << reference << ")" << std::defaultfloat << std::endl;
-      state.SkipWithError(str.str().data());
-    }
-    return true;
-  }
-
-  static uint64_t f64_ulp_dist(double a, double b) {
-    uint64_t ua, ub;
-    std::memcpy(&ua, &a, sizeof(ua));
-    std::memcpy(&ub, &b, sizeof(ub));
-    if ((int64_t)(ub ^ ua) >= 0)
-      return (int64_t)(ua - ub) >= 0 ? (ua - ub) : (ub - ua);
-    return ua + ub + 0x80000000;
-  }
-};
-
-template<typename T, typename U>
-static bool diff_results(benchmark::State &state, const T &result, const U &reference, diff_flags flags) {
-  return result_differ<T, U>::diff(state, result, reference, flags);
-}
-
-} // namespace json_benchmark

benchmark/json_benchmark/file_runner.h

@@ -1,48 +0,0 @@
-#pragma once
-
-#include "json_benchmark/runner_base.h"
-#include "simdjson.h"
-
-namespace json_benchmark {
-
-template<typename I>
-struct file_runner : public runner_base<I> {
-  simdjson::padded_string original_json{};
-  simdjson::padded_string json{};
-
-  simdjson_warn_unused bool load_json(benchmark::State &state, const char *file) {
-    simdjson::error_code error;
-    if ((error = simdjson::padded_string::load(file).get(original_json))) {
-      std::stringstream err;
-      err << "error loading " << file << ": " << error;
-      state.SkipWithError(err.str().data());
-      return false;
-    }
-    json = simdjson::padded_string(original_json.data(), original_json.size());
-    return true;
-  }
-
-  simdjson_warn_unused bool before_run(benchmark::State &state) {
-    if (!runner_base<I>::after_run(state)) { return false; };
-    // Copy the original json in case we did *in situ* last time
-    std::memcpy(json.data(), original_json.data(), original_json.size());
-    return true;
-  }
-
-  /** Get the total number of bytes processed in each iteration. Used for metrics like bytes/second. */
-  size_t bytes_per_iteration() {
-    return json.size();
-  }
-
-  /** Get the total number of documents processed in each iteration. Used for metrics like documents/second. */
-  size_t documents_per_iteration() {
-    return 1;
-  }
-
-  /** Get the total number of items processed in each iteration. Used for metrics like items/second. */
-  size_t items_per_iteration() {
-    return 1;
-  }
-};
-
-} // namespace json_benchmark

benchmark/json_benchmark/point.h

@@ -1,26 +0,0 @@
-#pragma once
-
-#include "diff_results.h"
-
-namespace json_benchmark {
-
-struct point {
-  double x;
-  double y;
-  double z;
-};
-
-template<>
-struct result_differ<point, point> {
-  static bool diff(benchmark::State &state, const point &result, const point &reference, diff_flags flags) {
-    return diff_results(state, result.x, reference.x, flags)
-        && diff_results(state, result.y, reference.y, flags)
-        && diff_results(state, result.z, reference.z, flags);
-  }
-};
-
-static simdjson_unused std::ostream &operator<<(std::ostream &o, const point &p) {
-  return o << p.x << "," << p.y << "," << p.z << std::endl;
-}
-
-} // namespace json_benchmark

benchmark/json_benchmark/run_json_benchmark.h

@@ -1,107 +0,0 @@
-#pragma once
-
-#include "simdjson.h"
-#include "event_counter.h"
-#include <iostream>
-
-namespace json_benchmark {
-
-void maybe_display_implementation() {
-  static bool displayed_implementation = false;
-  if(!displayed_implementation) {
-    displayed_implementation = true;
-    std::cout << "simdjson::dom implementation:      " << simdjson::active_implementation->name() << std::endl;
-    std::cout << "simdjson::ondemand implementation (stage 1): " << simdjson::active_implementation->name() << std::endl;
-    std::cout << "simdjson::ondemand implementation (stage 2): " << simdjson::builtin_implementation()->name() << std::endl;
-  }
-}
-
-template<typename B, typename R> static void run_json_benchmark(benchmark::State &state) {
-  maybe_display_implementation();
-
-  event_collector collector(true);
-  event_aggregate events;
-
-  // Warmup and equality check (make sure the data is right!)
-  B bench;
-  if (!bench.setup(state)) { return; }
-  if (!bench.before_run(state)) { state.SkipWithError("warmup document before_run failed"); return; }
-  if (!bench.run(state)) { state.SkipWithError("warmup document reading failed"); return; }
-  if (!bench.after_run(state)) { state.SkipWithError("warmup document after_run failed"); return; }
-  {
-    R reference;
-    if (!reference.setup(state)) { return; }
-    if (!reference.before_run(state)) { state.SkipWithError("reference before_run failed"); };
-    if (!reference.run(state)) { state.SkipWithError("reference document reading failed"); return; }
-    if (!reference.after_run(state)) { state.SkipWithError("reference before_run failed"); };
-    if (!bench.diff(state, reference)) { return; }
-  }
-
-  // Run the benchmark
-  for (simdjson_unused auto _ : state) {
-    if (!bench.before_run(state)) { state.SkipWithError("before_run failed"); };
-    collector.start();
-    if (!bench.run(state)) { state.SkipWithError("run failed"); return; }
-    auto event = collector.end();
-    events << event;
-    state.SetIterationTime(event.elapsed_sec());
-    if (!bench.after_run(state)) { state.SkipWithError("after_run failed"); return; };
-  }
-
-  state.SetBytesProcessed(bench.bytes_per_iteration() * state.iterations());
-  state.SetItemsProcessed(bench.items_per_iteration() * state.iterations());
-  state.counters["best_docs_per_sec"] = benchmark::Counter(double(bench.documents_per_iteration()) / events.best.elapsed_sec());
-  state.counters["best_bytes_per_sec"] = benchmark::Counter(double(bench.bytes_per_iteration()) / events.best.elapsed_sec());
-  state.counters["best_items_per_sec"] = benchmark::Counter(double(bench.items_per_iteration()) / events.best.elapsed_sec());
-  state.counters["docs_per_sec"] = benchmark::Counter(double(bench.documents_per_iteration()), benchmark::Counter::kIsIterationInvariantRate);
-
-  if (collector.has_events()) {
-    state.counters["instructions"] = events.instructions();
-    state.counters["cycles"]       = events.cycles();
-    state.counters["branch_miss"]  = events.branch_misses();
-    state.counters["cache_miss"]   = events.cache_misses();
-    state.counters["cache_ref"]    = events.cache_references();
-
-    state.counters["instructions_per_byte"]  = events.instructions() / double(bench.bytes_per_iteration());
-    state.counters["instructions_per_cycle"] = events.instructions() / events.cycles();
-    state.counters["cycles_per_byte"]        = events.cycles()       / double(bench.bytes_per_iteration());
-    state.counters["frequency"]              = benchmark::Counter(events.cycles(), benchmark::Counter::kIsIterationInvariantRate);
-
-    state.counters["best_instructions"] = events.best.instructions();
-    state.counters["best_cycles"]       = events.best.cycles();
-    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();
-
-    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_cycles_per_byte"]        = events.best.cycles()       / double(bench.bytes_per_iteration());
-    state.counters["best_frequency"]              = events.best.cycles()       / events.best.elapsed_sec();
-  }
-  state.counters["bytes"] = benchmark::Counter(double(bench.bytes_per_iteration()));
-  state.counters["items"] = benchmark::Counter(double(bench.items_per_iteration()));
-
-  // Build the label
-  using namespace std;
-  stringstream label;
-  label << fixed << setprecision(2);
-  label << "[BEST:";
-  label << " throughput="     << setw(6)  << (double(bench.bytes_per_iteration()) / 1000000000.0     / events.best.elapsed_sec()) << " GB/s";
-  label << " doc_throughput=" << setw(6)  << uint64_t(bench.documents_per_iteration()                / events.best.elapsed_sec()) << " docs/s";
-
-  if (collector.has_events()) {
-    label << " instructions=" << setw(12) << uint64_t(events.best.instructions())     << setw(0);
-    label << " cycles="       << setw(12) << uint64_t(events.best.cycles())           << 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);
-  }
-
-  label << " items=" << setw(10) << bench.items_per_iteration() << setw(0);
-  label << " avg_time=" << setw(10) << uint64_t(events.elapsed_ns()) << setw(0) << " ns";
-  label << "]";
-
-  state.SetLabel(label.str());
-}
-
-} // namespace json_benchmark

benchmark/json_benchmark/runner_base.h

@@ -1,40 +0,0 @@
-#pragma once
-
-#include "constants.h"
-#include "run_json_benchmark.h"
-#include "diff_results.h"
-
-namespace json_benchmark {
-
-//
-// Extend this to create a new type of test (e.g. partial_tweets).
-//
-template<typename I>
-struct runner_base {
-  /** Run once, before all iterations. */
-  simdjson_warn_unused bool setup(benchmark::State &) { return true; }
-
-  /** Run on each iteration. This is what gets benchmarked. */
-  simdjson_warn_unused bool run(benchmark::State &state) {
-    return implementation.run(state);
-  }
-
-  /** Called before each iteration, to clear / set up state. */
-  simdjson_warn_unused bool before_run(benchmark::State &state) { return true; }
-
-  /** Called after each iteration, to tear down / massage state. */
-  simdjson_warn_unused bool after_run(benchmark::State &) { return true; }
-
-  /** Get the total number of bytes processed in each iteration. Used for metrics like bytes/second. */
-  size_t bytes_per_iteration();
-
-  /** Get the total number of documents processed in each iteration. Used for metrics like documents/second. */
-  size_t documents_per_iteration();
-
-  /** Get the total number of items processed in each iteration. Used for metrics like items/second. */
-  size_t items_per_iteration();
-
-  I implementation{};
-};
-
-}

benchmark/json_benchmark/string_runner.h

@@ -1,37 +0,0 @@
-#pragma once
-
-#include "runner_base.h"
-#include "simdjson.h"
-
-namespace json_benchmark {
-
-template<typename I>
-struct string_runner : public runner_base<I> {
-  const simdjson::padded_string &original_json;
-  simdjson::padded_string json;
-  string_runner(const simdjson::padded_string &_json) : original_json{_json}, json(original_json.data(), original_json.size()) {}
-
-  simdjson_warn_unused bool before_run(benchmark::State &state) {
-    if (!runner_base<I>::after_run(state)) { return false; };
-    // Copy the original json in case we did *in situ*
-    std::memcpy(json.data(), original_json.data(), original_json.size());
-    return true;
-  }
-
-  /** Get the total number of bytes processed in each iteration. Used for metrics like bytes/second. */
-  size_t bytes_per_iteration() {
-    return json.size();
-  }
-
-  /** Get the total number of documents processed in each iteration. Used for metrics like documents/second. */
-  size_t documents_per_iteration() {
-    return 1;
-  }
-
-  /** Get the total number of items processed in each iteration. Used for metrics like items/second. */
-  size_t items_per_iteration() {
-    return 1;
-  }
-};
-
-} // namespace json_benchmark

benchmark/kostya/dom.h

@@ -0,0 +1,69 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "kostya.h"
+
+namespace kostya {
+
+using namespace simdjson;
+
+class Dom {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+
+  simdjson_really_inline const std::vector<my_point> &Result() { return container; }
+  simdjson_really_inline size_t ItemCount() { return container.size(); }
+
+private:
+  dom::parser parser{};
+  std::vector<my_point> container{};
+};
+
+simdjson_really_inline bool Dom::Run(const padded_string &json) {
+  container.clear();
+
+  for (auto point : parser.parse(json)["coordinates"]) {
+    container.emplace_back(my_point{point["x"], point["y"], point["z"]});
+  }
+
+  return true;
+}
+
+BENCHMARK_TEMPLATE(Kostya, Dom);
+
+namespace sum {
+
+class Dom {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+
+  simdjson_really_inline my_point &Result() { return sum; }
+  simdjson_really_inline size_t ItemCount() { return count; }
+
+private:
+  dom::parser parser{};
+  my_point sum{};
+  size_t count{};
+};
+
+simdjson_really_inline bool Dom::Run(const padded_string &json) {
+  sum = { 0, 0, 0 };
+  count = 0;
+
+  for (auto coord : parser.parse(json)["coordinates"]) {
+    sum.x += double(coord["x"]);
+    sum.y += double(coord["y"]);
+    sum.z += double(coord["z"]);
+    count++;
+  }
+
+  return true;
+}
+
+BENCHMARK_TEMPLATE(KostyaSum, Dom);
+
+} // namespace sum
+} // namespace kostya
+
+#endif // SIMDJSON_EXCEPTIONS

benchmark/kostya/iter.h

@@ -0,0 +1,96 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "kostya.h"
+
+namespace kostya {
+
+using namespace simdjson;
+using namespace simdjson::builtin;
+
+class Iter {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+
+  simdjson_really_inline const std::vector<my_point> &Result() { return container; }
+  simdjson_really_inline size_t ItemCount() { return container.size(); }
+
+private:
+  ondemand::parser parser{};
+  std::vector<my_point> container{};
+
+  simdjson_really_inline simdjson_result<double> first_double(ondemand::json_iterator &iter, const char *key) {
+    if (!iter.start_object() || ondemand::raw_json_string(iter.field_key()) != key || iter.field_value()) { throw "Invalid field"; }
+    return iter.consume_double();
+  }
+
+  simdjson_really_inline simdjson_result<double> next_double(ondemand::json_iterator &iter, const char *key) {
+    if (!iter.has_next_field() || ondemand::raw_json_string(iter.field_key()) != key || iter.field_value()) { throw "Invalid field"; }
+    return iter.consume_double();
+  }
+
+};
+
+simdjson_really_inline bool Iter::Run(const padded_string &json) {
+  container.clear();
+
+  using std::cerr;
+  using std::endl;
+  auto iter = parser.iterate_raw(json).value();
+  if (!iter.start_object() || !iter.find_field_raw("coordinates")) { cerr << "find coordinates field failed" << endl; return false; }
+  if (iter.start_array()) {
+    do {
+      container.emplace_back(my_point{first_double(iter, "x"), next_double(iter, "y"), next_double(iter, "z")});
+      if (iter.skip_container()) { return false; } // Skip the rest of the coordinates object
+    } while (iter.has_next_element());
+  }
+
+  return true;
+}
+
+BENCHMARK_TEMPLATE(Kostya, Iter);
+
+
+namespace sum {
+
+class Iter {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+
+  simdjson_really_inline my_point &Result() { return sum; }
+  simdjson_really_inline size_t ItemCount() { return count; }
+
+private:
+  ondemand::parser parser{};
+  my_point sum{};
+  size_t count{};
+};
+
+simdjson_really_inline bool Iter::Run(const padded_string &json) {
+  sum = {0,0,0};
+  count = 0;
+
+  auto iter = parser.iterate_raw(json).value();
+  if (!iter.start_object() || !iter.find_field_raw("coordinates")) { return false; }
+  if (!iter.start_array()) { return false; }
+  do {
+    if (!iter.start_object()   || !iter.find_field_raw("x")) { return false; }
+    sum.x += iter.consume_double();
+    if (!iter.has_next_field() || !iter.find_field_raw("y")) { return false; }
+    sum.y +=  iter.consume_double();
+    if (!iter.has_next_field() || !iter.find_field_raw("z")) { return false; }
+    sum.z +=  iter.consume_double();
+    if (iter.skip_container()) { return false; } // Skip the rest of the coordinates object
+    count++;
+  } while (iter.has_next_element());
+
+  return true;
+}
+
+BENCHMARK_TEMPLATE(KostyaSum, Iter);
+
+} // namespace sum
+} // namespace kostya
+
+#endif // SIMDJSON_EXCEPTIONS

benchmark/kostya/kostya.h

@@ -1,41 +1,18 @@
 #pragma once
 
-#include "json_benchmark/string_runner.h"
-#include "json_benchmark/point.h"
-#include <vector>
-#include <random>
+#if SIMDJSON_EXCEPTIONS
+
+//
+// Interface
+//
 
 namespace kostya {
+template<typename T> static void Kostya(benchmark::State &state);
+namespace sum {
+template<typename T> static void KostyaSum(benchmark::State &state);
+}
 
-using namespace json_benchmark;
-
-static const simdjson::padded_string &get_built_json_array();
-
-template<typename I>
-struct runner : public string_runner<I> {
-  std::vector<point> result;
-
-  runner() : string_runner<I>(get_built_json_array()) {}
-
-  bool before_run(benchmark::State &state) {
-    if (!string_runner<I>::before_run(state)) { return false; }
-    result.clear();
-    return true;
-  }
-
-  bool run(benchmark::State &) {
-    return this->implementation.run(this->json, result);
-  }
-
-  template<typename R>
-  bool diff(benchmark::State &state, runner<R> &reference) {
-    return diff_results(state, result, reference.result, I::DiffFlags);
-  }
-
-  size_t items_per_iteration() {
-    return result.size();
-  }
-};
+using namespace simdjson;
 
 static void append_coordinate(std::default_random_engine &e, std::uniform_real_distribution<> &dis, std::stringstream &myss) {
   using std::endl;
@@ -68,19 +45,51 @@ static std::string build_json_array(size_t N) {
   myss << R"(    "info": "some info")" << endl;
   myss << R"(})" << endl;
   string answer = myss.str();
-  cout << "Creating a source file spanning " << (answer.size() + 512) / 1024 << " KB " << endl;
+  cout << "Creating a source file spanning " << (answer.size() + 512) / 1024 << " KB " << endl;  
   return answer;
 }
 
-static const simdjson::padded_string &get_built_json_array() {
-  static simdjson::padded_string json = build_json_array(524288);
+static const padded_string &get_built_json_array() {
+  static padded_string json = build_json_array(524288);
   return json;
 }
 
-struct simdjson_dom;
+struct my_point {
+  double x;
+  double y;
+  double z;
+  simdjson_really_inline bool operator==(const my_point &other) const {
+    return x == other.x && y == other.y && z == other.z;
+  }
+  simdjson_really_inline bool operator!=(const my_point &other) const { return !(*this == other); }
+};
 
-template<typename I> simdjson_really_inline static void kostya(benchmark::State &state) {
-  run_json_benchmark<runner<I>, runner<simdjson_dom>>(state);
+simdjson_unused static std::ostream &operator<<(std::ostream &o, const my_point &p) {
+  return o << p.x << "," << p.y << "," << p.z << std::endl;
 }
 
 } // namespace kostya
+
+//
+// Implementation
+//
+#include <vector>
+#include "event_counter.h"
+#include "dom.h"
+#include "json_benchmark.h"
+
+namespace kostya {
+
+template<typename T> static void Kostya(benchmark::State &state) {
+  JsonBenchmark<T, Dom>(state, get_built_json_array());
+}
+
+namespace sum {
+template<typename T> static void KostyaSum(benchmark::State &state) {
+  JsonBenchmark<T, Dom>(state, get_built_json_array());
+}
+}
+
+} // namespace kostya
+
+#endif // SIMDJSON_EXCEPTIONS

benchmark/kostya/nlohmann_json.h

@@ -1,25 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_NLOHMANN_JSON
-
-#include "kostya.h"
-
-namespace kostya {
-
-struct nlohmann_json {
-  static constexpr diff_flags DiffFlags = diff_flags::NONE;
-
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    auto root = nlohmann::json::parse(json.data(), json.data() + json.size());
-    for (auto point : root["coordinates"]) {
-      result.emplace_back(json_benchmark::point{point["x"], point["y"], point["z"]});
-    }
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(kostya, nlohmann_json)->UseManualTime();
-
-} // namespace kostya
-
-#endif // SIMDJSON_COMPETITION_NLOHMANN_JSON

benchmark/kostya/ondemand.h

@@ -0,0 +1,74 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "kostya.h"
+
+namespace kostya {
+
+using namespace simdjson;
+using namespace simdjson::builtin;
+
+class OnDemand {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+  simdjson_really_inline const std::vector<my_point> &Result() { return container; }
+  simdjson_really_inline size_t ItemCount() { return container.size(); }
+
+private:
+  ondemand::parser parser{};
+  std::vector<my_point> container{};
+};
+
+simdjson_really_inline bool OnDemand::Run(const padded_string &json) {
+  container.clear();
+
+  using std::cout;
+  using std::endl;
+
+  auto doc = parser.iterate(json);
+  for (ondemand::object coord : doc["coordinates"]) {
+    container.emplace_back(my_point{coord["x"], coord["y"], coord["z"]});
+  }
+
+  return true;
+}
+
+BENCHMARK_TEMPLATE(Kostya, OnDemand);
+
+
+namespace sum {
+
+class OnDemand {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+  simdjson_really_inline my_point &Result() { return sum; }
+  simdjson_really_inline size_t ItemCount() { return count; }
+
+private:
+  ondemand::parser parser{};
+  my_point sum{};
+  size_t count{};
+};
+
+simdjson_really_inline bool OnDemand::Run(const padded_string &json) {
+  sum = {0,0,0};
+  count = 0;
+
+  auto doc = parser.iterate(json);
+  for (ondemand::object coord : doc["coordinates"]) {
+    sum.x += double(coord["x"]);
+    sum.y += double(coord["y"]);
+    sum.z += double(coord["z"]);
+    count++;
+  }
+
+  return true;
+}
+
+BENCHMARK_TEMPLATE(KostyaSum, OnDemand);
+
+} // namespace sum
+} // namespace kostya
+
+#endif // SIMDJSON_EXCEPTIONS

benchmark/kostya/rapidjson.h

@@ -1,61 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-
-#include "kostya.h"
-
-namespace kostya {
-
-using namespace rapidjson;
-
-struct rapidjson_base {
-  static constexpr diff_flags DiffFlags = diff_flags::NONE;
-
-  Document doc;
-
-  simdjson_really_inline double get_double(Value &object, std::string_view key) {
-    auto field = object.FindMember(key.data());
-    if (field == object.MemberEnd()) { throw "Missing double field"; }
-    if (!field->value.IsNumber()) { throw "Field is not double"; }
-    return field->value.GetDouble();
-  }
-
-  bool run(Document &root, std::vector<point> &result) {
-    if (root.HasParseError()) { return false; }
-    if (!root.IsObject()) { return false; }
-    auto coords = root.FindMember("coordinates");
-    if (coords == root.MemberEnd()) { return false; }
-    if (!coords->value.IsArray()) { return false; }
-    for (auto &coord : coords->value.GetArray()) {
-      if (!coord.IsObject()) { return false; }
-      result.emplace_back(json_benchmark::point{get_double(coord, "x"), get_double(coord, "y"), get_double(coord, "z")});
-    }
-
-    return true;
-  }
-};
-
-struct rapidjson : rapidjson_base {
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    return rapidjson_base::run(doc.Parse<kParseValidateEncodingFlag>(json.data()), result);
-  }
-};
-BENCHMARK_TEMPLATE(kostya, rapidjson)->UseManualTime();
-
-struct rapidjson_lossless : rapidjson_base {
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    return rapidjson_base::run(doc.Parse<kParseValidateEncodingFlag | kParseFullPrecisionFlag>(json.data()), result);
-  }
-};
-BENCHMARK_TEMPLATE(kostya, rapidjson_lossless)->UseManualTime();
-
-struct rapidjson_insitu : rapidjson_base {
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    return rapidjson_base::run(doc.ParseInsitu<kParseValidateEncodingFlag>(json.data()), result);
-  }
-};
-BENCHMARK_TEMPLATE(kostya, rapidjson_insitu)->UseManualTime();
-
-} // namespace kostya
-
-#endif // SIMDJSON_COMPETITION_RAPIDJSON

benchmark/kostya/sajson.h

@@ -1,65 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_SAJSON
-
-#include "kostya.h"
-
-namespace kostya {
-
-struct sajson {
-  static constexpr diff_flags DiffFlags = diff_flags::IMPRECISE_FLOATS;
-
-  size_t ast_buffer_size{0};
-  size_t *ast_buffer{nullptr};
-
-  simdjson_really_inline double get_double(const ::sajson::value &obj, std::string_view key) {
-    using namespace sajson;
-
-    auto val = obj.get_value_of_key({key.data(), key.length()});
-    switch (val.get_type()) {
-      case TYPE_INTEGER:
-      case TYPE_DOUBLE:
-        return val.get_number_value();
-      default:
-        throw "field not double";
-    }
-  }
-
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    using namespace sajson;
-
-    if (!ast_buffer) {
-      ast_buffer_size = json.size();
-      ast_buffer = (size_t *)std::malloc(ast_buffer_size * sizeof(size_t));
-    }
-    auto doc = parse(
-      bounded_allocation(ast_buffer, ast_buffer_size),
-      mutable_string_view(json.size(), json.data())
-    );
-    if (!doc.is_valid()) { return false; }
-
-    auto root = doc.get_root();
-    if (root.get_type() != TYPE_OBJECT) { return false; }
-    auto points = root.get_value_of_key({"coordinates", strlen("coordinates")});
-    if (points.get_type() != TYPE_ARRAY) { return false; }
-
-    for (size_t i=0; i<points.get_length(); i++) {
-      auto point = points.get_array_element(i);
-      if (point.get_type() != TYPE_OBJECT) { return false; }
-      result.emplace_back(json_benchmark::point{
-        get_double(point, "x"),
-        get_double(point, "y"),
-        get_double(point, "z")
-      });
-    }
-
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(kostya, sajson)->UseManualTime();
-
-} // namespace kostya
-
-#endif // SIMDJSON_COMPETITION_SAJSON
-

benchmark/kostya/simdjson_dom.h

@@ -1,28 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "kostya.h"
-
-namespace kostya {
-
-using namespace simdjson;
-
-struct simdjson_dom {
-  static constexpr diff_flags DiffFlags = diff_flags::NONE;
-
-  dom::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    for (auto point : parser.parse(json)["coordinates"]) {
-      result.emplace_back(json_benchmark::point{point["x"], point["y"], point["z"]});
-    }
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(kostya, simdjson_dom)->UseManualTime();
-
-} // namespace kostya
-
-#endif // SIMDJSON_EXCEPTIONS

benchmark/kostya/simdjson_ondemand.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "kostya.h"
-
-namespace kostya {
-
-using namespace simdjson;
-
-struct simdjson_ondemand {
-  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 (ondemand::object point : doc.find_field("coordinates")) {
-      result.emplace_back(json_benchmark::point{point.find_field("x"), point.find_field("y"), point.find_field("z")});
-    }
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(kostya, simdjson_ondemand)->UseManualTime();
-
-} // namespace kostya
-
-#endif // SIMDJSON_EXCEPTIONS

benchmark/kostya/yyjson.h

@@ -1,66 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_YYJSON
-
-#include "kostya.h"
-
-namespace kostya {
-
-struct yyjson_base {
-  static constexpr diff_flags DiffFlags = diff_flags::NONE;
-
-  simdjson_really_inline double get_double(yyjson_val *obj, std::string_view key) {
-    yyjson_val *val = yyjson_obj_getn(obj, key.data(), key.length());
-    if (!val) { throw "missing point field!"; }
-    if (yyjson_get_type(val) != YYJSON_TYPE_NUM) { throw "Number is not a type!"; }
-
-    switch (yyjson_get_subtype(val)) {
-      case YYJSON_SUBTYPE_UINT:
-        return double(yyjson_get_uint(val));
-      case YYJSON_SUBTYPE_SINT:
-        return double(yyjson_get_sint(val));
-      case YYJSON_SUBTYPE_REAL:
-        return yyjson_get_real(val);
-      default:
-        SIMDJSON_UNREACHABLE();
-    }
-    SIMDJSON_UNREACHABLE();
-    return 0.0; // unreachable
-  }
-
-  bool run(yyjson_doc *doc, std::vector<point> &result) {
-    if (!doc) { return false; }
-    yyjson_val *root = yyjson_doc_get_root(doc);
-    if (!yyjson_is_obj(root)) { return false; }
-    yyjson_val *coords = yyjson_obj_get(root, "coordinates");
-    if (!yyjson_is_arr(coords)) { return false; }
-
-    size_t idx, max;
-    yyjson_val *coord;
-    yyjson_arr_foreach(coords, idx, max, coord) {
-      if (!yyjson_is_obj(coord)) { return false; }
-      result.emplace_back(json_benchmark::point{get_double(coord, "x"), get_double(coord, "y"), get_double(coord, "z")});
-    }
-
-    return true;
-  }
-
-};
-
-struct yyjson : yyjson_base {
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), result);
-  }
-};
-BENCHMARK_TEMPLATE(kostya, yyjson)->UseManualTime();
-
-struct yyjson_insitu : yyjson_base {
-  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);
-  }
-};
-BENCHMARK_TEMPLATE(kostya, yyjson_insitu)->UseManualTime();
-
-} // namespace kostya
-
-#endif // SIMDJSON_COMPETITION_YYJSON

benchmark/large_random/large_random.h

@@ -1,73 +0,0 @@
-#pragma once
-
-#include "json_benchmark/string_runner.h"
-#include "json_benchmark/point.h"
-#include <random>
-
-namespace large_random {
-
-static const simdjson::padded_string &get_built_json_array();
-
-using namespace json_benchmark;
-
-simdjson_unused static std::ostream &operator<<(std::ostream &o, const point &p) {
-  return o << p.x << "," << p.y << "," << p.z << std::endl;
-}
-
-template<typename I>
-struct runner : public string_runner<I> {
-  std::vector<point> result;
-
-  runner() : string_runner<I>(get_built_json_array()) {}
-
-  bool before_run(benchmark::State &state) {
-    if (!string_runner<I>::before_run(state)) { return false; }
-    result.clear();
-    return true;
-  }
-
-  bool run(benchmark::State &) {
-    return this->implementation.run(this->json, result);
-  }
-
-  template<typename R>
-  bool diff(benchmark::State &state, runner<R> &reference) {
-    return diff_results(state, result, reference.result, I::DiffFlags);
-  }
-
-  size_t items_per_iteration() {
-    return result.size();
-  }
-};
-
-static std::string build_json_array(size_t N) {
-  std::default_random_engine e;
-  std::uniform_real_distribution<> dis(0, 1);
-  std::stringstream myss;
-  myss << "[" << std::endl;
-  if(N > 0) {
-    myss << "{ \"x\":" << dis(e) << ",  \"y\":" << dis(e) << ", \"z\":" << dis(e) << "}" << std::endl;
-  }
-  for(size_t i = 1; i < N; i++) {
-    myss << "," << std::endl;
-    myss << "{ \"x\":" << dis(e) << ",  \"y\":" << dis(e) << ", \"z\":" << dis(e) << "}";
-  }
-  myss << std::endl;
-  myss << "]" << std::endl;
-  std::string answer = myss.str();
-  std::cout << "Creating a source file spanning " << (answer.size() + 512) / 1024 << " KB " << std::endl;
-  return answer;
-}
-
-static const simdjson::padded_string &get_built_json_array() {
-  static simdjson::padded_string json = build_json_array(1000000);
-  return json;
-}
-
-struct simdjson_dom;
-
-template<typename T> static void large_random(benchmark::State &state) {
-  run_json_benchmark<runner<T>, runner<simdjson_dom>>(state);
-}
-
-} // namespace large_random

benchmark/large_random/nlohmann_json.h

@@ -1,24 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_NLOHMANN_JSON
-
-#include "large_random.h"
-
-namespace large_random {
-
-struct nlohmann_json {
-  static constexpr diff_flags DiffFlags = diff_flags::NONE;
-
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    for (auto point : nlohmann::json::parse(json.data(), json.data() + json.size())) {
-      result.emplace_back(json_benchmark::point{point["x"], point["y"], point["z"]});
-    }
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(large_random, nlohmann_json)->UseManualTime();
-
-} // namespace large_random
-
-#endif // SIMDJSON_COMPETITION_NLOHMANN_JSON

benchmark/large_random/rapidjson.h

@@ -1,59 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-
-#include "large_random.h"
-
-namespace large_random {
-
-using namespace rapidjson;
-
-struct rapidjson_base {
-  static constexpr diff_flags DiffFlags = diff_flags::NONE;
-
-  Document doc;
-
-  simdjson_really_inline double get_double(Value &object, std::string_view key) {
-    auto field = object.FindMember(key.data());
-    if (field == object.MemberEnd()) { throw "Missing double field"; }
-    if (!field->value.IsNumber()) { throw "Field is not double"; }
-    return field->value.GetDouble();
-  }
-
-  bool run(Document &coords, std::vector<point> &result) {
-    if (coords.HasParseError()) { return false; }
-    if (!coords.IsArray()) { return false; }
-    for (auto &coord : coords.GetArray()) {
-      if (!coord.IsObject()) { return false; }
-      result.emplace_back(json_benchmark::point{get_double(coord, "x"), get_double(coord, "y"), get_double(coord, "z")});
-    }
-
-    return true;
-  }
-};
-
-struct rapidjson : rapidjson_base {
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    return rapidjson_base::run(doc.Parse<kParseValidateEncodingFlag>(json.data()), result);
-  }
-};
-BENCHMARK_TEMPLATE(large_random, rapidjson)->UseManualTime();
-
-struct rapidjson_lossless : rapidjson_base {
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    return rapidjson_base::run(doc.Parse<kParseValidateEncodingFlag | kParseFullPrecisionFlag>(json.data()), result);
-  }
-};
-BENCHMARK_TEMPLATE(large_random, rapidjson_lossless)->UseManualTime();
-
-struct rapidjson_insitu : rapidjson_base {
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    return rapidjson_base::run(doc.ParseInsitu<kParseValidateEncodingFlag>(json.data()), result);
-  }
-};
-BENCHMARK_TEMPLATE(large_random, rapidjson_insitu)->UseManualTime();
-
-
-} // namespace large_random
-
-#endif // SIMDJSON_COMPETITION_RAPIDJSON

benchmark/large_random/sajson.h

@@ -1,63 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_SAJSON
-
-#include "large_random.h"
-
-namespace large_random {
-
-struct sajson {
-  static constexpr diff_flags DiffFlags = diff_flags::IMPRECISE_FLOATS;
-
-  size_t ast_buffer_size{0};
-  size_t *ast_buffer{nullptr};
-
-  simdjson_really_inline double get_double(const ::sajson::value &obj, std::string_view key) {
-    using namespace sajson;
-
-    auto val = obj.get_value_of_key({key.data(), key.length()});
-    switch (val.get_type()) {
-      case TYPE_INTEGER:
-      case TYPE_DOUBLE:
-        return val.get_number_value();
-      default:
-        throw "field not double";
-    }
-  }
-
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    using namespace sajson;
-
-    if (!ast_buffer) {
-      ast_buffer_size = json.size();
-      ast_buffer = (size_t *)std::malloc(ast_buffer_size * sizeof(size_t));
-    }
-    auto doc = parse(
-      bounded_allocation(ast_buffer, ast_buffer_size),
-      mutable_string_view(json.size(), json.data())
-    );
-    if (!doc.is_valid()) { return false; }
-
-    auto points = doc.get_root();
-    if (points.get_type() != TYPE_ARRAY) { return false; }
-
-    for (size_t i=0; i<points.get_length(); i++) {
-      auto point = points.get_array_element(i);
-      if (point.get_type() != TYPE_OBJECT) { return false; }
-      result.emplace_back(json_benchmark::point{
-        get_double(point, "x"),
-        get_double(point, "y"),
-        get_double(point, "z")
-      });
-    }
-
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(large_random, sajson)->UseManualTime();
-
-} // namespace large_random
-
-#endif // SIMDJSON_COMPETITION_SAJSON
-

benchmark/large_random/simdjson_dom.h

@@ -1,28 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "large_random.h"
-
-namespace large_random {
-
-using namespace simdjson;
-
-struct simdjson_dom {
-  static constexpr diff_flags DiffFlags = diff_flags::NONE;
-
-  dom::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    for (auto point : parser.parse(json)) {
-      result.emplace_back(json_benchmark::point{point["x"], point["y"], point["z"]});
-    }
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(large_random, simdjson_dom)->UseManualTime();
-
-} // namespace large_random
-
-#endif // SIMDJSON_EXCEPTIONS

benchmark/large_random/simdjson_ondemand.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "large_random.h"
-
-namespace large_random {
-
-using namespace simdjson;
-
-struct simdjson_ondemand {
-  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 (ondemand::object coord : doc) {
-      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)->UseManualTime();
-
-} // namespace large_random
-
-#endif // SIMDJSON_EXCEPTIONS

benchmark/large_random/simdjson_ondemand_unordered.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "large_random.h"
-
-namespace large_random {
-
-using namespace simdjson;
-
-struct simdjson_ondemand_unordered {
-  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 (ondemand::object coord : doc) {
-      result.emplace_back(json_benchmark::point{coord["x"], coord["y"], coord["z"]});
-    }
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(large_random, simdjson_ondemand_unordered)->UseManualTime();
-
-} // namespace large_random
-
-#endif // SIMDJSON_EXCEPTIONS

benchmark/large_random/yyjson.h

@@ -1,64 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_YYJSON
-
-#include "large_random.h"
-
-namespace large_random {
-
-struct yyjson_base {
-  static constexpr diff_flags DiffFlags = diff_flags::NONE;
-
-  simdjson_really_inline double get_double(yyjson_val *obj, std::string_view key) {
-    yyjson_val *val = yyjson_obj_getn(obj, key.data(), key.length());
-    if (!val) { throw "missing point field!"; }
-    if (yyjson_get_type(val) != YYJSON_TYPE_NUM) { throw "Number is not a type!"; }
-
-    switch (yyjson_get_subtype(val)) {
-      case YYJSON_SUBTYPE_UINT:
-        return double(yyjson_get_uint(val));
-      case YYJSON_SUBTYPE_SINT:
-        return double(yyjson_get_sint(val));
-      case YYJSON_SUBTYPE_REAL:
-        return yyjson_get_real(val);
-      default:
-        SIMDJSON_UNREACHABLE();
-    }
-    SIMDJSON_UNREACHABLE();
-    return 0.0; // unreachable
-  }
-
-  bool run(yyjson_doc *doc, std::vector<point> &result) {
-    if (!doc) { return false; }
-    yyjson_val *coords = yyjson_doc_get_root(doc);
-    if (!yyjson_is_arr(coords)) { return false; }
-
-    // Walk the document, parsing the tweets as we go
-    size_t idx, max;
-    yyjson_val *coord;
-    yyjson_arr_foreach(coords, idx, max, coord) {
-      if (!yyjson_is_obj(coord)) { return false; }
-      result.emplace_back(json_benchmark::point{get_double(coord, "x"), get_double(coord, "y"), get_double(coord, "z")});
-    }
-
-    return true;
-  }
-};
-
-struct yyjson : yyjson_base {
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), result);
-  }
-};
-BENCHMARK_TEMPLATE(large_random, yyjson)->UseManualTime();
-
-struct yyjson_insitu : yyjson_base {
-  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);
-  }
-};
-BENCHMARK_TEMPLATE(large_random, yyjson_insitu)->UseManualTime();
-
-} // namespace large_random
-
-#endif // SIMDJSON_COMPETITION_YYJSON

benchmark/largerandom/dom.h

@@ -0,0 +1,69 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "largerandom.h"
+
+namespace largerandom {
+
+using namespace simdjson;
+
+class Dom {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+
+  simdjson_really_inline const std::vector<my_point> &Result() { return container; }
+  simdjson_really_inline size_t ItemCount() { return container.size(); }
+
+private:
+  dom::parser parser{};
+  std::vector<my_point> container{};
+};
+
+simdjson_really_inline bool Dom::Run(const padded_string &json) {
+  container.clear();
+
+  for (auto point : parser.parse(json)) {
+    container.emplace_back(my_point{point["x"], point["y"], point["z"]});
+  }
+
+  return true;
+}
+
+BENCHMARK_TEMPLATE(LargeRandom, Dom);
+
+namespace sum {
+
+class Dom {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+
+  simdjson_really_inline my_point &Result() { return sum; }
+  simdjson_really_inline size_t ItemCount() { return count; }
+
+private:
+  dom::parser parser{};
+  my_point sum{};
+  size_t count{};
+};
+
+simdjson_really_inline bool Dom::Run(const padded_string &json) {
+  sum = { 0, 0, 0 };
+  count = 0;
+
+  for (auto coord : parser.parse(json)) {
+    sum.x += double(coord["x"]);
+    sum.y += double(coord["y"]);
+    sum.z += double(coord["z"]);
+    count++;
+  }
+
+  return true;
+}
+
+BENCHMARK_TEMPLATE(LargeRandomSum, Dom);
+
+} // namespace sum
+} // namespace largerandom
+
+#endif // SIMDJSON_EXCEPTIONS

benchmark/largerandom/iter.h

@@ -7,6 +7,7 @@
 namespace largerandom {
 
 using namespace simdjson;
+using namespace simdjson::builtin;
 
 class Iter {
 public:
@@ -47,6 +48,45 @@ simdjson_really_inline bool Iter::Run(const padded_string &json) {
 
 BENCHMARK_TEMPLATE(LargeRandom, Iter);
 
+
+namespace sum {
+
+class Iter {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+
+  simdjson_really_inline my_point &Result() { return sum; }
+  simdjson_really_inline size_t ItemCount() { return count; }
+
+private:
+  ondemand::parser parser{};
+  my_point sum{};
+  size_t count{};
+};
+
+simdjson_really_inline bool Iter::Run(const padded_string &json) {
+  sum = {0,0,0};
+  count = 0;
+
+  auto iter = parser.iterate_raw(json).value();
+  if (!iter.start_array()) { return false; }
+  do {
+    if (!iter.start_object()   || iter.field_key().value() != "x" || iter.field_value()) { return false; }
+    sum.x += iter.consume_double();
+    if (!iter.has_next_field() || iter.field_key().value() != "y" || iter.field_value()) { return false; }
+    sum.y +=  iter.consume_double();
+    if (!iter.has_next_field() || iter.field_key().value() != "z" || iter.field_value()) { return false; }
+    sum.z +=  iter.consume_double();
+    if (*iter.advance() != '}') { return false; }
+    count++;
+  } while (iter.has_next_element());
+
+  return true;
+}
+
+BENCHMARK_TEMPLATE(LargeRandomSum, Iter);
+
+} // namespace sum
 } // namespace largerandom
 
 #endif // SIMDJSON_EXCEPTIONS

benchmark/largerandom/largerandom.h

@@ -0,0 +1,80 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+//
+// Interface
+//
+
+namespace largerandom {
+template<typename T> static void LargeRandom(benchmark::State &state);
+namespace sum {
+template<typename T> static void LargeRandomSum(benchmark::State &state);
+}
+
+using namespace simdjson;
+
+static std::string build_json_array(size_t N) {
+  std::default_random_engine e;
+  std::uniform_real_distribution<> dis(0, 1);
+  std::stringstream myss;
+  myss << "[" << std::endl;
+  if(N > 0) {
+    myss << "{ \"x\":" << dis(e) << ",  \"y\":" << dis(e) << ", \"z\":" << dis(e) << "}" << std::endl;
+  }
+  for(size_t i = 1; i < N; i++) {
+    myss << "," << std::endl;
+    myss << "{ \"x\":" << dis(e) << ",  \"y\":" << dis(e) << ", \"z\":" << dis(e) << "}";
+  }
+  myss << std::endl;
+  myss << "]" << std::endl;
+  std::string answer = myss.str();
+  std::cout << "Creating a source file spanning " << (answer.size() + 512) / 1024 << " KB " << std::endl;  
+  return answer;
+}
+
+static const padded_string &get_built_json_array() {
+  static padded_string json = build_json_array(1000000);
+  return json;
+}
+
+struct my_point {
+  double x;
+  double y;
+  double z;
+  simdjson_really_inline bool operator==(const my_point &other) const {
+    return x == other.x && y == other.y && z == other.z;
+  }
+  simdjson_really_inline bool operator!=(const my_point &other) const { return !(*this == other); }
+};
+
+simdjson_unused static std::ostream &operator<<(std::ostream &o, const my_point &p) {
+  return o << p.x << "," << p.y << "," << p.z << std::endl;
+}
+
+} // namespace largerandom
+
+//
+// Implementation
+//
+#include <vector>
+#include "event_counter.h"
+#include "dom.h"
+#include "json_benchmark.h"
+
+namespace largerandom {
+
+template<typename T> static void LargeRandom(benchmark::State &state) {
+  JsonBenchmark<T, Dom>(state, get_built_json_array());
+}
+
+namespace sum {
+
+template<typename T> static void LargeRandomSum(benchmark::State &state) {
+  JsonBenchmark<T, Dom>(state, get_built_json_array());
+}
+
+}
+} // namespace largerandom
+
+#endif // SIMDJSON_EXCEPTIONS

benchmark/largerandom/ondemand.h

@@ -7,6 +7,7 @@
 namespace largerandom {
 
 using namespace simdjson;
+using namespace simdjson::builtin;
 
 class OnDemand {
 public:
@@ -24,7 +25,7 @@ simdjson_really_inline bool OnDemand::Run(const padded_string &json) {
 
   auto doc = parser.iterate(json);
   for (ondemand::object coord : doc) {
-    container.emplace_back(my_point{coord.find_field("x"), coord.find_field("y"), coord.find_field("z")});
+    container.emplace_back(my_point{coord["x"], coord["y"], coord["z"]});
   }
 
   return true;
@@ -32,6 +33,39 @@ simdjson_really_inline bool OnDemand::Run(const padded_string &json) {
 
 BENCHMARK_TEMPLATE(LargeRandom, OnDemand);
 
+
+namespace sum {
+
+class OnDemand {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+  simdjson_really_inline my_point &Result() { return sum; }
+  simdjson_really_inline size_t ItemCount() { return count; }
+
+private:
+  ondemand::parser parser{};
+  my_point sum{};
+  size_t count{};
+};
+
+simdjson_really_inline bool OnDemand::Run(const padded_string &json) {
+  sum = {0,0,0};
+  count = 0;
+
+  auto doc = parser.iterate(json);
+  for (ondemand::object coord : doc.get_array()) {
+    sum.x += double(coord["x"]);
+    sum.y += double(coord["y"]);
+    sum.z += double(coord["z"]);
+    count++;
+  }
+
+  return true;
+}
+
+BENCHMARK_TEMPLATE(LargeRandomSum, OnDemand);
+
+} // namespace sum
 } // namespace largerandom
 
 #endif // SIMDJSON_EXCEPTIONS

benchmark/largerandom/sax.h

@@ -7,6 +7,7 @@
 namespace largerandom {
 
 using namespace simdjson;
+using namespace simdjson::builtin;
 using namespace simdjson::builtin::stage2;
 
 class Sax {
@@ -51,7 +52,7 @@ public:
   simdjson_really_inline error_code visit_key(json_iterator &, const uint8_t * key) {
     switch(key[1]) {
       // Technically, we should check the other characters
-      // in the key, but we are cheating to go as fast
+      // in the key, but we are cheating to go as fast 
       // as possible.
       case 'x':
         idx = GOT_X;
@@ -61,11 +62,11 @@ public:
         break;
       case 'z':
         idx = GOT_Z;
-        break;
+        break; 
       default:
-        idx = GOT_SOMETHING_ELSE;
+        idx = GOT_SOMETHING_ELSE; 
     }
-    return SUCCESS;
+    return SUCCESS; 
   }
   simdjson_really_inline error_code visit_array_start(json_iterator &)  { return SUCCESS; }
   simdjson_really_inline error_code visit_array_end(json_iterator &) { return SUCCESS; }

benchmark/linux/linux-perf-events.h

@@ -10,7 +10,7 @@
 #else // no __has_include
 // Please insure that linux headers have been installed.
 #include <asm/unistd.h>       // for __NR_perf_event_open
-#endif
+#endif 
 #include <linux/perf_event.h> // for perf event constants
 #include <sys/ioctl.h>        // for ioctl
 #include <unistd.h>           // for syscall
@@ -28,7 +28,7 @@ template <int TYPE = PERF_TYPE_HARDWARE> class LinuxEvents {
   perf_event_attr attribs{};
   size_t num_events{};
   std::vector<uint64_t> temp_result_vec{};
-  std::vector<uint64_t> result{};
+  std::vector<uint64_t> ids{};
   bool quiet;
 
 public:
@@ -48,7 +48,7 @@ public:
 
     int group = -1; // no group
     num_events = config_vec.size();
-    result.resize(config_vec.size());
+    ids.resize(config_vec.size());
     uint32_t i = 0;
     for (auto config : config_vec) {
       attribs.config = config;
@@ -56,7 +56,7 @@ public:
       if (fd == -1) {
         report_error("perf_event_open");
       }
-      ioctl(fd, PERF_EVENT_IOC_ID, &result[i++]);
+      ioctl(fd, PERF_EVENT_IOC_ID, &ids[i++]);
       if (group == -1) {
         group = fd;
       }
@@ -90,7 +90,7 @@ public:
       }
     }
     // our actual results are in slots 1,3,5, ... of this structure
-    // we really should be checking our result obtained earlier to be safe
+    // we really should be checking our ids obtained earlier to be safe
     for (uint32_t i = 1; i < temp_result_vec.size(); i += 2) {
       results[i / 2] = temp_result_vec[i];
     }

benchmark/minifiercompetition.cpp

@@ -0,0 +1,196 @@
+#include <iostream>
+#include <unistd.h>
+
+#include "benchmark.h"
+#include "simdjson.h"
+
+SIMDJSON_PUSH_DISABLE_ALL_WARNINGS
+
+// #define RAPIDJSON_SSE2 // bad
+// #define RAPIDJSON_SSE42 // bad
+#include "rapidjson/document.h"
+#include "rapidjson/reader.h" // you have to check in the submodule
+#include "rapidjson/stringbuffer.h"
+#include "rapidjson/writer.h"
+#include "sajson.h"
+
+SIMDJSON_POP_DISABLE_WARNINGS
+
+using namespace rapidjson;
+using namespace simdjson;
+
+std::string rapid_stringme_insitu(char *json) {
+  Document d;
+  d.ParseInsitu(json);
+  if (d.HasParseError()) {
+    std::cerr << "problem!" << std::endl;
+    return ""; // should do something
+  }
+  StringBuffer buffer;
+  Writer<StringBuffer> writer(buffer);
+  d.Accept(writer);
+  return buffer.GetString();
+}
+
+std::string rapid_stringme(char *json) {
+  Document d;
+  d.Parse(json);
+  if (d.HasParseError()) {
+    std::cerr << "problem!" << std::endl;
+    return ""; // should do something
+  }
+  StringBuffer buffer;
+  Writer<StringBuffer> writer(buffer);
+  d.Accept(writer);
+  return buffer.GetString();
+}
+
+std::string simdjson_stringme(simdjson::padded_string & json) {
+  std::stringstream ss;
+  dom::parser parser;
+  dom::element doc;
+  auto error = parser.parse(json).get(doc);
+  if (error) { std::cerr << error << std::endl; abort(); }
+  ss << simdjson::minify(doc);
+  return ss.str();
+}
+
+
+int main(int argc, char *argv[]) {
+  int c;
+  bool verbose = false;
+  bool just_data = false;
+
+  while ((c = getopt(argc, argv, "vt")) != -1)
+    switch (c) {
+    case 't':
+      just_data = true;
+      break;
+    case 'v':
+      verbose = true;
+      break;
+    default:
+      abort();
+    }
+  if (optind >= argc) {
+    std::cerr << "Usage: " << argv[0] << " <jsonfile>" << std::endl;
+    exit(1);
+  }
+  const char *filename = argv[optind];
+  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;
+  }
+  // Gigabyte: https://en.wikipedia.org/wiki/Gigabyte
+  if (verbose) {
+    std::cout << "Input has ";
+    if (p.size() > 1000 * 1000)
+      std::cout << p.size() / (1000 * 1000) << " MB ";
+    else if (p.size() > 1000)
+      std::cout << p.size() / 1000 << " KB ";
+    else
+      std::cout << p.size() << " B ";
+    std::cout << std::endl;
+  }
+  char *buffer = simdjson::internal::allocate_padded_buffer(p.size() + 1);
+  if(buffer == nullptr) {
+    std::cerr << "Out of memory!" << std::endl;
+    abort();
+  }
+  memcpy(buffer, p.data(), p.size());
+  buffer[p.size()] = '\0';
+
+  int repeat = 50;
+  size_t volume = p.size();
+  if (just_data) {
+    printf(
+        "name cycles_per_byte cycles_per_byte_err  gb_per_s gb_per_s_err \n");
+  }
+  size_t strlength = rapid_stringme((char *)p.data()).size();
+  if (verbose)
+    std::cout << "input length is " << p.size() << " stringified length is "
+              << strlength << std::endl;
+  BEST_TIME_NOCHECK("despacing with RapidJSON",
+                    rapid_stringme((char *)p.data()), , repeat, volume,
+                    !just_data);
+  BEST_TIME_NOCHECK(
+      "despacing with RapidJSON Insitu", rapid_stringme_insitu((char *)buffer),
+      memcpy(buffer, p.data(), p.size()), repeat, volume, !just_data);
+
+  BEST_TIME_NOCHECK(
+      "despacing with std::minify", simdjson_stringme(p),, repeat, volume, !just_data);
+
+      
+  memcpy(buffer, p.data(), p.size());
+  size_t outlength;
+  uint8_t *cbuffer = (uint8_t *)buffer;
+  for (auto imple : simdjson::available_implementations) {
+    if(imple->supported_by_runtime_system()) {
+      BEST_TIME((std::string("simdjson->minify+")+imple->name()).c_str(), (imple->minify(cbuffer, p.size(), cbuffer, outlength) == simdjson::SUCCESS ? outlength : -1),
+            outlength, memcpy(buffer, p.data(), p.size()), repeat, volume,
+            !just_data);
+    }
+  }
+
+  printf("minisize = %zu, original size = %zu  (minified down to %.2f percent "
+         "of original) \n",
+         outlength, p.size(), static_cast<double>(outlength) * 100.0 / static_cast<double>(p.size()));
+
+  /***
+   * Is it worth it to minify before parsing?
+   ***/
+  rapidjson::Document d;
+  BEST_TIME("RapidJSON Insitu orig", d.ParseInsitu(buffer).HasParseError(),
+            false, memcpy(buffer, p.data(), p.size()), repeat, volume,
+            !just_data);
+
+  char *mini_buffer = simdjson::internal::allocate_padded_buffer(p.size() + 1);
+  if(mini_buffer == nullptr) {
+    std::cerr << "Out of memory" << std::endl;
+    abort();
+  }
+  size_t minisize;
+  auto minierror = minify(p.data(), p.size(),mini_buffer, minisize);
+  if (!minierror) { std::cerr << minierror << std::endl; exit(1); }
+  mini_buffer[minisize] = '\0';
+
+  BEST_TIME("RapidJSON Insitu despaced", d.ParseInsitu(buffer).HasParseError(),
+            false, memcpy(buffer, mini_buffer, p.size()), repeat, volume,
+            !just_data);
+
+  size_t ast_buffer_size = p.size() * 2;
+  size_t *ast_buffer = (size_t *)malloc(ast_buffer_size * sizeof(size_t));
+
+  BEST_TIME(
+      "sajson orig",
+      sajson::parse(sajson::bounded_allocation(ast_buffer, ast_buffer_size),
+                    sajson::mutable_string_view(p.size(), buffer))
+          .is_valid(),
+      true, memcpy(buffer, p.data(), p.size()), repeat, volume, !just_data);
+
+  BEST_TIME(
+      "sajson despaced",
+      sajson::parse(sajson::bounded_allocation(ast_buffer, ast_buffer_size),
+                    sajson::mutable_string_view(minisize, buffer))
+          .is_valid(),
+      true, memcpy(buffer, mini_buffer, p.size()), repeat, volume, !just_data);
+
+  simdjson::dom::parser parser;
+  bool automated_reallocation = false;
+  BEST_TIME("simdjson orig",
+            parser.parse((const uint8_t *)buffer, p.size(),
+                                 automated_reallocation).error(),
+            simdjson::SUCCESS, memcpy(buffer, p.data(), p.size()), repeat, volume,
+            !just_data);
+  BEST_TIME("simdjson despaced",
+            parser.parse((const uint8_t *)buffer, minisize,
+                                 automated_reallocation).error(),
+            simdjson::SUCCESS, memcpy(buffer, mini_buffer, p.size()), repeat, volume,
+            !just_data);
+
+  free(buffer);
+  free(ast_buffer);
+  free(mini_buffer);
+}