Version 0.8.

It seems that we export too many targets. (#1385 )
* It seems that we export too many targets. * Adding missing word. * Let us try this. * Restoring dead line. * Some fixes. * Update src/CMakeLists.txt Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * Update cmake/simdjson-config.nothread.cmake.in Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * Update cmake/simdjson-config.cmake.in Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * Update CMakeLists.txt Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * Update CMakeLists.txt Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * Removing useless file * Simplifying the PR somewhat. Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
2026-06-08 17:27:07 +00:00 · 2021-01-22 12:04:08 -05:00 · 2021-01-20 13:20:49 -05:00 · 2021-01-18 12:00:02 -05:00 · 2021-01-16 15:08:27 -05:00 · 2021-01-16 02:50:55 +00:00
342 changed files with 32099 additions and 16745 deletions
@@ -4,24 +4,34 @@ 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: -E checkperf
+      CMAKE_ARGS: -A %Platform% -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_ENABLE_THREADS=OFF
+      CTEST_ARGS: -LE explicitonly
    - 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: -E "checkperf|ondemand_basictests"
+      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
    - job_name: VS2015
      image: Visual Studio 2015
-      CMAKE_ARGS:  -A %Platform% -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_ENABLE_THREADS=OFF
-      CTEST_ARGS: -E checkperf
+      CMAKE_ARGS: -A %Platform% -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_ENABLE_THREADS=OFF
+      CTEST_ARGS: -LE explicitonly

 build_script:
  - mkdir build
@@ -61,6 +61,19 @@ 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
@@ -74,7 +87,9 @@ 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:
@@ -88,7 +103,14 @@ commands:
          cd build &&
          tools/json2json -h &&
          ctest $CTEST_FLAGS -L acceptance &&
-          ctest $CTEST_FLAGS -LE acceptance -E checkperf
+          ctest $CTEST_FLAGS -LE acceptance -LE explicitonly
+
+  cmake_assert_test:
+    steps:
+      - run: |
+          cd build &&
+          tools/json2json -h &&
+          ctest $CTEST_FLAGS -L assert

  cmake_test_all:
    steps:
@@ -97,9 +119,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 -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 &&
+          SIMDJSON_FORCE_IMPLEMENTATION=haswell ctest $CTEST_FLAGS -L per_implementation -LE explicitonly &&
+          SIMDJSON_FORCE_IMPLEMENTATION=westmere ctest $CTEST_FLAGS -L per_implementation -LE explicitonly &&
+          SIMDJSON_FORCE_IMPLEMENTATION=fallback ctest $CTEST_FLAGS -L per_implementation -LE explicitonly &&
          ctest $CTEST_FLAGS -LE "acceptance|per_implementation" # Everything we haven't run yet, run now.


@@ -129,6 +151,16 @@ 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
@@ -159,14 +191,23 @@ 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 -E checkperf }
+    environment: { CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, BUILD_FLAGS: "", CTEST_FLAGS: --output-on-failure -LE explicitonly }
    steps: [ cmake_test ]
  sanitize-clang10:
    description: Build and run tests on clang 10 and AVX 2 with a cmake sanitize build
    executor: clang10
-    environment: { CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -E checkperf }
+    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 }
    steps: [ cmake_test ]
-
  # dynamic
  dynamic-gcc10:
    description: Build and run tests on GCC 10 and AVX 2 with a cmake dynamic build
@@ -221,12 +262,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 -E checkperf }
+    environment: {  CXXFLAGS: -march=haswell, CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, BUILD_FLAGS: "", CTEST_FLAGS: --output-on-failure -LE explicitonly }
    steps: [ cmake_test ]
  sanitize-haswell-clang10:
    description: Build and run tests on clang 10 and AVX 2 with a cmake sanitize build
    executor: clang10
