Moving it to 0.6.1.

Using decimal notation.
Fixing build errors under legacy libc++.
2026-06-08 17:27:07 +00:00 · 2020-11-03 22:16:07 -05:00 · 2020-11-03 22:09:42 -05:00 · 2020-11-03 21:57:23 -05:00
2416 changed files with 334931 additions and 50184 deletions
@@ -4,40 +4,30 @@ 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   -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_CROSSCOMPILING=1 -D SIMDJSON_GOOGLE_BENCHMARKS=OFF # Does Google Benchmark builds under VS ARM?
+      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_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_ENABLE_THREADS=OFF
-      CTEST_ARGS: -LE explicitonly
+      CMAKE_ARGS:  -A %Platform% -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_ENABLE_THREADS=OFF
+      CTEST_ARGS: -E checkperf
    - job_name: VS2019 (Win32)
      platform: Win32
-      CMAKE_ARGS: -A %Platform%   -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=ON -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_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=ON -DSIMDJSON_ENABLE_THREADS=ON -DSIMDJSON_EXCEPTIONS=OFF
-      CTEST_ARGS: -LE explicitonly
+      CMAKE_ARGS:  -A %Platform% -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_ENABLE_THREADS=ON # This should be the default. Testing anyway.
+      CTEST_ARGS: -E "checkperf|ondemand_basictests"
    - job_name: VS2015
      image: Visual Studio 2015
-      CMAKE_ARGS: -A %Platform%   -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_ENABLE_THREADS=OFF
-      CTEST_ARGS: -LE explicitonly
+      CMAKE_ARGS:  -A %Platform% -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_ENABLE_THREADS=OFF
+      CTEST_ARGS: -E checkperf

 build_script:
  - mkdir build
  - cd build
  - cmake --version
-  - cmake %CMAKE_ARGS% ..
+  - cmake %CMAKE_ARGS% --parallel ..
  - cmake -LH ..
  - cmake --build . --config %Configuration% --verbose --parallel

@@ -1,7 +1,7 @@
 version: 2.1


-# We constantly run out of memory so please do not use parallelism (-j, -j4).
+# We constantly run out of memory so please do not use parallelism (-j, -j4). 

 # Reusable image / compiler definitions
 executors:
@@ -11,7 +11,7 @@ executors:
        environment:
          CXX: g++-8
          CC: gcc-8
-          CMAKE_BUILD_FLAGS:
+          BUILD_FLAGS: 
          CTEST_FLAGS: --output-on-failure

  gcc9:
@@ -20,7 +20,7 @@ executors:
        environment:
          CXX: g++-9
          CC: gcc-9
-          CMAKE_BUILD_FLAGS:
+          BUILD_FLAGS:
          CTEST_FLAGS: --output-on-failure

  gcc10:
@@ -29,7 +29,7 @@ executors:
        environment:
          CXX: g++-10
          CC: gcc-10
-          CMAKE_BUILD_FLAGS:
+          BUILD_FLAGS:
          CTEST_FLAGS: --output-on-failure

  clang10:
@@ -38,7 +38,7 @@ executors:
        environment:
          CXX: clang++-10
          CC: clang-10
-          CMAKE_BUILD_FLAGS:
+          BUILD_FLAGS:
          CTEST_FLAGS: --output-on-failure

  clang9:
@@ -47,8 +47,8 @@ executors:
        environment:
          CXX: clang++-9
          CC: clang-9
-          CMAKE_BUILD_FLAGS:
-          CTEST_FLAGS: --output-on-failure
+          BUILD_FLAGS:
+          CTEST_FLAGS: --output-on-failure 

  clang6:
    docker:
@@ -56,24 +56,11 @@ executors:
        environment:
          CXX: clang++-6.0
          CC: clang-6.0
-          CMAKE_BUILD_FLAGS:
+          BUILD_FLAGS:
          CTEST_FLAGS: --output-on-failure

 # Reusable test commands (and initializer for clang 6)
 commands:
-  dependency_restore:
-    steps:
-      - restore_cache:
-          keys:
-            - cmake-cache-{{ checksum "dependencies/CMakeLists.txt" }}
-
-  dependency_cache:
-    steps:
-      - save_cache:
-          key: cmake-cache-{{ checksum "dependencies/CMakeLists.txt" }}
-          paths:
-            - dependencies/.cache
-
  install_cmake:
    steps:
      - run: apt-get update -qq
@@ -87,14 +74,12 @@ commands:
  cmake_build_cache:
    steps:
      - cmake_prep
-      - dependency_restore
-      - run: cmake  -DSIMDJSON_DEVELOPER_MODE=ON $CMAKE_FLAGS -DCMAKE_INSTALL_PREFIX:PATH=destination -B build .
-      - dependency_cache # dependencies are produced in the configure step
+      - run: cmake $CMAKE_FLAGS -DCMAKE_INSTALL_PREFIX:PATH=destination -B build . 

  cmake_build:
    steps:
      - cmake_build_cache
-      - run: cmake  --build build
+      - run: cmake --build build

  cmake_test:
    steps:
@@ -103,14 +88,7 @@ commands:
          cd build &&
          tools/json2json -h &&
          ctest $CTEST_FLAGS -L acceptance &&
-          ctest $CTEST_FLAGS -LE acceptance -LE explicitonly
-
-  cmake_assert_test:
-    steps:
-      - run: |
-          cd build &&
-          tools/json2json -h &&
-          ctest $CTEST_FLAGS -L assert
+          ctest $CTEST_FLAGS -LE acceptance -E checkperf

  cmake_test_all:
    steps:
@@ -119,9 +97,9 @@ commands:
          cd build &&
          tools/json2json -h &&
          ctest $CTEST_FLAGS -DSIMDJSON_IMPLEMENTATION="haswell;westmere;fallback" -L acceptance -LE per_implementation &&
-          SIMDJSON_FORCE_IMPLEMENTATION=haswell ctest $CTEST_FLAGS -L per_implementation -LE explicitonly &&
-          SIMDJSON_FORCE_IMPLEMENTATION=westmere ctest $CTEST_FLAGS -L per_implementation -LE explicitonly &&
-          SIMDJSON_FORCE_IMPLEMENTATION=fallback ctest $CTEST_FLAGS -L per_implementation -LE explicitonly &&
+          SIMDJSON_FORCE_IMPLEMENTATION=haswell ctest $CTEST_FLAGS -L per_implementation -E checkperf &&
+          SIMDJSON_FORCE_IMPLEMENTATION=westmere ctest $CTEST_FLAGS -L per_implementation -E checkperf &&
+          SIMDJSON_FORCE_IMPLEMENTATION=fallback ctest $CTEST_FLAGS -L per_implementation -E checkperf &&
          ctest $CTEST_FLAGS -LE "acceptance|per_implementation" # Everything we haven't run yet, run now.


@@ -129,8 +107,8 @@ commands:
    steps:
      - cmake_build_cache
      - run: |
-          cmake -DSIMDJSON_ENABLE_DOM_CHECKPERF=ON --build  build --target checkperf &&
-          cd build &&
+          cmake --build  build --target checkperf &&
+          cd build && 
          ctest --output-on-failure -R checkperf

  # we not only want cmake to build and run tests, but we want also a successful installation from which we can build, link and run programs
@@ -151,73 +129,54 @@ 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
-    environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DBUILD_SHARED_LIBS=OFF }
+    environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_BUILD_STATIC=ON }
    steps: [ cmake_perftest ]
  gcc10:
    description: Build and run tests on GCC 10 and AVX 2 with a cmake static build
    executor: gcc10
-    environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF }
+    environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON }
    steps: [ cmake_test, cmake_install_test, cmake_installed_test_cxx20 ]
  clang6:
    description: Build and run tests on clang 6 and AVX 2 with a cmake static build
    executor: clang6
-    environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF }
+    environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON }
    steps: [ cmake_test, cmake_install_test ]
  clang10:
    description: Build and run tests on clang 10 and AVX 2 with a cmake static build
    executor: clang10
-    environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON  -DBUILD_SHARED_LIBS=OFF }
+    environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON  -DSIMDJSON_BUILD_STATIC=ON }
    steps: [ cmake_test, cmake_install_test, cmake_installed_test_cxx20 ]
  # libcpp
  libcpp-clang10:
    description: Build and run tests on clang 10 and AVX 2 with a cmake static build and libc++
    executor: clang10
-    environment: { CMAKE_FLAGS: -DSIMDJSON_USE_LIBCPP=ON  -DBUILD_SHARED_LIBS=OFF }
+    environment: { CMAKE_FLAGS: -DSIMDJSON_USE_LIBCPP=ON  -DSIMDJSON_BUILD_STATIC=ON }
    steps: [ cmake_test, cmake_install_test, cmake_installed_test_cxx20 ]
  # sanitize
  sanitize-gcc10:
    description: Build and run tests on GCC 10 and AVX 2 with a cmake sanitize build
    executor: gcc10
-    environment: { CMAKE_FLAGS: -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=ON -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    environment: { CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, BUILD_FLAGS: "", CTEST_FLAGS: --output-on-failure -E checkperf }
    steps: [ cmake_test ]
  sanitize-clang10:
    description: Build and run tests on clang 10 and AVX 2 with a cmake sanitize build
    executor: clang10
-    environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON -DSIMDJSON_NO_FORCE_INLINING=ON -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
-    steps: [ cmake_test ]
-  threadsanitize-gcc10:
-    description: Build and run tests on GCC 10 and AVX 2 with a cmake sanitize build
-    executor: gcc10
-    environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON -DSIMDJSON_SANITIZE_THREADS=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
-    steps: [ cmake_test ]
-  threadsanitize-clang10:
-    description: Build and run tests on clang 10 and AVX 2 with a cmake sanitize build
-    executor: clang10
-    environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON  -DSIMDJSON_NO_FORCE_INLINING=ON -DSIMDJSON_SANITIZE_THREADS=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    environment: { CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -E checkperf }
    steps: [ cmake_test ]
+
  # dynamic
  dynamic-gcc10:
    description: Build and run tests on GCC 10 and AVX 2 with a cmake dynamic build
    executor: gcc10
-    environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON }
+    environment: { CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF }
    steps: [ cmake_test, cmake_install_test ]
  dynamic-clang10:
    description: Build and run tests on clang 10 and AVX 2 with a cmake dynamic build
    executor: clang10
-    environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON }
+    environment: { CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF }
    steps: [ cmake_test, cmake_install_test ]

  # unthreaded
@@ -262,12 +221,12 @@ jobs:
  sanitize-haswell-gcc10:
    description: Build and run tests on GCC 10 and AVX 2 with a cmake sanitize build
    executor: gcc10
-    environment: {  CXXFLAGS: -march=haswell, CMAKE_FLAGS: -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=ON -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    environment: {  CXXFLAGS: -march=haswell, CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, BUILD_FLAGS: "", CTEST_FLAGS: --output-on-failure -E checkperf }
    steps: [ cmake_test ]
  sanitize-haswell-clang10:
    description: Build and run tests on clang 10 and AVX 2 with a cmake sanitize build
    executor: clang10
-    environment: { CXXFLAGS: -march=haswell, CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON  -DSIMDJSON_NO_FORCE_INLINING=ON -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    environment: { CXXFLAGS: -march=haswell, CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -E checkperf }
    steps: [ cmake_test ]

 workflows:
@@ -286,8 +245,6 @@ workflows:
      # full single-implementation tests
      - sanitize-gcc10
      - sanitize-clang10
-      - threadsanitize-gcc10
-      - threadsanitize-clang10
      - dynamic-gcc10
      - dynamic-clang10
      - unthreaded-gcc10
@@ -309,8 +266,4 @@ workflows:
      # testing "just the library"
      - justlib-gcc10

-      # testing asserts
-      - assert-gcc10
-      - assert-clang10
-
      # TODO add windows: https://circleci.com/docs/2.0/configuration-reference/#windows
@@ -6,11 +6,6 @@ task:

  env:
    ASSUME_ALWAYS_YES: YES
-    simdjson_DEPENDENCY_CACHE_DIR: $HOME/.dep_cache
-  dep_cache:
-    folder: $HOME/.dep_cache
-    reupload_on_changes: false
-    fingerprint_script: cat dependencies/CMakeLists.txt
  setup_script:
    - pkg update -f
    - pkg install bash
@@ -23,4 +18,4 @@ task:
    - make
  test_script:
    - cd build
-    - ctest --output-on-failure -LE explicitonly
+    - ctest --output-on-failure -E checkperf
@@ -1,7 +1,7 @@
 *
 !.git
 !Makefile
-!amalgamate.py
+!amalgamate.sh
 !benchmark
 !dependencies
 !include
@@ -12,4 +12,4 @@
 !src
 !style
 !tests
-!tools
+!tools
@@ -1,4 +1,46 @@
 kind: pipeline
+name: i386-gcc # we do not support 32-bit systems, but we run tests
+platform: { os: linux, arch: amd64 }
+steps:
+- name: Build and Test
+  image: i386/ubuntu
+  environment:
+    CC: gcc
+    CXX: g++
+    BUILD_FLAGS: -- -j
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf 
+  commands:
+    - apt-get update -qq
+    - apt-get install -y g++ cmake gcc
+    - mkdir build
+    - cd build
+    - cmake $CMAKE_FLAGS ..
+    - cmake --build . $BUILD_FLAGS
+    - ctest $CTEST_FLAGS 
+---
+kind: pipeline
+name: i386-clang # we do not support 32-bit systems, but we run tests
+platform: { os: linux, arch: amd64 }
+steps:
+- name: Build and Test
+  image: i386/ubuntu
+  environment:
+    CC: clang-6.0
+    CXX: clang++-6.0
+    BUILD_FLAGS: -- -j
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf 
+  commands:
+    - apt-get update -qq
+    - apt-get install -y clang++-6.0 cmake
+    - mkdir build
+    - cd build
+    - cmake $CMAKE_FLAGS ..
+    - cmake --build . $BUILD_FLAGS
+    - ctest $CTEST_FLAGS 
+---
+kind: pipeline
 name: gcc9
 platform: { os: linux, arch: amd64 }
 steps:
@@ -8,18 +50,16 @@ steps:
    CC: gcc
    CXX: g++
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_IMPLEMENTATION=icelake;haswell;westmere;fallback
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=haswell;westmere;fallback
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
  commands:
-    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
    - apt-get update -qq
-    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
    - cmake --build . $BUILD_FLAGS
    - ctest $CTEST_FLAGS -L acceptance -LE per_implementation
-    - SIMDJSON_FORCE_IMPLEMENTATION=icelake ctest $CTEST_FLAGS -L per_implementation
    - SIMDJSON_FORCE_IMPLEMENTATION=haswell ctest $CTEST_FLAGS -L per_implementation
    - SIMDJSON_FORCE_IMPLEMENTATION=westmere ctest $CTEST_FLAGS -L per_implementation
    - SIMDJSON_FORCE_IMPLEMENTATION=fallback ctest $CTEST_FLAGS -L per_implementation
@@ -36,15 +76,14 @@ steps:
    CC: clang-6.0
    CXX: clang++-6.0
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_IMPLEMENTATION=icelake;haswell;westmere;fallback
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=haswell;westmere;fallback
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
  commands:
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
    - cmake --build . $BUILD_FLAGS
    - ctest $CTEST_FLAGS -L acceptance -LE per_implementation
-    - SIMDJSON_FORCE_IMPLEMENTATION=icelake ctest $CTEST_FLAGS -L per_implementation
    - SIMDJSON_FORCE_IMPLEMENTATION=haswell ctest $CTEST_FLAGS -L per_implementation
    - SIMDJSON_FORCE_IMPLEMENTATION=westmere ctest $CTEST_FLAGS -L per_implementation
    - SIMDJSON_FORCE_IMPLEMENTATION=fallback ctest $CTEST_FLAGS -L per_implementation
@@ -60,12 +99,11 @@ steps:
    CC: gcc
    CXX: g++
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
  commands:
-    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
    - apt-get update -qq
-    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -82,9 +120,9 @@ steps:
  environment:
    CC: clang-9
    CXX: clang++-9
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
    BUILD_FLAGS: -- -j
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
  commands:
    - mkdir build
    - cd build
@@ -102,18 +140,16 @@ steps:
    CC: gcc
    CXX: g++
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_IMPLEMENTATION=icelake;haswell;westmere;fallback
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=haswell;westmere;fallback
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
  commands:
-    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
    - apt-get update -qq
-    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
    - cmake --build . $BUILD_FLAGS
    - ASAN_OPTIONS="detect_leaks=0" ctest $CTEST_FLAGS -L acceptance -LE per_implementation
-    - SIMDJSON_FORCE_IMPLEMENTATION=icelake ASAN_OPTIONS="detect_leaks=0" ctest $CTEST_FLAGS -L per_implementation
    - SIMDJSON_FORCE_IMPLEMENTATION=haswell ASAN_OPTIONS="detect_leaks=0" ctest $CTEST_FLAGS -L per_implementation
    - SIMDJSON_FORCE_IMPLEMENTATION=westmere ASAN_OPTIONS="detect_leaks=0" ctest $CTEST_FLAGS -L per_implementation
    - SIMDJSON_FORCE_IMPLEMENTATION=fallback ASAN_OPTIONS="detect_leaks=0" ctest $CTEST_FLAGS -L per_implementation
@@ -129,43 +165,21 @@ steps:
  environment:
    CC: clang-9
    CXX: clang++-9
-    CMAKE_FLAGS: -DSIMDJSON_SANITIZE=ON -DSIMDJSON_IMPLEMENTATION=icelake;haswell;westmere;fallback
+    CMAKE_FLAGS: -DSIMDJSON_SANITIZE=ON -DSIMDJSON_IMPLEMENTATION=haswell;westmere;fallback
    BUILD_FLAGS: -- -j
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
  commands:
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
    - cmake --build . $BUILD_FLAGS
    - ASAN_OPTIONS="detect_leaks=0" ctest $CTEST_FLAGS -L acceptance -LE per_implementation
-    - SIMDJSON_FORCE_IMPLEMENTATION=icelake ASAN_OPTIONS="detect_leaks=0" ctest $CTEST_FLAGS -L per_implementation
    - SIMDJSON_FORCE_IMPLEMENTATION=haswell ASAN_OPTIONS="detect_leaks=0" ctest $CTEST_FLAGS -L per_implementation
    - SIMDJSON_FORCE_IMPLEMENTATION=westmere ASAN_OPTIONS="detect_leaks=0" ctest $CTEST_FLAGS -L per_implementation
    - SIMDJSON_FORCE_IMPLEMENTATION=fallback ASAN_OPTIONS="detect_leaks=0" ctest $CTEST_FLAGS -L per_implementation
    - 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:
@@ -175,12 +189,11 @@ steps:
    CC: gcc
    CXX: g++
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_IMPLEMENTATION=arm64;fallback
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=arm64;fallback
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
  commands:
-    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
    - apt-get update -qq
-    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -195,17 +208,16 @@ name: arm64-clang6
 platform: { os: linux, arch: arm64 }
 steps:
 - name: Build and Test
-  image: debian:buster-backports
+  image: ubuntu:18.04
  environment:
    CC: clang-6.0
    CXX: clang++-6.0
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
    BUILD_FLAGS: -- -j
-    CTEST_FLAGS: -j4 --output-on-failure  -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure  -E checkperf
  commands:
-    - apt-get -qq update
-    - apt-get -t buster-backports install -y cmake
-    - apt-get install -y clang-6.0 git
+    - apt-get update -qq
+    - apt-get install -y clang cmake git
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -222,12 +234,11 @@ steps:
    CC: gcc
    CXX: g++
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
  commands:
-    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
    - apt-get update -qq
-    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -239,17 +250,16 @@ name: arm64-dynamic-clang6
 platform: { os: linux, arch: arm64 }
 steps:
 - name: Build and Test
-  image: debian:buster-backports
+  image: ubuntu:18.04
  environment:
    CC: clang-6.0
    CXX: clang++-6.0
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
    BUILD_FLAGS: -- -j
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
  commands:
-    - apt-get -qq update
-    - apt-get -t buster-backports install -y cmake
-    - apt-get install -y clang-6.0 git
+    - apt-get update -qq
+    - apt-get install -y clang cmake git
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -264,15 +274,13 @@ steps:
  image: gcc:8
  environment:
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_IMPLEMENTATION=arm64;fallback
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=arm64;fallback
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
    CC: gcc
    CXX: g++
  commands:
-    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
    - apt-get update -qq
-    - apt-get -t buster-backports install -y cmake
-    - apt-get install -y libstdc++6
+    - apt-get install -y cmake libstdc++6
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -287,17 +295,16 @@ name: arm64-sanitize-clang6
 platform: { os: linux, arch: arm64 }
 steps:
 - name: Build and Test
-  image: debian:buster-backports
+  image: ubuntu:18.04
  environment:
    CC: clang-6.0
    CXX: clang++-6.0
    CMAKE_FLAGS: -DSIMDJSON_SANITIZE=ON -DSIMDJSON_IMPLEMENTATION=arm64;fallback
    BUILD_FLAGS: -- -j
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
  commands:
-    - apt-get -qq update
-    - apt-get -t buster-backports install -y cmake
-    - apt-get install -y clang-6.0 git
+    - apt-get update -qq
+    - apt-get install -y clang cmake git
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -318,10 +325,12 @@ steps:
    CC: clang-9
    CXX: clang++-9
    BUILD_FLAGS: -- -j 4
-    CMAKE_FLAGS: -GNinja -DBUILD_SHARED_LIBS=OFF
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CMAKE_FLAGS: -GNinja -DSIMDJSON_BUILD_STATIC=ON
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
    CXXFLAGS: -stdlib=libc++
  commands:
+    - apt-get update -qq
+    - apt-get install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -339,31 +348,12 @@ steps:
    CC: clang-9
    CXX: clang++-9
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=OFF
-    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: -DBUILD_SHARED_LIBS=OFF
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
    CXXFLAGS: -stdlib=libc++
  commands:
+    - apt-get update -qq
+    - apt-get install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -381,11 +371,10 @@ steps:
    CXX: g++
    BUILD_FLAGS: -- -j
    CMAKE_FLAGS: -DSIMDJSON_EXCEPTIONS=OFF
-    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
+    CTEST_FLAGS: -j4 --output-on-failure -E checkperf
  commands:
-    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
    - apt-get update -qq
-    - apt-get -t buster-backports install -y cmake
+    - apt-get install -y cmake
    - mkdir build
    - cd build
    - cmake $CMAKE_FLAGS ..
@@ -404,10 +393,10 @@ steps:
    DEBIAN_FRONTEND: noninteractive
    ASAN_OPTIONS: detect_leaks=0
  commands:
-    - apt-get -qq update
+    - apt-get update -qq
    - apt-get install -q -y clang cmake git wget zip ninja-build
-    - wget -O corpus.tar.gz https://readonly:readonly@www.pauldreik.se/fuzzdata/index.php?project=simdjson
-    - tar xf corpus.tar.gz && rm corpus.tar.gz
+    - wget --quiet https://dl.bintray.com/pauldreik/simdjson-fuzz-corpus/corpus/corpus.tar
+    - tar xf corpus.tar && rm corpus.tar
    - fuzz/build_like_ossfuzz.sh
    - mkdir -p common_out
    - for fuzzer in build/fuzz/fuzz_* ; do echo $fuzzer;$fuzzer common_out out/* -max_total_time=40; done
@@ -3,7 +3,7 @@
 * text=auto

 # we don't want json files to be modified for this project
-*.json binary diff=astextplain
+*.json binary 


 # Common settings that generally should always be used with your language specific settings
@@ -18,39 +18,24 @@ 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.

-A compiler or static-analyzer warning is not a bug.
-
-We are committed to providing good documentation. We accept the lack of documentation or a misleading documentation as a bug (a 'documentation bug').
-
-We accept the identification of an issue by a sanitizer or some checker tool (e.g., valgrind) as a bug, but you must first ensure that it is not a false positive.
-
-We recommend that you run your tests using different optimization levels.
-
-Before reporting a bug, please ensure that you have read our documentation.
+Note that a compiler warning is not a bug. 

 **To Reproduce**
 Steps to reproduce the behaviour: provide a code sample if possible.

-If we cannot reproduce the issue, then we cannot address it. Note that a stack trace from your own program is not enough. A sample of your source code is insufficient: please provide a complete test for us to reproduce the issue. Please reduce the issue: use as small and as simple an example of the bug as possible.
+If we cannot reproduce the issue, then we cannot address it.

-It should be possible to trigger the bug by using solely simdjson with our default build setup. If you can only observe the bug within some specific context, with some other software, please reduce the issue first.
+Note that a stack trace from your own program is not enough.

-**simjson release**
-
-Unless you plan to contribute to simdjson, you should only work from releases. Please be mindful that our main branch may have additional features, bugs and documentation items.
-
-It is fine to report bugs against our main branch, but if that is what you are doing, please be explicit.
-
-**Configuration (please complete the following information if relevant)**
+**Configuration (please complete the following information if relevant):**
 - OS: [e.g. Ubuntu 16.04.6 LTS]
 - Compiler [e.g. Apple clang version 11.0.3 (clang-1103.0.32.59) x86_64-apple-darwin19.4.0]
 - Version [e.g. 22]
- - Optimization setting (e.g., -O3)

-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
@@ -1,8 +0,0 @@
-
-
-Our tests check whether you have introduced trailing white space. If such a test fails, please check the "artifacts button" above, which if you click it gives a link to a downloadable file to help you identify the issue. You can also run scripts/remove_trailing_whitespace.sh locally if you have a bash shell and the sed command available on your system.
-
-If you plan to contribute to simdjson, please read our
-
-CONTRIBUTING guide: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md and our
-HACKING guide: https://github.com/simdjson/simdjson/blob/master/HACKING.md
@@ -1,19 +1,12 @@
 name: Alpine Linux
-
-on: [push, pull_request]
-
+'on':
+  - push
+  - pull_request
 jobs:
  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
      - name: start docker
        run: |
          docker run -w /src -dit --name alpine -v $PWD:/src alpine:latest
@@ -25,10 +18,10 @@ jobs:
          ./alpine.sh apk add build-base cmake g++ linux-headers git bash
      - name: cmake
        run: |
-          ./alpine.sh cmake -DSIMDJSON_DEVELOPER_MODE=ON -B build_for_alpine
+          ./alpine.sh cmake -B build_for_alpine
      - name: build
        run: |
          ./alpine.sh cmake --build build_for_alpine
      - name: test
        run: |
-          ./alpine.sh bash -c "cd build_for_alpine && ctest  -LE explicitonly"
+          ./alpine.sh bash -c "cd build_for_alpine && ctest"
@@ -1,24 +0,0 @@
-name: CIFuzz
-on: [pull_request]
-jobs:
-  Fuzzing:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Build Fuzzers
-      id: build
-      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
-      with:
-        oss-fuzz-project-name: 'simdjson'
-        dry-run: false
-    - name: Run Fuzzers
-      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
-      with:
-        oss-fuzz-project-name: 'simdjson'
-        fuzz-seconds: 600
-        dry-run: false
-    - name: Upload Crash
-      uses: actions/upload-artifact@v1
-      if: failure() && steps.build.outcome == 'success'
-      with:
-        name: artifacts
-        path: ./out/artifacts
@@ -1,34 +0,0 @@
-name: Detect trailing whitespace
-
-on: [push, pull_request]
-
-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,28 +5,20 @@ on:
    branches:
      - master
  pull_request:
-    branches:
-      - master
  schedule:
    - cron: 23 */8 * * *

 jobs:
-  build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
+  build:    
    runs-on: ubuntu-latest
    env:
-      # fuzzers that change behaviour with SIMDJSON_FORCE_IMPLEMENTATION
-      defaultimplfuzzers: atpointer dump dump_raw_tape element minify parser print_json
-      # fuzzers that loop over the implementations themselves, or don't need to switch.
-      implfuzzers: implementations minifyimpl ndjson ondemand padded utf8
+      # fuzzers that use the default implementation
+      defaultimplfuzzers: atpointer dump dump_raw_tape element minify  parser print_json
+      # fuzzers that loop over the implementations themselves
+      implfuzzers: implementations minifyimpl utf8
      implementations: haswell westmere fallback
      UBSAN_OPTIONS: halt_on_error=1
      MAXLEN: -max_len=4000
-      CLANGVERSION: 11
-      # which optimization level to use for the sanitizer build (see build_fuzzer.variants.sh)
-      OPTLEVEL: -O3

    steps:
    - name: Install packages necessary for building
@@ -35,27 +27,10 @@ jobs:
        sudo apt-get install --quiet ninja-build valgrind zip unzip
        wget https://apt.llvm.org/llvm.sh
        chmod +x llvm.sh
-        sudo ./llvm.sh $CLANGVERSION
+        sudo ./llvm.sh 10

    - uses: actions/checkout@v1

-    - uses: actions/cache@v2
-      with:
-        path: dependencies/.cache
-        key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-
-    - uses: actions/cache@v2
-      id: cache-corpus
-      with:
-        path: out/
-        key: corpus-${{ github.run_id }}
-        restore-keys: corpus-
-    
-    - name: show statistics for the cached corpus
-      run: |
-        echo number of files in github action corpus cache:
-        find out -type f |wc -l
-    
    - name: Create and prepare the initial seed corpus
      run: |
        fuzz/build_corpus.sh
@@ -63,6 +38,12 @@ jobs:
        mkdir seedcorpus
        unzip -q -d seedcorpus seed_corpus.zip

+    - name: Download the corpus from the last run
+      run: |
+        wget --quiet https://dl.bintray.com/pauldreik/simdjson-fuzz-corpus/corpus/corpus.tar
+        tar xf corpus.tar
+        rm corpus.tar
+
    - name: List clang versions
      run: |
        ls /usr/bin/clang*
@@ -70,13 +51,13 @@ jobs:
        clang++ --version

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

    - name: Explore fast (release build, default implementation)
      run: |
        set -eux
        for fuzzer in $defaultimplfuzzers $implfuzzers; do
-          mkdir -p out/$fuzzer # in case this is a new fuzzer, or the github action cached corpus is broken
+          mkdir -p out/$fuzzer # in case this is a new fuzzer, or corpus.tar is broken
          # get input from everyone else (corpus cross pollination)
          others=$(find out -type d -not -name $fuzzer -not -name out -not -name cmin)
          build-fast/fuzz/fuzz_$fuzzer out/$fuzzer $others seedcorpus -max_total_time=30 $MAXLEN
@@ -90,7 +71,7 @@ jobs:
          others=$(find out -type d -not -name $fuzzer -not -name out -not -name cmin)
          for implementation in $implementations; do
            export SIMDJSON_FORCE_IMPLEMENTATION=$implementation
-            build-sanitizers$OPTLEVEL/fuzz/fuzz_$fuzzer out/$fuzzer $others seedcorpus -max_total_time=20 $MAXLEN
+            build-sanitizers/fuzz/fuzz_$fuzzer out/$fuzzer $others seedcorpus -max_total_time=20 $MAXLEN
          done
          echo now have $(ls out/$fuzzer |wc -l) files in corpus        
        done
@@ -101,7 +82,7 @@ jobs:
        for fuzzer in $implfuzzers; do
          # get input from everyone else (corpus cross pollination)
          others=$(find out -type d -not -name $fuzzer -not -name out -not -name cmin)
-          build-sanitizers$OPTLEVEL/fuzz/fuzz_$fuzzer out/$fuzzer $others seedcorpus -max_total_time=20 $MAXLEN
+          build-sanitizers/fuzz/fuzz_$fuzzer out/$fuzzer $others seedcorpus -max_total_time=20 $MAXLEN
          echo now have $(ls out/$fuzzer |wc -l) files in corpus
        done

@@ -129,11 +110,6 @@ jobs:
        name: corpus
        path: corpus.tar

-    - name: Store the corpus externally
-      run: |
-        gzip --keep corpus.tar
-        curl -F"filedata=@corpus.tar.gz" https://simdjson:${{ secrets.fuzzdatapassword }}@www.pauldreik.se/fuzzdata/index.php
-
    # This takes a subset of the minimized corpus and run it through valgrind. It is slow,
    # therefore take a "random" subset. The random selection is accomplished by sorting on filenames,
    # which are hashes of the content.
@@ -154,6 +130,15 @@ jobs:
        path: valgrind.tar
        if-no-files-found: ignore

+    - name: Upload the corpus and results to bintray if we are on master
+      if: ${{ github.event_name == 'schedule' }} 
+      run: |
+        echo uploading each artifact twice, otherwise it will not be published
+        curl -T corpus.tar -upauldreik:${{ secrets.bintrayApiKey }} https://api.bintray.com/content/pauldreik/simdjson-fuzz-corpus/corpus/0/corpus/corpus.tar";publish=1;override=1"
+        curl -T corpus.tar -upauldreik:${{ secrets.bintrayApiKey }} https://api.bintray.com/content/pauldreik/simdjson-fuzz-corpus/corpus/0/corpus/corpus.tar";publish=1;override=1"
+        curl -T valgrind.tar -upauldreik:${{ secrets.bintrayApiKey }} https://api.bintray.com/content/pauldreik/simdjson-fuzz-corpus/corpus/0/corpus/valgrind.tar";publish=1;override=1"
+        curl -T valgrind.tar -upauldreik:${{ secrets.bintrayApiKey }} https://api.bintray.com/content/pauldreik/simdjson-fuzz-corpus/corpus/0/corpus/valgrind.tar";publish=1;override=1"
+
    - name: Archive any crashes as an artifact
      uses: actions/upload-artifact@v2
      if: always()
@@ -164,3 +149,4 @@ jobs:
          leak-*
          timeout-*
        if-no-files-found: ignore
+
@@ -1,34 +0,0 @@
-name: Macos (Xcode 11)
-
-on: [push, pull_request]
-
-jobs:
-  macos-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake
-        run: |
-          xcversion select 11.7
-          mkdir builddebug &&
-          cd builddebug &&
-          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
-          cd .. &&
-          mkdir build &&
-          cd build &&
-          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
-          cmake --install . &&
-          echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
-          cd ../tests/installation_tests/find &&
-          mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../build/destination .. &&  cmake --build .
@@ -1,33 +0,0 @@
-name: Macos
-
-on: [push, pull_request]
-
-jobs:
-  macos-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake
-        run: |
-          mkdir builddebug &&
-          cd builddebug &&
-          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
-          cd .. &&
-          mkdir build &&
-          cd build &&
-          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
-          cmake --install . &&
-          echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
-          cd ../tests/installation_tests/find &&
-          mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../build/destination .. &&  cmake --build .
@@ -0,0 +1,53 @@
+name: MinGW32-CI
+
+on: [push, pull_request]
+
+# Important: scoop will either install 32-bit GCC or 64-bit GCC, not both.
+
+# It is important to build static libraries because cmake is not smart enough under Windows/mingw to take care of the path. So
+# with a dynamic library, you could get failures due to the fact that the EXE can't find its DLL.
+
+jobs:
+  ci:
+    name: windows-gcc
+    runs-on: windows-2016
+
+    env:
+      CMAKE_GENERATOR: Ninja # This is critical, try ' cmake  -GNinja-DSIMDJSON_BUILD_STATIC=ON .. ' if using the command line
+      CC: gcc
+      CXX: g++
+
+    steps: # To reproduce what is below, start a powershell with administrative rights, using scoop *is* a good idea
+      - uses: actions/checkout@v2
+
+      - uses: actions/cache@v2 # we cache the scoop setup with 32-bit GCC
+        id: cache
+        with:
+          path: |
+            C:\ProgramData\scoop
+          key: scoop32 # static key: should be good forever
+      - name: Setup Windows # This should almost never run if the cache works.
+        if: steps.cache.outputs.cache-hit != 'true'
+        shell: powershell
+        run: |
+          Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
+          scoop install sudo --global
+          sudo scoop install git --global 
+          sudo scoop install ninja --global
+          sudo scoop install cmake --global
+          sudo scoop install gcc --arch 32bit --global
+          $env:path
+          Write-Host 'Everything has been installed, you are good!'
+      - name: Build and Test 32-bit x86
+        shell: powershell
+        run: |
+          $ENV:PATH="C:\ProgramData\scoop\shims;C:\ProgramData\scoop\apps\gcc\current\bin;C:\ProgramData\scoop\apps\ninja\current;$ENV:PATH"
+          g++ --version
+          cmake --version
+          ninja --version
+          git --version
+          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
@@ -0,0 +1,59 @@
+name: MinGW64-CI
+
+on: [push, pull_request]
+
+# Important: scoop will either install 32-bit GCC or 64-bit GCC, not both.
+
+# It is important to build static libraries because cmake is not smart enough under Windows/mingw to take care of the path. So
+# with a dynamic library, you could get failures due to the fact that the EXE can't find its DLL.
+
+jobs:
+  ci:
+    name: windows-gcc
+    runs-on: windows-2016
+
+    env:
+      CMAKE_GENERATOR: Ninja # This is critical, try ' cmake  -GNinja-DSIMDJSON_BUILD_STATIC=ON .. ' if using the command line
+      CC: gcc
+      CXX: g++
+
+    steps: # To reproduce what is below, start a powershell with administrative rights, using scoop *is* a good idea
+      - uses: actions/checkout@v2
+
+      - uses: actions/cache@v2 # we cache the scoop setup with 64-bit GCC
+        id: cache
+        with:
+          path: |
+            C:\ProgramData\scoop
+          key: scoop64 # static key: should be good forever
+      - name: Setup Windows # This should almost never run if the cache works.
+        if: steps.cache.outputs.cache-hit != 'true'
+        shell: powershell
+        run: |
+          Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
+          scoop install sudo --global
+          sudo scoop install git --global
+          sudo scoop install ninja --global
+          sudo scoop install cmake --global
+          sudo scoop install gcc --arch 64bit --global
+          $env:path
+          Write-Host 'Everything has been installed, you are good!'
+      - name: Build and Test 64-bit x64
+        shell: powershell
+        run: |
+          $ENV:PATH="C:\ProgramData\scoop\shims;C:\ProgramData\scoop\apps\gcc\current\bin;C:\ProgramData\scoop\apps\ninja\current;$ENV:PATH"
+          g++ --version
+          cmake --version
+          ninja --version
+          git --version
+          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
+          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
@@ -1,43 +0,0 @@
-name: MSYS2-CLANG-CI
-
-on: [push, pull_request]
-
-
-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-libxml2 mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-clang
-            type: Release
-          - msystem: "MINGW64"
-            install: mingw-w64-x86_64-libxml2 mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-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 -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_DO_NOT_USE_THREADS_NO_MATTER_WHAT=ON ..
-          cmake --build . --verbose
-          ctest -j4 --output-on-failure -LE explicitonly
@@ -4,9 +4,6 @@ on: [push, pull_request]

 jobs:
  windows-mingw:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
    name: ${{ matrix.msystem }}
    runs-on: windows-latest
    defaults:
@@ -19,18 +16,20 @@ jobs:
          - msystem: "MINGW64"
            install: mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-gcc
            type: Release
+          - msystem: "MINGW32"
+            install: mingw-w64-i686-cmake mingw-w64-i686-ninja mingw-w64-i686-gcc
+            type: Release
          - msystem: "MINGW64"
            install: mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-gcc
            type: Debug
+          - msystem: "MINGW32"
+            install: mingw-w64-i686-cmake mingw-w64-i686-ninja mingw-w64-i686-gcc
+            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
@@ -40,6 +39,6 @@ jobs:
        run: |
          mkdir build
          cd build
-          cmake -DSIMDJSON_DEVELOPER_MODE=ON -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_DO_NOT_USE_THREADS_NO_MATTER_WHAT=ON ..
+          cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_DO_NOT_USE_THREADS_NO_MATTER_WHAT=ON ..
          cmake --build . --verbose
-          ctest -j4 --output-on-failure -LE explicitonly
+          ctest -j4 --output-on-failure -E checkperf
@@ -1,71 +0,0 @@
-name: short fuzz on the power arch
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  armv7_job:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    # The host should always be Linux
-    runs-on: ubuntu-20.04
-    name: Build on ubuntu-20.04 ppc64le
-    steps:
-      - uses: actions/checkout@v2.1.0
-      - uses: uraimo/run-on-arch-action@v2.0.5
-        name: Run commands
-        id: runcmd
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        with:
-          arch: ppc64le
-          distro: buster
-
-          # Not required, but speeds up builds by storing container images in
-          # a GitHub package registry.
-          githubToken: ${{ github.token }}
-
-          run: |
-            export CLANGSUFFIX="-7"
-            apt-get -qq update
-            apt-get install -q -y clang-7 libfuzzer-7-dev git wget zip ninja-build gnupg software-properties-common
-            wget -q -O - "https://raw.githubusercontent.com/simdjson/debian-ppa/master/key.gpg" | apt-key add -
-            apt-add-repository "deb https://raw.githubusercontent.com/simdjson/debian-ppa/master simdjson main"
-            apt-get -qq update
-            apt-get purge cmake cmake-data
-            apt-get -t simdjson -y install cmake
-            mkdir -p build ; cd build
-            cmake .. -GNinja \
-                  -DCMAKE_CXX_COMPILER=clang++$CLANGSUFFIX \
-                  -DCMAKE_C_COMPILER=clang$CLANGSUFFIX \
-                  -DBUILD_SHARED_LIBS=OFF \
-                  -DSIMDJSON_DEVELOPER_MODE=ON \
-                  -DSIMDJSON_ENABLE_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 -O corpus.tar.gz https://readonly:readonly@www.pauldreik.se/fuzzdata/index.php?project=simdjson
-            tar xf corpus.tar.gz
-            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,29 +1,21 @@
 name: Performance check on Ubuntu 18.04 CI (GCC 7)

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

 jobs:
  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
    runs-on: ubuntu-18.04
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v1.0
        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+          cmake-version: '3.9.x'
      - name: Use cmake
        run: |
          mkdir build &&
          cd build &&
-          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_ENABLE_DOM_CHECKPERF=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
+          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
          cmake --build . --target checkperf  &&
          ctest --output-on-failure -R checkperf  ubuntu18-checkperf.yml
+
@@ -1,31 +0,0 @@
-name: Ubuntu 18.04 CI (LLVM 7)
-
-on: [push, pull_request]
-
-jobs:
-  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-18.04
-
-    env:
-      CC: clang-7
-      CXX: clang++-7
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: install clang 7
-        run: |
-          sudo apt update
-          sudo apt install clang-7
-      - name: Use cmake
-        run: |
-          mkdir build &&
-          cd build &&
-          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly
@@ -1,25 +0,0 @@
-name: Ubuntu 18.04 CI (GCC 7) with Thread Sanitizer
-
-on: [push, pull_request]
-
-
-jobs:
-  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake
-        run: |
-          mkdir build &&
-          cd build &&
-          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE_THREADS=ON ..  &&
-          cmake --build . --target document_stream_tests --target ondemand_document_stream_tests --target parse_many_test  &&
-          ctest --output-on-failure  -R parse_many_test  &&
-          ctest --output-on-failure  -R document_stream_tests
@@ -4,22 +4,19 @@ on: [push, pull_request]

 jobs:
  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
    runs-on: ubuntu-18.04
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v1.0
        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+          cmake-version: '3.9.x'
      - name: Use cmake
        run: |
          mkdir build &&
          cd build &&
-          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
+          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
+          ctest -j --output-on-failure -E checkperf   &&
          make install  &&
          echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json
@@ -1,29 +1,20 @@
 name: Performance check on Ubuntu 20.04 CI (GCC 9)

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

 jobs:
  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v1.0
        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+          cmake-version: '3.9.x'
      - name: Use cmake
        run: |
          mkdir build &&
          cd build &&
-          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_ENABLE_DOM_CHECKPERF=ON -DCMAKE_CXX_FLAGS="-Werror=old-style-cast -pedantic -Wpedantic" -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
+          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
          cmake --build . --target checkperf  &&
-          ctest --output-on-failure -R checkperf
+          ctest --output-on-failure -R checkperf 
@@ -1,34 +0,0 @@
-name: Ubuntu 20.04 CI (GCC 9) without exceptions
-
-on: [push, pull_request]
-
-jobs:
-  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake
-        run: |
-          mkdir builddebug &&
-          cd builddebug &&
-          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_EXCEPTIONS=OFF -DBUILD_SHARED_LIBS=OFF ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
-          cd .. &&
-          mkdir build &&
-          cd build &&
-          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_EXCEPTIONS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
-          make install  &&
-          echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
-          mkdir testfindpackage &&
-          cd testfindpackage &&
-          echo -e 'cmake_minimum_required(VERSION 3.1)\nproject(simdjsontester)\nset(CMAKE_CXX_STANDARD 17)\nfind_package(simdjson REQUIRED)'> CMakeLists.txt && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../destination .. &&  cmake --build .
@@ -1,34 +0,0 @@
-name: Ubuntu 20.04 CI (GCC 9) Without Threads
-
-on: [push, pull_request]
-
-jobs:
-  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake
-        run: |
-          mkdir builddebug &&
-          cd builddebug &&
-          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF  -DSIMDJSON_ENABLE_THREADS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
-          cd .. &&
-          mkdir build &&
-          cd build &&
-          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_ENABLE_THREADS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
-          make install  &&
-          echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
-          mkdir testfindpackage &&
-          cd testfindpackage &&
-          echo -e 'cmake_minimum_required(VERSION 3.1)\nproject(simdjsontester)\nset(CMAKE_CXX_STANDARD 17)\nfind_package(simdjson REQUIRED)'> CMakeLists.txt && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../destination .. &&  cmake --build .
@@ -1,23 +0,0 @@
-name: Ubuntu 20.04 CI (GCC 9) With Memory Sanitizer
-
-on: [push, pull_request]
-
-jobs:
-  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake
-        run: |
-          mkdir builddebug &&
-          cd builddebug &&
-          cmake -DSIMDJSON_SANITIZE=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly
@@ -1,24 +0,0 @@
-name: Ubuntu 20.04 CI (GCC 9) with Thread Sanitizer
-
-on: [push, pull_request]
-
-jobs:
-  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake
-        run: |
-          mkdir build &&
-          cd build &&
-          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE_THREADS=ON ..  &&
-          cmake --build . --target document_stream_tests  --target ondemand_document_stream_tests --target parse_many_test  &&
-          ctest --output-on-failure  -R parse_many_test  &&
-          ctest --output-on-failure  -R document_stream_tests
@@ -4,30 +4,19 @@ on: [push, pull_request]

 jobs:
  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v1.0
        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+          cmake-version: '3.9.x'
      - name: Use cmake
        run: |
-          mkdir builddebug &&
-          cd builddebug &&
-          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
-          cd .. &&
          mkdir build &&
          cd build &&
-          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
+          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
-          cmake --install . &&
-          echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
-          cd ../tests/installation_tests/find &&
-          mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../build/destination .. &&  cmake --build .
+          ctest -j --output-on-failure -E checkperf   &&
+          make install  &&
+          echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json
@@ -1,33 +0,0 @@
-name: Ubuntu 22.04 CI (GCC 11)
-
-on: [push, pull_request]
-
-jobs:
-  ubuntu-build:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake
-        run: |
-          mkdir builddebug &&
-          cd builddebug &&
-          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
-          cd .. &&
-          mkdir build &&
-          cd build &&
-          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly   &&
-          cmake --install . &&
-          echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
-          cd ../tests/installation_tests/find &&
-          mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../build/destination .. &&  cmake --build .
@@ -0,0 +1,26 @@
+name: VS16-CI
+
+on: [push, pull_request]
+
+jobs:
+  ci:
+    name: windows-vs16
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: 'Run CMake with VS16'
+      uses: lukka/run-cmake@v2
+      with:
+        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
+        buildDirectory: "${{ github.workspace }}/../../_temp/windows"
+        cmakeBuildType: Release   
+        buildWithCMake: true
+        cmakeGenerator: VS16Win64 
+        cmakeAppendedArgs: -DSIMDJSON_COMPETITION=OFF
+        buildWithCMakeArgs: --config Release  
+        
+    - name: 'Run CTest'
+      run: ctest -C Release  -E checkperf  --output-on-failure 
+      working-directory: "${{ github.workspace }}/../../_temp/windows"
+  
@@ -0,0 +1,25 @@
+name: VS16-CLANG-CI
+
+on: [push, pull_request]
+
+jobs:
+  ci:
+    name: windows-vs16
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: 'Run CMake with VS16'
+      uses: lukka/run-cmake@v2
+      with:
+        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
+        buildDirectory: "${{ github.workspace }}/../../_temp/windows"
+        cmakeBuildType: Release   
+        buildWithCMake: true
+        cmakeGenerator: VS16Win64 
+        cmakeAppendedArgs:  -T ClangCL -DSIMDJSON_COMPETITION=OFF  -DSIMDJSON_BUILD_STATIC=ON
+        buildWithCMakeArgs: --config Release  
+        
+    - name: 'Run CTest'
+      run: ctest -C Release -E checkperf  --output-on-failure 
+      working-directory: "${{ github.workspace }}/../../_temp/windows"
@@ -0,0 +1,26 @@
+name: VS16-Ninja-CI
+
+on: [push, pull_request]
+
+jobs:
+  ci:
+    name: windows-vs16
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: 'Run CMake with VS16'
+      uses: lukka/run-cmake@v2
+      with:
+        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
+        buildDirectory: "${{ github.workspace }}/../../_temp/windows"
+        cmakeBuildType: Release   
+        buildWithCMake: true
+        cmakeGenerator: VS16Win64 
+        cmakeAppendedArgs:  -G Ninja -DSIMDJSON_COMPETITION=OFF   -DSIMDJSON_BUILD_STATIC=ON
+        buildWithCMakeArgs: --config Release  
+        
+    - name: 'Run CTest'
+      run: ctest -C Release  -E checkperf  --output-on-failure 
+      working-directory: "${{ github.workspace }}/../../_temp/windows"
+  
@@ -1,21 +0,0 @@
-name: VS17-ARM-CI
-
-on: [push, pull_request]
-
-jobs:
-   ci:
-     name: windows-vs17
-     runs-on: windows-latest
-     strategy:
-       fail-fast: false
-       matrix:
-         include:
-           - {arch: ARM}
-           - {arch: ARM64}
-     steps:
-       - name: checkout
-         uses: actions/checkout@v2
-       - name: Use cmake
-         run: |
-           cmake -A ${{ matrix.arch }} -DCMAKE_CROSSCOMPILING=1 -DSIMDJSON_DEVELOPER_MODE=ON -D SIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_EXCEPTIONS=OFF -B build  &&
-           cmake --build build --verbose
@@ -1,44 +0,0 @@
-name: VS17-CI
-
-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-vs17
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - {gen: Visual Studio 17 2022, arch: Win32, shared: ON}
-          - {gen: Visual Studio 17 2022, arch: Win32, shared: OFF}
-          - {gen: Visual Studio 17 2022, arch: x64, shared: ON}
-          - {gen: Visual Studio 17 2022, arch: x64, shared: OFF}
-    steps:
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: Configure
-      run: |
-        cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
-    - name: Build Debug
-      run: cmake --build build --config Debug --verbose
-    - name: Build Release
-      run: cmake --build build --config Release --verbose
-    - name: Run Release tests
-      run: |
-        cd build
-        ctest -C Release  -LE explicitonly  --output-on-failure
-    - name: Run Debug tests
-      run: |
-        cd build
-        ctest -C Debug  -LE explicitonly  --output-on-failure
-    - name: Install
-      run: |
-        cmake --install build --config Release
-    - name: Test Installation
-      run: |
-        cmake -G "${{matrix.gen}}" -A ${{matrix.arch}}  -B build_install_test tests/installation_tests/find
-        cmake --build build_install_test --config Release
@@ -1,41 +0,0 @@
-name: VS17-CLANG-CI
-
-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-vs17
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - {gen: Visual Studio 17 2022, arch: x64}
-    steps:
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: Configure
-      run: |
-        cmake -G "${{matrix.gen}}" -A ${{matrix.arch}}  -T ClangCL -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
-    - name: Build Debug
-      run: cmake --build build --config Debug --verbose
-    - name: Build Release
-      run: cmake --build build --config Release --verbose
-    - name: Run Release tests
-      run: |
-        cd build
-        ctest -C Release  -LE explicitonly  --output-on-failure
-    - name: Run Debug tests
-      run: |
-        cd build
-        ctest -C Debug  -LE explicitonly  --output-on-failure
-    - name: Install
-      run: |
-        cmake --install build --config Release
-    - name: Test Installation
-      run: |
-        cmake -G "${{matrix.gen}}" -A ${{matrix.arch}}  -B build_install_test tests/installation_tests/find
-        cmake --build build_install_test --config Release
@@ -1,30 +0,0 @@
-name: VS17-NoExcept-CI
-
-on: [push, pull_request]
-
-jobs:
-  ci:
-    name: windows-vs17
-    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 VS17'
-      uses: lukka/run-cmake@v3
-      with:
-        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
-        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
-        buildDirectory: "${{ github.workspace }}/../../_temp/windows"
-        cmakeBuildType: Release
-        buildWithCMake: true
-        cmakeGenerator: VS16Win64
-        cmakeAppendedArgs: -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_DEVELOPER_MODE=ON  -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,11 +96,3 @@ objs

 # Generated docs
 /doc/api
-*.orig
-
-# VSCode workspace files
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
@@ -0,0 +1,42 @@
+[submodule "scalarvssimd/rapidjson"]
+	path = dependencies/rapidjson
+	url = https://github.com/Tencent/rapidjson.git
+[submodule "dependencies/sajson"]
+	path = dependencies/sajson
+	url = https://github.com/chadaustin/sajson.git
+[submodule "dependencies/json11"]
+	path = dependencies/json11
+	url = https://github.com/dropbox/json11.git
+[submodule "dependencies/fastjson"]
+	path = dependencies/fastjson
+	url = https://github.com/mikeando/fastjson.git
+[submodule "dependencies/gason"]
+	path = dependencies/gason
+	url = https://github.com/vivkin/gason.git
+[submodule "dependencies/ujson4c"]
+	path = dependencies/ujson4c
+	url = https://github.com/esnme/ujson4c.git
+[submodule "dependencies/jsmn"]
+	path = dependencies/jsmn
+	url = https://github.com/zserge/jsmn.git
+[submodule "dependencies/cJSON"]
+	path = dependencies/cJSON
+	url = https://github.com/DaveGamble/cJSON.git
+[submodule "dependencies/jsoncpp"]
+	path = dependencies/jsoncpp
+	url = https://github.com/open-source-parsers/jsoncpp.git
+[submodule "dependencies/json"]
+	path = dependencies/json
+	url = https://github.com/nlohmann/json.git
+[submodule "dependencies/benchmark"]
+	path = dependencies/benchmark
+	url = https://github.com/google/benchmark.git
+[submodule "dependencies/cxxopts"]
+	path = dependencies/cxxopts
+	url = https://github.com/jarro2783/cxxopts
+[submodule "dependencies/boost.json"]
+	path = dependencies/boost.json
+	url = https://github.com/CPPAlliance/json.git
+[submodule "dependencies/yyjson"]
+	path = dependencies/yyjson
+	url = https://github.com/ibireme/yyjson.git
@@ -1,190 +1,30 @@
 language: cpp
+sudo: false
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - gcc-7
+      - g++-7
+      - clang-format
+      - python
+branches:
+  only:
+    - master

-dist: bionic
+script: 
+   - export CXX=g++-7
+   - export CC=gcc-7
+   - make
+   - make test 
+   - make everything
+   - make amalgamate
+   - make clean
+   - make SANITIZEGOLD=1 test
+   - make clean
+   - ARCHFLAGS="-march=nehalem" make 
+   - ARCHFLAGS="-march=nehalem" make test
+   - ARCHFLAGS="-march=nehalem" make everything
+   - ./style/run-clang-format.py -r include/ benchmark/ src/ tests/

-arch:
-  - ppc64le
-
-cache:
-  directories:
-    - $HOME/.dep_cache
-
-env:
-  global:
-    - simdjson_DEPENDENCY_CACHE_DIR=$HOME/.dep_cache
-
-matrix:
-  include:
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-8
-      env:
-        - COMPILER="CC=gcc-8 && CXX=g++-8"
-      compiler: gcc-8
-
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-9
-      env:
-        - COMPILER="CC=gcc-9 && CXX=g++-9"
-      compiler: gcc-9
-
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-10
-      env:
-        - COMPILER="CC=gcc-10 && CXX=g++-10"
-      compiler: gcc-10
-
-# The sanitizer runs fail systematically
-#    - 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
-
-# The clang sanitizer runs fail frequently at setup time
-#    - 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} -DBUILD_SHARED_LIBS=OFF";
-    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,17 +0,0 @@
-{
-	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
-	// List of extensions which should be recommended for users of this workspace.
-	"recommendations": [
-		// Syntax
-		"ms-vscode.cpptools",
-		"ms-vscode.cmake-tools",
-		"ms-python.python",
-		"twxs.cmake"
-	],
-	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
-	"unwantedRecommendations": [
-
-	]
-}
@@ -1,91 +0,0 @@
-{
-    "editor.rulers": [
-        {"column": 95 },
-        {"column": 120 }
-    ],
-    "files.trimTrailingWhitespace": true,
-    "files.associations": {
-        "array": "cpp",
-        "iterator": "cpp",
-        "chrono": "cpp",
-        "optional": "cpp",
-        "__locale": "cpp",
-        "__tuple": "cpp",
-        "__bit_reference": "cpp",
-        "__config": "cpp",
-        "__debug": "cpp",
-        "__errc": "cpp",
-        "__functional_base": "cpp",
-        "__hash_table": "cpp",
-        "__mutex_base": "cpp",
-        "__node_handle": "cpp",
-        "__nullptr": "cpp",
-        "__split_buffer": "cpp",
-        "__string": "cpp",
-        "__threading_support": "cpp",
-        "__tree": "cpp",
-        "algorithm": "cpp",
-        "atomic": "cpp",
-        "bit": "cpp",
-        "bitset": "cpp",
-        "cctype": "cpp",
-        "cinttypes": "cpp",
-        "clocale": "cpp",
-        "cmath": "cpp",
-        "codecvt": "cpp",
-        "complex": "cpp",
-        "condition_variable": "cpp",
-        "cstdarg": "cpp",
-        "cstddef": "cpp",
-        "cstdint": "cpp",
-        "cstdio": "cpp",
-        "cstdlib": "cpp",
-        "cstring": "cpp",
-        "ctime": "cpp",
-        "cwchar": "cpp",
-        "cwctype": "cpp",
-        "deque": "cpp",
-        "exception": "cpp",
-        "forward_list": "cpp",
-        "fstream": "cpp",
-        "functional": "cpp",
-        "initializer_list": "cpp",
-        "iomanip": "cpp",
-        "ios": "cpp",
-        "iosfwd": "cpp",
-        "iostream": "cpp",
-        "istream": "cpp",
-        "limits": "cpp",
-        "list": "cpp",
-        "locale": "cpp",
-        "map": "cpp",
-        "memory": "cpp",
-        "mutex": "cpp",
-        "new": "cpp",
-        "numeric": "cpp",
-        "ostream": "cpp",
-        "random": "cpp",
-        "ratio": "cpp",
-        "regex": "cpp",
-        "set": "cpp",
-        "sstream": "cpp",
-        "stack": "cpp",
-        "stdexcept": "cpp",
-        "streambuf": "cpp",
-        "string": "cpp",
-        "string_view": "cpp",
-        "system_error": "cpp",
-        "thread": "cpp",
-        "tuple": "cpp",
-        "type_traits": "cpp",
-        "typeinfo": "cpp",
-        "unordered_map": "cpp",
-        "unordered_set": "cpp",
-        "utility": "cpp",
-        "valarray": "cpp",
-        "vector": "cpp",
-        "*.ipp": "cpp",
-        "__functional_base_03": "cpp",
-        "filesystem": "cpp"
-    }
-}
@@ -1,222 +1,57 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.9) # CMP0069 NEW

-project(
-    simdjson
-    # The version number is modified by tools/release.py
-    VERSION 1.0.2
-    DESCRIPTION "Parsing gigabytes of JSON per second"
-    HOMEPAGE_URL "https://simdjson.org/"
-    LANGUAGES CXX C
+project(simdjson
+  DESCRIPTION "Parsing gigabytes of JSON per second"
+  LANGUAGES CXX C
 )

-set(SIMDJSON_GITHUB_REPOSITORY "https://github.com/simdjson/simdjson")
+set(PROJECT_VERSION_MAJOR 0)
+set(PROJECT_VERSION_MINOR 6)
+set(PROJECT_VERSION_PATCH 1)
+set(SIMDJSON_SEMANTIC_VERSION "0.6.1" CACHE STRING "simdjson semantic version")
+set(SIMDJSON_LIB_VERSION "4.0.0" CACHE STRING "simdjson library version")
+set(SIMDJSON_LIB_SOVERSION "4" CACHE STRING "simdjson library soversion")
+set(SIMDJSON_GITHUB_REPOSITORY https://github.com/simdjson/simdjson)

-string(
-    COMPARE EQUAL
-    "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}"
-    is_top_project
-)
-
-# ---- Options, variables ----
-
-# These version numbers are modified by tools/release.py
-set(SIMDJSON_LIB_VERSION "9.0.0" CACHE STRING "simdjson library version")
-set(SIMDJSON_LIB_SOVERSION "9" CACHE STRING "simdjson library soversion")
-
-option(SIMDJSON_ENABLE_THREADS "Link with thread support" ON)
-
-include(cmake/simdjson-props.cmake)
-include(cmake/implementation-flags.cmake)
-include(cmake/exception-flags.cmake)
-
-option(SIMDJSON_DISABLE_DEPRECATED_API "Disables deprecated APIs" OFF)
-if(SIMDJSON_DISABLE_DEPRECATED_API)
-  simdjson_add_props(
-      target_compile_definitions PUBLIC
-      SIMDJSON_DISABLE_DEPRECATED_API=1
-  )
-endif()
-
-option(SIMDJSON_DEVELOPMENT_CHECKS "Enable development-time aids, such as \
-checks for incorrect API usage. Enabled by default in DEBUG." OFF)
-if(SIMDJSON_DEVELOPMENT_CHECKS)
-  simdjson_add_props(
-      target_compile_definitions PUBLIC
-      SIMDJSON_DEVELOPMENT_CHECKS
-  )
-endif()
-
-if(is_top_project)
-  option(SIMDJSON_DEVELOPER_MODE "Enable targets for developing simdjson" OFF)
-  option(BUILD_SHARED_LIBS "Build simdjson as a shared library" OFF)
-endif()
-
-include(cmake/handle-deprecations.cmake)
-include(cmake/developer-options.cmake)
-
-# ---- simdjson library ----
-
-add_library(simdjson src/simdjson.cpp)
-add_library(simdjson::simdjson ALIAS simdjson)
-
-set_target_properties(
-    simdjson PROPERTIES
-    VERSION "${SIMDJSON_LIB_VERSION}"
-    SOVERSION "${SIMDJSON_LIB_SOVERSION}"
-    # FIXME: symbols should be hidden by default
-    WINDOWS_EXPORT_ALL_SYMBOLS YES
-)
-
-# FIXME: Use proper CMake integration for exports
-if(MSVC AND BUILD_SHARED_LIBS)
-  target_compile_definitions(
-      simdjson
-      PRIVATE SIMDJSON_BUILDING_WINDOWS_DYNAMIC_LIBRARY=1
-      INTERFACE SIMDJSON_USING_WINDOWS_DYNAMIC_LIBRARY=1
-  )
-endif()
-
-simdjson_add_props(
-    target_include_directories
-    PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
-    PRIVATE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>"
-)
-
-simdjson_add_props(target_compile_features PUBLIC cxx_std_11)
-
-# workaround for GNU GCC poor AVX load/store code generation
-if(
-    CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-    AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$"
-)
-  simdjson_add_props(
-      target_compile_options PRIVATE
-      -mno-avx256-split-unaligned-load -mno-avx256-split-unaligned-store
-  )
-endif()
-
-if(SIMDJSON_ENABLE_THREADS)
-  find_package(Threads REQUIRED)
-  simdjson_add_props(target_link_libraries PUBLIC Threads::Threads)
-  simdjson_add_props(target_compile_definitions PUBLIC SIMDJSON_THREADS_ENABLED=1)
-endif()
-
-simdjson_apply_props(simdjson)
-
-# ---- Install rules ----
-
-include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
+include(cmake/simdjson-flags.cmake)
+include(cmake/simdjson-user-cmakecache.cmake)

-install(
-    FILES singleheader/simdjson.h
-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-    COMPONENT simdjson_Development
-)

-install(
-    TARGETS simdjson
-    EXPORT simdjsonTargets
-    RUNTIME COMPONENT simdjson_Runtime
-    LIBRARY COMPONENT simdjson_Runtime
-    NAMELINK_COMPONENT simdjson_Development
-    ARCHIVE COMPONENT simdjson_Development
-    INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-)

-configure_file(cmake/simdjson-config.cmake.in simdjson-config.cmake @ONLY)
-
-write_basic_package_version_file(
-    simdjson-config-version.cmake
-    COMPATIBILITY SameMinorVersion
-)
-
-set(
-    SIMDJSON_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/simdjson"
-    CACHE STRING "CMake package config location relative to the install prefix"
-)
-mark_as_advanced(SIMDJSON_INSTALL_CMAKEDIR)
-
-install(
-    FILES
-    "${PROJECT_BINARY_DIR}/simdjson-config.cmake"
-    "${PROJECT_BINARY_DIR}/simdjson-config-version.cmake"
-    DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
-    COMPONENT simdjson_Development
-)
-
-install(
-    EXPORT simdjsonTargets
-    NAMESPACE simdjson::
-    DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
-    COMPONENT example_Development
-)
+if(SIMDJSON_JUST_LIBRARY)
+  message( STATUS "Building just the library, omitting all tests, tools and benchmarks." )
+else(SIMDJSON_JUST_LIBRARY)
+  # Setup tests
+  enable_testing()
+  add_subdirectory(jsonchecker)
+  add_subdirectory(jsonexamples)
+  add_library(test-data INTERFACE)
+  target_link_libraries(test-data INTERFACE jsonchecker-data jsonchecker-minefield-data jsonexamples-data)
+endif(SIMDJSON_JUST_LIBRARY)

+# Create the top level simdjson library (must be done at this level to use both src/ and include/
+# directories) and tools
 #
-# CPack
-#
-if(is_top_project)
-  set(CPACK_PACKAGE_VENDOR "Daniel Lemire")
-  set(CPACK_PACKAGE_CONTACT "lemire@gmail.com")
-  set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
-  set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md")
-
-  set(CPACK_RPM_PACKAGE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
-
-  set(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
-
-  include(CPack)
-endif()
-
-# ---- Developer mode extras ----
-
-if(NOT SIMDJSON_DEVELOPER_MODE)
-  message(STATUS "Building only the library. Advanced users may want to turn SIMDJSON_DEVELOPER_MODE to ON, e.g., via -D SIMDJSON_DEVELOPER_MODE=ON.")
-  return()
-elseif(NOT is_top_project)
-  message(AUTHOR_WARNING "Developer mode is intended for developers of simdjson")
-endif()
-
-simdjson_apply_props(simdjson-internal-flags)
-
-set(
-    SIMDJSON_USER_CMAKECACHE
-    "${CMAKE_BINARY_DIR}/.simdjson-user-CMakeCache.txt"
-)
-add_custom_target(
-    simdjson-user-cmakecache
-    COMMAND "${CMAKE_COMMAND}"
-    -D "BINARY_DIR=${CMAKE_BINARY_DIR}"
-    -D "USER_CMAKECACHE=${SIMDJSON_USER_CMAKECACHE}"
-    -P "${PROJECT_SOURCE_DIR}/cmake/simdjson-user-cmakecache.cmake"
-    VERBATIM
-)
-
-# Setup tests
-enable_testing()
-# So we can build just tests with "make all_tests"
-add_custom_target(all_tests)
-
+add_subdirectory(include)
+add_subdirectory(src)
 add_subdirectory(windows)
-add_subdirectory(dependencies) ## This needs to be before tools because of cxxopts
-add_subdirectory(tools)  ## This needs to be before tests because of cxxopts
-
-# Data: jsonexamples is left with only the bare essential.
-# most of the data has been moved to https://github.com/simdjson/simdjson-data
-add_subdirectory(jsonexamples)
-
-
-add_subdirectory(singleheader)
-
-
+if(NOT(SIMDJSON_JUST_LIBRARY))
+  add_subdirectory(dependencies) ## This needs to be before tools because of cxxopts
+  add_subdirectory(tools)  ## This needs to be before tests because of cxxopts
+  add_subdirectory(singleheader)
+endif()
+install(FILES singleheader/simdjson.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

 #
 # Compile tools / tests / benchmarks
 #
-add_subdirectory(tests)
-add_subdirectory(examples)
-add_subdirectory(benchmark)
-add_subdirectory(fuzz)
+if(NOT(SIMDJSON_JUST_LIBRARY))
+  add_subdirectory(tests)
+  add_subdirectory(examples)
+  add_subdirectory(benchmark)
+  add_subdirectory(fuzz)
+endif()

 #
 # Source files should be just ASCII
@@ -224,59 +59,29 @@ add_subdirectory(fuzz)
 find_program(FIND find)
 find_program(FILE file)
 find_program(GREP grep)
-if(FIND AND FILE AND GREP)
-  add_test(
-      NAME just_ascii
-      COMMAND sh -c "\
-${FIND} include src windows tools singleheader tests examples benchmark \
-path benchmark/checkperf-reference -prune -name '*.h' -o -name '*.cpp' \
-type f -exec ${FILE} '{}' \; | ${GREP} -qv ASCII || exit 0  && exit 1"
-      WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
-  )
+if((FIND) AND (FILE) AND (GREP))
+    add_test(
+      NAME "just_ascii"
+      COMMAND sh -c "${FIND}  include src windows tools singleheader tests examples benchmark -path benchmark/checkperf-reference -prune -name '*.h'  -o -name '*.cpp' -type f  -exec ${FILE} '{}' \; |${GREP} -v ASCII || exit 0  && exit 1"
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    )
 endif()

-##
-## In systems like R, libraries must not use stderr or abort to be acceptable.
-## Thus we make it a hard rule that one is not allowed to call abort or stderr.
-## The sanitized builds are allowed to abort.
-##
-if(NOT SIMDJSON_SANITIZE)
-  find_program(GREP grep)
-  find_program(NM nm)
-  if((NOT GREP) OR (NOT NM))
-    message("grep and nm are unavailable on this system.")
-  else()
-    add_test(
-      NAME "avoid_abort"
-      # Under FreeBSD, the __cxa_guard_abort symbol may appear but it is fine.
-      # So we want to look for <space><possibly _>abort as a test.
-      COMMAND sh -c "${NM}  $<TARGET_FILE_NAME:simdjson> |  ${GREP} ' _*abort' || exit 0  && exit 1"
-      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-    )
-    add_test(
-      NAME "avoid_cout"
-      COMMAND sh -c "${NM}  $<TARGET_FILE_NAME:simdjson> |  ${GREP} ' _*cout' || exit 0  && exit 1"
-      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-    )
-    add_test(
-      NAME "avoid_cerr"
-      COMMAND sh -c "${NM}  $<TARGET_FILE_NAME:simdjson> |  ${GREP} ' _*cerr' || exit 0  && exit 1"
-      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-    )
-    add_test(
-      NAME "avoid_printf"
-      COMMAND sh -c "${NM}  $<TARGET_FILE_NAME:simdjson> |  ${GREP} ' _*printf' || exit 0  && exit 1"
-      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-    )
-    add_test(
-      NAME "avoid_stdout"
-      COMMAND sh -c "${NM}  $<TARGET_FILE_NAME:simdjson> |  ${GREP} stdout || exit 0 && exit 1"
-      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-    )
-    add_test(
-      NAME "avoid_stderr"
-      COMMAND sh -c "${NM}  $<TARGET_FILE_NAME:simdjson> |  ${GREP} stderr || exit 0 && exit 1"
-      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-    )
-  endif()
-endif()
+
+#
+# CPack
+#
+set(CPACK_PACKAGE_VENDOR "Daniel Lemire")
+set(CPACK_PACKAGE_CONTACT "lemire@gmail.com")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Parsing gigabytes of JSON per second")
+set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+
+set(CPACK_RPM_PACKAGE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+
+set(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
+
+include(CPack)
@@ -42,7 +42,6 @@ We have few hard rules, but we have some:
 - Calls to `abort()` are forbidden in the core library. This follows from the [Writing R Extensions](https://cran.r-project.org/doc/manuals/R-exts.html) manual which states that "Under no circumstances should your compiled code ever call abort or exit".
 - All source code files (.h, .cpp) must be ASCII.
 - All C macros introduced in public headers need to be prefixed with either `SIMDJSON_` or `simdjson_`.
- We avoid trailing white space characters within lines. That is, your lines of code should not terminate with unnecessary spaces. Generally, please avoid making unnecessary changes to white-space characters when contributing code.

 Tools, tests and benchmarks are not held to these same strict rules.

@@ -69,9 +68,7 @@ Pull requests are always invited. However, we ask that you follow these guidelin
   3. Other types of changes must be clearly motivated. We openly discourage changes with no identifiable benefits.
 - 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 responsibility 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.
+- 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.

 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,11 +35,5 @@ Matjaž Ostroveršnik
 Nong Li
 Furkan Taşkale
 Brendan Knapp
-Danila Kutenin
-Pavel Pavlov
-Hao Chen
-Nicolas Boyer
-Kim Walisch and Jatin Bhateja (AVX-512 bitset decoder)
-Eric Zhang (AVX-512 kernel)
-# if you have contributed to the project and your name does not
+# if you have contributed to the project and your name does not 
 # appear in this list, please let us know!
@@ -0,0 +1,88 @@
+###
+#
+# Though simdjson requires only commonly available compilers and tools, it can
+# be convenient to build it and test it inside a docker container: it makes it
+# possible to test and benchmark simdjson under even relatively out-of-date
+# Linux servers. It should also work under macOS and Windows, though not
+# at native speeds, maybe.
+#
+# Assuming that you have a working docker server, this file
+# allows you to build, test and benchmark simdjson.
+#
+#  We build the library and associated files in the dockerbuild subdirectory.
+# It may be necessary to delete it before creating the image:
+#
+# rm -r -f dockerbuild
+#
+# The need to delete the directory has nothing to do with docker per se: it is
+# simply cleaner in CMake to start from a fresh directory. This is important: if you
+# reuse the same directory with different configurations, you may get broken builds.
+#
+#
+# Then you can build the image as follows:
+#
+# docker build -t simdjson --build-arg USER_ID=$(id -u)  --build-arg GROUP_ID=$(id -g) .
+#
+# Please note that the image does not contain a copy of the code. However, the image will contain the
+# the compiler and the build system. This means that if you change the source code, after you have built
+# the image, you won't need to rebuild the image. In fact, unless you want to try a different compiler, you
+# do not need to ever rebuild the image, even if you do a lot of work on the source code.
+#
+# We specify the users to avoid having files owned by a privileged user (root) in our directory. Some
+# people like to run their machine as the "root" user. We do not think it is cool.
+#
+# Then you need to build the project:
+#
+# docker run  -v $(pwd):/project:Z  simdjson
+#
+# Should you change a source file, you may need to call this command again. Because the output
+# files are persistent between calls to this command (they reside in the dockerbuild directory),
+# this command can be fast.
+#
+# 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"
+#
+# The run the complete tests requires you to have built all of simdjson.
+#
+# Building all of simdjson takes a long time. Instead, you can build just one target:
+#
+# docker run -it -v $(pwd):/project:Z  simdjson sh -c "[ -d dockerbuild ] || mkdir dockerbuild && cd dockerbuild && cmake ..  && cmake --build . --target parse"
+#
+# Note that it is safe to remove dockerbuild before call the previous command, as the repository gets rebuild. It is also possible, by changing the command, to use a different directory name.
+#
+# You can run performance tests:
+#
+# docker run -it --privileged -v $(pwd):/project:Z  simdjson sh -c "cd dockerbuild && for i in ../jsonexamples/*.json; do echo \$i; ./benchmark/parse \$i;  done"
+#
+# The "--privileged" is recommended so you can get performance counters under Linux.
+#
+# You can also grab a fresh copy of simdjson and rebuild it, to make comparisons:
+#
+# docker run -it -v $(pwd):/project:Z  simdjson sh -c "git clone https://github.com/simdjson/simdjson.git && cd simdjson && mkdir build && cd build && cmake .. && cmake --build . --target parse "
+#
+# Then you can run comparisons:
+#
+# docker run -it --privileged -v $(pwd):/project:Z  simdjson sh -c "for i in jsonexamples/*.json; do echo \$i; dockerbuild/benchmark/parse \$i| grep GB| head -n 1; simdjson/build/benchmark/parse \$i | grep GB |head -n 1;  done"
+#
+####
+FROM ubuntu:20.10
+################
+# We would prefer to use the conan io images but they do not support 64-bit ARM? The small gcc images appear to
+# be broken on ARM.
+# Furthermore, we would not expect users to frequently rebuild the container, so using ubuntu is probably fine.
+###############
+ARG USER_ID
+ARG GROUP_ID
+RUN apt-get update -qq
+RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
+RUN apt-get install -y cmake g++ git
+RUN mkdir project
+
+RUN addgroup --gid $GROUP_ID user; exit 0
+RUN adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID user; exit 0
+USER user
+RUN gcc --version
+WORKDIR /project
+
+CMD ["sh","-c","[ -d dockerbuild ] || mkdir dockerbuild && cd dockerbuild && cmake .. && cmake --build . "]
@@ -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         = "1.0.2"
+PROJECT_NUMBER         = "0.6.1"

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -32,18 +32,6 @@ Stage 1 also does unicode validation.

 Stage 2 handles all of the rest: number parsings, recognizing atoms like true, false, null, and so forth.

-Developer mode
--------------
-
-Build system targets that are only useful for developers of the simdjson
-library are behind the `SIMDJSON_DEVELOPER_MODE` option. Enabling this option
-makes tests, examples, benchmarks and other developer targets available. Not
-enabling this option means that you are a consumer of simdjson and thus you
-only get the library targets and options.
-
-Developer mode is forced to be on when the `CI` environment variable is set to
-a value that CMake recognizes as "on", which is set to `true` in all of the CI
-workflows used by simdjson.

 Directory Structure and Source
 ------------------------------
@@ -60,7 +48,7 @@ simdjson's source structure, from the top level, looks like this:
  implementations).
  * simdjson.cpp: A "main source" that includes all implementation files from src/. This is
    equivalent to the distributed simdjson.cpp.
-  * arm64/|fallback/|haswell/|ppc64/|westmere/: Architecture-specific implementations. All functions are
+  * arm64/|fallback/|haswell/|westmere/: Architecture-specific implementations. All functions are
    Each architecture defines its own namespace, e.g. simdjson::haswell.
  * generic/: Generic implementations of the simdjson parser. These files may be included and
    compiled multiple times, from whichever architectures use them. They assume they are already
@@ -79,26 +67,26 @@ Other important files and directories:
 * **.circleci:** Definitions for Circle CI.
 * **.github/workflows:** Definitions for GitHub Actions (CI).
 * **singleheader:** Contains generated `simdjson.h` and `simdjson.cpp` that we release. The files `singleheader/simdjson.h` and `singleheader/simdjson.cpp` should never be edited by hand.
-* **singleheader/amalgamate.py:** Generates `singleheader/simdjson.h` and `singleheader/simdjson.cpp` for release (python script).
+* **singleheader/amalgamate.sh:** Generates `singleheader/simdjson.h` and `singleheader/simdjson.cpp` for release (bash script). 
 * **benchmark:** This is where we do benchmarking. Benchmarking is core to every change we make; the
  cardinal rule is don't regress performance without knowing exactly why, and what you're trading
  for it. Many of our benchmarks are microbenchmarks. We are effectively doing controlled scientific experiments for the purpose of understanding what affects our performance. So we simplify as much as possible. We try to avoid irrelevant factors such as page faults, interrupts, unnnecessary system calls. We recommend checking the performance as follows:
  ```bash
  mkdir build
  cd build
-  cmake -D SIMDJSON_DEVELOPER_MODE=ON ..
+  cmake ..
  cmake --build . --config Release
-  benchmark/dom/parse ../jsonexamples/twitter.json
+  benchmark/parse ../jsonexamples/twitter.json
  ```
  The last line becomes `./benchmark/Release/parse.exe ../jsonexample/twitter.json` under Windows. You may also use Google Benchmark:
  ```bash
  mkdir build
  cd build
-  cmake -D SIMDJSON_DEVELOPER_MODE=ON ..
+  cmake ..
  cmake --build . --target bench_parse_call --config Release
  ./benchmark/bench_parse_call
  ```
-  The last line becomes `./benchmark/Release/bench_parse_call.exe` under Windows. Under Windows, you can also build with the clang compiler by adding `-T ClangCL` to the call to `cmake ..`: `cmake -T ClangCL ..`.
+  The last line becomes `./benchmark/Release/bench_parse_call.exe` under Windows. Under Windows, you can also build with the clang compiler by adding `-T ClangCL` to the call to `cmake ..`: `cmake .. - TClangCL`.
 * **fuzz:** The source for fuzz testing. This lets us explore important edge and middle cases
 * **fuzz:** The source for fuzz testing. This lets us explore important edge and middle cases
  automatically, and is run in CI.
@@ -159,7 +147,7 @@ processor.

 At this point, we are require to use one of two main strategies.

-1. On POSIX systems, the main compilers (LLVM clang, GNU gcc) allow us to use any intrinsic function after including the header, but they fail to inline the resulting instruction if the target processor does not support them. Because we compile for a generic processor, we would not be able to use most intrinsic functions. Thankfully, more recent versions of these compilers allow us to flag a region of code with a specific target, so that we can compile only some of the code with support for advanced instructions. Thus in our C++, one might notice macros like `TARGET_HASWELL`. It is then our responsibility, at runtime, to only run the regions of code (that we call kernels) matching the properties of the runtime processor. The benefit of this approach is that the compiler not only let us use intrinsic functions, but it can also optimize the rest of the code in the kernel with advanced instructions we enabled.
+1. On POSIX systems, the main compilers (LLVM clang, GNU gcc) allow us to use any intrinsic function after including the header, but they fail to inline the resulting instruction if the target processor does not support them. Because we compile for a generic processor, we would not be able to use most intrinsic functions. Thankfully, more recent versions of these compilers allow us to flag a region of code with a specific target, so that we can compile only some of the code with support for advanced instructions. Thus in our C++, one might notice macros like `TARGET_HASWELL`. It is then our responsability, at runtime, to only run the regions of code (that we call kernels) matching the properties of the runtime processor. The benefit of this approach is that the compiler not only let us use intrinsic functions, but it can also optimize the rest of the code in the kernel with advanced instructions we enabled.

 2. Under Visual Studio, the problem is somewhat simpler. Visual Studio will not only provide the intrinsic functions, but it will also allow us to use them. They will compile just fine. It is at runtime that they may cause a crash. So we do not need to mark regions of code for compilation toward advanced processors (e.g., with  `TARGET_HASWELL` macros). The downside of the Visual Studio approach is that the compiler is not allowed to use advanced instructions others than those we specify. In principle, this means that Visual Studio has weaker optimization opportunities.

@@ -180,14 +168,13 @@ systematically regenerated on releases. To ensure you have the latest code, you
 ```bash
 mkdir build
 cd build
-cmake -D SIMDJSON_DEVELOPER_MODE=ON ..
-cmake --build . # needed, because currently dependencies do not work fully for the amalgamate target
+cmake ..
 cmake --build . --target amalgamate
 ```

-You need to have python3 installed on your system.
+You need to have a working bash on your system.

-The amalgamator script `amalgamate.py` generates singleheader/simdjson.h by
+The amalgamator script is `amalgamate.sh` generates singleheader/simdjson.h by
 reading through include/simdjson.h, copy/pasting each header file into the amalgamated file at the
 point it gets included (but only once per header). singleheader/simdjson.cpp is generated from
 src/simdjson.cpp the same way, except files under generic/ may be included and copy/pasted multiple
@@ -221,31 +208,31 @@ Building: While in the project repository, do the following:
 ```
 mkdir build
 cd build
-cmake -D SIMDJSON_DEVELOPER_MODE=ON ..
+cmake ..
 cmake --build .
 ctest
 ```

-CMake will build a library. By default, it builds a static library (e.g., libsimdjson.a on Linux).
+CMake will build a library. By default, it builds a shared library (e.g., libsimdjson.so on Linux).

-You can build a shared library:
+You can build a static library:

 ```
-mkdir buildshared
-cd buildshared
-cmake -D BUILD_SHARED_LIBS=ON -D SIMDJSON_DEVELOPER_MODE=ON ..
+mkdir buildstatic
+cd buildstatic
+cmake -DSIMDJSON_BUILD_STATIC=ON ..
 cmake --build .
 ctest
 ```

-In some cases, you may want to specify your compiler, especially if the default compiler on your system is too old.  You need to tell cmake which compiler you wish to use by setting the CC and CXX variables. Under bash, you can do so with commands such as `export CC=gcc-7` and `export CXX=g++-7`. You can also do it as part of the `cmake` command: `cmake -DCMAKE_CXX_COMPILER=g++ ..`.  You may proceed as follows:
+In some cases, you may want to specify your compiler, especially if the default compiler on your system is too old.  You need to tell cmake which compiler you wish to use by setting the CC and CXX variables. Under bash, you can do so with commands such as `export CC=gcc-7` and `export CXX=g++-7`. You can also do it as part of the `cmake` command: `cmake .. -DCMAKE_CXX_COMPILER=g++`.  You may proceed as follows:

 ```
 brew install gcc@8
 mkdir build
 cd build
 export CXX=g++-8 CC=gcc-8
-cmake -D SIMDJSON_DEVELOPER_MODE=ON ..
+cmake ..
 cmake --build .
 ctest
 ```
@@ -264,7 +251,7 @@ We assume you have a common 64-bit Windows PC with at least Visual Studio 2019.
 - Install [CMake](https://cmake.org/download/). When you install it, make sure to ask that `cmake` be made available from the command line. Please choose a recent version of cmake.
 - Create a subdirectory within simdjson, such as `build`.
 - Using a shell, go to this newly created directory. You can start a shell directly from GitHub Desktop (Repository > Open in Command Prompt).
- Type `cmake  ..` in the shell while in the `build` repository.
+- Type `cmake  ..` in the shell while in the `build` repository. 
 - This last command (`cmake ...`) created a Visual Studio solution file in the newly created directory (e.g., `simdjson.sln`). Open this file in Visual Studio. You should now be able to build the project and run the tests. For example, in the `Solution Explorer` window (available from the `View` menu), right-click `ALL_BUILD` and select `Build`. To test the code, still in the `Solution Explorer` window, select `RUN_TESTS` and select `Build`.


@@ -281,7 +268,7 @@ Furthermore, if you have installed LLVM clang on Windows, for example as a compo

 - `mkdir build`
 - `cd build`
- `cmake -T ClangCL ..`
+- `cmake ..  -T ClangCL`
 - `cmake --build . -config Release`


@@ -1,9 +1,9 @@
-
+[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/simdjson.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&q=proj%3Asimdjson&can=2)
 ![Ubuntu 18.04 CI](https://github.com/simdjson/simdjson/workflows/Ubuntu%2018.04%20CI%20(GCC%207)/badge.svg)
 [![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/1.0.0/index.html)
+[![][license img]][license]  [![Doxygen Documentation](https://img.shields.io/badge/docs-doxygen-green.svg)](https://simdjson.org/api/0.6.0/index.html)

 simdjson : Parsing gigabytes of JSON per second
 ===============================================
@@ -11,11 +11,12 @@ simdjson : Parsing gigabytes of JSON per second
 <img src="images/logo.png" width="10%" style="float: right">
 JSON is everywhere on the Internet. Servers spend a *lot* of time parsing it. We need a fresh
 approach. The simdjson library uses commonly available SIMD instructions and microparallel algorithms
-to parse JSON 4x  faster than RapidJSON and 25x faster than JSON for Modern C++.
+to parse JSON 2.5x  faster than RapidJSON and 25x faster than JSON for Modern C++.

-* **Fast:** Over 4x faster than commonly used production-grade JSON parsers.
+* **Fast:** Over 2.5x faster than commonly used production-grade JSON parsers.
 * **Record Breaking Features:** Minify JSON  at 6 GB/s, validate UTF-8  at 13 GB/s,  NDJSON at 3.5 GB/s.
 * **Easy:** First-class, easy to use and carefully documented APIs.
+* **Beyond DOM:** Try the new On Demand API for twice the speed (>4GB/s).
 * **Strict:** Full JSON and UTF-8 validation, lossless parsing. Performance with no compromises.
 * **Automatic:** Selects a CPU-tailored parser at runtime. No configuration needed.
 * **Reliable:** From memory allocation to error handling, simdjson's design avoids surprises.
@@ -39,30 +40,23 @@ Table of Contents
 Quick Start
 -----------

+          
 The simdjson library is easily consumable with a single .h and .cpp file.

-0. Prerequisites: `g++` (version 7 or better) or `clang++` (version 6 or better), and a 64-bit
-   system with a command-line shell (e.g., Linux, macOS, freeBSD). We also support programming
-   environments like Visual Studio and Xcode, but different steps are needed.
-1. Pull [simdjson.h](singleheader/simdjson.h) and [simdjson.cpp](singleheader/simdjson.cpp) into a
-   directory, along with the sample file [twitter.json](jsonexamples/twitter.json).
-
+0. Prerequisites: `g++` (version 7 or better) or `clang++` (version 6 or better), and a 64-bit system with a command-line shell (e.g., Linux, macOS, freeBSD). We also support programming environnements like Visual Studio and Xcode, but different steps are needed.
+1. Pull [simdjson.h](singleheader/simdjson.h) and [simdjson.cpp](singleheader/simdjson.cpp) into a directory, along with the sample file [twitter.json](jsonexamples/twitter.json).
   ```
   wget https://raw.githubusercontent.com/simdjson/simdjson/master/singleheader/simdjson.h https://raw.githubusercontent.com/simdjson/simdjson/master/singleheader/simdjson.cpp https://raw.githubusercontent.com/simdjson/simdjson/master/jsonexamples/twitter.json
   ```
 2. Create `quickstart.cpp`:

-```c++
-#include <iostream>
-#include "simdjson.h"
-using namespace simdjson;
-int main(void) {
-    ondemand::parser parser;
-    padded_string json = padded_string::load("twitter.json");
-    ondemand::document tweets = parser.iterate(json);
-    std::cout << uint64_t(tweets["search_metadata"]["count"]) << " results." << std::endl;
-}
-
+   ```c++
+   #include "simdjson.h"
+   int main(void) {
+     simdjson::dom::parser parser;
+     simdjson::dom::element tweets = parser.load("twitter.json");
+     std::cout << tweets["search_metadata"]["count"] << " results." << std::endl;
+   }
   ```
 3. `c++ -o quickstart quickstart.cpp simdjson.cpp`
 4. `./quickstart`
@@ -79,31 +73,59 @@ Usage documentation is available:
 * [Performance](doc/performance.md) shows some more advanced scenarios and how to tune for them.
 * [Implementation Selection](doc/implementation-selection.md) describes runtime CPU detection and
  how you can work with it.
-* [API](https://simdjson.org/api/1.0.0/annotated.html) contains the automatically generated API documentation.
+* [API](https://simdjson.org/api/0.6.0/annotated.html) contains the automatically generated API documentation.

 Performance results
 -------------------

-The simdjson library uses three-quarters less instructions than state-of-the-art parser [RapidJSON](https://rapidjson.org). To our knowledge, simdjson is the first fully-validating JSON parser
+The simdjson library uses three-quarters less instructions than state-of-the-art parser [RapidJSON](https://rapidjson.org) and
+fifty percent less than sajson. To our knowledge, simdjson is the first fully-validating JSON parser
 to run at [gigabytes per second](https://en.wikipedia.org/wiki/Gigabyte) (GB/s) on commodity processors. It can parse millions of JSON documents per second on a single core.

 The following figure represents parsing speed in GB/s for parsing various files
-on an Intel Skylake processor (3.4 GHz) using the GNU GCC 10 compiler (with the -O3 flag).
-We compare against the best and fastest C++ libraries on benchmarks that load and process the data.
+on an Intel Skylake processor (3.4 GHz) using the GNU GCC 9 compiler (with the -O3 flag).
+We compare against the best and fastest C++ libraries.
 The simdjson library offers full unicode ([UTF-8](https://en.wikipedia.org/wiki/UTF-8)) validation and exact
-number parsing.
+number parsing. The RapidJSON library is tested in two modes: fast and
+exact number parsing. The sajson library offers fast (but not exact)
+number parsing and partial unicode validation. In this data set, the file
+sizes range from 65KB (github_events) all the way to 3.3GB (gsoc-2018).
+Many files are mostly made of numbers: canada, mesh.pretty, mesh, random
+and numbers: in such instances, we see lower JSON parsing speeds due to the
+high cost of number parsing. The simdjson library uses exact number parsing which
+is particular taxing.
+
+<img src="doc/gbps.png" width="90%">
+
+On a Skylake processor, the parsing speeds (in GB/s) of various processors on the twitter.json file are as follows, using again GNU GCC 9.1 (with the -O3 flag). The popular JSON for Modern C++ library is particularly slow: it obviously trades parsing speed for other desirable features.
+
+| parser                                | GB/s |
+| ------------------------------------- | ---- |
+| simdjson                              | 2.5  |
+| RapidJSON UTF8-validation             | 0.29 |
+| RapidJSON UTF8-valid., exact numbers  | 0.28 |
+| RapidJSON insitu, UTF8-validation     | 0.41 |
+| RapidJSON insitu, UTF8-valid., exact  | 0.39 |
+| sajson (insitu, dynamic)              | 0.62 |
+| sajson (insitu, static)               | 0.88 |
+| dropbox                               | 0.13 |
+| fastjson                              | 0.27 |
+| gason                                 | 0.59 |
+| ultrajson                             | 0.34 |
+| jsmn                                  | 0.25 |
+| cJSON                                 | 0.31 |
+| JSON for Modern C++ (nlohmann/json)   | 0.11 |

-<img src="doc/rome.png" width="60%">

 The simdjson library offers high speed whether it processes tiny files (e.g., 300 bytes)
 or larger files (e.g., 3MB). The following plot presents parsing
 speed for [synthetic files over various sizes generated with a script](https://github.com/simdjson/simdjson_experiments_vldb2019/blob/master/experiments/growing/gen.py) on a 3.4 GHz Skylake processor (GNU GCC 9, -O3).
-
-<img src="doc/growing.png" width="60%">
+<img src="doc/growing.png" width="90%">

 [All our experiments are reproducible](https://github.com/simdjson/simdjson_experiments_vldb2019).


+You can go beyond 4 GB/s with our new [On Demand API](https://github.com/simdjson/simdjson/blob/master/doc/ondemand.md).
 For NDJSON files, we can exceed 3 GB/s with [our  multithreaded parsing functions](https://github.com/simdjson/simdjson/blob/master/doc/parse_many.md).


@@ -126,7 +148,6 @@ We distinguish between "bindings" (which just wrap the C++ code) and a port to a
 - [ZippyJSON](https://github.com/michaeleisel/zippyjson): Swift bindings for the simdjson project.
 - [libpy_simdjson](https://github.com/gerrymanoim/libpy_simdjson/): high-speed Python bindings for simdjson using [libpy](https://github.com/quantopian/libpy).
 - [pysimdjson](https://github.com/TkTech/pysimdjson): Python bindings for the simdjson project.
- [cysimdjson](https://github.com/TeskaLabs/cysimdjson): high-speed Python bindings for the simdjson project.
 - [simdjson-rs](https://github.com/simd-lite): Rust port.
 - [simdjson-rust](https://github.com/SunDoge/simdjson-rust): Rust wrapper (bindings).
 - [SimdJsonSharp](https://github.com/EgorBo/SimdJsonSharp): C# version for .NET Core (bindings and full port).
@@ -137,8 +158,6 @@ We distinguish between "bindings" (which just wrap the C++ code) and a port to a
 - [simdjson-go](https://github.com/minio/simdjson-go): Go port using Golang assembly.
 - [rcppsimdjson](https://github.com/eddelbuettel/rcppsimdjson): R bindings.
 - [simdjson_erlang](https://github.com/ChomperT/simdjson_erlang): erlang bindings.
- [lua-simdjson](https://github.com/FourierTransformer/lua-simdjson): lua bindings.
- [hermes-json](https://hackage.haskell.org/package/hermes-json): haskell bindings.


 About simdjson
@@ -149,18 +168,18 @@ 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:

- John Keiser, Daniel Lemire, [Validating UTF-8 In Less Than One Instruction Per Byte](https://arxiv.org/abs/2010.03090), Software: Practice & Experience 51 (5), 2021.
+- John Keiser, Daniel Lemire, [Validating UTF-8 In Less Than One Instruction Per Byte](https://arxiv.org/abs/2010.03090), Software: Practice & Experience (to appear)

 We also have an informal [blog post providing some background and context](https://branchfree.org/2019/02/25/paper-parsing-gigabytes-of-json-per-second/).

 For the video inclined, <br />
 [![simdjson at QCon San Francisco 2019](http://img.youtube.com/vi/wlvKAT7SZIQ/0.jpg)](http://www.youtube.com/watch?v=wlvKAT7SZIQ)<br />
-(It was the best voted talk, we're kinda proud of it.)
+(it was the best voted talk, we're kinda proud of it).

 Funding
 -------
@@ -184,8 +203,4 @@ This code is made available under the [Apache License 2.0](https://www.apache.or

 Under Windows, we build some tools using the windows/dirent_portable.h file (which is outside our library code): it under the liberal (business-friendly) MIT license.

-For compilers that do not support [C++17](https://en.wikipedia.org/wiki/C%2B%2B17), we bundle the string-view library which is published under the [Boost license](http://www.boost.org/LICENSE_1_0.txt). Like the Apache license, the Boost license is a permissive license allowing commercial redistribution.
-
-For efficient number serialization, we bundle Florian Loitsch's implementation of the Grisu2 algorithm for binary to decimal floating-point numbers. The implementation was slightly modified by JSON for Modern C++ library. Both Florian Loitsch's implementation and JSON for Modern C++ are provided under the MIT license.
-
-For runtime dispatching, we use some code from the PyTorch project licensed under 3-clause BSD.
+For compilers that do not support [C++17](https://en.wikipedia.org/wiki/C%2B%2B17), we bundle the string-view library which is published under the Boost license (http://www.boost.org/LICENSE_1_0.txt). Like the Apache license, the Boost license is a permissive license allowing commercial redistribution.
@@ -1,31 +1,50 @@
-add_subdirectory(dom)
-
-
 include_directories( . linux )
 link_libraries(simdjson-windows-headers test-data)
-link_libraries(simdjson)

+
+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)
+add_executable(parse parse.cpp)
+add_executable(parse_stream parse_stream.cpp)
+add_executable(statisticalmodel statisticalmodel.cpp)
+
+add_executable(parse_noutf8validation parse.cpp)
+target_compile_definitions(parse_noutf8validation PRIVATE SIMDJSON_SKIPUTF8VALIDATION)
+add_executable(parse_nonumberparsing parse.cpp)
+target_compile_definitions(parse_nonumberparsing PRIVATE SIMDJSON_SKIPNUMBERPARSING)
+add_executable(parse_nostringparsing parse.cpp)
+target_compile_definitions(parse_nostringparsing PRIVATE SIMDJSON_SKIPSTRINGPARSING)
+
+if (TARGET competition-all)
+  add_executable(distinctuseridcompetition distinctuseridcompetition.cpp)
+  target_link_libraries(distinctuseridcompetition competition-core)
+
+  add_executable(minifiercompetition minifiercompetition.cpp)
+  target_link_libraries(minifiercompetition competition-core)
+
+  add_executable(parseandstatcompetition parseandstatcompetition.cpp)
+  target_link_libraries(parseandstatcompetition competition-core)
+
+  add_executable(parsingcompetition parsingcompetition.cpp)
+  target_link_libraries(parsingcompetition competition-core)
+
+  add_executable(allparsingcompetition parsingcompetition.cpp)
+  target_link_libraries(allparsingcompetition competition-all)
+  target_compile_definitions(allparsingcompetition PRIVATE ALLPARSER)
+endif()

 if (TARGET benchmark::benchmark)
  link_libraries(benchmark::benchmark)
  add_executable(bench_parse_call bench_parse_call.cpp)
  add_executable(bench_dom_api bench_dom_api.cpp)
-  if(SIMDJSON_EXCEPTIONS)
-    add_executable(bench_ondemand bench_ondemand.cpp)
-    if(TARGET yyjson)
-      target_link_libraries(bench_ondemand PRIVATE yyjson)
-    endif()
-    if(TARGET rapidjson)
-      target_link_libraries(bench_ondemand PRIVATE rapidjson)
-    endif()
-    if(TARGET sajson)
-      target_link_libraries(bench_ondemand PRIVATE sajson)
-    endif()
-    if(TARGET nlohmann_json)
-      target_link_libraries(bench_ondemand PRIVATE nlohmann_json)
-    endif()
-  endif()
+  add_executable(bench_ondemand bench_ondemand.cpp)
 endif()

+include(checkperf.cmake)
@@ -0,0 +1,19 @@
+# From the ROOT, run:
+# docker build -t simdjsonbench -f benchmark/Dockerfile . && docker run --privileged -t simdjsonbench
+FROM gcc:8.3
+
+# # Build latest
+# ENV latest_release=v0.2.1
+# WORKDIR /usr/src/$latest_release/
+# RUN git clone --depth 1 https://github.com/lemire/simdjson/ -b $latest_release .
+# RUN make parse
+
+# # Build master
+# WORKDIR /usr/src/master/
+# RUN git clone --depth 1 https://github.com/lemire/simdjson/ .
+# RUN make parse
+
+# Build the current source
+COPY . /usr/src/current/
+WORKDIR /usr/src/current/
+RUN make checkperf
@@ -1,68 +0,0 @@
-#pragma once
-
-#include "json_benchmark/file_runner.h"
-#include <map>
-#include <string>
-
-namespace amazon_cellphones {
-
-using namespace json_benchmark;
-
-struct brand {
-    double cumulative_rating;
-    uint64_t reviews_count;
-    simdjson_really_inline bool operator==(const brand &other) const {
-        return cumulative_rating == other.cumulative_rating &&
-            reviews_count == other.reviews_count;
-    }
-    simdjson_really_inline bool operator!=(const brand &other) const { return !(*this == other); }
-};
-
-simdjson_unused static std::ostream &operator<<(std::ostream &o, const brand &b) {
-  o << "cumulative_rating: " << b.cumulative_rating << std::endl;
-  o << "reviews_count: " << b.reviews_count << std::endl;
-  return o;
-}
-
-template<typename StringType>
-simdjson_unused static std::ostream &operator<<(std::ostream &o, const std::pair<const StringType, brand> &p) {
-  o << "brand: " << p.first << std::endl;
-	o << p.second;
-  return o;
-}
-
-template<typename I>
-struct runner : public file_runner<I> {
-    std::map<typename I::StringType, brand> result{};
-
-    bool setup(benchmark::State &state) {
-        return this->load_json(state, AMAZON_CELLPHONES_NDJSON);
-    }
-
-    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);
-    }
-
-    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 amazon_cellphones(benchmark::State &state) {
-  run_json_benchmark<runner<I>, runner<simdjson_dom>>(state);
-}
-
-}   // namespace amazon_cellphones
@@ -1,44 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "amazon_cellphones.h"
-
-namespace amazon_cellphones {
-
-using namespace simdjson;
-
-struct simdjson_dom {
-  using StringType = std::string;
-
-  dom::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::map<StringType, brand> &result) {
-    auto stream = parser.parse_many(json);
-    auto i = stream.begin();
-    ++i;  // Skip first line
-    for (;i != stream.end(); ++i) {
-      auto doc = *i;
-      StringType copy(std::string_view(doc.at(1)));
-      auto x = result.find(copy);
-      if (x == result.end()) {  // If key not found, add new key
-        result.emplace(copy, amazon_cellphones::brand{
-          double(doc.at(5)) * uint64_t(doc.at(7)),
-          uint64_t(doc.at(7))
-        });
-      } else {  // Otherwise, update key data
-        x->second.cumulative_rating += double(doc.at(5)) * uint64_t(doc.at(7));
-        x->second.reviews_count += uint64_t(doc.at(7));
-      }
-    }
-
-    return true;
-  }
-
-};
-
-BENCHMARK_TEMPLATE(amazon_cellphones, simdjson_dom)->UseManualTime();
-
-} // namespace amazon_cellphones
-
-#endif // SIMDJSON_EXCEPTIONS
@@ -1,65 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "amazon_cellphones.h"
-
-namespace amazon_cellphones {
-
-using namespace simdjson;
-
-struct simdjson_ondemand {
-  using StringType = std::string;
-
-  ondemand::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::map<StringType, brand> &result) {
-    ondemand::document_stream stream = parser.iterate_many(json);
-    ondemand::document_stream::iterator i = stream.begin();
-    ++i;  // Skip first line
-    for (;i != stream.end(); ++i) {
-      auto doc = *i;
-      size_t index{0};
-      StringType copy;
-      double rating;
-      uint64_t reviews;
-      for ( auto value : doc ) {
-        switch (index)
-        {
-        case 1:
-          copy = StringType(std::string_view(value));
-          break;
-        case 5:
-          rating = double(value);
-          break;
-        case 7:
-          reviews = uint64_t(value);
-          break;
-        default:
-          break;
-        }
-        index++;
-      }
-
-      auto x = result.find(copy);
-      if (x == result.end()) {  // If key not found, add new key
-        result.emplace(copy, amazon_cellphones::brand{
-          rating * reviews,
-          reviews
-        });
-      } else {  // Otherwise, update key data
-        x->second.cumulative_rating += rating * reviews;
-        x->second.reviews_count += reviews;
-      }
-    }
-
-    return true;
-  }
-
-};
-
-BENCHMARK_TEMPLATE(amazon_cellphones, simdjson_ondemand)->UseManualTime();
-
-} // namespace amazon_cellphones
-
-#endif // SIMDJSON_EXCEPTIONS
@@ -1,5 +1,4 @@
 #include <benchmark/benchmark.h>
-#include <iostream>
 #include "simdjson.h"
 #include <sstream>

@@ -9,8 +8,8 @@ using namespace std;

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

-static const char *TWITTER_JSON = SIMDJSON_BENCHMARK_DATA_DIR "twitter.json";
-static const char *NUMBERS_JSON = SIMDJSON_BENCHMARK_DATA_DIR "numbers.json";
+const char *TWITTER_JSON = SIMDJSON_BENCHMARK_DATA_DIR "twitter.json";
+const char *NUMBERS_JSON = SIMDJSON_BENCHMARK_DATA_DIR "numbers.json";

 static void recover_one_string(State& state) {
  dom::parser parser;
@@ -88,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;
@@ -140,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
@@ -212,7 +211,7 @@ static void numbers_scan(State& state) {
    }
    benchmark::DoNotOptimize(container.data());
    benchmark::ClobberMemory();
-  }
+  }  
 }
 BENCHMARK(numbers_scan);

@@ -237,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);

@@ -316,7 +315,7 @@ static void numbers_load_scan(State& state) {
    }
    benchmark::DoNotOptimize(container.data());
    benchmark::ClobberMemory();
-  }
+  }  
 }
 BENCHMARK(numbers_load_scan);

@@ -342,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);

@@ -361,7 +360,7 @@ static void numbers_exceptions_scan(State& state) {
    }
    benchmark::DoNotOptimize(container.data());
    benchmark::ClobberMemory();
-  }
+  }  
 }
 BENCHMARK(numbers_exceptions_scan);

@@ -379,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);

@@ -438,7 +437,7 @@ static void numbers_exceptions_load_scan(State& state) {
    }
    benchmark::DoNotOptimize(container.data());
    benchmark::ClobberMemory();
-  }
+  }  
 }
 BENCHMARK(numbers_exceptions_load_scan);

@@ -457,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);

@@ -473,7 +472,6 @@ static void twitter_count(State& state) {
 }
 BENCHMARK(twitter_count);

-#ifndef SIMDJSON_DISABLE_DEPRECATED_API
 SIMDJSON_PUSH_DISABLE_WARNINGS
 SIMDJSON_DISABLE_DEPRECATED_WARNING
 static void iterator_twitter_count(State& state) {
@@ -493,7 +491,6 @@ static void iterator_twitter_count(State& state) {
 }
 BENCHMARK(iterator_twitter_count);
 SIMDJSON_POP_DISABLE_WARNINGS
-#endif // SIMDJSON_DISABLE_DEPRECATED_API

 static void twitter_default_profile(State& state) {
  // Count unique users with a default profile.
@@ -504,7 +501,7 @@ static void twitter_default_profile(State& state) {
    for (dom::object tweet : doc["statuses"]) {
      dom::object user = tweet["user"];
      if (user["default_profile"]) {
-        default_users.emplace(user["screen_name"]);
+        default_users.insert(user["screen_name"]);
      }
    }
    if (default_users.size() != 86) { return; }
@@ -523,8 +520,8 @@ static void twitter_image_sizes(State& state) {
      dom::array media;
      if (not (error = tweet["entities"]["media"].get(media))) {
        for (dom::object image : media) {
-          for (auto size : image["sizes"].get_object()) {
-             image_sizes.emplace(size.value["w"], size.value["h"]);
+          for (auto size : image["sizes"].get<dom::object>()) {
+            image_sizes.insert({ size.value["w"], size.value["h"] });
          }
        }
      }
@@ -578,11 +575,8 @@ static void error_code_twitter_default_profile(State& state) noexcept {
 }
 BENCHMARK(error_code_twitter_default_profile);

-#ifndef SIMDJSON_DISABLE_DEPRECATED_API
-
 SIMDJSON_PUSH_DISABLE_WARNINGS
 SIMDJSON_DISABLE_DEPRECATED_WARNING
-
 static void iterator_twitter_default_profile(State& state) {
  // Count unique users with a default profile.
  padded_string json;
@@ -608,7 +602,7 @@ static void iterator_twitter_default_profile(State& state) {

            // default_users.insert(user["screen_name"]);
            if (!(iter.move_to_key("screen_name") && iter.is_string())) { return; }
-            default_users.emplace(iter.get_string(), iter.get_string_length());
+            default_users.insert(string_view(iter.get_string(), iter.get_string_length()));
          }
          if (!iter.up()) { return; } // back to user
        }
@@ -621,10 +615,8 @@ static void iterator_twitter_default_profile(State& state) {
    if (default_users.size() != 86) { return; }
  }
 }
-
 SIMDJSON_POP_DISABLE_WARNINGS
 BENCHMARK(iterator_twitter_default_profile);
-#endif // SIMDJSON_DISABLE_DEPRECATED_API

 static void error_code_twitter_image_sizes(State& state) noexcept {
  // Count unique image sizes
@@ -646,7 +638,7 @@ static void error_code_twitter_image_sizes(State& state) noexcept {
            uint64_t width, height;
            if ((error = size.value["w"].get(width))) { return; }
            if ((error = size.value["h"].get(height))) { return; }
-            image_sizes.emplace(width, height);
+            image_sizes.insert({ width, height });
          }
        }
      }
@@ -656,8 +648,6 @@ static void error_code_twitter_image_sizes(State& state) noexcept {
 }
 BENCHMARK(error_code_twitter_image_sizes);

-#ifndef SIMDJSON_DISABLE_DEPRECATED_API
-
 SIMDJSON_PUSH_DISABLE_WARNINGS
 SIMDJSON_DISABLE_DEPRECATED_WARNING
 static void iterator_twitter_image_sizes(State& state) {
@@ -700,7 +690,7 @@ static void iterator_twitter_image_sizes(State& state) {
                    if (!(iter.move_to_key("h")) && !iter.is_integer()) { return; }
                    uint64_t height = iter.get_integer();
                    if (!iter.up()) { return; } // back to size
-                    image_sizes.emplace(width, height);
+                    image_sizes.insert({ width, height });

                  } while (iter.next()); // next size
                  if (!iter.up()) { return; } // back to sizes
@@ -712,7 +702,7 @@ static void iterator_twitter_image_sizes(State& state) {
            if (!iter.up()) { return; } // back to entities
          }
          if (!iter.up()) { return; } // back to status
-        }
+        } 
      } while (iter.next()); // next status
    }

@@ -721,9 +711,6 @@ static void iterator_twitter_image_sizes(State& state) {
 }
 BENCHMARK(iterator_twitter_image_sizes);

-#endif // SIMDJSON_DISABLE_DEPRECATED_API
-
-#ifndef SIMDJSON_DISABLE_DEPRECATED_API
 static void print_json(State& state) noexcept {
  // Prints the number of results in twitter.json
  dom::parser parser;
@@ -740,7 +727,6 @@ static void print_json(State& state) noexcept {
  }
 }
 BENCHMARK(print_json);
-#endif // SIMDJSON_DISABLE_DEPRECATED_API
 SIMDJSON_POP_DISABLE_WARNINGS

-BENCHMARK_MAIN();
+BENCHMARK_MAIN();
@@ -1,92 +1,26 @@
 #include "simdjson.h"
-
+#include <iostream>
+#include <sstream>
+#include <random>
+#include <vector>
 SIMDJSON_PUSH_DISABLE_ALL_WARNINGS
-
-#ifdef SIMDJSON_COMPETITION_YYJSON
-#include "yyjson.h"
-#endif
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-#include "rapidjson/document.h"
-#include "rapidjson/reader.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/writer.h"
-#endif
-
-#ifdef SIMDJSON_COMPETITION_SAJSON
-#include "sajson.h"
-#endif
-
-#ifdef SIMDJSON_COMPETITION_NLOHMANN_JSON
-#include <nlohmann/json.hpp>
-#endif
-
-// This has to be last, for reasons I don't yet understand
 #include <benchmark/benchmark.h>
-
 SIMDJSON_POP_DISABLE_WARNINGS

-#include "amazon_cellphones/simdjson_dom.h"
-#include "amazon_cellphones/simdjson_ondemand.h"
+#include "partial_tweets/ondemand.h"
+#include "partial_tweets/iter.h"
+#include "partial_tweets/dom.h"

-#include "large_amazon_cellphones/simdjson_dom.h"
-#include "large_amazon_cellphones/simdjson_ondemand.h"
+#include "largerandom/ondemand.h"
+#include "largerandom/iter.h"
+#include "largerandom/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/rapidjson_sax.h"
-#include "partial_tweets/nlohmann_json.h"
-#include "partial_tweets/nlohmann_json_sax.h"
+#include "kostya/ondemand.h"
+#include "kostya/iter.h"
+#include "kostya/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/rapidjson_sax.h"
-#include "large_random/nlohmann_json.h"
-#include "large_random/nlohmann_json_sax.h"
+#include "distinctuserid/ondemand.h"
+#include "distinctuserid/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/rapidjson_sax.h"
-#include "kostya/nlohmann_json.h"
-#include "kostya/nlohmann_json_sax.h"
-
-#include "distinct_user_id/simdjson_dom.h"
-#include "distinct_user_id/simdjson_dom_json_pointer.h"
-#include "distinct_user_id/simdjson_ondemand.h"
-#include "distinct_user_id/simdjson_ondemand_json_pointer.h"
-#include "distinct_user_id/yyjson.h"
-#include "distinct_user_id/sajson.h"
-#include "distinct_user_id/rapidjson.h"
-#include "distinct_user_id/rapidjson_sax.h"
-#include "distinct_user_id/nlohmann_json.h"
-#include "distinct_user_id/nlohmann_json_sax.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/rapidjson_sax.h"
-#include "find_tweet/nlohmann_json.h"
-#include "find_tweet/nlohmann_json_sax.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/rapidjson_sax.h"
-#include "top_tweet/nlohmann_json.h"
-#include "top_tweet/nlohmann_json_sax.h"

 BENCHMARK_MAIN();
@@ -1,5 +1,4 @@
 #include <benchmark/benchmark.h>
-#include <iostream>
 #include "simdjson.h"
 using namespace simdjson;
 using namespace benchmark;
@@ -11,64 +10,6 @@ const char *GSOC_JSON = SIMDJSON_BENCHMARK_DATA_DIR "gsoc-2018.json";



-
-static void fast_minify_twitter(State& state) {
-  dom::parser parser;
-  padded_string docdata;
-  auto error = padded_string::load(TWITTER_JSON).get(docdata);
-  if(error) {
-      cerr << "could not parse twitter.json" << error << endl;
-      return;
-  }
-  std::unique_ptr<char[]> buffer{new char[docdata.size()]};
-
-  size_t bytes = 0;
-  for (simdjson_unused auto _ : state) {
-    size_t new_length{}; // It will receive the minified length.
-    auto error = simdjson::minify(docdata.data(), docdata.size(), buffer.get(), new_length);
-    bytes += docdata.size();
-    benchmark::DoNotOptimize(error);
-  }
-  // Gigabyte: https://en.wikipedia.org/wiki/Gigabyte
-  state.counters["Gigabytes"] = benchmark::Counter(
-	        double(bytes), benchmark::Counter::kIsRate,
-	        benchmark::Counter::OneK::kIs1000); // For GiB : kIs1024
-  state.counters["docs"] = Counter(double(state.iterations()), benchmark::Counter::kIsRate);
-}
-BENCHMARK(fast_minify_twitter)->Repetitions(10)->ComputeStatistics("max", [](const std::vector<double>& v) -> double {
-    return *(std::max_element(std::begin(v), std::end(v)));
-  })->DisplayAggregatesOnly(true);
-
-
-
-
-static void fast_minify_gsoc(State& state) {
-  dom::parser parser;
-  padded_string docdata;
-  auto error = padded_string::load(GSOC_JSON).get(docdata);
-  if(error) {
-      cerr << "could not parse gsoc-2018.json" << error << endl;
-      return;
-  }
-  std::unique_ptr<char[]> buffer{new char[docdata.size()]};
-
-  size_t bytes = 0;
-  for (simdjson_unused auto _ : state) {
-    size_t new_length{}; // It will receive the minified length.
-    auto error = simdjson::minify(docdata.data(), docdata.size(), buffer.get(), new_length);
-    bytes += docdata.size();
-    benchmark::DoNotOptimize(error);
-  }
-  // Gigabyte: https://en.wikipedia.org/wiki/Gigabyte
-  state.counters["Gigabytes"] = benchmark::Counter(
-	        double(bytes), benchmark::Counter::kIsRate,
-	        benchmark::Counter::OneK::kIs1000); // For GiB : kIs1024
-  state.counters["docs"] = Counter(double(state.iterations()), benchmark::Counter::kIsRate);
-}
-BENCHMARK(fast_minify_gsoc)->Repetitions(10)->ComputeStatistics("max", [](const std::vector<double>& v) -> double {
-    return *(std::max_element(std::begin(v), std::end(v)));
-  })->DisplayAggregatesOnly(true);
-
 static void unicode_validate_twitter(State& state) {
  dom::parser parser;
  padded_string docdata;
@@ -170,7 +111,6 @@ BENCHMARK(parse_gsoc)->Repetitions(10)->ComputeStatistics("max", [](const std::v



-#ifndef SIMDJSON_DISABLE_DEPRECATED_API
 SIMDJSON_PUSH_DISABLE_WARNINGS
 SIMDJSON_DISABLE_DEPRECATED_WARNING
 static void json_parse(State& state) {
@@ -183,8 +123,6 @@ static void json_parse(State& state) {
 }
 SIMDJSON_POP_DISABLE_WARNINGS
 BENCHMARK(json_parse);
-#endif // SIMDJSON_DISABLE_DEPRECATED_API
-
 static void parser_parse_error_code(State& state) {
  dom::parser parser;
  if (parser.allocate(EMPTY_ARRAY.length())) { return; }
@@ -213,7 +151,6 @@ BENCHMARK(parser_parse_exception);

 #endif // SIMDJSON_EXCEPTIONS

-#ifndef SIMDJSON_DISABLE_DEPRECATED_API
 SIMDJSON_PUSH_DISABLE_WARNINGS
 SIMDJSON_DISABLE_DEPRECATED_WARNING
 static void build_parsed_json(State& state) {
@@ -225,8 +162,6 @@ static void build_parsed_json(State& state) {
 SIMDJSON_POP_DISABLE_WARNINGS

 BENCHMARK(build_parsed_json);
-#endif
-
 static void document_parse_error_code(State& state) {
  for (simdjson_unused auto _ : state) {
    dom::parser parser;
@@ -0,0 +1,14 @@
+#include "simdjson.h"
+#include "simdjson.cpp"
+#include <iostream>
+#include <sstream>
+#include <random>
+#include <vector>
+SIMDJSON_PUSH_DISABLE_ALL_WARNINGS
+#include <benchmark/benchmark.h>
+SIMDJSON_POP_DISABLE_WARNINGS
+
+#include "partial_tweets/sax.h"
+#include "largerandom/sax.h"
+
+BENCHMARK_MAIN();
@@ -63,8 +63,8 @@ void print_usage(ostream& out) {
  out << "-s STAGE   - Stop after the given stage." << endl;
  out << "             -s stage1 - Stop after find_structural_bits." << endl;
  out << "             -s all    - Run all stages." << endl;
-  out << "-a ARCH    - Use the parser with the designated architecture (HASWELL, WESTMERE," << endl;
-  out << "             PPC64 or ARM64). By default, detects best supported architecture." << endl;
+  out << "-a ARCH    - Use the parser with the designated architecture (HASWELL, WESTMERE" << endl;
+  out << "             or ARM64). By default, detects best supported architecture." << endl;
 }

 void exit_usage(string message) {
@@ -97,13 +97,13 @@ struct option_struct {
        verbose = true;
        break;
      case 'a': {
-          auto impl = simdjson::get_available_implementations()[optarg];
+          auto impl = simdjson::available_implementations[optarg];
          if(impl && impl->supported_by_runtime_system()) {
-            simdjson::get_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,13 +315,13 @@ struct benchmarker {
    // We always allocate at least 64KB. Smaller allocations may actually be slower under some systems.
    error_code error = parser.allocate(json.size() < 65536 ? 65536 : json.size());
    if (error) {
-      exit_error(string("Unable to allocate_stage ") + to_string(json.size()) + " bytes for the JSON text: " + error_message(error));
+      exit_error(string("Unable to allocate_stage ") + to_string(json.size()) + " bytes for the JSON result: " + error_message(error));
    }
    event_count allocate_count = collector.end();
    allocate_stage << allocate_count;
    // Run it once to get hot buffers
    if(hotbuffers) {
-      auto result = parser.parse(reinterpret_cast<const uint8_t *>(json.data()), json.size());
+      auto result = parser.parse((const uint8_t *)json.data(), json.size());
      if (result.error()) {
        exit_error(string("Failed to parse ") + filename + string(":") + error_message(result.error()));
      }
@@ -331,7 +331,7 @@ struct benchmarker {

    // Stage 1 (find structurals)
    collector.start();
-    error = parser.implementation->stage1(reinterpret_cast<const uint8_t *>(json.data()), json.size(), stage1_mode::regular);
+    error = parser.implementation->stage1((const uint8_t *)json.data(), json.size(), false);
    event_count stage1_count = collector.end();
    stage1 << stage1_count;
    if (error) {
@@ -367,7 +367,7 @@ struct benchmarker {

  void run_loop(size_t iterations) {
    dom::parser parser;
-    auto firstresult = parser.parse(reinterpret_cast<const uint8_t *>(json.data()), json.size());
+    auto firstresult = parser.parse((const uint8_t *)json.data(), json.size());
    if (firstresult.error()) {
      exit_error(string("Failed to parse ") + filename + string(":") + error_message(firstresult.error()));
    }
@@ -375,7 +375,7 @@ struct benchmarker {
    collector.start();
    // some users want something closer to "number of documents per second"
    for(size_t i = 0; i < iterations; i++) {
-      auto result = parser.parse(reinterpret_cast<const uint8_t *>(json.data()), json.size());
+      auto result = parser.parse((const uint8_t *)json.data(), json.size());
      if (result.error()) {
        exit_error(string("Failed to parse ") + filename + string(":") + error_message(result.error()));
      }
@@ -446,7 +446,7 @@ struct benchmarker {

  void print(bool tabbed_output) const {
    if (tabbed_output) {
-      char* filename_copy = reinterpret_cast<char*>(malloc(strlen(filename)+1));
+      char* filename_copy = (char*)malloc(strlen(filename)+1);
      SIMDJSON_PUSH_DISABLE_WARNINGS
      SIMDJSON_DISABLE_DEPRECATED_WARNING // Validated CRT_SECURE safe here
      strcpy(filename_copy, filename);
@@ -5,12 +5,9 @@
 # checkperf-repo: initialize and sync reference repository (first time only)
 # TEST checkperf: runs the actual checkperf test

-option(SIMDJSON_ENABLE_DOM_CHECKPERF "Enable DOM performance comparison with main branch" OFF)
-
-
 # Clone the repository if it's not there
 find_package(Git QUIET)
-if (SIMDJSON_ENABLE_DOM_CHECKPERF AND Git_FOUND AND (GIT_VERSION_STRING VERSION_GREATER  "2.1.4") AND (NOT CMAKE_GENERATOR MATCHES Ninja) AND (NOT MSVC) ) # We use "-C" which requires a recent git
+if (SIMDJSON_IS_UNDER_GIT AND SIMDJSON_GIT AND Git_FOUND AND (GIT_VERSION_STRING VERSION_GREATER  "2.1.4") AND (NOT CMAKE_GENERATOR MATCHES Ninja) ) # We use "-C" which requires a recent git
  message(STATUS "Git is available and it is recent. We are enabling checkperf targets.")
  # sync_git_repository(myrepo ...) creates two targets:
  # myrepo - if the repo does not exist, creates and syncs it against the origin branch
@@ -64,13 +61,7 @@ if (SIMDJSON_ENABLE_DOM_CHECKPERF AND Git_FOUND AND (GIT_VERSION_STRING VERSION_
    OUTPUT ${SIMDJSON_CHECKPERF_DIR}/build/cmake_install.cmake # We make many things but this seems the most cross-platform one we can depend on
    COMMAND
    ${CMAKE_COMMAND} -E env CXX=${CMAKE_CXX_COMPILER} CC=${CMAKE_C_COMPILER}
-    ${CMAKE_COMMAND}
-    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-    -DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-    -DSIMDJSON_COMPETITION=OFF
-    -DSIMDJSON_DEVELOPER_MODE=YES
-    -G ${CMAKE_GENERATOR}
-    ..
+    ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_COMPETITION=OFF -G ${CMAKE_GENERATOR} ..
    WORKING_DIRECTORY ${SIMDJSON_CHECKPERF_DIR}/build
    DEPENDS ${SIMDJSON_CHECKPERF_DIR}/build/CMakeCache.txt
  )
@@ -79,7 +70,7 @@ if (SIMDJSON_ENABLE_DOM_CHECKPERF AND Git_FOUND AND (GIT_VERSION_STRING VERSION_
  if (CMAKE_CONFIGURATION_TYPES)
    set(CHECKPERF_PARSE ${SIMDJSON_CHECKPERF_DIR}/build/benchmark/$<CONFIGURATION>/parse)
  else()
-    set(CHECKPERF_PARSE ${SIMDJSON_CHECKPERF_DIR}/build/benchmark/dom/parse)
+    set(CHECKPERF_PARSE ${SIMDJSON_CHECKPERF_DIR}/build/benchmark/parse)
  endif()
  add_custom_target(
    checkperf-parse ALL # TODO is ALL necessary?
@@ -98,15 +89,13 @@ if (SIMDJSON_ENABLE_DOM_CHECKPERF AND Git_FOUND AND (GIT_VERSION_STRING VERSION_
    # COMMAND ECHO $<TARGET_FILE:perfdiff> \"$<TARGET_FILE:parse> -t ${SIMDJSON_CHECKPERF_ARGS}\" \"${CHECKPERF_PARSE} -t ${SIMDJSON_CHECKPERF_ARGS}\" }
    COMMAND $<TARGET_FILE:perfdiff> $<TARGET_FILE:parse> ${CHECKPERF_PARSE} -H -t ${SIMDJSON_CHECKPERF_ARGS}
  )
-  set_property(TEST checkperf APPEND PROPERTY LABELS per_implementation explicitonly)
+  set_property(TEST checkperf APPEND PROPERTY LABELS per_implementation)
  set_property(TEST checkperf APPEND PROPERTY DEPENDS parse perfdiff ${SIMDJSON_USER_CMAKECACHE})
  set_property(TEST checkperf PROPERTY RUN_SERIAL TRUE)
-  add_dependencies(per_implementation_tests checkperf)
-  add_dependencies(explicitonly_tests checkperf)
 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 ()
@@ -1,53 +0,0 @@
-
-#pragma once
-
-#include "json_benchmark/file_runner.h"
-#include <vector>
-
-namespace distinct_user_id {
-
-using namespace json_benchmark;
-
-template<typename I>
-struct runner : public file_runner<I> {
-  std::vector<uint64_t> result{};
-
-  bool setup(benchmark::State &state) {
-    return this->load_json(state, TWITTER_JSON);
-  }
-
-  bool before_run(benchmark::State &state) {
-    if (!file_runner<I>::before_run(state)) { return false; }
-    result.clear();
-    return true;
-  }
-
-  bool run(benchmark::State &) {
-    return this->implementation.run(this->json, result);
-  }
-
-  bool after_run(benchmark::State &state) {
-    if (!file_runner<I>::after_run(state)) { return false; }
-    std::sort(result.begin(), result.end());
-    auto last = std::unique(result.begin(), result.end());
-    result.erase(last, result.end());
-    return true;
-  }
-
-  template<typename R>
-  bool diff(benchmark::State &state, runner<R> &reference) {
-    return diff_results(state, result, reference.result, diff_flags::NONE);
-  }
-
-  size_t items_per_iteration() {
-    return result.size();
-  }
-};
-
-struct simdjson_dom;
-
-template<typename I> simdjson_really_inline static void distinct_user_id(benchmark::State &state) {
-  run_json_benchmark<runner<I>, runner<simdjson_dom>>(state);
-}
-
-} // namespace distinct_user_id
@@ -1,27 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_NLOHMANN_JSON
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-struct nlohmann_json {
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    auto root = nlohmann::json::parse(json.data(), json.data() + json.size());
-    for (auto tweet : root["statuses"]) {
-      result.push_back(tweet["user"]["id"]);
-      if (tweet.contains("retweeted_status")) {
-        result.push_back(tweet["retweeted_status"]["user"]["id"]);
-      }
-    }
-
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(distinct_user_id, nlohmann_json)->UseManualTime();
-
-} // namespace distinct_user_id
-
-#endif // SIMDJSON_COMPETITION_NLOHMANN_JSON
@@ -1,59 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_NLOHMANN_JSON
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-using json = nlohmann::json;
-
-struct nlohmann_json_sax {
-    struct Handler : json::json_sax_t
-    {
-        std::vector<uint64_t>& result;
-        bool user = false;
-        bool user_id = false;
-        Handler(std::vector<uint64_t> &r) : result(r) { }
-
-        bool key(string_t& val) override {
-            // Assume that valid user/id pairs appear only once in main array of user objects
-            if (user) { // If already found user object, find id key
-                if (val.compare("id") == 0) { user_id = true; }
-            }
-            else if (val.compare("user") == 0) { user = true; } // Otherwise, find user object
-            return true;
-        }
-        bool number_unsigned(number_unsigned_t val) override {
-            if (user_id) {
-                result.emplace_back(val);
-                user = false;
-                user_id = false;
-            }
-            return true;
-        }
-        // Irrelevant events
-        bool null() override { return true; }
-        bool boolean(bool val) override { return true; }
-        bool number_float(number_float_t val, const string_t& s) override { return true; }
-        bool number_integer(number_integer_t val) override { return true; }
-        bool string(string_t& val) override { return true; }
-        bool start_object(std::size_t elements) override { return true; }
-        bool end_object() override { return true; }
-        bool start_array(std::size_t elements) override { return true; }
-        bool end_array() override { return true; }
-        bool binary(json::binary_t& val) override { return true; }
-        bool parse_error(std::size_t position, const std::string& last_token, const json::exception& ex) override { return false; }
-    }; // Handler
-
-    bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-        Handler handler(result);
-        json::sax_parse(json.data(), &handler);
-
-        return true;
-    }
-}; // nlohmann_json_sax
-BENCHMARK_TEMPLATE(distinct_user_id, nlohmann_json_sax)->UseManualTime();
-} // namespace distinct_user_id
-
-#endif // SIMDJSON_COMPETITION_NLOHMANN_JSON
@@ -1,58 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-using namespace rapidjson;
-
-struct rapidjson_base {
-  Document doc{};
-
-  bool run(Document &root, std::vector<uint64_t> &result) {
-    if (root.HasParseError()) { printf("parse error\n"); return false; }
-    if (!root.IsObject()) { printf("root is not an object\n"); return false; }
-    auto statuses = root.FindMember("statuses");
-    if (statuses == root.MemberEnd() || !statuses->value.IsArray()) { printf("statuses is not an array\n"); return false; }
-    for (auto &tweet : statuses->value.GetArray()) {
-      if (!tweet.IsObject()) { return false; }
-      auto user = tweet.FindMember("user");
-      if (user == tweet.MemberEnd() || !user->value.IsObject()) { printf("user is not an object\n"); return false; }
-      auto id = user->value.FindMember("id");
-      if (id == user->value.MemberEnd() || !id->value.IsUint64()) { printf("id is not an int\n"); return false; }
-      result.push_back(id->value.GetUint64());
-
-      auto retweet = tweet.FindMember("retweeted_status");
-      if (retweet != tweet.MemberEnd()) {
-        if (!retweet->value.IsObject()) { printf("retweet is not an object\n"); return false; }
-        user = retweet->value.FindMember("user");
-        if (user == retweet->value.MemberEnd() || !user->value.IsObject()) { printf("rewtweet.user is not an object\n"); return false; }
-        id = user->value.FindMember("id");
-        if (id == user->value.MemberEnd() || !id->value.IsUint64()) { printf("retweet.id is not an int\n"); return false; }
-        result.push_back(id->value.GetUint64());
-      }
-    }
-
-    return true;
-  }
-};
-
-struct rapidjson : rapidjson_base {
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    return rapidjson_base::run(doc.Parse<kParseValidateEncodingFlag>(json.data()), result);
-  }
-};
-BENCHMARK_TEMPLATE(distinct_user_id, rapidjson)->UseManualTime();
-
-struct rapidjson_insitu : rapidjson_base {
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    return rapidjson_base::run(doc.ParseInsitu<kParseValidateEncodingFlag>(json.data()), result);
-  }
-};
-BENCHMARK_TEMPLATE(distinct_user_id, rapidjson_insitu)->UseManualTime();
-
-} // namespace partial_tweets
-
-#endif // SIMDJSON_COMPETITION_RAPIDJSON
@@ -1,61 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-
-#include "distinct_user_id.h"
-#include <string.h>
-namespace distinct_user_id {
-
-using namespace rapidjson;
-
-struct rapidjson_sax {
-    struct Handler {
-        std::vector<uint64_t>& result;
-        bool user = false;
-        bool user_id = false;
-        Handler(std::vector<uint64_t> &r) : result(r) { }
-
-        bool Key(const char* key, SizeType length, bool copy) {
-            // Assume that valid user/id pairs appear only once in main array of user objects
-            if (user) { // If already found user object, find id key
-                if ((length == 2) && memcmp(key,"id",2) == 0) { user_id = true; }
-            }
-            else if ((length == 4) && memcmp(key,"user",4) == 0) { user = true; } // Otherwise, find user object
-            return true;
-        }
-        bool Uint(unsigned i) {     // id values are treated as Uint (not Uint64) by the reader
-            if (user_id) {  // Getting id if previous key was "id" for a user
-                result.emplace_back(i);
-                user_id = false;
-                user = false;
-            }
-            return true;
-        }
-        // Irrelevant events
-        bool Null() { return true; }
-        bool Bool(bool b) { return true; }
-        bool Double(double d) { return true; }
-        bool Int(int i) { return true; }
-        bool Int64(int64_t i) { return true; }
-        bool Uint64(uint64_t i) { return true; }
-        bool RawNumber(const char* str, SizeType length, bool copy) { return true; }
-        bool String(const char* str, SizeType length, bool copy) { return true; }
-        bool StartObject() { return true; }
-        bool EndObject(SizeType memberCount) { return true; }
-        bool StartArray() { return true; }
-        bool EndArray(SizeType elementCount) { return true; }
-    }; // handler
-
-    bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-        Reader reader;
-        Handler handler(result);
-        InsituStringStream ss(json.data());
-        reader.Parse<kParseInsituFlag | kParseValidateEncodingFlag | kParseFullPrecisionFlag>(ss,handler);
-        return true;
-    }
-
-}; // rapid_jason_sax
-BENCHMARK_TEMPLATE(distinct_user_id, rapidjson_sax)->UseManualTime();
-} // namespace distinct_user_id
-
-#endif // SIMDJSON_COMPETITION_RAPIDJSON
@@ -1,80 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_SAJSON
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-struct sajson {
-  size_t ast_buffer_size{0};
-  size_t *ast_buffer{nullptr};
-  simdjson_really_inline std::string_view get_string_view(const ::sajson::value &obj, std::string_view key) {
-    auto val = obj.get_value_of_key({key.data(), key.length()});
-    if (val.get_type() != ::sajson::TYPE_STRING) { throw "field is not a string"; }
-    return { val.as_cstring(), val.get_string_length() };
-  }
-  simdjson_really_inline uint64_t get_str_uint64(const ::sajson::value &obj, std::string_view key) {
-    // Since sajson only supports 53-bit numbers, and IDs in twitter.json can be > 53 bits, we read the corresponding id_str and parse that.
-    auto val = obj.get_value_of_key({key.data(), key.length()});
-    if (val.get_type() != ::sajson::TYPE_STRING) { throw "field not a string"; }
-    auto str = val.as_cstring();
-    char *endptr;
-    uint64_t result = strtoull(str, &endptr, 10);
-    if (endptr != &str[val.get_string_length()]) { throw "field is a string, but not an integer string"; }
-    return result;
-  }
-
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    using namespace sajson;
-    if (!ast_buffer) {
-      ast_buffer_size = json.size();
-      ast_buffer = (size_t *)std::malloc(ast_buffer_size * sizeof(size_t));
-    }
-    auto doc = parse(
-      bounded_allocation(ast_buffer, ast_buffer_size),
-      mutable_string_view(json.size(), json.data())
-    );
-    if (!doc.is_valid()) { return false; }
-
-    auto root = doc.get_root();
-    if (root.get_type() != TYPE_OBJECT) { return false; }
-    auto statuses = root.get_value_of_key({"statuses", strlen("statuses")});
-    if (statuses.get_type() != TYPE_ARRAY) { return false; }
-
-    for (size_t i=0; i<statuses.get_length(); i++) {
-      auto tweet = statuses.get_array_element(i);
-
-      // get tweet.user.id
-      if (tweet.get_type() != TYPE_OBJECT) { return false; }
-      auto user = tweet.get_value_of_key({"user", strlen("user")});
-      if (user.get_type() != TYPE_OBJECT) { return false; }
-      result.push_back(get_str_uint64(user, "id_str"));
-
-      // get tweet.retweeted_status.user.id
-      auto retweet = tweet.get_value_of_key({"retweeted_status", strlen("retweeted_status")});
-      switch (retweet.get_type()) {
-        case TYPE_OBJECT: {
-          auto retweet_user = retweet.get_value_of_key({"user", strlen("user")});
-          if (retweet_user.get_type() != TYPE_OBJECT) { return false; }
-          result.push_back(get_str_uint64(retweet_user, "id_str"));
-          break;
-        }
-        // TODO distinguish null and missing. null is bad. missing is fine.
-        case TYPE_NULL:
-          break;
-        default:
-          return false;
-      }
-    }
-
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(distinct_user_id, sajson)->UseManualTime();
-
-} // namespace distinct_user_id
-
-#endif // SIMDJSON_COMPETITION_SAJSON
-
@@ -1,36 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-using namespace simdjson;
-
-struct simdjson_dom {
-  dom::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    // Walk the document, parsing as we go
-    auto doc = parser.parse(json);
-    for (dom::object tweet : doc["statuses"]) {
-      // We believe that all statuses have a matching
-      // user, and we are willing to throw when they do not.
-      result.push_back(tweet["user"]["id"]);
-      // Not all tweets have a "retweeted_status", but when they do
-      // we want to go and find the user within.
-      auto retweet = tweet["retweeted_status"];
-      if (retweet.error() != NO_SUCH_FIELD) {
-        result.push_back(retweet["user"]["id"]);
-      }
-    }
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(distinct_user_id, simdjson_dom)->UseManualTime();
-
-} // namespace distinct_user_id
-
-#endif // SIMDJSON_EXCEPTIONS
@@ -1,36 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-using namespace simdjson;
-
-struct simdjson_dom_json_pointer {
-  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.at_pointer("/user/id"));
-      // Not all tweets have a "retweeted_status", but when they do
-      // we want to go and find the user within.
-      auto retweet_id = tweet.at_pointer("/retweeted_status/user/id");
-      if (retweet_id.error() != NO_SUCH_FIELD) {
-        result.push_back(retweet_id);
-      }
-    }
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(distinct_user_id, simdjson_dom_json_pointer)->UseManualTime();
-
-} // namespace distinct_user_id
-
-#endif // SIMDJSON_EXCEPTIONS
@@ -1,37 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-using namespace simdjson;
-
-struct simdjson_ondemand {
-  ondemand::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    // Walk the document, parsing as we go
-    auto doc = parser.iterate(json);
-    for (ondemand::object tweet : doc.find_field("statuses")) {
-      // We believe that all statuses have a matching
-      // user, and we are willing to throw when they do not.
-      result.push_back(tweet.find_field("user").find_field("id"));
-      // Not all tweets have a "retweeted_status", but when they do
-      // we want to go and find the user within.
-      auto retweet = tweet.find_field("retweeted_status");
-      if (!retweet.error()) {
-        result.push_back(retweet.find_field("user").find_field("id"));
-      }
-    }
-
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(distinct_user_id, simdjson_ondemand)->UseManualTime();
-
-} // namespace distinct_user_id
-
-#endif // SIMDJSON_EXCEPTIONS
@@ -1,37 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-using namespace simdjson;
-
-struct simdjson_ondemand_json_pointer {
-  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.at_pointer("/user/id"));
-      // Not all tweets have a "retweeted_status", but when they do
-      // we want to go and find the user within.
-      auto retweet_id = tweet.at_pointer("/retweeted_status/user/id");
-      if (retweet_id.error() != NO_SUCH_FIELD) {
-        result.push_back(retweet_id);
-      }
-    }
-
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(distinct_user_id, simdjson_ondemand_json_pointer)->UseManualTime();
-
-} // namespace distinct_user_id
-
-#endif // SIMDJSON_EXCEPTIONS
@@ -1,61 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_YYJSON
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-struct yyjson_base {
-  bool run(yyjson_doc *doc, std::vector<uint64_t> &result) {
-    if (!doc) { return false; }
-    yyjson_val *root = yyjson_doc_get_root(doc);
-    if (!yyjson_is_obj(root)) { return false; }
-    yyjson_val *statuses = yyjson_obj_get(root, "statuses");
-    if (!yyjson_is_arr(statuses)) { return false; }
-
-    // Walk the document, parsing the tweets as we go
-    size_t tweet_idx, tweets_max;
-    yyjson_val *tweet;
-    yyjson_arr_foreach(statuses, tweet_idx, tweets_max, tweet) {
-      auto user = yyjson_obj_get(tweet, "user");
-      if (!yyjson_is_obj(user)) { return false; }
-      auto id = yyjson_obj_get(user, "id");
-      if (!yyjson_is_uint(id)) { return false; }
-      result.push_back(yyjson_get_uint(id));
-
-      // Not all tweets have a "retweeted_status", but when they do
-      // we want to go and find the user within.
-      auto retweet = yyjson_obj_get(tweet, "retweeted_status");
-      if (retweet) {
-        if (!yyjson_is_obj(retweet)) { return false; }
-        user = yyjson_obj_get(retweet, "user");
-        if (!yyjson_is_obj(user)) { return false; }
-        id = yyjson_obj_get(user, "id");
-        if (!yyjson_is_uint(id)) { return false; }
-        result.push_back(yyjson_get_sint(id));
-      }
-    }
-
-    return true;
-  }
-
-};
-
-struct yyjson : yyjson_base {
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), result);
-  }
-};
-BENCHMARK_TEMPLATE(distinct_user_id, yyjson)->UseManualTime();
-
-struct yyjson_insitu : yyjson_base {
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-    return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), result);
-  }
-};
-BENCHMARK_TEMPLATE(distinct_user_id, yyjson_insitu)->UseManualTime();
-
-} // namespace distinct_user_id
-
-#endif // SIMDJSON_COMPETITION_YYJSON
@@ -0,0 +1,52 @@
+
+#pragma once
+#include <vector>
+#include <cstdint>
+#include "event_counter.h"
+#include "json_benchmark.h"
+
+
+bool equals(const char *s1, const char *s2) { return strcmp(s1, s2) == 0; }
+
+void remove_duplicates(std::vector<int64_t> &v) {
+  std::sort(v.begin(), v.end());
+  auto last = std::unique(v.begin(), v.end());
+  v.erase(last, v.end());
+}
+
+//
+// Interface
+//
+
+namespace distinct_user_id {
+template<typename T> static void DistinctUserID(benchmark::State &state);
+} // namespace 
+
+//
+// Implementation
+//
+
+#include "dom.h"
+
+
+namespace distinct_user_id {
+
+using namespace simdjson;
+
+template<typename T> static void DistinctUserID(benchmark::State &state) {
+  //
+  // Load the JSON file
+  //
+  constexpr const char *TWITTER_JSON = SIMDJSON_BENCHMARK_DATA_DIR "twitter.json";
+  error_code error;
+  padded_string json;
+  if ((error = padded_string::load(TWITTER_JSON).get(json))) {
+    std::cerr << error << std::endl;
+    state.SkipWithError("error loading");
+    return;
+  }
+
+  JsonBenchmark<T, Dom>(state, json);
+}
+
+} // namespace distinct_user_id
@@ -0,0 +1,89 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "distinctuserid.h"
+
+namespace distinct_user_id {
+
+using namespace simdjson;
+
+
+simdjson_really_inline void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::element element);
+void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::array array) {
+  for (auto child : array) {
+    simdjson_recurse(v, child);
+  }
+}
+void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::object object) {
+  for (auto [key, value] : object) {
+    if((key.size() == 4) && (memcmp(key.data(), "user", 4) == 0)) {
+      // we are in an object under the key "user"
+      simdjson::error_code error;
+      simdjson::dom::object child_object;
+      simdjson::dom::object child_array;
+      if (not (error = value.get(child_object))) {
+        for (auto [child_key, child_value] : child_object) {
+          if((child_key.size() == 2) && (memcmp(child_key.data(), "id", 2) == 0)) {
+            int64_t x;
+            if (not (error = child_value.get(x))) {
+              v.push_back(x);
+            }
+          }
+          simdjson_recurse(v, child_value);
+        }
+      } else if (not (error = value.get(child_array))) {
+        simdjson_recurse(v, child_array);
+      }
+      // end of: we are in an object under the key "user"
+    } else {
+      simdjson_recurse(v, value);
+    }
+  }
+}
+simdjson_really_inline void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::element element) {
+  simdjson_unused simdjson::error_code error;
+  simdjson::dom::array array;
+  simdjson::dom::object object;
+  if (not (error = element.get(array))) {
+    simdjson_recurse(v, array);
+  } else if (not (error = element.get(object))) {
+    simdjson_recurse(v, object);
+  }
+}
+
+
+
+
+
+class Dom {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+  simdjson_really_inline const std::vector<int64_t> &Result() { return ids; }
+  simdjson_really_inline size_t ItemCount() { return ids.size(); }
+
+private:
+  dom::parser parser{};
+  std::vector<int64_t> ids{};
+
+};
+void print_vec(const std::vector<int64_t> &v) {
+  for (auto i : v) {
+    std::cout << i << " ";
+  }
+  std::cout << std::endl;
+}
+
+simdjson_really_inline bool Dom::Run(const padded_string &json) {
+  ids.clear();
+  dom::element doc = parser.parse(json);
+  simdjson_recurse(ids, doc);
+  remove_duplicates(ids);
+  return true;
+}
+
+BENCHMARK_TEMPLATE(DistinctUserID, Dom);
+
+} // namespace distinct_user_id
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -0,0 +1,67 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "distinctuserid.h"
+
+namespace distinct_user_id {
+
+using namespace simdjson;
+using namespace simdjson::builtin;
+
+
+class OnDemand {
+public:
+  OnDemand() { 
+    if(!displayed_implementation) {
+      std::cout << "On Demand implementation: " << builtin_implementation()->name() << std::endl; 
+      displayed_implementation = true;
+    }
+  } 
+  simdjson_really_inline bool Run(const padded_string &json);
+  simdjson_really_inline const std::vector<int64_t> &Result() { return ids; }
+  simdjson_really_inline size_t ItemCount() { return ids.size(); }
+
+private:
+  ondemand::parser parser{};
+  std::vector<int64_t> ids{};
+
+  static inline bool displayed_implementation = false;
+};
+
+simdjson_really_inline bool OnDemand::Run(const padded_string &json) {
+  ids.clear();
+  // Walk the document, parsing as we go
+  auto doc = parser.iterate(json);
+  for (ondemand::object tweet : doc["statuses"]) {
+      // We believe that all statuses have a matching
+      // user, and we are willing to throw when they do not:
+      //
+      // You might think that you do not need the braces, but
+      // you do, otherwise you will get the wrong answer. That is
+      // because you can only have one active object or array 
+      // at a time. 
+      {
+        ondemand::object user = tweet["user"];
+        int64_t id = user["id"]; 
+        ids.push_back(id);
+      }
+      // Not all tweets have a "retweeted_status", but when they do 
+      // we want to go and find the user within.
+      auto retweet = tweet["retweeted_status"];
+      if(!retweet.error()) {
+          ondemand::object retweet_content = retweet;
+          ondemand::object reuser = retweet_content["user"];
+          int64_t rid = reuser["id"]; 
+          ids.push_back(rid);
+      }
+  }
+  remove_duplicates(ids);
+  return true;
+}
+
+BENCHMARK_TEMPLATE(DistinctUserID, OnDemand);
+
+} // namespace distinct_user_id
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -0,0 +1,406 @@
+#include "simdjson.h"
+#include <algorithm>
+#include <cstring>
+#include <unistd.h>
+#include <vector>
+
+#include "benchmark.h"
+
+SIMDJSON_PUSH_DISABLE_ALL_WARNINGS
+
+// #define RAPIDJSON_SSE2 // bad for performance
+// #define RAPIDJSON_SSE42 // bad for performance
+#include "rapidjson/document.h"
+#include "rapidjson/reader.h"
+#include "rapidjson/stringbuffer.h"
+#include "rapidjson/writer.h"
+
+#include "sajson.h"
+
+SIMDJSON_POP_DISABLE_WARNINGS
+
+using namespace rapidjson;
+
+bool equals(const char *s1, const char *s2) { return strcmp(s1, s2) == 0; }
+
+void remove_duplicates(std::vector<int64_t> &v) {
+  std::sort(v.begin(), v.end());
+  auto last = std::unique(v.begin(), v.end());
+  v.erase(last, v.end());
+}
+
+void print_vec(const std::vector<int64_t> &v) {
+  for (auto i : v) {
+    std::cout << i << " ";
+  }
+  std::cout << std::endl;
+}
+
+// clang-format off
+
+// simdjson_recurse below can be implemented like so but it is slow:
+/*void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::element element) {
+  error_code error;
+  if (element.is_array()) {
+    dom::array array;
+    error = element.get(array);
+    for (auto child : array) {
+      if (child.is<simdjson::dom::array>() || child.is<simdjson::dom::object>()) {
+        simdjson_recurse(v, child);
+      }
+    }
+  } else if (element.is_object()) {
+    int64_t id;
+    error = element["user"]["id"].get(id);
+    if(!error) {
+      v.push_back(id);
+    }
+    for (auto [key, value] : object) {
+      if (value.is<simdjson::dom::array>() || value.is<simdjson::dom::object>()) {
+        simdjson_recurse(v, value);
+      }
+    }
+  }
+}*/
+// clang-format on
+
+
+simdjson_really_inline void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::element element);
+void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::array array) {
+  for (auto child : array) {
+    simdjson_recurse(v, child);
+  }
+}
+void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::object object) {
+  for (auto [key, value] : object) {
+    if((key.size() == 4) && (memcmp(key.data(), "user", 4) == 0)) {
+      // we are in an object under the key "user"
+      simdjson::error_code error;
+      simdjson::dom::object child_object;
+      simdjson::dom::object child_array;
+      if (not (error = value.get(child_object))) {
+        for (auto [child_key, child_value] : child_object) {
+          if((child_key.size() == 2) && (memcmp(child_key.data(), "id", 2) == 0)) {
+            int64_t x;
+            if (not (error = child_value.get(x))) {
+              v.push_back(x);
+            }
+          }
+          simdjson_recurse(v, child_value);
+        }
+      } else if (not (error = value.get(child_array))) {
+        simdjson_recurse(v, child_array);
+      }
+      // end of: we are in an object under the key "user"
+    } else {
+      simdjson_recurse(v, value);
+    }
+  }
+}
+simdjson_really_inline void simdjson_recurse(std::vector<int64_t> & v, simdjson::dom::element element) {
+  simdjson_unused simdjson::error_code error;
+  simdjson::dom::array array;
+  simdjson::dom::object object;
+  if (not (error = element.get(array))) {
+    simdjson_recurse(v, array);
+  } else if (not (error = element.get(object))) {
+    simdjson_recurse(v, object);
+  }
+}
+
+simdjson_really_inline std::vector<int64_t>
+simdjson_just_dom(simdjson::dom::element doc) {
+  std::vector<int64_t> answer;
+  simdjson_recurse(answer, doc);
+  remove_duplicates(answer);
+  return answer;
+}
+
+simdjson_really_inline std::vector<int64_t>
+simdjson_compute_stats(const simdjson::padded_string &p) {
+  std::vector<int64_t> answer;
+  simdjson::dom::parser parser;
+  simdjson::dom::element doc;
+  auto error = parser.parse(p).get(doc);
+  if (!error) {
+    simdjson_recurse(answer, doc);
+    remove_duplicates(answer);
+  }
+  return answer;
+}
+
+simdjson_really_inline simdjson::error_code
+simdjson_just_parse(const simdjson::padded_string &p) {
+  simdjson::dom::parser parser;
+  return parser.parse(p).error();
+}
+
+void sajson_traverse(std::vector<int64_t> &answer, const sajson::value &node) {
+  using namespace sajson;
+  switch (node.get_type()) {
+  case TYPE_ARRAY: {
+    auto length = node.get_length();
+    for (size_t i = 0; i < length; ++i) {
+      sajson_traverse(answer, node.get_array_element(i));
+    }
+    break;
+  }
+  case TYPE_OBJECT: {
+    auto length = node.get_length();
+    // sajson has O(log n) find_object_key, but we still visit each node anyhow
+    // because we need to visit all values.
+    for (auto i = 0u; i < length; ++i) {
+      auto key = node.get_object_key(i); // expected: sajson::string
+      bool found_user =
+          (key.length() == 4) && (memcmp(key.data(), "user", 4) == 0);
+      if (found_user) {                             // found a user!!!
+        auto user_value = node.get_object_value(i); // get the value
+        if (user_value.get_type() ==
+            TYPE_OBJECT) { // the value should be an object
+          // now we know that we only need one value
+          auto user_value_length = user_value.get_length();
+          auto right_index =
+              user_value.find_object_key(sajson::string("id", 2));
+          if (right_index < user_value_length) {
+            auto v = user_value.get_object_value(right_index);
+            if (v.get_type() == TYPE_INTEGER) { // check that it is an integer
+              answer.push_back(v.get_integer_value()); // record it!
+            } else if (v.get_type() == TYPE_DOUBLE) {
+              answer.push_back((int64_t)v.get_double_value()); // record it!
+            }
+          }
+        }
+      }
+      sajson_traverse(answer, node.get_object_value(i));
+    }
+    break;
+  }
+  case TYPE_NULL:
+  case TYPE_FALSE:
+  case TYPE_TRUE:
+  case TYPE_STRING:
+  case TYPE_DOUBLE:
+  case TYPE_INTEGER:
+    break;
+  default:
+    assert(false && "unknown node type");
+  }
+}
+
+simdjson_really_inline std::vector<int64_t>
+sasjon_just_dom(sajson::document &d) {
+  std::vector<int64_t> answer;
+  sajson_traverse(answer, d.get_root());
+  remove_duplicates(answer);
+  return answer;
+}
+
+simdjson_really_inline std::vector<int64_t>
+sasjon_compute_stats(const simdjson::padded_string &p) {
+  std::vector<int64_t> answer;
+  char *buffer = (char *)malloc(p.size());
+  memcpy(buffer, p.data(), p.size());
+  auto d = sajson::parse(sajson::dynamic_allocation(),
+                         sajson::mutable_string_view(p.size(), buffer));
+  if (!d.is_valid()) {
+    free(buffer);
+    return answer;
+  }
+  sajson_traverse(answer, d.get_root());
+  free(buffer);
+  remove_duplicates(answer);
+  return answer;
+}
+
+simdjson_really_inline bool
+sasjon_just_parse(const simdjson::padded_string &p) {
+  char *buffer = (char *)malloc(p.size());
+  memcpy(buffer, p.data(), p.size());
+  auto d = sajson::parse(sajson::dynamic_allocation(),
+                         sajson::mutable_string_view(p.size(), buffer));
+  bool answer = !d.is_valid();
+  free(buffer);
+  return answer;
+}
+
+void rapid_traverse(std::vector<int64_t> &answer, const rapidjson::Value &v) {
+  switch (v.GetType()) {
+  case kObjectType:
+    for (Value::ConstMemberIterator m = v.MemberBegin(); m != v.MemberEnd();
+         ++m) {
+      bool found_user = (m->name.GetStringLength() == 4) &&
+                        (memcmp(m->name.GetString(), "user", 4) == 0);
+      if (found_user) {
+        const rapidjson::Value &child = m->value;
+        if (child.GetType() == kObjectType) {
+          for (Value::ConstMemberIterator k = child.MemberBegin();
+               k != child.MemberEnd(); ++k) {
+            if (equals(k->name.GetString(), "id")) {
+              const rapidjson::Value &val = k->value;
+              if (val.GetType() == kNumberType) {
+                answer.push_back(val.GetInt64());
+              }
+            }
+          }
+        }
+      }
+      rapid_traverse(answer, m->value);
+    }
+    break;
+  case kArrayType:
+    for (Value::ConstValueIterator i = v.Begin(); i != v.End();
+         ++i) { // v.Size();
+      rapid_traverse(answer, *i);
+    }
+    break;
+  case kNullType:
+  case kFalseType:
+  case kTrueType:
+  case kStringType:
+  case kNumberType:
+  default:
+    break;
+  }
+}
+
+simdjson_really_inline std::vector<int64_t>
+rapid_just_dom(rapidjson::Document &d) {
+  std::vector<int64_t> answer;
+  rapid_traverse(answer, d);
+  remove_duplicates(answer);
+  return answer;
+}
+
+simdjson_really_inline std::vector<int64_t>
+rapid_compute_stats(const simdjson::padded_string &p) {
+  std::vector<int64_t> answer;
+  char *buffer = (char *)malloc(p.size() + 1);
+  memcpy(buffer, p.data(), p.size());
+  buffer[p.size()] = '\0';
+  rapidjson::Document d;
+  d.ParseInsitu<kParseValidateEncodingFlag>(buffer);
+  if (d.HasParseError()) {
+    free(buffer);
+    return answer;
+  }
+  rapid_traverse(answer, d);
+  free(buffer);
+  remove_duplicates(answer);
+  return answer;
+}
+
+simdjson_really_inline bool
+rapid_just_parse(const simdjson::padded_string &p) {
+  char *buffer = (char *)malloc(p.size() + 1);
+  memcpy(buffer, p.data(), p.size());
+  buffer[p.size()] = '\0';
+  rapidjson::Document d;
+  d.ParseInsitu<kParseValidateEncodingFlag>(buffer);
+  bool answer = d.HasParseError();
+  free(buffer);
+  return answer;
+}
+
+int main(int argc, char *argv[]) {
+  bool verbose = false;
+  bool just_data = false;
+
+  int c;
+  while ((c = getopt(argc, argv, "vt")) != -1)
+    switch (c) {
+    case 't':
+      just_data = true;
+      break;
+    case 'v':
+      verbose = true;
+      break;
+    default:
+      abort();
+    }
+  if (optind >= argc) {
+    std::cerr
+        << "Using different parsers, we compute the content statistics of "
+           "JSON documents."
+        << std::endl;
+    std::cerr << "Usage: " << argv[0] << " <jsonfile>" << std::endl;
+    std::cerr << "Or " << argv[0] << " -v <jsonfile>" << std::endl;
+    exit(1);
+  }
+  const char *filename = argv[optind];
+  if (optind + 1 < argc) {
+    std::cerr << "warning: ignoring everything after " << argv[optind + 1]
+              << std::endl;
+  }
+  simdjson::padded_string p;
+  auto error = simdjson::padded_string::load(filename).get(p);
+  if (error) {
+    std::cerr << "Could not load the file " << filename << std::endl;
+    return EXIT_FAILURE;
+  }
+  // Gigabyte: https://en.wikipedia.org/wiki/Gigabyte
+  if (verbose) {
+    std::cout << "Input has ";
+    if (p.size() > 1000 * 1000)
+      std::cout << p.size() / (1000 * 1000) << " MB ";
+    else if (p.size() > 1000)
+      std::cout << p.size() / 1000 << " KB ";
+    else
+      std::cout << p.size() << " B ";
+    std::cout << std::endl;
+  }
+  std::vector<int64_t> s1 = simdjson_compute_stats(p);
+  if (verbose) {
+    printf("simdjson: ");
+    print_vec(s1);
+  }
+  std::vector<int64_t> s2 = rapid_compute_stats(p);
+  if (verbose) {
+    printf("rapid:    ");
+    print_vec(s2);
+  }
+  std::vector<int64_t> s3 = sasjon_compute_stats(p);
+  if (verbose) {
+    printf("sasjon:   ");
+    print_vec(s3);
+  }
+  assert(s1 == s2);
+  assert(s1 == s3);
+  size_t size = s1.size();
+
+  int repeat = 500;
+  size_t volume = p.size();
+  if (just_data) {
+    printf(
+        "name cycles_per_byte cycles_per_byte_err  gb_per_s gb_per_s_err \n");
+  }
+  BEST_TIME("simdjson ", simdjson_compute_stats(p).size(), size, , repeat,
+            volume, !just_data);
+  BEST_TIME("rapid  ", rapid_compute_stats(p).size(), size, , repeat, volume,
+            !just_data);
+  BEST_TIME("sasjon  ", sasjon_compute_stats(p).size(), size, , repeat, volume,
+            !just_data);
+  BEST_TIME("simdjson (just parse)  ", simdjson_just_parse(p), simdjson::error_code::SUCCESS, , repeat,
+            volume, !just_data);
+  BEST_TIME("rapid  (just parse) ", rapid_just_parse(p), false, , repeat,
+            volume, !just_data);
+  BEST_TIME("sasjon (just parse) ", sasjon_just_parse(p), false, , repeat,
+            volume, !just_data);
+  simdjson::dom::parser parser;
+  simdjson::dom::element doc;
+  error = parser.parse(p).get(doc);
+  BEST_TIME("simdjson (just dom)  ", simdjson_just_dom(doc).size(), size,
+            , repeat, volume, !just_data);
+  char *buffer = (char *)malloc(p.size() + 1);
+  buffer[p.size()] = '\0';
+  memcpy(buffer, p.data(), p.size());
+  rapidjson::Document drapid;
+  drapid.ParseInsitu<kParseValidateEncodingFlag>(buffer);
+  BEST_TIME("rapid  (just dom) ", rapid_just_dom(drapid).size(), size, , repeat,
+            volume, !just_data);
+  memcpy(buffer, p.data(), p.size());
+  auto dsasjon = sajson::parse(sajson::dynamic_allocation(),
+                               sajson::mutable_string_view(p.size(), buffer));
+  BEST_TIME("sasjon (just dom) ", sasjon_just_dom(dsasjon).size(), size, ,
+            repeat, volume, !just_data);
+  free(buffer);
+}
@@ -1,16 +0,0 @@
-include_directories( .. ../linux )
-link_libraries(simdjson-windows-headers test-data)
-link_libraries(simdjson)
-
-add_executable(perfdiff perfdiff.cpp)
-add_executable(parse parse.cpp)
-add_executable(parse_stream parse_stream.cpp)
-add_executable(statisticalmodel statisticalmodel.cpp)
-
-add_executable(parse_noutf8validation parse.cpp)
-target_compile_definitions(parse_noutf8validation PRIVATE SIMDJSON_SKIPUTF8VALIDATION)
-add_executable(parse_nonumberparsing parse.cpp)
-target_compile_definitions(parse_nonumberparsing PRIVATE SIMDJSON_SKIPNUMBERPARSING)
-add_executable(parse_nostringparsing parse.cpp)
-target_compile_definitions(parse_nostringparsing PRIVATE SIMDJSON_SKIPSTRINGPARSING)
-include(checkperf.cmake)
@@ -1,40 +0,0 @@
-
-#pragma once
-
-#include "json_benchmark/file_runner.h"
-
-namespace find_tweet {
-
-using namespace json_benchmark;
-
-template<typename I>
-struct runner : public file_runner<I> {
-  typename I::StringType result;
-
-  bool setup(benchmark::State &state) {
-    return this->load_json(state, TWITTER_JSON);
-  }
-
-  bool before_run(benchmark::State &state) {
-    if (!file_runner<I>::before_run(state)) { return false; }
-    result = "";
-    return true;
-  }
-
-  bool run(benchmark::State &) {
-    return this->implementation.run(this->json, 505874901689851904ULL, result);
-  }
-
-  template<typename R>
-  bool diff(benchmark::State &state, runner<R> &reference) {
-    return diff_results(state, result, reference.result, diff_flags::NONE);
-  }
-};
-
-struct simdjson_dom;
-
-template<typename I> simdjson_really_inline static void find_tweet(benchmark::State &state) {
-  run_json_benchmark<runner<I>, runner<simdjson_dom>>(state);
-}
-
-} // namespace find_tweet
@@ -1,29 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_NLOHMANN_JSON
-
-#include "find_tweet.h"
-
-namespace find_tweet {
-
-struct nlohmann_json {
-  using StringType=std::string;
-
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string &result) {
-    auto root = nlohmann::json::parse(json.data(), json.data() + json.size());
-    for (auto tweet : root["statuses"]) {
-      if (tweet["id"] == find_id) {
-        result = tweet["text"];
-        return true;
-      }
-    }
-
-    return false;
-  }
-};
-
-BENCHMARK_TEMPLATE(find_tweet, nlohmann_json)->UseManualTime();
-
-} // namespace find_tweet
-
-#endif // SIMDJSON_COMPETITION_NLOHMANN_JSON
@@ -1,68 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_NLOHMANN_JSON
-
-#include "find_tweet.h"
-
-namespace find_tweet {
-
-using json = nlohmann::json;
-
-struct nlohmann_json_sax {
-    using StringType=std::string;
-
-    struct Handler : json::json_sax_t
-    {
-        bool text_key = false;
-        bool id_key = false;
-        bool found_id = false;
-        uint64_t find_id;
-        std::string &result;
-
-        Handler(std::string &r,uint64_t id): result(r), find_id(id) { }
-
-        // We assume id is found before text
-        bool key(string_t& val) override {
-            if (found_id) { // If have found id, find text key
-                if (val.compare("text") == 0) { text_key = true; }
-            }
-            else if (val.compare("id") == 0) { id_key = true; } // Otherwise, find id key
-            return true;
-        }
-        bool number_unsigned(number_unsigned_t val) override {
-            if (id_key && (val == find_id)) {  // If id key, check if id value matches find_id
-                found_id = true;
-            }
-            return true;
-        }
-        bool string(string_t& val) override {
-            if (text_key) {
-                result = val;
-                return false;   // End parsing
-            }
-            return true;
-        }
-        // Irrelevant events
-        bool null() override { return true; }
-        bool boolean(bool val) override { return true; }
-        bool number_float(number_float_t val, const string_t& s) override { return true; }
-        bool number_integer(number_integer_t val) override { return true; }
-        bool start_object(std::size_t elements) override { return true; }
-        bool end_object() override { return true; }
-        bool start_array(std::size_t elements) override { return true; }
-        bool end_array() override { return true; }
-        bool binary(json::binary_t& val) override { return true; }
-        bool parse_error(std::size_t position, const std::string& last_token, const json::exception& ex) override { return false; }
-    }; // Handler
-
-    bool run(simdjson::padded_string &json, uint64_t find_id, std::string &result) {
-        Handler handler(result,find_id);
-        json::sax_parse(json.data(), &handler);
-
-        return true;
-    }
-}; // nlohmann_json_sax
-BENCHMARK_TEMPLATE(find_tweet, nlohmann_json_sax)->UseManualTime();
-} // namespace find_tweet
-
-#endif // SIMDJSON_COMPETITION_NLOHMANN_JSON
@@ -1,52 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-
-#include "find_tweet.h"
-
-namespace find_tweet {
-
-using namespace rapidjson;
-
-struct rapidjson_base {
-  using StringType=std::string_view;
-
-  Document doc{};
-
-  bool run(Document &root, uint64_t find_id, std::string_view &result) {
-    if (root.HasParseError() || !root.IsObject()) { return false; }
-    auto statuses = root.FindMember("statuses");
-    if (statuses == root.MemberEnd() || !statuses->value.IsArray()) { return false; }
-    for (auto &tweet : statuses->value.GetArray()) {
-      if (!tweet.IsObject()) { return false; }
-      auto id = tweet.FindMember("id");
-      if (id == tweet.MemberEnd() || !id->value.IsUint64()) { return false; }
-      if (id->value.GetUint64() == find_id) {
-        auto text = tweet.FindMember("text");
-        if (text == tweet.MemberEnd() || !text->value.IsString()) { return false; }
-        result = { text->value.GetString(), text->value.GetStringLength() };
-        return true;
-      }
-    }
-
-    return false;
-  }
-};
-
-struct rapidjson : rapidjson_base {
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
-    return rapidjson_base::run(doc.Parse<kParseValidateEncodingFlag>(json.data()), find_id, result);
-  }
-};
-BENCHMARK_TEMPLATE(find_tweet, rapidjson)->UseManualTime();
-
-struct rapidjson_insitu : rapidjson_base {
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
-    return rapidjson_base::run(doc.ParseInsitu<kParseValidateEncodingFlag>(json.data()), find_id, result);
-  }
-};
-BENCHMARK_TEMPLATE(find_tweet, rapidjson_insitu)->UseManualTime();
-
-} // namespace find_tweet
-
-#endif // SIMDJSON_COMPETITION_RAPIDJSON
@@ -1,70 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-
-#include "find_tweet.h"
-#include <string.h>
-
-namespace find_tweet {
-
-using namespace rapidjson;
-
-struct rapidjson_sax {
-using StringType=std::string_view;
-
-struct Handler {
-        bool text_key = false;
-        bool id_key = false;
-        bool found_id = false;
-        uint64_t find_id;
-        std::string_view &result;
-
-        Handler(std::string_view &r,uint64_t id): result(r), find_id(id) { }
-
-        // We assume id is found before text
-        bool Key(const char* key, SizeType length, bool copy) {
-            if (found_id) { // If have found id, find text key
-                if ((length == 4) && (memcmp(key,"text",4) == 0)) { text_key = true; }
-            }
-            else if ((length == 2) && (memcmp(key,"id",2) == 0)) { id_key = true; } // Otherwise, find id key
-            return true;
-        }
-        bool Uint64(uint64_t i) {
-            if (id_key && (i == find_id)) {  // If id key, check if id value matches find_id
-                found_id = true;
-            }
-            return true;
-        }
-        bool String(const char* str, SizeType length, bool copy) {
-            if (text_key) {
-                result = {str,length};
-                return false;   // End parsing
-            }
-            return true;
-        }
-        // Irrelevant events
-        bool Null() { return true; }
-        bool Bool(bool b) { return true; }
-        bool Double(double d) { return true; }
-        bool Int(int i) { return true; }
-        bool Int64(int64_t i) { return true; }
-        bool Uint(unsigned i) { return true; }
-        bool RawNumber(const char* str, SizeType length, bool copy) { return true; }
-        bool StartObject() { return true; }
-        bool EndObject(SizeType memberCount) { return true; }
-        bool StartArray() { return true; }
-        bool EndArray(SizeType elementCount) { return true; }
-    }; // handler
-
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
-        Reader reader;
-        Handler handler(result,find_id);
-        InsituStringStream ss(json.data());
-        reader.Parse<kParseInsituFlag | kParseValidateEncodingFlag | kParseFullPrecisionFlag>(ss,handler);
-        return true;
-    }
-}; // rapidjson_sax
-BENCHMARK_TEMPLATE(find_tweet, rapidjson_sax)->UseManualTime();
-} // namespace find_tweet
-
-#endif // SIMDJSON_COMPETITION_RAPIDJSON
@@ -1,66 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_SAJSON
-
-#include "find_tweet.h"
-
-namespace find_tweet {
-
-struct sajson {
-  using StringType=std::string_view;
-
-  size_t ast_buffer_size{0};
-  size_t *ast_buffer{nullptr};
-  simdjson_really_inline std::string_view get_string_view(const ::sajson::value &obj, std::string_view key) {
-    auto val = obj.get_value_of_key({key.data(), key.length()});
-    if (val.get_type() != ::sajson::TYPE_STRING) { throw "field is not a string"; }
-    return { val.as_cstring(), val.get_string_length() };
-  }
-  simdjson_really_inline uint64_t get_str_uint64(const ::sajson::value &obj, std::string_view key) {
-    // Since sajson only supports 53-bit numbers, and IDs in twitter.json can be > 53 bits, we read the corresponding id_str and parse that.
-    auto val = obj.get_value_of_key({key.data(), key.length()});
-    if (val.get_type() != ::sajson::TYPE_STRING) { throw "field not a string"; }
-    auto str = val.as_cstring();
-    char *endptr;
-    uint64_t result = strtoull(str, &endptr, 10);
-    if (endptr != &str[val.get_string_length()]) { throw "field is a string, but not an integer string"; }
-    return result;
-  }
-
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
-    if (!ast_buffer) {
-      ast_buffer_size = json.size();
-      ast_buffer = (size_t *)std::malloc(ast_buffer_size * sizeof(size_t));
-    }
-    auto doc = ::sajson::parse(
-      ::sajson::bounded_allocation(ast_buffer, ast_buffer_size),
-      ::sajson::mutable_string_view(json.size(), json.data())
-    );
-    if (!doc.is_valid()) { return false; }
-
-    auto root = doc.get_root();
-    if (root.get_type() != ::sajson::TYPE_OBJECT) { printf("a\n"); return false; }
-    auto statuses = root.get_value_of_key({"statuses", strlen("statuses")});
-    if (statuses.get_type() != ::sajson::TYPE_ARRAY) { return false; }
-
-    for (size_t i=0; i<statuses.get_length(); i++) {
-      auto tweet = statuses.get_array_element(i);
-      if (tweet.get_type() != ::sajson::TYPE_OBJECT) { printf("b\n"); return false; }
-      // TODO if there is a way to get the raw string, it might be faster to iota find_id and then
-      // compare it to each id_str, instead of parsing each int and comparing to find_id.
-      if (get_str_uint64(tweet, "id_str") == find_id) {
-        result = get_string_view(tweet, "text");
-        return true;
-      }
-    }
-
-    return false;
-  }
-};
-
-BENCHMARK_TEMPLATE(find_tweet, sajson)->UseManualTime();
-
-} // namespace find_tweet
-
-#endif // SIMDJSON_COMPETITION_SAJSON
-
@@ -1,33 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "find_tweet.h"
-
-namespace find_tweet {
-
-using namespace simdjson;
-
-struct simdjson_dom {
-  using StringType=std::string_view;
-
-  dom::parser parser{};
-
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
-    result = "";
-    auto doc = parser.parse(json);
-    for (auto tweet : doc["statuses"]) {
-      if (uint64_t(tweet["id"]) == find_id) {
-        result = tweet["text"];
-        return true;
-      }
-    }
-    return false;
-  }
-};
-
-BENCHMARK_TEMPLATE(find_tweet, simdjson_dom)->UseManualTime();
-
-} // namespace find_tweet
-
-#endif // SIMDJSON_EXCEPTIONS
@@ -1,33 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "find_tweet.h"
-
-namespace find_tweet {
-
-using namespace simdjson;
-
-struct simdjson_ondemand {
-  using StringType=std::string_view;
-
-  ondemand::parser parser{};
-
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
-    // Walk the document, parsing as we go
-    auto doc = parser.iterate(json);
-    for (auto tweet : doc.find_field("statuses")) {
-      if (uint64_t(tweet.find_field("id")) == find_id) {
-        result = tweet.find_field("text");
-        return true;
-      }
-    }
-    return false;
-  }
-};
-
-BENCHMARK_TEMPLATE(find_tweet, simdjson_ondemand)->UseManualTime();
-
-} // namespace find_tweet
-
-#endif // SIMDJSON_EXCEPTIONS
@@ -1,53 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_YYJSON
-
-#include "find_tweet.h"
-
-namespace find_tweet {
-
-struct yyjson_base {
-  using StringType=std::string_view;
-
-  bool run(yyjson_doc *doc, uint64_t find_id, std::string_view &result) {
-    if (!doc) { return false; }
-    yyjson_val *root = yyjson_doc_get_root(doc);
-    if (!yyjson_is_obj(root)) { return false; }
-    yyjson_val *statuses = yyjson_obj_get(root, "statuses");
-    if (!yyjson_is_arr(statuses)) { return false; }
-
-    // Walk the document, parsing the tweets as we go
-    size_t tweet_idx, tweets_max;
-    yyjson_val *tweet;
-    yyjson_arr_foreach(statuses, tweet_idx, tweets_max, tweet) {
-      if (!yyjson_is_obj(tweet)) { return false; }
-      auto id = yyjson_obj_get(tweet, "id");
-      if (!yyjson_is_uint(id)) { return false; }
-      if (yyjson_get_uint(id) == find_id) {
-        auto text = yyjson_obj_get(tweet, "text");
-        if (yyjson_is_str(id)) { return false; }
-        result = { yyjson_get_str(text), yyjson_get_len(text) };
-        return true;
-      }
-    }
-    return false;
-  }
-};
-
-struct yyjson : yyjson_base {
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
-    return yyjson_base::run(yyjson_read(json.data(), json.size(), 0), find_id, result);
-  }
-};
-BENCHMARK_TEMPLATE(find_tweet, yyjson)->UseManualTime();
-
-struct yyjson_insitu : yyjson_base {
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
-    return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), find_id, result);
-  }
-};
-BENCHMARK_TEMPLATE(find_tweet, yyjson_insitu)->UseManualTime();
-
-} // namespace find_tweet
-
-#endif // SIMDJSON_COMPETITION_YYJSON
@@ -9,7 +9,7 @@ simdjson_never_inline
 double bench(std::string filename, simdjson::padded_string& p) {
  std::chrono::time_point<std::chrono::steady_clock> start_clock =
      std::chrono::steady_clock::now();
-  simdjson::padded_string::load(filename).value_unsafe().swap(p);
+  simdjson::padded_string::load(filename).first.swap(p);
  std::chrono::time_point<std::chrono::steady_clock> end_clock =
      std::chrono::steady_clock::now();
  std::chrono::duration<double> elapsed = end_clock - start_clock;
@@ -29,7 +29,7 @@ int main(int argc, char *argv[]) {
              << std::endl;
  }
  simdjson::padded_string p;
-  bench(filename, p);
+  bench(filename, p); 
  double meanval = 0;
  double maxval = 0;
  double minval = 10000;
@@ -0,0 +1,80 @@
+#pragma once
+
+template<typename B, typename R> static void JsonBenchmark(benchmark::State &state, const simdjson::padded_string &json) {
+  event_collector collector(true);
+  event_aggregate events;
+
+  // Warmup and equality check (make sure the data is right!)
+  B bench;
+  if (!bench.Run(json)) { state.SkipWithError("warmup tweet reading failed"); return; }
+  {
+    R reference;
+    if (!reference.Run(json)) { state.SkipWithError("reference tweet reading failed"); return; }
+    if (bench.Result() != reference.Result()) { state.SkipWithError("results are not the same"); return; }
+  }
+
+  // Run the benchmark
+  for (simdjson_unused auto _ : state) {
+    collector.start();
+
+    if (!bench.Run(json)) { state.SkipWithError("tweet reading failed"); return; }
+
+    events << collector.end();
+  }
+
+  state.SetBytesProcessed(json.size() * state.iterations());
+  state.SetItemsProcessed(bench.ItemCount() * state.iterations());
+  state.counters["best_bytes_per_sec"] = benchmark::Counter(double(json.size()) / events.best.elapsed_sec());
+  state.counters["best_items_per_sec"] = benchmark::Counter(double(bench.ItemCount()) / events.best.elapsed_sec());
+
+  state.counters["docs_per_sec"] = benchmark::Counter(1.0, benchmark::Counter::kIsIterationInvariantRate);
+  state.counters["best_docs_per_sec"] = benchmark::Counter(1.0 / events.best.elapsed_sec());
+
+  if (collector.has_events()) {
+    state.counters["instructions"] = events.instructions();
+    state.counters["cycles"]       = events.cycles();
+    state.counters["branch_miss"]  = events.branch_misses();
+    state.counters["cache_miss"]   = events.cache_misses();
+    state.counters["cache_ref"]    = events.cache_references();
+
+    state.counters["instructions_per_byte"]  = events.instructions() / double(json.size());
+    state.counters["instructions_per_cycle"] = events.instructions() / events.cycles();
+    state.counters["cycles_per_byte"]        = events.cycles()       / double(json.size());
+    state.counters["frequency"]              = benchmark::Counter(events.cycles(), benchmark::Counter::kIsIterationInvariantRate);
+
+    state.counters["best_instructions"] = events.best.instructions();
+    state.counters["best_cycles"]       = events.best.cycles();
+    state.counters["best_branch_miss"]  = events.best.branch_misses();
+    state.counters["best_cache_miss"]   = events.best.cache_misses();
+    state.counters["best_cache_ref"]    = events.best.cache_references();
+
+    state.counters["best_instructions_per_byte"]  = events.best.instructions() / double(json.size());
+    state.counters["best_instructions_per_cycle"] = events.best.instructions() / events.best.cycles();
+    state.counters["best_cycles_per_byte"]        = events.best.cycles()       / double(json.size());
+    state.counters["best_frequency"]              = events.best.cycles()       / events.best.elapsed_sec();
+  }
+  state.counters["bytes"] = benchmark::Counter(double(json.size()));
+  state.counters["items"] = benchmark::Counter(double(bench.ItemCount()));
+
+  // Build the label
+  using namespace std;
+  stringstream label;
+  label << fixed << setprecision(2);
+  label << "[best:";
+  label << " throughput="     << setw(6)  << (double(json.size()) / 1000000000.0     / events.best.elapsed_sec()) << " GB/s";
+  label << " doc_throughput=" << setw(6)  << uint64_t(1.0                            / events.best.elapsed_sec()) << " docs/s";
+
+  if (collector.has_events()) {
+    label << " instructions=" << setw(12) << uint64_t(events.best.instructions())     << setw(0);
+    label << " cycles="       << setw(12) << uint64_t(events.best.cycles())           << setw(0);
+    label << " branch_miss="  << setw(8)  << uint64_t(events.best.branch_misses())    << setw(0);
+    label << " cache_miss="   << setw(8)  << uint64_t(events.best.cache_misses())     << setw(0);
+    label << " cache_ref="    << setw(10) << uint64_t(events.best.cache_references()) << setw(0);
+  }
+
+  label << " items=" << setw(10) << bench.ItemCount() << setw(0);
+  label << " avg_time=" << setw(10) << uint64_t(events.elapsed_ns()) << setw(0) << " ns";
+  label << "]";
+
+  state.SetLabel(label.str());
+}
@@ -1,9 +0,0 @@
-#pragma once
-
-namespace json_benchmark {
-
-static constexpr const char *TWITTER_JSON = SIMDJSON_BENCHMARK_DATA_DIR "twitter.json";
-static constexpr const char *NUMBERS_JSON = SIMDJSON_BENCHMARK_DATA_DIR "numbers.json";
-static constexpr const char *AMAZON_CELLPHONES_NDJSON = SIMDJSON_BENCHMARK_DATA_DIR "amazon_cellphones.ndjson";
-
-}
@@ -1,143 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <map>
-#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<typename T, typename U, typename StringType>
-struct result_differ<std::map<StringType,T>, std::map<StringType,U>> {
-  static bool diff(benchmark::State &state, const std::map<StringType,T> &result, const std::map<StringType,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<typename T, typename U>
-struct result_differ<std::map<std::string_view,T>, std::vector<std::string_view,U>> {
-  static bool diff(benchmark::State &state, const std::map<std::string_view,T> &result, const std::map<std::string_view,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
@@ -1,48 +0,0 @@
-#pragma once
-
-#include "json_benchmark/runner_base.h"
-#include "simdjson.h"
-
-namespace json_benchmark {
-
-template<typename I>
-struct file_runner : public runner_base<I> {
-  simdjson::padded_string original_json{};
-  simdjson::padded_string json{};
-
-  simdjson_warn_unused bool load_json(benchmark::State &state, const char *file) {
-    simdjson::error_code error;
-    if ((error = simdjson::padded_string::load(file).get(original_json))) {
-      std::stringstream err;
-      err << "error loading " << file << ": " << error;
-      state.SkipWithError(err.str().data());
-      return false;
-    }
-    json = simdjson::padded_string(original_json.data(), original_json.size());
-    return true;
-  }
-
-  simdjson_warn_unused bool before_run(benchmark::State &state) {
-    if (!runner_base<I>::after_run(state)) { return false; };
-    // Copy the original json in case we did *in situ* last time
-    std::memcpy(json.data(), original_json.data(), original_json.size());
-    return true;
-  }
-
-  /** Get the total number of bytes processed in each iteration. Used for metrics like bytes/second. */
-  size_t bytes_per_iteration() {
-    return json.size();
-  }
-
-  /** Get the total number of documents processed in each iteration. Used for metrics like documents/second. */
-  size_t documents_per_iteration() {
-    return 1;
-  }
-
-  /** Get the total number of items processed in each iteration. Used for metrics like items/second. */
-  size_t items_per_iteration() {
-    return 1;
-  }
-};
-
-} // namespace json_benchmark
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "diff_results.h"
-
-namespace json_benchmark {
-
-struct point {
-  double x;
-  double y;
-  double z;
-};
-
-template<>
-struct result_differ<point, point> {
-  static bool diff(benchmark::State &state, const point &result, const point &reference, diff_flags flags) {
-    return diff_results(state, result.x, reference.x, flags)
-        && diff_results(state, result.y, reference.y, flags)
-        && diff_results(state, result.z, reference.z, flags);
-  }
-};
-
-static simdjson_unused std::ostream &operator<<(std::ostream &o, const point &p) {
-  return o << p.x << "," << p.y << "," << p.z << std::endl;
-}
-
-} // namespace json_benchmark
@@ -1,107 +0,0 @@
-#pragma once
-
-#include "simdjson.h"
-#include "event_counter.h"
-#include <iostream>
-
-namespace json_benchmark {
-
-void maybe_display_implementation() {
-  static bool displayed_implementation = false;
-  if(!displayed_implementation) {
-    displayed_implementation = true;
-    std::cout << "simdjson::dom implementation:      " << simdjson::get_active_implementation()->name() << std::endl;
-    std::cout << "simdjson::ondemand implementation (stage 1): " << simdjson::get_active_implementation()->name() << std::endl;
-    std::cout << "simdjson::ondemand implementation (stage 2): " << simdjson::builtin_implementation()->name() << std::endl;
-  }
-}
-
-template<typename B, typename R> static void run_json_benchmark(benchmark::State &state) {
-  maybe_display_implementation();
-
-  event_collector collector(true);
-  event_aggregate events;
-
-  // Warmup and equality check (make sure the data is right!)
-  B bench;
-  if (!bench.setup(state)) { return; }
-  if (!bench.before_run(state)) { state.SkipWithError("warmup document before_run failed"); return; }
-  if (!bench.run(state)) { state.SkipWithError("warmup document reading failed"); return; }
-  if (!bench.after_run(state)) { state.SkipWithError("warmup document after_run failed"); return; }
-  {
-    R reference;
-    if (!reference.setup(state)) { return; }
-    if (!reference.before_run(state)) { state.SkipWithError("reference before_run failed"); };
-    if (!reference.run(state)) { state.SkipWithError("reference document reading failed"); return; }
-    if (!reference.after_run(state)) { state.SkipWithError("reference before_run failed"); };
-    if (!bench.diff(state, reference)) { return; }
-  }
-
-  // Run the benchmark
-  for (simdjson_unused auto _ : state) {
-    if (!bench.before_run(state)) { state.SkipWithError("before_run failed"); };
-    collector.start();
-    if (!bench.run(state)) { state.SkipWithError("run failed"); return; }
-    auto event = collector.end();
-    events << event;
-    state.SetIterationTime(event.elapsed_sec());
-    if (!bench.after_run(state)) { state.SkipWithError("after_run failed"); return; };
-  }
-
-  state.SetBytesProcessed(bench.bytes_per_iteration() * state.iterations());
-  state.SetItemsProcessed(bench.items_per_iteration() * state.iterations());
-  state.counters["best_docs_per_sec"] = benchmark::Counter(double(bench.documents_per_iteration()) / events.best.elapsed_sec());
-  state.counters["best_bytes_per_sec"] = benchmark::Counter(double(bench.bytes_per_iteration()) / events.best.elapsed_sec());
-  state.counters["best_items_per_sec"] = benchmark::Counter(double(bench.items_per_iteration()) / events.best.elapsed_sec());
-  state.counters["docs_per_sec"] = benchmark::Counter(double(bench.documents_per_iteration()), benchmark::Counter::kIsIterationInvariantRate);
-
-  if (collector.has_events()) {
-    state.counters["instructions"] = events.instructions();
-    state.counters["cycles"]       = events.cycles();
-    state.counters["branch_miss"]  = events.branch_misses();
-    state.counters["cache_miss"]   = events.cache_misses();
-    state.counters["cache_ref"]    = events.cache_references();
-
-    state.counters["instructions_per_byte"]  = events.instructions() / double(bench.bytes_per_iteration());
-    state.counters["instructions_per_cycle"] = events.instructions() / events.cycles();
-    state.counters["cycles_per_byte"]        = events.cycles()       / double(bench.bytes_per_iteration());
-    state.counters["frequency"]              = benchmark::Counter(events.cycles(), benchmark::Counter::kIsIterationInvariantRate);
-
-    state.counters["best_instructions"] = events.best.instructions();
-    state.counters["best_cycles"]       = events.best.cycles();
-    state.counters["best_branch_miss"]  = events.best.branch_misses();
-    state.counters["best_cache_miss"]   = events.best.cache_misses();
-    state.counters["best_cache_ref"]    = events.best.cache_references();
-
-    state.counters["best_instructions_per_byte"]  = events.best.instructions() / double(bench.bytes_per_iteration());
-    state.counters["best_instructions_per_cycle"] = events.best.instructions() / events.best.cycles();
-    state.counters["best_cycles_per_byte"]        = events.best.cycles()       / double(bench.bytes_per_iteration());
-    state.counters["best_frequency"]              = events.best.cycles()       / events.best.elapsed_sec();
-  }
-  state.counters["bytes"] = benchmark::Counter(double(bench.bytes_per_iteration()));
-  state.counters["items"] = benchmark::Counter(double(bench.items_per_iteration()));
-
-  // Build the label
-  using namespace std;
-  stringstream label;
-  label << fixed << setprecision(2);
-  label << "[BEST:";
-  label << " throughput="     << setw(6)  << (double(bench.bytes_per_iteration()) / 1000000000.0     / events.best.elapsed_sec()) << " GB/s";
-  label << " doc_throughput=" << setw(6)  << uint64_t(bench.documents_per_iteration()                / events.best.elapsed_sec()) << " docs/s";
-
-  if (collector.has_events()) {
-    label << " instructions=" << setw(12) << uint64_t(events.best.instructions())     << setw(0);
-    label << " cycles="       << setw(12) << uint64_t(events.best.cycles())           << setw(0);
-    label << " branch_miss="  << setw(8)  << uint64_t(events.best.branch_misses())    << setw(0);
-    label << " cache_miss="   << setw(8)  << uint64_t(events.best.cache_misses())     << setw(0);
-    label << " cache_ref="    << setw(10) << uint64_t(events.best.cache_references()) << setw(0);
-  }
-
-  label << " items=" << setw(10) << bench.items_per_iteration() << setw(0);
-  label << " avg_time=" << setw(10) << uint64_t(events.elapsed_ns()) << setw(0) << " ns";
-  label << "]";
-
-  state.SetLabel(label.str());
-}
-
-} // namespace json_benchmark
@@ -1,40 +0,0 @@
-#pragma once
-
-#include "constants.h"
-#include "run_json_benchmark.h"
-#include "diff_results.h"
-
-namespace json_benchmark {
-
-//
-// Extend this to create a new type of test (e.g. partial_tweets).
-//
-template<typename I>
-struct runner_base {
-  /** Run once, before all iterations. */
-  simdjson_warn_unused bool setup(benchmark::State &) { return true; }
-
-  /** Run on each iteration. This is what gets benchmarked. */
-  simdjson_warn_unused bool run(benchmark::State &state) {
-    return implementation.run(state);
-  }
-
-  /** Called before each iteration, to clear / set up state. */
-  simdjson_warn_unused bool before_run(benchmark::State &state) { return true; }
-
-  /** Called after each iteration, to tear down / massage state. */
-  simdjson_warn_unused bool after_run(benchmark::State &) { return true; }
-
-  /** Get the total number of bytes processed in each iteration. Used for metrics like bytes/second. */
-  size_t bytes_per_iteration();
-
-  /** Get the total number of documents processed in each iteration. Used for metrics like documents/second. */
-  size_t documents_per_iteration();
-
-  /** Get the total number of items processed in each iteration. Used for metrics like items/second. */
-  size_t items_per_iteration();
-
-  I implementation{};
-};
-
-}
@@ -1,37 +0,0 @@
-#pragma once
-
-#include "runner_base.h"
-#include "simdjson.h"
-
-namespace json_benchmark {
-
-template<typename I>
-struct string_runner : public runner_base<I> {
-  const simdjson::padded_string &original_json;
-  simdjson::padded_string json;
-  string_runner(const simdjson::padded_string &_json) : original_json{_json}, json(original_json.data(), original_json.size()) {}
-
-  simdjson_warn_unused bool before_run(benchmark::State &state) {
-    if (!runner_base<I>::after_run(state)) { return false; };
-    // Copy the original json in case we did *in situ*
-    std::memcpy(json.data(), original_json.data(), original_json.size());
-    return true;
-  }
-
-  /** Get the total number of bytes processed in each iteration. Used for metrics like bytes/second. */
-  size_t bytes_per_iteration() {
-    return json.size();
-  }
-
-  /** Get the total number of documents processed in each iteration. Used for metrics like documents/second. */
-  size_t documents_per_iteration() {
-    return 1;
-  }
-
-  /** Get the total number of items processed in each iteration. Used for metrics like items/second. */
-  size_t items_per_iteration() {
-    return 1;
-  }
-};
-
-} // namespace json_benchmark
@@ -0,0 +1,69 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "kostya.h"
+
+namespace kostya {
+
+using namespace simdjson;
+
+class Dom {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+
+  simdjson_really_inline const std::vector<my_point> &Result() { return container; }
+  simdjson_really_inline size_t ItemCount() { return container.size(); }
+
+private:
+  dom::parser parser{};
+  std::vector<my_point> container{};
+};
+
+simdjson_really_inline bool Dom::Run(const padded_string &json) {
+  container.clear();
+
+  for (auto point : parser.parse(json)["coordinates"]) {
+    container.emplace_back(my_point{point["x"], point["y"], point["z"]});
+  }
+
+  return true;
+}
+
+BENCHMARK_TEMPLATE(Kostya, Dom);
+
+namespace sum {
+
+class Dom {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+
+  simdjson_really_inline my_point &Result() { return sum; }
+  simdjson_really_inline size_t ItemCount() { return count; }
+
+private:
+  dom::parser parser{};
+  my_point sum{};
+  size_t count{};
+};
+
+simdjson_really_inline bool Dom::Run(const padded_string &json) {
+  sum = { 0, 0, 0 };
+  count = 0;
+
+  for (auto coord : parser.parse(json)["coordinates"]) {
+    sum.x += double(coord["x"]);
+    sum.y += double(coord["y"]);
+    sum.z += double(coord["z"]);
+    count++;
+  }
+
+  return true;
+}
+
+BENCHMARK_TEMPLATE(KostyaSum, Dom);
+
+} // namespace sum
+} // namespace kostya
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -0,0 +1,96 @@
+#pragma once
+
+#if SIMDJSON_EXCEPTIONS
+
+#include "kostya.h"
+
+namespace kostya {
+
+using namespace simdjson;
+using namespace simdjson::builtin;
+
+class Iter {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+
+  simdjson_really_inline const std::vector<my_point> &Result() { return container; }
+  simdjson_really_inline size_t ItemCount() { return container.size(); }
+
+private:
+  ondemand::parser parser{};
+  std::vector<my_point> container{};
+
+  simdjson_really_inline simdjson_result<double> first_double(ondemand::json_iterator &iter, const char *key) {
+    if (!iter.start_object() || ondemand::raw_json_string(iter.field_key()) != key || iter.field_value()) { throw "Invalid field"; }
+    return iter.consume_double();
+  }
+
+  simdjson_really_inline simdjson_result<double> next_double(ondemand::json_iterator &iter, const char *key) {
+    if (!iter.has_next_field() || ondemand::raw_json_string(iter.field_key()) != key || iter.field_value()) { throw "Invalid field"; }
+    return iter.consume_double();
+  }
+
+};
+
+simdjson_really_inline bool Iter::Run(const padded_string &json) {
+  container.clear();
+
+  using std::cerr;
+  using std::endl;
+  auto iter = parser.iterate_raw(json).value();
+  if (!iter.start_object() || !iter.find_field_raw("coordinates")) { cerr << "find coordinates field failed" << endl; return false; }
+  if (iter.start_array()) {
+    do {
+      container.emplace_back(my_point{first_double(iter, "x"), next_double(iter, "y"), next_double(iter, "z")});
+      if (iter.skip_container()) { return false; } // Skip the rest of the coordinates object
+    } while (iter.has_next_element());
+  }
+
+  return true;
+}
+
+BENCHMARK_TEMPLATE(Kostya, Iter);
+
+
+namespace sum {
+
+class Iter {
+public:
+  simdjson_really_inline bool Run(const padded_string &json);
+
+  simdjson_really_inline my_point &Result() { return sum; }
+  simdjson_really_inline size_t ItemCount() { return count; }
+
+private:
+  ondemand::parser parser{};
+  my_point sum{};
+  size_t count{};
+};
+
+simdjson_really_inline bool Iter::Run(const padded_string &json) {
+  sum = {0,0,0};
+  count = 0;
+
+  auto iter = parser.iterate_raw(json).value();
+  if (!iter.start_object() || !iter.find_field_raw("coordinates")) { return false; }
+  if (!iter.start_array()) { return false; }
+  do {
+    if (!iter.start_object()   || !iter.find_field_raw("x")) { return false; }
+    sum.x += iter.consume_double();
+    if (!iter.has_next_field() || !iter.find_field_raw("y")) { return false; }
+    sum.y +=  iter.consume_double();
+    if (!iter.has_next_field() || !iter.find_field_raw("z")) { return false; }
+    sum.z +=  iter.consume_double();
+    if (iter.skip_container()) { return false; } // Skip the rest of the coordinates object
+    count++;
+  } while (iter.has_next_element());
+
+  return true;
+}
+
+BENCHMARK_TEMPLATE(KostyaSum, Iter);
+
+} // namespace sum
+} // namespace kostya
+
+#endif // SIMDJSON_EXCEPTIONS
@@ -1,41 +1,18 @@
 #pragma once

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

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

-using namespace json_benchmark;
-
-static const simdjson::padded_string &get_built_json_array();
-
-template<typename I>
-struct runner : public string_runner<I> {
-  std::vector<point> result;
-
-  runner() : string_runner<I>(get_built_json_array()) {}
-
-  bool before_run(benchmark::State &state) {
-    if (!string_runner<I>::before_run(state)) { return false; }
-    result.clear();
-    return true;
-  }
-
-  bool run(benchmark::State &) {
-    return this->implementation.run(this->json, result);
-  }
-
-  template<typename R>
-  bool diff(benchmark::State &state, runner<R> &reference) {
-    return diff_results(state, result, reference.result, I::DiffFlags);
-  }
-
-  size_t items_per_iteration() {
-    return result.size();
-  }
-};
+using namespace simdjson;

 static void append_coordinate(std::default_random_engine &e, std::uniform_real_distribution<> &dis, std::stringstream &myss) {
  using std::endl;
@@ -68,19 +45,51 @@ static std::string build_json_array(size_t N) {
  myss << R"(    "info": "some info")" << endl;
  myss << R"(})" << endl;
  string answer = myss.str();
-  cout << "Creating a source file spanning " << (answer.size() + 512) / 1024 << " KB " << endl;
+  cout << "Creating a source file spanning " << (answer.size() + 512) / 1024 << " KB " << endl;  
  return answer;
 }

-static const simdjson::padded_string &get_built_json_array() {
-  static simdjson::padded_string json = build_json_array(524288);
+static const padded_string &get_built_json_array() {
+  static padded_string json = build_json_array(524288);
  return json;
 }

-struct simdjson_dom;
+struct my_point {
+  double x;
+  double y;
+  double z;
+  simdjson_really_inline bool operator==(const my_point &other) const {
+    return x == other.x && y == other.y && z == other.z;
+  }
+  simdjson_really_inline bool operator!=(const my_point &other) const { return !(*this == other); }
+};

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

 } // namespace kostya
+
+//
+// Implementation
+//
+#include <vector>
+#include "event_counter.h"
+#include "dom.h"
+#include "json_benchmark.h"
+
+namespace kostya {
+
+template<typename T> static void Kostya(benchmark::State &state) {
+  JsonBenchmark<T, Dom>(state, get_built_json_array());
+}
+
+namespace sum {
+template<typename T> static void KostyaSum(benchmark::State &state) {
+  JsonBenchmark<T, Dom>(state, get_built_json_array());
+}
+}
+
+} // namespace kostya
+
+#endif // SIMDJSON_EXCEPTIONS
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel Lemire	2cc3b4c650	Moving it to 0.6.1.	2020-11-03 22:16:07 -05:00
Daniel Lemire	146191d791	Using decimal notation.	2020-11-03 22:09:42 -05:00
Daniel Lemire	80db053be3	Fixing build errors under legacy libc++.	2020-11-03 21:57:23 -05:00