-    environment: { CXXFLAGS: -march=haswell, CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -E checkperf }
+    environment: { CXXFLAGS: -march=haswell, CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
    steps: [ cmake_test ]

 workflows:
@@ -245,6 +286,8 @@ workflows:
      # full single-implementation tests
      - sanitize-gcc10
      - sanitize-clang10
+      - threadsanitize-gcc10
+      - threadsanitize-clang10
      - dynamic-gcc10
      - dynamic-clang10
      - unthreaded-gcc10
@@ -266,4 +309,8 @@ 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
@@ -6,6 +6,11 @@ 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
@@ -18,4 +23,4 @@ task:
    - make
  test_script:
    - cd build
-    - ctest --output-on-failure -E checkperf
+    - ctest --output-on-failure -LE explicitonly
@@ -1,7 +1,7 @@
 *
 !.git
 !Makefile
-!amalgamate.sh
+!amalgamate.py
 !benchmark
 !dependencies
 !include
@@ -12,4 +12,4 @@
 !src
 !style
 !tests
-!tools
+!tools
@@ -9,10 +9,10 @@ steps:
    CXX: g++
    BUILD_FLAGS: -- -j
    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
-    CTEST_FLAGS: -j4 --output-on-failure -E checkperf 
+    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly 
  commands:
-    - apt-get update -qq
-    - apt-get install -y g++ cmake gcc
+    - scripts/addcmakeppa.sh "$(env -i sh -c '. /etc/os-release; echo $VERSION_CODENAME')"
+    - apt-get install -y g++ cmake gcc git
    - 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 -E checkperf 
+    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly 
  commands:
-    - apt-get update -qq
-    - apt-get install -y clang++-6.0 cmake
+    - scripts/addcmakeppa.sh "$(env -i sh -c '. /etc/os-release; echo $VERSION_CODENAME')"
+    - apt-get install -y clang++-6.0 cmake git
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -51,10 +51,11 @@ steps:
    CXX: g++
    BUILD_FLAGS: -- -j
    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=haswell;westmere;fallback
-    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
+    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
+    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
    - apt-get update -qq
-    - apt-get install -y cmake
+    - apt-get -t buster-backports install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -77,7 +78,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 -E checkperf
+    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
    - mkdir build
    - cd build
@@ -100,10 +101,11 @@ steps:
    CXX: g++
    BUILD_FLAGS: -- -j
    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
-    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
+    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
+    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
    - apt-get update -qq
-    - apt-get install -y cmake
+    - apt-get -t buster-backports install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -122,7 +124,7 @@ steps:
    CXX: clang++-9
    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
    BUILD_FLAGS: -- -j
-    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
+    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
    - mkdir build
    - cd build
@@ -141,10 +143,11 @@ steps:
    CXX: g++
    BUILD_FLAGS: -- -j
    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=haswell;westmere;fallback
-    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
+    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
+    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
    - apt-get update -qq
-    - apt-get install -y cmake
+    - apt-get -t buster-backports install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -167,7 +170,7 @@ steps:
    CXX: clang++-9
    CMAKE_FLAGS: -DSIMDJSON_SANITIZE=ON -DSIMDJSON_IMPLEMENTATION=haswell;westmere;fallback
    BUILD_FLAGS: -- -j
-    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
+    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
    - mkdir build
    - cd build
@@ -180,6 +183,27 @@ 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:
@@ -190,10 +214,11 @@ steps:
    CXX: g++
    BUILD_FLAGS: -- -j
    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=arm64;fallback
-    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
+    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
+    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
    - apt-get update -qq
-    - apt-get install -y cmake
+    - apt-get -t buster-backports install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -208,16 +233,17 @@ name: arm64-clang6
 platform: { os: linux, arch: arm64 }
 steps:
 - name: Build and Test
-  image: ubuntu:18.04
+  image: debian:buster-backports
  environment:
    CC: clang-6.0
    CXX: clang++-6.0
    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
    BUILD_FLAGS: -- -j
-    CTEST_FLAGS: -j4 --output-on-failure  -E checkperf
+    CTEST_FLAGS: -j4 --output-on-failure  -LE explicitonly
  commands:
-    - apt-get update -qq
-    - apt-get install -y clang cmake git
+    - apt-get -qq update
+    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y clang-6.0 git
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -235,10 +261,11 @@ steps:
    CXX: g++
    BUILD_FLAGS: -- -j
    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
-    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
+    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
+    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
    - apt-get update -qq
-    - apt-get install -y cmake
+    - apt-get -t buster-backports install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -250,16 +277,17 @@ name: arm64-dynamic-clang6
 platform: { os: linux, arch: arm64 }
 steps:
 - name: Build and Test
-  image: ubuntu:18.04
+  image: debian:buster-backports
  environment:
    CC: clang-6.0
    CXX: clang++-6.0
    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
    BUILD_FLAGS: -- -j
-    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
+    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
-    - apt-get update -qq
-    - apt-get install -y clang cmake git
+    - apt-get -qq update
+    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y clang-6.0 git
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -275,12 +303,14 @@ steps:
  environment:
    BUILD_FLAGS: -- -j
    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=arm64;fallback
-    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
+    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
    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 install -y cmake libstdc++6
+    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y libstdc++6
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -295,16 +325,17 @@ name: arm64-sanitize-clang6
 platform: { os: linux, arch: arm64 }
 steps:
 - name: Build and Test
-  image: ubuntu:18.04
+  image: debian:buster-backports
  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 -E checkperf
+    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
-    - apt-get update -qq
-    - apt-get install -y clang cmake git
+    - apt-get -qq update
+    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y clang-6.0 git
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -326,11 +357,9 @@ steps:
    CXX: clang++-9
    BUILD_FLAGS: -- -j 4
    CMAKE_FLAGS: -GNinja -DSIMDJSON_BUILD_STATIC=ON
-    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
+    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
    CXXFLAGS: -stdlib=libc++
  commands:
-    - apt-get update -qq
-    - apt-get install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -349,11 +378,30 @@ steps:
    CXX: clang++-9
    BUILD_FLAGS: -- -j
    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
-    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
+    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
    CXXFLAGS: -stdlib=libc++
  commands:
-    - apt-get update -qq
-    - apt-get install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -371,10 +419,11 @@ steps:
    CXX: g++
    BUILD_FLAGS: -- -j
    CMAKE_FLAGS: -DSIMDJSON_EXCEPTIONS=OFF
-    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
+    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
+    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
    - apt-get update -qq
-    - apt-get install -y cmake
+    - apt-get -t buster-backports install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -393,7 +442,7 @@ steps:
    DEBIAN_FRONTEND: noninteractive
    ASAN_OPTIONS: detect_leaks=0
  commands:
-    - apt-get update -qq
+    - apt-get -qq update
    - 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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,8 @@
+
+
+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
@@ -1,12 +1,25 @@
 name: Alpine Linux
-'on':
-  - push
-  - pull_request
+
+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-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
@@ -24,4 +37,4 @@ jobs:
          ./alpine.sh cmake --build build_for_alpine
      - name: test
        run: |
-          ./alpine.sh bash -c "cd build_for_alpine && ctest"
+          ./alpine.sh bash -c "cd build_for_alpine && ctest  -LE explicitonly"
@@ -0,0 +1,37 @@
+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
+
@@ -5,20 +5,28 @@ on:
    branches:
      - master
  pull_request:
+    branches:
+      - master
  schedule:
    - cron: 23 */8 * * *

 jobs:
-  build:    
+  build:
+    if: >-
+      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
+      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
    runs-on: ubuntu-latest
    env:
-      # 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
+      # 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
      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
@@ -27,10 +35,15 @@ 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 10
+        sudo ./llvm.sh $CLANGVERSION

    - 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
@@ -51,7 +64,7 @@ jobs:
        clang++ --version

    - name: Build all the variants
-      run: fuzz/build_fuzzer_variants.sh
+      run: CLANGSUFFIX=-$CLANGVERSION fuzz/build_fuzzer_variants.sh

    - name: Explore fast (release build, default implementation)
      run: |
@@ -71,7 +84,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/fuzz/fuzz_$fuzzer out/$fuzzer $others seedcorpus -max_total_time=20 $MAXLEN
+            build-sanitizers$OPTLEVEL/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
@@ -82,7 +95,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/fuzz/fuzz_$fuzzer out/$fuzzer $others seedcorpus -max_total_time=20 $MAXLEN
+          build-sanitizers$OPTLEVEL/fuzz/fuzz_$fuzzer out/$fuzzer $others seedcorpus -max_total_time=20 $MAXLEN
          echo now have $(ls out/$fuzzer |wc -l) files in corpus
        done

@@ -149,4 +162,3 @@ jobs:
          leak-*
          timeout-*
        if-no-files-found: ignore
-
@@ -1,6 +1,12 @@
 name: MinGW32-CI

-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master

 # Important: scoop will either install 32-bit GCC or 64-bit GCC, not both.

@@ -9,6 +15,9 @@ 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-gcc
    runs-on: windows-2016

@@ -26,6 +35,12 @@ 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
@@ -49,5 +64,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 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
+          cmake --build . --target acceptance_tests --verbose
+          ctest -L acceptance --output-on-failure
@@ -1,6 +1,12 @@
 name: MinGW64-CI

-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master

 # Important: scoop will either install 32-bit GCC or 64-bit GCC, not both.

@@ -9,6 +15,9 @@ 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-gcc
    runs-on: windows-2016

@@ -26,6 +35,12 @@ 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
@@ -49,11 +64,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 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
+          cmake --build . --target acceptance_tests --verbose
+          ctest -L acceptance --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 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
+          cmake --build . --target acceptance_tests --verbose
+          ctest -L acceptance --output-on-failure
@@ -0,0 +1,54 @@
+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
@@ -1,9 +1,18 @@
 name: MSYS2-CI

-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master

 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:
@@ -30,6 +39,10 @@ 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
@@ -41,4 +54,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 -E checkperf
+          ctest -j4 --output-on-failure -LE explicitonly
@@ -0,0 +1,65 @@
+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"
@@ -1,16 +1,25 @@
 name: Performance check on Ubuntu 18.04 CI (GCC 7)

-on: [push, pull_request]
+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
-      - name: Setup cmake
-        uses: jwlawson/actions-setup-cmake@v1.0
+      - uses: actions/cache@v2
        with:
-          cmake-version: '3.9.x'
+          path: dependencies/.cache
+          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
      - name: Use cmake
        run: |
          mkdir build &&
@@ -18,4 +27,3 @@ 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
-
@@ -0,0 +1,30 @@
+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
@@ -1,22 +1,31 @@
 name: Ubuntu 18.04 CI (GCC 7)

-on: [push, pull_request]
+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
-      - name: Setup cmake
-        uses: jwlawson/actions-setup-cmake@v1.0
+      - uses: actions/cache@v2
        with:
-          cmake-version: '3.9.x'
+          path: dependencies/.cache
+          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
      - 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 -E checkperf   &&
+          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
@@ -1,16 +1,25 @@
 name: Performance check on Ubuntu 20.04 CI (GCC 9)

-on: [push, pull_request]
+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
-      - name: Setup cmake
-        uses: jwlawson/actions-setup-cmake@v1.0
+      - uses: actions/cache@v2
        with:
-          cmake-version: '3.9.x'
+          path: dependencies/.cache
+          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
      - name: Use cmake
        run: |
          mkdir build &&
@@ -0,0 +1,30 @@
+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
@@ -1,22 +1,31 @@
 name: Ubuntu 20.04 CI (GCC 9)

-on: [push, pull_request]
+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
-      - name: Setup cmake
-        uses: jwlawson/actions-setup-cmake@v1.0
+      - uses: actions/cache@v2
        with:
-          cmake-version: '3.9.x'
+          path: dependencies/.cache
+          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
      - 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 -E checkperf   &&
+          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
@@ -1,13 +1,26 @@
 name: VS16-CI

-on: [push, pull_request]
+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-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:
@@ -21,6 +34,6 @@ jobs:
        buildWithCMakeArgs: --config Release  
        
    - name: 'Run CTest'
-      run: ctest -C Release  -E checkperf  --output-on-failure 
+      run: ctest -C Release  -LE explicitonly  --output-on-failure 
      working-directory: "${{ github.workspace }}/../../_temp/windows"
  
@@ -1,13 +1,26 @@
 name: VS16-CLANG-CI

-on: [push, pull_request]
+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-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:
@@ -21,5 +34,5 @@ jobs:
        buildWithCMakeArgs: --config Release  
        
    - name: 'Run CTest'
-      run: ctest -C Release -E checkperf  --output-on-failure 
-      working-directory: "${{ github.workspace }}/../../_temp/windows"
+      run: ctest -C Release -LE explicitonly  --output-on-failure 
+      working-directory: "${{ github.workspace }}/../../_temp/windows"
@@ -1,13 +1,26 @@
 name: VS16-Ninja-CI

-on: [push, pull_request]
+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-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:
@@ -21,6 +34,6 @@ jobs:
        buildWithCMakeArgs: --config Release  
        
    - name: 'Run CTest'
-      run: ctest -C Release  -E checkperf  --output-on-failure 
+      run: ctest -C Release  -LE explicitonly  --output-on-failure 
      working-directory: "${{ github.workspace }}/../../_temp/windows"
  
@@ -0,0 +1,36 @@
+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@v2
+      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"
+  
@@ -96,3 +96,4 @@ objs

 # Generated docs
 /doc/api
+*.orig
@@ -1,42 +0,0 @@
-[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
@@ -1,30 +1,188 @@
 language: cpp
-sudo: false
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - gcc-7
-      - g++-7
-      - clang-format
-      - python
-branches:
-  only:
-    - master

-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/
+dist: bionic

+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"
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9) # CMP0069 NEW
+cmake_minimum_required(VERSION 3.13)

 project(simdjson
  DESCRIPTION "Parsing gigabytes of JSON per second"
@@ -6,11 +6,11 @@ project(simdjson
 )

 set(PROJECT_VERSION_MAJOR 0)
-set(PROJECT_VERSION_MINOR 6)
+set(PROJECT_VERSION_MINOR 8)
 set(PROJECT_VERSION_PATCH 0)
-set(SIMDJSON_SEMANTIC_VERSION "0.6.0" 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_SEMANTIC_VERSION "0.8.0" CACHE STRING "simdjson semantic version")
+set(SIMDJSON_LIB_VERSION "7.0.0" CACHE STRING "simdjson library version")
+set(SIMDJSON_LIB_SOVERSION "7" CACHE STRING "simdjson library soversion")
 set(SIMDJSON_GITHUB_REPOSITORY https://github.com/simdjson/simdjson)

 include(GNUInstallDirs)
@@ -43,6 +43,14 @@ 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)
+
 #
 # Compile tools / tests / benchmarks
 #
@@ -42,6 +42,7 @@ 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.

@@ -69,6 +70,8 @@ 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.

@@ -35,5 +35,6 @@ 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!
@@ -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 -E checkperf"
+# docker run -it -v $(pwd):/project:Z   simdjson sh -c "cd dockerbuild && ctest . --output-on-failure -LE explicitonly"
 #
 # The run the complete tests requires you to have built all of simdjson.
 #
@@ -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.6.0"
+PROJECT_NUMBER         = "0.8.0"

 # 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
@@ -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/|westmere/: Architecture-specific implementations. All functions are
+  * arm64/|fallback/|haswell/|ppc64/|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.sh:** Generates `singleheader/simdjson.h` and `singleheader/simdjson.cpp` for release (bash script). 
+* **singleheader/amalgamate.py:** Generates `singleheader/simdjson.h` and `singleheader/simdjson.cpp` for release (python 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,12 +169,13 @@ 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 a working bash on your system.
+You need to have python3 installed on your system.

-The amalgamator script is `amalgamate.sh` generates singleheader/simdjson.h by
+The amalgamator script `amalgamate.py` 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
@@ -251,7 +252,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`.


@@ -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.6.0/index.html)
+[![][license img]][license]  [![Doxygen Documentation](https://img.shields.io/badge/docs-doxygen-green.svg)](https://simdjson.org/api/0.8.0/index.html)

 simdjson : Parsing gigabytes of JSON per second
 ===============================================
@@ -28,6 +28,7 @@ Table of Contents
 -----------------

 * [Quick Start](#quick-start)
+  * [On Demand](#on-demand)
 * [Documentation](#documentation)
 * [Performance results](#performance-results)
 * [Real-world usage](#real-world-usage)
@@ -40,11 +41,14 @@ 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 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).
+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).
+
   ```
   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
   ```
@@ -64,6 +68,34 @@ The simdjson library is easily consumable with a single .h and .cpp file.
   100 results.
   ```

+### On Demand
+
+The new On Demand JSON parser is just as easy, but much faster due to just-in-time parsing. It is in
+alpha right now. More information can be found in the [On Demand Guide](doc/ondemand.md).
+
+1. Do step 1 of the [Quick Start](#quick-start).
+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;
+   }
+   ```
+3. `c++ -march=native -o quickstart quickstart.cpp simdjson.cpp`
+4. `./quickstart`
+   ```
+   100 results.
+   ```
+
+You'll notice that the code here is very similar to the [main Quick Start code](#quick-start) (and
+indeed, it does the same thing). However, if you compare the performance, you should find On
+Demand much faster.
+
 Documentation
 -------------

@@ -73,7 +105,7 @@ 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.6.0/annotated.html) contains the automatically generated API documentation.
+* [API](https://simdjson.org/api/0.8.0/annotated.html) contains the automatically generated API documentation.

 Performance results
 -------------------
@@ -168,7 +200,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:
@@ -1,13 +1,7 @@
 include_directories( . linux )
 link_libraries(simdjson-windows-headers test-data)
-
-
-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)
@@ -22,29 +16,25 @@ 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)
-  add_executable(bench_ondemand bench_ondemand.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()
 endif()

 include(checkperf.cmake)
@@ -8,8 +8,8 @@ using namespace std;

 const padded_string EMPTY_ARRAY("[]", 2);

-const char *TWITTER_JSON = SIMDJSON_BENCHMARK_DATA_DIR "twitter.json";
-const char *NUMBERS_JSON = SIMDJSON_BENCHMARK_DATA_DIR "numbers.json";
+static const char *TWITTER_JSON = SIMDJSON_BENCHMARK_DATA_DIR "twitter.json";
+static 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,6 +472,7 @@ 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) {
@@ -491,6 +492,7 @@ 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.
@@ -501,7 +503,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.insert(user["screen_name"]);
+        default_users.emplace(user["screen_name"]);
      }
    }
    if (default_users.size() != 86) { return; }
@@ -521,7 +523,7 @@ static void twitter_image_sizes(State& state) {
      if (not (error = tweet["entities"]["media"].get(media))) {
        for (dom::object image : media) {
          for (auto size : image["sizes"].get<dom::object>()) {
-            image_sizes.insert({ size.value["w"], size.value["h"] });
+             image_sizes.emplace(size.value["w"], size.value["h"]);
          }
        }
      }
@@ -575,8 +577,11 @@ 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;
@@ -602,7 +607,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.insert(string_view(iter.get_string(), iter.get_string_length()));
+            default_users.emplace(iter.get_string(), iter.get_string_length());
          }
          if (!iter.up()) { return; } // back to user
        }
@@ -615,8 +620,10 @@ 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
@@ -638,7 +645,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.insert({ width, height });
+            image_sizes.emplace(width, height);
          }
        }
      }
@@ -648,6 +655,8 @@ 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) {
@@ -690,7 +699,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.insert({ width, height });
+                    image_sizes.emplace(width, height);

                  } while (iter.next()); // next size
                  if (!iter.up()) { return; } // back to sizes
@@ -702,7 +711,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
    }

@@ -711,6 +720,9 @@ 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;
@@ -727,6 +739,7 @@ static void print_json(State& state) noexcept {
  }
 }
 BENCHMARK(print_json);
+#endif // SIMDJSON_DISABLE_DEPRECATED_API
 SIMDJSON_POP_DISABLE_WARNINGS

-BENCHMARK_MAIN();
+BENCHMARK_MAIN();
@@ -1,26 +1,72 @@
 #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/ondemand.h"
-#include "partial_tweets/iter.h"
-#include "partial_tweets/dom.h"
+#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 "largerandom/ondemand.h"
-#include "largerandom/iter.h"
-#include "largerandom/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 "kostya/ondemand.h"
-#include "kostya/iter.h"
-#include "kostya/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 "distinctuserid/ondemand.h"
-#include "distinctuserid/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 "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();
@@ -111,6 +111,7 @@ 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) {
@@ -123,6 +124,8 @@ 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; }
@@ -151,6 +154,7 @@ 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) {
@@ -162,6 +166,8 @@ 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;
@@ -1,14 +0,0 @@
-#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();
@@ -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 << "             or ARM64). By default, detects best supported architecture." << 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;
 }

 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")) {
@@ -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,7 +315,7 @@ 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 result: " + error_message(error));
+      exit_error(string("Unable to allocate_stage ") + to_string(json.size()) + " bytes for the JSON text: " + error_message(error));
    }
    event_count allocate_count = collector.end();
    allocate_stage << allocate_count;
@@ -7,7 +7,7 @@

 # Clone the repository if it's not there
 find_package(Git QUIET)
-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
+if (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 (SIMDJSON_IS_UNDER_GIT AND SIMDJSON_GIT AND Git_FOUND AND (GIT_VERSION_STRING
    # 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)
+  set_property(TEST checkperf APPEND PROPERTY LABELS per_implementation explicitonly)
  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 ()
@@ -0,0 +1,53 @@
+
+#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
@@ -0,0 +1,27 @@
+#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
@@ -0,0 +1,58 @@
+#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
@@ -0,0 +1,80 @@
+#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
+
@@ -0,0 +1,36 @@
+#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
@@ -0,0 +1,37 @@
+#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
@@ -0,0 +1,61 @@
+#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
@@ -1,52 +0,0 @@
-
-#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
@@ -1,89 +0,0 @@
-#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
@@ -1,67 +0,0 @@
-#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
@@ -1,406 +0,0 @@
-#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);
-}
@@ -0,0 +1,40 @@
+
+#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
@@ -0,0 +1,29 @@
+#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
@@ -0,0 +1,52 @@
+#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
@@ -0,0 +1,66 @@
+#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
+
@@ -0,0 +1,33 @@
+#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
@@ -0,0 +1,33 @@
+#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
@@ -0,0 +1,53 @@
+#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
@@ -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).first.swap(p);
+  simdjson::padded_string::load(filename).value_unsafe().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;
@@ -1,80 +0,0 @@
-#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());
-}
@@ -0,0 +1,8 @@
+#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";
+
+}
@@ -0,0 +1,92 @@
+#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
@@ -0,0 +1,48 @@
+#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
@@ -0,0 +1,26 @@
+#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
@@ -0,0 +1,106 @@
+#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: " << 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
@@ -0,0 +1,40 @@
+#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{};
+};
+
+}
@@ -0,0 +1,37 @@
+#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
@@ -1,69 +0,0 @@
-#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
@@ -1,96 +0,0 @@
-#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
@@ -1,18 +1,41 @@
 #pragma once

-#if SIMDJSON_EXCEPTIONS
-
-//
-// Interface
-//
+#include "json_benchmark/string_runner.h"
+#include "json_benchmark/point.h"
+#include <vector>
+#include <random>

 namespace kostya {
-template<typename T> static void Kostya(benchmark::State &state);
-namespace sum {
-template<typename T> static void KostyaSum(benchmark::State &state);
-}

-using namespace simdjson;
+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();
+  }
+};

 static void append_coordinate(std::default_random_engine &e, std::uniform_real_distribution<> &dis, std::stringstream &myss) {
  using std::endl;
@@ -45,51 +68,19 @@ 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 padded_string &get_built_json_array() {
-  static padded_string json = build_json_array(524288);
+static const simdjson::padded_string &get_built_json_array() {
+  static simdjson::padded_string json = build_json_array(524288);
  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); }
-};
+struct simdjson_dom;

-simdjson_unused static std::ostream &operator<<(std::ostream &o, const my_point &p) {
-  return o << p.x << "," << p.y << "," << p.z << std::endl;
+template<typename I> simdjson_really_inline static void kostya(benchmark::State &state) {
+  run_json_benchmark<runner<I>, runner<simdjson_dom>>(state);
 }

 } // 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
@@ -0,0 +1,25 @@
+#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
@@ -1,74 +0,0 @@
-#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
@@ -0,0 +1,61 @@
+#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
@@ -0,0 +1,65 @@
+#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
+
@@ -0,0 +1,28 @@
+#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
@@ -0,0 +1,29 @@
+#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
@@ -0,0 +1,64 @@
+#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 yyjson_get_uint(val);
+      case YYJSON_SUBTYPE_SINT:
+        return yyjson_get_sint(val);
+      case YYJSON_SUBTYPE_REAL:
+        return yyjson_get_real(val);
+      default:
+        SIMDJSON_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
@@ -0,0 +1,73 @@
+#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
@@ -0,0 +1,24 @@
+#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
@@ -0,0 +1,59 @@
+#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
@@ -0,0 +1,63 @@
+#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
+
@@ -0,0 +1,28 @@
+#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
@@ -0,0 +1,29 @@
+#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
@@ -0,0 +1,29 @@
+#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
@@ -0,0 +1,62 @@
+#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 yyjson_get_uint(val);
+      case YYJSON_SUBTYPE_SINT:
+        return yyjson_get_sint(val);
+      case YYJSON_SUBTYPE_REAL:
+        return yyjson_get_real(val);
+      default:
+        SIMDJSON_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
@@ -1,69 +0,0 @@
-#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
@@ -7,7 +7,6 @@
 namespace largerandom {

 using namespace simdjson;
-using namespace simdjson::builtin;

 class Iter {
 public:
@@ -48,45 +47,6 @@ 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
@@ -1,80 +0,0 @@
-#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
@@ -7,7 +7,6 @@
 namespace largerandom {

 using namespace simdjson;
-using namespace simdjson::builtin;

 class OnDemand {
 public:
@@ -25,7 +24,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["x"], coord["y"], coord["z"]});
+    container.emplace_back(my_point{coord.find_field("x"), coord.find_field("y"), coord.find_field("z")});
  }

  return true;
@@ -33,39 +32,6 @@ 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
@@ -7,7 +7,6 @@
 namespace largerandom {

 using namespace simdjson;
-using namespace simdjson::builtin;
 using namespace simdjson::builtin::stage2;

 class Sax {
@@ -52,7 +51,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;
@@ -62,11 +61,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; }
@@ -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> ids{};
+  std::vector<uint64_t> result{};
  bool quiet;

 public:
@@ -48,7 +48,7 @@ public:

    int group = -1; // no group
    num_events = config_vec.size();
-    ids.resize(config_vec.size());
+    result.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, &ids[i++]);
+      ioctl(fd, PERF_EVENT_IOC_ID, &result[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 ids obtained earlier to be safe
+    // we really should be checking our result obtained earlier to be safe
    for (uint32_t i = 1; i < temp_result_vec.size(); i += 2) {
      results[i / 2] = temp_result_vec[i];
    }
@@ -1,196 +0,0 @@
-#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);
-}
@@ -25,11 +25,12 @@ int main(int argc, char *argv[]) {
    exit(1);
  }
  const char *filename = argv[1];
-  auto[p, err] = simdjson::padded_string::load(filename);
-  if (err) {
+  auto v = simdjson::padded_string::load(filename);
+  if (v.error()) {
    std::cerr << "Could not load the file " << filename << std::endl;
    return EXIT_FAILURE;
  }
+  const simdjson::padded_string& p = v.value_unsafe();
  if (test_baseline) {
    std::wclog << "Baseline: Getline + normal parse... " << std::endl;
    std::cout << "Gigabytes/second\t"
@@ -1,502 +0,0 @@
-#include "simdjson.h"
-#include <unistd.h>
-
-#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;
-using namespace simdjson;
-struct stat_s {
-  size_t number_count;
-  size_t object_count;
-  size_t array_count;
-  size_t null_count;
-  size_t true_count;
-  size_t false_count;
-  bool valid;
-};
-
-typedef struct stat_s stat_t;
-
-bool stat_equal(const stat_t &s1, const stat_t &s2) {
-  return (s1.valid == s2.valid) && (s1.number_count == s2.number_count) &&
-         (s1.object_count == s2.object_count) &&
-         (s1.array_count == s2.array_count) &&
-         (s1.null_count == s2.null_count) && (s1.true_count == s2.true_count) &&
-         (s1.false_count == s2.false_count);
-}
-
-void print_stat(const stat_t &s) {
-  if (!s.valid) {
-    printf("invalid\n");
-    return;
-  }
-  printf("number: %zu object: %zu array: %zu null: %zu true: %zu false: %zu\n",
-         s.number_count, s.object_count, s.array_count, s.null_count,
-         s.true_count, s.false_count);
-}
-
-simdjson_really_inline void simdjson_process_atom(stat_t &s,
-                                         simdjson::dom::element element) {
-  if (element.is<double>()) {
-    s.number_count++;
-  } else if (element.is<bool>()) {
-    simdjson::error_code error;
-    bool v;
-    if (not (error = element.get(v)) && v) {
-      s.true_count++;
-    } else {
-      s.false_count++;
-    }
-  } else if (element.is_null()) {
-    s.null_count++;
-  }
-}
-
-void simdjson_recurse(stat_t &s, simdjson::dom::element element) {
-  error_code error;
-  if (element.is<simdjson::dom::array>()) {
-    s.array_count++;
-    dom::array array;
-    if ((error = element.get(array))) {
-      std::cerr << error << std::endl;
-      abort();
-    }
-    for (auto child : array) {
-      if (child.is<simdjson::dom::array>() ||
-          child.is<simdjson::dom::object>()) {
-        simdjson_recurse(s, child);
-      } else {
-        simdjson_process_atom(s, child);
-      }
-    }
-  } else if (element.is<simdjson::dom::object>()) {
-    s.object_count++;
-    dom::object object;
-    if ((error = element.get(object))) {
-      std::cerr << error << std::endl;
-      abort();
-    }
-    for (auto field : object) {
-      if (field.value.is<simdjson::dom::array>() ||
-          field.value.is<simdjson::dom::object>()) {
-        simdjson_recurse(s, field.value);
-      } else {
-        simdjson_process_atom(s, field.value);
-      }
-    }
-  } else {
-    simdjson_process_atom(s, element);
-  }
-}
-
-simdjson_never_inline stat_t simdjson_compute_stats(const simdjson::padded_string &p) {
-  stat_t s{};
-  simdjson::dom::parser parser;
-  simdjson::dom::element doc;
-  auto error = parser.parse(p).get(doc);
-  if (error) {
-    s.valid = false;
-    return s;
-  }
-  s.valid = true;
-  simdjson_recurse(s, doc);
-  return s;
-}
-
-///
-struct Stat {
-  size_t objectCount;
-  size_t arrayCount;
-  size_t numberCount;
-  size_t stringCount;
-  size_t trueCount;
-  size_t falseCount;
-  size_t nullCount;
-
-  size_t memberCount;  // Number of members in all objects
-  size_t elementCount; // Number of elements in all arrays
-  size_t stringLength; // Number of code units in all strings
-};
-
-static error_code GenStatPlus(Stat &stat, const dom::element &v);
-static error_code GenStatPlus(Stat &stat, const simdjson_result<dom::element> &r) {
-  dom::element v;
-  SIMDJSON_TRY( r.get(v) );
-  return GenStatPlus(stat, v);
-}
-static error_code GenStatPlus(Stat &stat, const dom::element &v) {
-  switch (v.type()) {
-  case dom::element_type::ARRAY: {
-    dom::array a;
-    SIMDJSON_TRY( v.get(a) )
-    for (auto child : a) {
-      GenStatPlus(stat, child);
-      stat.elementCount++;
-    }
-    stat.arrayCount++;
-  } break;
-  case dom::element_type::OBJECT: {
-    dom::object o;
-    SIMDJSON_TRY( v.get(o) );
-    for (dom::key_value_pair kv : o) {
-      GenStatPlus(stat, kv.value);
-      stat.stringLength += kv.key.size();
-      stat.memberCount++;
-      stat.stringCount++;
-    }
-    stat.objectCount++;
-  } break;
-  case dom::element_type::INT64:
-  case dom::element_type::UINT64:
-  case dom::element_type::DOUBLE:
-    stat.numberCount++;
-    break;
-  case dom::element_type::STRING: {
-    stat.stringCount++;
-    std::string_view sv;
-    SIMDJSON_TRY( v.get(sv) );
-    stat.stringLength += sv.size();
-  } break;
-  case dom::element_type::BOOL: {
-    bool b;
-    SIMDJSON_TRY( v.get(b) );
-    if (b) {
-      stat.trueCount++;
-    } else {
-      stat.falseCount++;
-    }
-  } break;
-  case dom::element_type::NULL_VALUE:
-    ++stat.nullCount;
-    break;
-  }
-  return SUCCESS;
-}
-
-static void RapidGenStat(Stat &stat, const rapidjson::Value &v) {
-  switch (v.GetType()) {
-  case kNullType:
-    stat.nullCount++;
-    break;
-  case kFalseType:
-    stat.falseCount++;
-    break;
-  case kTrueType:
-    stat.trueCount++;
-    break;
-
-  case kObjectType:
-    for (Value::ConstMemberIterator m = v.MemberBegin(); m != v.MemberEnd();
-         ++m) {
-      stat.stringLength += m->name.GetStringLength();
-      RapidGenStat(stat, m->value);
-    }
-    stat.objectCount++;
-    stat.memberCount += (v.MemberEnd() - v.MemberBegin());
-    stat.stringCount += (v.MemberEnd() - v.MemberBegin()); // Key
-    break;
-
-  case kArrayType:
-    for (Value::ConstValueIterator i = v.Begin(); i != v.End(); ++i)
-      RapidGenStat(stat, *i);
-    stat.arrayCount++;
-    stat.elementCount += v.Size();
-    break;
-
-  case kStringType:
-    stat.stringCount++;
-    stat.stringLength += v.GetStringLength();
-    break;
-
-  case kNumberType:
-    stat.numberCount++;
-    break;
-  }
-}
-simdjson_never_inline Stat rapidjson_compute_stats_ref(const rapidjson::Value &doc) {
-  Stat s{};
-  RapidGenStat(s, doc);
-  return s;
-}
-
-simdjson_never_inline Stat
-simdjson_compute_stats_refplus(const simdjson::dom::element &doc) {
-  Stat s{};
-  auto error = GenStatPlus(s, doc);
-  if (error) { std::cerr << error << std::endl; abort(); }
-  return s;
-}
-
-// see
-// https://github.com/miloyip/nativejson-benchmark/blob/master/src/tests/sajsontest.cpp
-void sajson_traverse(stat_t &stats, const sajson::value &node) {
-  using namespace sajson;
-  switch (node.get_type()) {
-  case TYPE_NULL:
-    stats.null_count++;
-    break;
-  case TYPE_FALSE:
-    stats.false_count++;
-    break;
-  case TYPE_TRUE:
-    stats.true_count++;
-    break;
-  case TYPE_ARRAY: {
-    stats.array_count++;
-    auto length = node.get_length();
-    for (size_t i = 0; i < length; ++i) {
-      sajson_traverse(stats, node.get_array_element(i));
-    }
-    break;
-  }
-  case TYPE_OBJECT: {
-    stats.object_count++;
-    auto length = node.get_length();
-    for (auto i = 0u; i < length; ++i) {
-      sajson_traverse(stats, node.get_object_value(i));
-    }
-    break;
-  }
-  case TYPE_STRING:
-    // skip
-    break;
-
-  case TYPE_DOUBLE:
-  case TYPE_INTEGER:
-    stats.number_count++; // node.get_number_value();
-    break;
-  default:
-    assert(false && "unknown node type");
-  }
-}
-
-simdjson_never_inline stat_t sasjon_compute_stats(const simdjson::padded_string &p) {
-  stat_t answer{};
-  char *buffer = (char *)malloc(p.size());
-  if (buffer == nullptr) {
-    return answer;
-  }
-  memcpy(buffer, p.data(), p.size());
-  auto d = sajson::parse(sajson::dynamic_allocation(),
-                         sajson::mutable_string_view(p.size(), buffer));
-  answer.valid = d.is_valid();
-  if (!answer.valid) {
-    free(buffer);
-    return answer;
-  }
-  answer.number_count = 0;
-  answer.object_count = 0;
-  answer.array_count = 0;
-  answer.null_count = 0;
-  answer.true_count = 0;
-  answer.false_count = 0;
-  sajson_traverse(answer, d.get_root());
-  free(buffer);
-  return answer;
-}
-
-void rapid_traverse(stat_t &stats, const rapidjson::Value &v) {
-  switch (v.GetType()) {
-  case kNullType:
-    stats.null_count++;
-    break;
-  case kFalseType:
-    stats.false_count++;
-    break;
-  case kTrueType:
-    stats.true_count++;
-    break;
-
-  case kObjectType:
-    for (Value::ConstMemberIterator m = v.MemberBegin(); m != v.MemberEnd();
-         ++m) {
-      rapid_traverse(stats, m->value);
-    }
-    stats.object_count++;
-    break;
-  case kArrayType:
-    for (Value::ConstValueIterator i = v.Begin(); i != v.End();
-         ++i) { // v.Size();
-      rapid_traverse(stats, *i);
-    }
-    stats.array_count++;
-    break;
-
-  case kStringType:
-    break;
-
-  case kNumberType:
-    stats.number_count++;
-    break;
-  }
-}
-
-simdjson_never_inline stat_t rapid_compute_stats(const simdjson::padded_string &p) {
-  stat_t answer{};
-  char *buffer = (char *)malloc(p.size() + 1);
-  if (buffer == nullptr) {
-    return answer;
-  }
-  memcpy(buffer, p.data(), p.size());
-  buffer[p.size()] = '\0';
-  rapidjson::Document d;
-  d.ParseInsitu<kParseValidateEncodingFlag>(buffer);
-  answer.valid = !d.HasParseError();
-  if (!answer.valid) {
-    free(buffer);
-    return answer;
-  }
-  answer.number_count = 0;
-  answer.object_count = 0;
-  answer.array_count = 0;
-  answer.null_count = 0;
-  answer.true_count = 0;
-  answer.false_count = 0;
-  rapid_traverse(answer, d);
-  free(buffer);
-  return answer;
-}
-
-simdjson_never_inline stat_t
-rapid_accurate_compute_stats(const simdjson::padded_string &p) {
-  stat_t answer{};
-  char *buffer = (char *)malloc(p.size() + 1);
-  if (buffer == nullptr) {
-    return answer;
-  }
-  memcpy(buffer, p.data(), p.size());
-  buffer[p.size()] = '\0';
-  rapidjson::Document d;
-  d.ParseInsitu<kParseValidateEncodingFlag | kParseFullPrecisionFlag>(buffer);
-  answer.valid = !d.HasParseError();
-  if (!answer.valid) {
-    free(buffer);
-    return answer;
-  }
-  answer.number_count = 0;
-  answer.object_count = 0;
-  answer.array_count = 0;
-  answer.null_count = 0;
-  answer.true_count = 0;
-  answer.false_count = 0;
-  rapid_traverse(answer, d);
-  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;
-  }
-  stat_t s1 = simdjson_compute_stats(p);
-  if (verbose) {
-    printf("simdjson: ");
-    print_stat(s1);
-  }
-  stat_t s2 = rapid_compute_stats(p);
-  if (verbose) {
-    printf("rapid:    ");
-    print_stat(s2);
-  }
-  stat_t s2a = rapid_accurate_compute_stats(p);
-  if (verbose) {
-    printf("rapid full:    ");
-    print_stat(s2a);
-  }
-  stat_t s3 = sasjon_compute_stats(p);
-  if (verbose) {
-    printf("sasjon:   ");
-    print_stat(s3);
-  }
-  assert(stat_equal(s1, s2));
-  assert(stat_equal(s1, s3));
-  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");
-  }
-  BEST_TIME("simdjson            ", simdjson_compute_stats(p).valid, true, ,
-            repeat, volume, !just_data);
-  BEST_TIME("RapidJSON           ", rapid_compute_stats(p).valid, true, ,
-            repeat, volume, !just_data);
-  BEST_TIME("RapidJSON (precise) ", rapid_accurate_compute_stats(p).valid, true,
-            , repeat, volume, !just_data);
-  BEST_TIME("sasjon              ", sasjon_compute_stats(p).valid, true, ,
-            repeat, volume, !just_data);
-  if (!just_data) {
-    printf("API traversal tests\n");
-    printf("Based on https://github.com/miloyip/nativejson-benchmark\n");
-    simdjson::dom::parser parser;
-    simdjson::dom::element doc;
-    auto error = parser.parse(p).get(doc);
-    if (error) { std::cerr << error << std::endl; abort(); }
-    size_t refval = simdjson_compute_stats_refplus(doc).objectCount;
-
-    BEST_TIME("simdjson            ",
-              simdjson_compute_stats_refplus(doc).objectCount, refval, , repeat,
-              volume, !just_data);
-    char *buffer = (char *)malloc(p.size() + 1);
-    memcpy(buffer, p.data(), p.size());
-    buffer[p.size()] = '\0';
-    rapidjson::Document d;
-    d.ParseInsitu<kParseValidateEncodingFlag>(buffer);
-    BEST_TIME("rapid              ", rapidjson_compute_stats_ref(d).objectCount,
-              refval, , repeat, volume, !just_data);
-    free(buffer);
-  }
-}
@@ -1,424 +0,0 @@
-#include "simdjson.h"
-
-#include <unistd.h>
-#ifndef _MSC_VER
-#include "linux-perf-events.h"
-#ifdef __linux__
-#include <libgen.h>
-#endif //__linux__
-#endif // _MSC_VER
-
-#include <memory>
-
-#include "benchmark.h"
-
-SIMDJSON_PUSH_DISABLE_ALL_WARNINGS
-#include "yyjson.h"
-
-// #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"
-
-#include <nlohmann/json.hpp>
-using json = nlohmann::json;
-
-#include <boost/json/parser.hpp>
-#include <boost/json/monotonic_resource.hpp>
-
-#ifdef ALLPARSER
-
-#include "fastjson.cpp"
-#include "fastjson_dom.cpp"
-#include "gason.cpp"
-
-#include "json11.cpp"
-extern "C" {
-#include "cJSON.c"
-#include "cJSON.h"
-#include "jsmn.c"
-#include "jsmn.h"
-#include "ujdecode.h"
-#include "ultrajsondec.c"
-}
-
-#include "jsoncpp.cpp"
-#include "json/json.h"
-
-#endif
-
-SIMDJSON_POP_DISABLE_WARNINGS
-
-using namespace rapidjson;
-
-#ifdef ALLPARSER
-// fastjson has a tricky interface
-void on_json_error(void *, simdjson_unused const fastjson::ErrorContext &ec) {
-  // std::cerr<<"ERROR: "<<ec.mesg<<std::endl;
-}
-bool fastjson_parse(const char *input) {
-  fastjson::Token token;
-  fastjson::dom::Chunk chunk;
-  return fastjson::dom::parse_string(input, &token, &chunk, 0, &on_json_error,
-                                     NULL);
-}
-// end of fastjson stuff
-#endif
-
-simdjson_never_inline size_t sum_line_lengths(std::stringstream &is) {
-  std::string line;
-  size_t sumofalllinelengths{0};
-  while (std::getline(is, line)) {
-    sumofalllinelengths += line.size();
-  }
-  return sumofalllinelengths;
-}
-
-inline void reset_stream(std::stringstream &is) {
-  is.clear();
-  is.seekg(0, std::ios::beg);
-}
-
-bool bench(const char *filename, bool verbose, bool just_data,
-           double repeat_multiplier) {
-  simdjson::padded_string p;
-  auto error = simdjson::padded_string::load(filename).get(p);
-  if (error) {
-    std::cerr << "Could not load the file " << filename << ": " << error
-              << std::endl;
-    return false;
-  }
-
-  int repeat = static_cast<int>((50000000 * repeat_multiplier) /
-                                static_cast<double>(p.size()));
-  if (repeat < 10) {
-    repeat = 10;
-  }
-  // Gigabyte: https://en.wikipedia.org/wiki/Gigabyte
-  if (verbose) {
-    std::cout << "Input " << filename << " 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 << ": will run " << repeat << " iterations." << std::endl;
-  }
-  size_t volume = p.size();
-  if (just_data) {
-    std::printf("%-42s %20s %20s %20s %20s \n", "name", "cycles_per_byte",
-                "cycles_per_byte_err", "gb_per_s", "gb_per_s_err");
-  }
-  if (!just_data) {
-    const std::string inputcopy(p.data(), p.data() + p.size());
-    std::stringstream is;
-    is.str(inputcopy);
-    const size_t lc = sum_line_lengths(is);
-    BEST_TIME("getline ", sum_line_lengths(is), lc, reset_stream(is), repeat,
-              volume, !just_data);
-  }
-
-  if (!just_data) {
-    auto parse_dynamic = [](auto &str) {
-      simdjson::dom::parser parser;
-      return parser.parse(str).error();
-    };
-    BEST_TIME("simdjson (dynamic mem) ", parse_dynamic(p), simdjson::SUCCESS, ,
-              repeat, volume, !just_data);
-  }
-  // (static alloc)
-  simdjson::dom::parser parser;
-  BEST_TIME("simdjson ", parser.parse(p).error(), simdjson::SUCCESS, , repeat,
-            volume, !just_data);
-
-  rapidjson::Document d;
-
-  char *buffer = (char *)std::malloc(p.size() + 1);
-  std::memcpy(buffer, p.data(), p.size());
-  buffer[p.size()] = '\0';
-#ifndef ALLPARSER
-  if (!just_data)
-#endif
-  {
-    std::memcpy(buffer, p.data(), p.size());
-    BEST_TIME("RapidJSON  ",
-              d.Parse<kParseValidateEncodingFlag>((const char *)buffer)
-                  .HasParseError(),
-              false, , repeat, volume, !just_data);
-  }
-#ifndef ALLPARSER
-  if (!just_data)
-#endif
-  {
-    std::memcpy(buffer, p.data(), p.size());
-    BEST_TIME("RapidJSON (accurate number parsing)  ",
-              d.Parse<kParseValidateEncodingFlag | kParseFullPrecisionFlag>(
-                   (const char *)buffer)
-                  .HasParseError(),
-              false, , repeat, volume, !just_data);
-  }
-  BEST_TIME(
-      "RapidJSON (insitu)",
-      d.ParseInsitu<kParseValidateEncodingFlag>(buffer).HasParseError(), false,
-      std::memcpy(buffer, p.data(), p.size()) && (buffer[p.size()] = '\0'),
-      repeat, volume, !just_data);
-  BEST_TIME("RapidJSON (insitu, accurate number parsing)",
-            d.ParseInsitu<kParseValidateEncodingFlag | kParseFullPrecisionFlag>(
-                 buffer)
-                .HasParseError(),
-            false,
-            std::memcpy(buffer, p.data(), p.size()) &&
-                (buffer[p.size()] = '\0'),
-            repeat, volume, !just_data);
-
-  {
-    const boost::json::string_view sv(p.data(), p.size());
-    boost::json::parser p;
-    auto execute = [&p](auto sv) -> bool {
-      boost::json::error_code ec;
-      boost::json::monotonic_resource mr;
-        p.reset( &mr );
-        p.write(sv,ec);
-       if(!ec)
-         auto jv=p.release();
-       return !!ec;
-    };
-
-    BEST_TIME("Boost.json", execute(sv), false, , repeat, volume, !just_data);
-  }
-  {
-    
-    auto execute = [&p]() -> bool {
-      yyjson_doc *doc = yyjson_read(p.data(), p.size(), 0);
-      bool is_ok = doc != nullptr;
-      yyjson_doc_free(doc);
-      return is_ok;
-    };
-    
-    BEST_TIME("yyjson", execute(), true, , repeat, volume, !just_data);
-  }
-#ifndef ALLPARSER
-  if (!just_data)
-#endif
-    BEST_TIME("sajson (dynamic mem)",
-              sajson::parse(sajson::dynamic_allocation(),
-                            sajson::mutable_string_view(p.size(), buffer))
-                  .is_valid(),
-              true, std::memcpy(buffer, p.data(), p.size()), repeat, volume,
-              !just_data);
-
-  size_t ast_buffer_size = p.size();
-  size_t *ast_buffer = (size_t *)std::malloc(ast_buffer_size * sizeof(size_t));
-  //  (static alloc, insitu)
-  BEST_TIME(
-      "sajson",
-      sajson::parse(sajson::bounded_allocation(ast_buffer, ast_buffer_size),
-                    sajson::mutable_string_view(p.size(), buffer))
-          .is_valid(),
-      true, std::memcpy(buffer, p.data(), p.size()), repeat, volume,
-      !just_data);
-
-  std::memcpy(buffer, p.data(), p.size());
-  size_t expected = json::parse(p.data(), p.data() + p.size()).size();
-  BEST_TIME("nlohmann-json", json::parse(buffer, buffer + p.size()).size(),
-            expected, , repeat, volume, !just_data);
-
-#ifdef ALLPARSER
-  std::string json11err;
-  BEST_TIME("dropbox (json11)     ",
-            ((json11::Json::parse(buffer, json11err).is_null()) ||
-             (!json11err.empty())),
-            false, std::memcpy(buffer, p.data(), p.size()), repeat, volume,
-            !just_data);
-
-  BEST_TIME("fastjson             ", fastjson_parse(buffer), true,
-            std::memcpy(buffer, p.data(), p.size()), repeat, volume,
-            !just_data);
-  JsonValue value;
-  JsonAllocator allocator;
-  char *endptr;
-  BEST_TIME("gason             ", jsonParse(buffer, &endptr, &value, allocator),
-            JSON_OK, std::memcpy(buffer, p.data(), p.size()), repeat, volume,
-            !just_data);
-  void *state;
-  BEST_TIME("ultrajson         ",
-            (UJDecode(buffer, p.size(), NULL, &state) == NULL), false,
-            std::memcpy(buffer, p.data(), p.size()), repeat, volume,
-            !just_data);
-
-  {
-    std::unique_ptr<jsmntok_t[]> tokens =
-        std::make_unique<jsmntok_t[]>(p.size());
-    jsmn_parser jparser;
-    jsmn_init(&jparser);
-    std::memcpy(buffer, p.data(), p.size());
-    buffer[p.size()] = '\0';
-    BEST_TIME("jsmn           ",
-              (jsmn_parse(&jparser, buffer, p.size(), tokens.get(),
-                          static_cast<unsigned int>(p.size())) > 0),
-              true, jsmn_init(&jparser), repeat, volume, !just_data);
-  }
-  std::memcpy(buffer, p.data(), p.size());
-  buffer[p.size()] = '\0';
-  cJSON *tree = cJSON_Parse(buffer);
-  BEST_TIME("cJSON           ", ((tree = cJSON_Parse(buffer)) != NULL), true,
-            cJSON_Delete(tree), repeat, volume, !just_data);
-  cJSON_Delete(tree);
-
-  Json::CharReaderBuilder b;
-  Json::CharReader *json_cpp_reader = b.newCharReader();
-  Json::Value root;
-  Json::String errs;
-  BEST_TIME("jsoncpp           ",
-            json_cpp_reader->parse(buffer, buffer + volume, &root, &errs), true,
-            , repeat, volume, !just_data);
-  delete json_cpp_reader;
-#endif
-  if (!just_data)
-    BEST_TIME("memcpy            ",
-              (std::memcpy(buffer, p.data(), p.size()) == buffer), true, ,
-              repeat, volume, !just_data);
-#ifdef __linux__
-  if (!just_data) {
-    std::printf(
-        "\n \n <doing additional analysis with performance counters (Linux "
-        "only)>\n");
-    std::vector<int> evts;
-    evts.push_back(PERF_COUNT_HW_CPU_CYCLES);
-    evts.push_back(PERF_COUNT_HW_INSTRUCTIONS);
-    evts.push_back(PERF_COUNT_HW_BRANCH_MISSES);
-    evts.push_back(PERF_COUNT_HW_CACHE_REFERENCES);
-    evts.push_back(PERF_COUNT_HW_CACHE_MISSES);
-    LinuxEvents<PERF_TYPE_HARDWARE> unified(evts);
-    std::vector<unsigned long long> results;
-    std::vector<unsigned long long> stats;
-    results.resize(evts.size());
-    stats.resize(evts.size());
-    std::fill(stats.begin(), stats.end(), 0); // unnecessary
-    for (decltype(repeat) i = 0; i < repeat; i++) {
-      unified.start();
-      auto parse_error = parser.parse(p).error();
-      if (parse_error)
-        std::printf("bug\n");
-      unified.end(results);
-      std::transform(stats.begin(), stats.end(), results.begin(), stats.begin(),
-                     std::plus<unsigned long long>());
-    }
-    std::printf(
-        "simdjson : cycles %10.0f instructions %10.0f branchmisses %10.0f "
-        "cacheref %10.0f cachemisses %10.0f  bytespercachemiss %10.0f "
-        "inspercycle %10.1f insperbyte %10.1f\n",
-        static_cast<double>(stats[0]) / static_cast<double>(repeat),
-        static_cast<double>(stats[1]) / static_cast<double>(repeat),
-        static_cast<double>(stats[2]) / static_cast<double>(repeat),
-        static_cast<double>(stats[3]) / static_cast<double>(repeat),
-        static_cast<double>(stats[4]) / static_cast<double>(repeat),
-        static_cast<double>(volume) * static_cast<double>(repeat) /
-            static_cast<double>(stats[2]),
-        static_cast<double>(stats[1]) / static_cast<double>(stats[0]),
-        static_cast<double>(stats[1]) /
-            (static_cast<double>(volume) * static_cast<double>(repeat)));
-
-    std::fill(stats.begin(), stats.end(), 0);
-    for (decltype(repeat) i = 0; i < repeat; i++) {
-      std::memcpy(buffer, p.data(), p.size());
-      buffer[p.size()] = '\0';
-      unified.start();
-      if (d.ParseInsitu<kParseValidateEncodingFlag>(buffer).HasParseError() !=
-          false)
-        std::printf("bug\n");
-      unified.end(results);
-      std::transform(stats.begin(), stats.end(), results.begin(), stats.begin(),
-                     std::plus<unsigned long long>());
-    }
-    std::printf(
-        "RapidJSON: cycles %10.0f instructions %10.0f branchmisses %10.0f "
-        "cacheref %10.0f cachemisses %10.0f  bytespercachemiss %10.0f "
-        "inspercycle %10.1f insperbyte %10.1f\n",
-        static_cast<double>(stats[0]) / static_cast<double>(repeat),
-        static_cast<double>(stats[1]) / static_cast<double>(repeat),
-        static_cast<double>(stats[2]) / static_cast<double>(repeat),
-        static_cast<double>(stats[3]) / static_cast<double>(repeat),
-        static_cast<double>(stats[4]) / static_cast<double>(repeat),
-        static_cast<double>(volume) * static_cast<double>(repeat) /
-            static_cast<double>(stats[2]),
-        static_cast<double>(stats[1]) / static_cast<double>(stats[0]),
-        static_cast<double>(stats[1]) /
-            (static_cast<double>(volume) * static_cast<double>(repeat)));
-
-    std::fill(stats.begin(), stats.end(), 0); // unnecessary
-    for (decltype(repeat) i = 0; i < repeat; i++) {
-      std::memcpy(buffer, p.data(), p.size());
-      unified.start();
-      if (sajson::parse(sajson::bounded_allocation(ast_buffer, ast_buffer_size),
-                        sajson::mutable_string_view(p.size(), buffer))
-              .is_valid() != true)
-        std::printf("bug\n");
-      unified.end(results);
-      std::transform(stats.begin(), stats.end(), results.begin(), stats.begin(),
-                     std::plus<unsigned long long>());
-    }
-    std::printf(
-        "sajson   : cycles %10.0f instructions %10.0f branchmisses %10.0f "
-        "cacheref %10.0f cachemisses %10.0f  bytespercachemiss %10.0f "
-        "inspercycle %10.1f insperbyte %10.1f\n",
-        static_cast<double>(stats[0]) / static_cast<double>(repeat),
-        static_cast<double>(stats[1]) / static_cast<double>(repeat),
-        static_cast<double>(stats[2]) / static_cast<double>(repeat),
-        static_cast<double>(stats[3]) / static_cast<double>(repeat),
-        static_cast<double>(stats[4]) / static_cast<double>(repeat),
-        static_cast<double>(volume) * static_cast<double>(repeat) /
-            static_cast<double>(stats[2]),
-        static_cast<double>(stats[1]) / static_cast<double>(stats[0]),
-        static_cast<double>(stats[1]) /
-            (static_cast<double>(volume) * static_cast<double>(repeat)));
-  }
-#endif //  __linux__
-
-  std::free(ast_buffer);
-  std::free(buffer);
-  return true;
-}
-
-int main(int argc, char *argv[]) {
-  bool verbose = false;
-  bool just_data = false;
-  double repeat_multiplier = 1;
-  int c;
-  while ((c = getopt(argc, argv, "r:vt")) != -1)
-    switch (c) {
-    case 'r':
-      repeat_multiplier = atof(optarg);
-      break;
-    case 't':
-      just_data = true;
-      break;
-    case 'v':
-      verbose = true;
-      break;
-    default:
-      abort();
-    }
-  if (optind >= argc) {
-    std::cerr << "Usage: " << argv[0] << " <jsonfile>" << std::endl;
-    std::cerr << "Or " << argv[0] << " -v <jsonfile>" << std::endl;
-    std::cerr << "The '-t' flag outputs a table." << std::endl;
-    std::cerr << "The '-r <N>' flag sets the repeat multiplier: set it above 1 "
-                 "to do more iterations, and below 1 to do fewer."
-              << std::endl;
-    exit(1);
-  }
-  int result = EXIT_SUCCESS;
-  for (int fileind = optind; fileind < argc; fileind++) {
-    if (!bench(argv[fileind], verbose, just_data, repeat_multiplier)) {
-      result = EXIT_FAILURE;
-    }
-    std::printf("\n\n");
-  }
-  return result;
-}
--- a/Show More
+++ b/Show More