More trimming.

more removal
Removing some targets under MSVC.
2026-06-08 17:27:07 +00:00 · 2021-02-10 18:43:05 -05:00 · 2021-02-10 18:29:01 -05:00 · 2021-02-10 18:05:42 -05:00 · 2021-02-10 17:57:57 -05:00 · 2021-01-28 09:47:45 -05:00
2289 changed files with 335629 additions and 41742 deletions
@@ -15,29 +15,29 @@ environment:
    - job_name: VS2019
      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
+      CMAKE_ARGS: -A %Platform% -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_ENABLE_THREADS=OFF
      CTEST_ARGS: -LE explicitonly
    - job_name: VS2019 (Win32)
      platform: Win32
-      CMAKE_ARGS: -A %Platform%   -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=ON -DSIMDJSON_ENABLE_THREADS=ON # This should be the default. Testing anyway.
+      CMAKE_ARGS: -A %Platform% -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_ENABLE_THREADS=ON # This should be the default. Testing anyway.
      CTEST_ARGS: -LE explicitonly
    - job_name: VS2019 (Win32, No Exceptions)
      platform: Win32
-      CMAKE_ARGS: -A %Platform%   -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=ON -DSIMDJSON_ENABLE_THREADS=ON -DSIMDJSON_EXCEPTIONS=OFF
+      CMAKE_ARGS: -A %Platform% -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_ENABLE_THREADS=ON -DSIMDJSON_EXCEPTIONS=OFF
      CTEST_ARGS: -LE explicitonly
    - job_name: VS2015
      image: Visual Studio 2015
-      CMAKE_ARGS: -A %Platform%   -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_ENABLE_THREADS=OFF
+      CMAKE_ARGS: -A %Platform% -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_ENABLE_THREADS=OFF
      CTEST_ARGS: -LE explicitonly

 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,7 +56,7 @@ 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)
@@ -88,13 +88,13 @@ commands:
    steps:
      - cmake_prep
      - dependency_restore
-      - run: cmake  -DSIMDJSON_DEVELOPER_MODE=ON $CMAKE_FLAGS -DCMAKE_INSTALL_PREFIX:PATH=destination -B build .
+      - run: cmake $CMAKE_FLAGS -DCMAKE_INSTALL_PREFIX:PATH=destination -B build . 
      - dependency_cache # dependencies are produced in the configure step

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

  cmake_test:
    steps:
@@ -129,8 +129,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
@@ -164,60 +164,60 @@ jobs:
  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 -LE explicitonly }
    steps: [ cmake_test ]
  sanitize-clang10:
    description: Build and run tests on clang 10 and AVX 2 with a cmake sanitize build
    executor: clang10
-    environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON -DSIMDJSON_NO_FORCE_INLINING=ON -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    environment: { CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
    steps: [ cmake_test ]
  threadsanitize-gcc10:
    description: Build and run tests on GCC 10 and AVX 2 with a cmake sanitize build
    executor: gcc10
-    environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON -DSIMDJSON_SANITIZE_THREADS=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    environment: { CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE_THREADS=ON, BUILD_FLAGS: "", CTEST_FLAGS: --output-on-failure -LE explicitonly }
    steps: [ cmake_test ]
  threadsanitize-clang10:
    description: Build and run tests on clang 10 and AVX 2 with a cmake sanitize build
    executor: clang10
-    environment: { CMAKE_FLAGS: -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_THREADS=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
    steps: [ cmake_test ]
  # dynamic
  dynamic-gcc10:
    description: Build and run tests on GCC 10 and AVX 2 with a cmake dynamic build
    executor: gcc10
-    environment: { CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON }
+    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 +262,12 @@ jobs:
  sanitize-haswell-gcc10:
    description: Build and run tests on GCC 10 and AVX 2 with a cmake sanitize build
    executor: gcc10
-    environment: {  CXXFLAGS: -march=haswell, CMAKE_FLAGS: -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 -LE explicitonly }
    steps: [ cmake_test ]
  sanitize-haswell-clang10:
    description: Build and run tests on clang 10 and AVX 2 with a cmake sanitize build
    executor: clang10
-    environment: { CXXFLAGS: -march=haswell, CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON  -DSIMDJSON_NO_FORCE_INLINING=ON -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
+    environment: { CXXFLAGS: -march=haswell, CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF -DSIMDJSON_SANITIZE=ON, CTEST_FLAGS: --output-on-failure -LE explicitonly }
    steps: [ cmake_test ]

 workflows:
@@ -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 -LE explicitonly 
+  commands:
+    - scripts/addcmakeppa.sh "$(env -i sh -c '. /etc/os-release; echo $VERSION_CODENAME')"
+    - apt-get install -y g++ cmake gcc git
+    - mkdir build
+    - cd build
+    - cmake $CMAKE_FLAGS ..
+    - 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 -LE explicitonly 
+  commands:
+    - scripts/addcmakeppa.sh "$(env -i sh -c '. /etc/os-release; echo $VERSION_CODENAME')"
+    - apt-get install -y clang++-6.0 cmake git
+    - mkdir build
+    - cd build
+    - cmake $CMAKE_FLAGS ..
+    - cmake --build . $BUILD_FLAGS
+    - ctest $CTEST_FLAGS 
+---
+kind: pipeline
 name: gcc9
 platform: { os: linux, arch: amd64 }
 steps:
@@ -8,7 +50,7 @@ steps:
    CC: gcc
    CXX: g++
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_IMPLEMENTATION=icelake;haswell;westmere;fallback
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=haswell;westmere;fallback
    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
@@ -19,7 +61,6 @@ steps:
    - 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,7 +77,7 @@ steps:
    CC: clang-6.0
    CXX: clang++-6.0
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_IMPLEMENTATION=icelake;haswell;westmere;fallback
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=haswell;westmere;fallback
    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
    - mkdir build
@@ -44,7 +85,6 @@ steps:
    - 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,7 +100,7 @@ steps:
    CC: gcc
    CXX: g++
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
@@ -82,7 +122,7 @@ 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
  commands:
@@ -102,7 +142,7 @@ steps:
    CC: gcc
    CXX: g++
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_IMPLEMENTATION=icelake;haswell;westmere;fallback
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=haswell;westmere;fallback
    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
@@ -113,7 +153,6 @@ steps:
    - 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,7 +168,7 @@ 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
  commands:
@@ -138,7 +177,6 @@ steps:
    - 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
@@ -175,7 +213,7 @@ steps:
    CC: gcc
    CXX: g++
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_IMPLEMENTATION=arm64;fallback
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=arm64;fallback
    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
@@ -199,7 +237,7 @@ steps:
  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
  commands:
@@ -222,7 +260,7 @@ steps:
    CC: gcc
    CXX: g++
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=ON
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=OFF
    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
  commands:
    - echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
@@ -243,7 +281,7 @@ steps:
  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
  commands:
@@ -264,7 +302,7 @@ steps:
  image: gcc:8
  environment:
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_IMPLEMENTATION=arm64;fallback
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_IMPLEMENTATION=arm64;fallback
    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
    CC: gcc
    CXX: g++
@@ -318,7 +356,7 @@ steps:
    CC: clang-9
    CXX: clang++-9
    BUILD_FLAGS: -- -j 4
-    CMAKE_FLAGS: -GNinja -DBUILD_SHARED_LIBS=OFF
+    CMAKE_FLAGS: -GNinja -DSIMDJSON_BUILD_STATIC=ON
    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
    CXXFLAGS: -stdlib=libc++
  commands:
@@ -339,7 +377,7 @@ steps:
    CC: clang-9
    CXX: clang++-9
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=OFF
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
    CXXFLAGS: -stdlib=libc++
  commands:
@@ -360,7 +398,7 @@ steps:
    CC: clang-7
    CXX: clang++-7
    BUILD_FLAGS: -- -j
-    CMAKE_FLAGS: -DBUILD_SHARED_LIBS=OFF
+    CMAKE_FLAGS: -DSIMDJSON_BUILD_STATIC=ON
    CTEST_FLAGS: -j4 --output-on-failure -LE explicitonly
    CXXFLAGS: -stdlib=libc++
  commands:
@@ -406,8 +444,8 @@ steps:
  commands:
    - apt-get -qq update
    - 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,34 +18,19 @@ 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.

@@ -1,6 +1,12 @@
 name: Alpine Linux

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

 jobs:
  ubuntu-build:
@@ -9,8 +15,8 @@ jobs:
      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
        with:
          path: dependencies/.cache
          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
@@ -25,7 +31,7 @@ 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
@@ -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,12 +1,15 @@
 name: Detect trailing whitespace

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

 jobs:
  whitespace:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - name: Remove whitespace and check the diff
        run: |
          set -eu
@@ -37,25 +37,13 @@ jobs:
        chmod +x llvm.sh
        sudo ./llvm.sh $CLANGVERSION

-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v1

-    - uses: actions/cache@v3
+    - uses: actions/cache@v2
      with:
        path: dependencies/.cache
        key: ${{ hashFiles('dependencies/CMakeLists.txt') }}

-    - uses: actions/cache@v3
-      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 +51,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*
@@ -76,7 +70,7 @@ jobs:
      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
@@ -129,11 +123,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 +143,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()
@@ -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@v3
-      - uses: actions/cache@v3
-        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@v3
-      - uses: actions/cache@v3
-        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,68 @@
+name: MinGW32-CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+# 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:
+    if: >-
+      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
+      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
+    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
+
+      - uses: actions/cache@v2
+        with:
+          path: dependencies/.cache
+          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+
+      - name: Setup Windows # This should almost never run if the cache works.
+        if: steps.cache.outputs.cache-hit != 'true'
+        shell: powershell
+        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 acceptance_tests --verbose
+          ctest -L acceptance --output-on-failure
@@ -0,0 +1,74 @@
+name: MinGW64-CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+# 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:
+    if: >-
+      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
+      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
+    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
+
+      - uses: actions/cache@v2
+        with:
+          path: dependencies/.cache
+          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+
+      - name: Setup Windows # This should almost never run if the cache works.
+        if: steps.cache.outputs.cache-hit != 'true'
+        shell: powershell
+        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 acceptance_tests --verbose
+          ctest -L acceptance --output-on-failure
+          cd ..
+          mkdir build64debug
+          cd build64debug
+          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_ENABLE_THREADS=OFF ..
+          cmake --build . --target acceptance_tests --verbose
+          ctest -L acceptance --output-on-failure
@@ -1,7 +1,12 @@
 name: MSYS2-CLANG-CI

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

 jobs:
  windows-mingw:
@@ -15,17 +20,23 @@ jobs:
      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
+            install: mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-clang
+            type: Release
+          - msystem: "MINGW32"
+            install: mingw-w64-i686-cmake mingw-w64-i686-ninja mingw-w64-i686-clang
            type: Release
          - msystem: "MINGW64"
-            install: mingw-w64-x86_64-libxml2 mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-clang
+            install: mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-clang
+            type: Debug
+          - msystem: "MINGW32"
+            install: mingw-w64-i686-cmake mingw-w64-i686-ninja mingw-w64-i686-clang
            type: Debug
    env:
      CMAKE_GENERATOR: Ninja

    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
        with:
          path: dependencies/.cache
          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
@@ -38,6 +49,6 @@ jobs:
        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 -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_DO_NOT_USE_THREADS_NO_MATTER_WHAT=ON ..
          cmake --build . --verbose
          ctest -j4 --output-on-failure -LE explicitonly
@@ -1,6 +1,12 @@
 name: MSYS2-CI

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

 jobs:
  windows-mingw:
@@ -19,15 +25,21 @@ 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@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
        with:
          path: dependencies/.cache
          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
@@ -40,6 +52,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
@@ -32,19 +32,13 @@ jobs:
          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
+            apt-get install -q -y clang-7 libfuzzer-7-dev cmake git wget zip ninja-build
            mkdir -p build ; cd build
            cmake .. -GNinja \
                  -DCMAKE_CXX_COMPILER=clang++$CLANGSUFFIX \
                  -DCMAKE_C_COMPILER=clang$CLANGSUFFIX \
-                  -DBUILD_SHARED_LIBS=OFF \
-                  -DSIMDJSON_DEVELOPER_MODE=ON \
-                  -DSIMDJSON_ENABLE_FUZZING=On \
+                  -DSIMDJSON_BUILD_STATIC=Off \
+                  -DENABLE_FUZZING=On \
                  -DSIMDJSON_COMPETITION=OFF \
                  -DSIMDJSON_GOOGLE_BENCHMARKS=OFF \
                  -DSIMDJSON_DISABLE_DEPRECATED_API=On \
@@ -56,8 +50,8 @@ jobs:
            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
+            wget --quiet https://dl.bintray.com/pauldreik/simdjson-fuzz-corpus/corpus/corpus.tar
+            tar xf corpus.tar && rm corpus.tar
            fuzzernames=$(cmake --build $builddir --target print_all_fuzzernames |tail -n1)
            for fuzzer in $fuzzernames ; do
               exe=$builddir/fuzz/$fuzzer
@@ -15,8 +15,8 @@ jobs:
      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
    runs-on: ubuntu-18.04
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
        with:
          path: dependencies/.cache
          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
@@ -24,6 +24,6 @@ jobs:
        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@v3
-      - uses: actions/cache@v3
-        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,7 +1,12 @@
 name: Ubuntu 18.04 CI (GCC 7) with Thread Sanitizer

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

 jobs:
  ubuntu-build:
@@ -10,8 +15,8 @@ jobs:
      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
    runs-on: ubuntu-18.04
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
        with:
          path: dependencies/.cache
          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
@@ -19,7 +24,7 @@ jobs:
        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  &&
+          cmake  -DSIMDJSON_SANITIZE_THREADS=ON ..  &&
+          cmake --build . --target document_stream_tests --target parse_many_test  &&
          ctest --output-on-failure  -R parse_many_test  &&
          ctest --output-on-failure  -R document_stream_tests
@@ -1,6 +1,12 @@
 name: Ubuntu 18.04 CI (GCC 7)

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

 jobs:
  ubuntu-build:
@@ -9,8 +15,8 @@ jobs:
      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
    runs-on: ubuntu-18.04
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
        with:
          path: dependencies/.cache
          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
@@ -18,7 +24,7 @@ jobs:
        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   &&
          make install  &&
@@ -15,8 +15,8 @@ jobs:
      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
        with:
          path: dependencies/.cache
          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
@@ -24,6 +24,6 @@ jobs:
        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,38 +0,0 @@
-name: Ubuntu 20.04 CI (GCC 8)
-
-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
-    env:
-      CXX: g++-8
-      CC: gcc-8
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Install GCC 8
-        run: sudo apt-get install -y g++-8
-      - 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 .
@@ -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@v3
-      - uses: actions/cache@v3
-        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@v3
-      - uses: actions/cache@v3
-        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@v3
-      - uses: actions/cache@v3
-        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,6 +1,12 @@
 name: Ubuntu 20.04 CI (GCC 9) with Thread Sanitizer

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

 jobs:
  ubuntu-build:
@@ -9,8 +15,8 @@ jobs:
      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
        with:
          path: dependencies/.cache
          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
@@ -18,7 +24,7 @@ jobs:
        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  &&
+          cmake  -DSIMDJSON_SANITIZE_THREADS=ON ..  &&
+          cmake --build . --target document_stream_tests --target parse_many_test  &&
          ctest --output-on-failure  -R parse_many_test  &&
          ctest --output-on-failure  -R document_stream_tests
@@ -1,6 +1,12 @@
 name: Ubuntu 20.04 CI (GCC 9)

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

 jobs:
  ubuntu-build:
@@ -9,25 +15,17 @@ jobs:
      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - 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  -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 .
+          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,25 +0,0 @@
-name: Ubuntu 22.04 CI (CLANG 13)
-
-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@v3
-      - uses: actions/cache@v3
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Install clang++-13
-        run: sudo apt-get install -y clang++-13
-      - name: Use cmake
-        run: |
-          mkdir build &&
-          cd build &&
-          CXX=clang++-13 cmake -DSIMDJSON_DEVELOPER_MODE=ON ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly
@@ -1,25 +0,0 @@
-name: Ubuntu 22.04 CI (GCC 12)
-
-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@v3
-      - uses: actions/cache@v3
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Install gcc12
-        run: sudo apt-get install -y g++-12
-      - name: Use cmake
-        run: |
-          mkdir build &&
-          cd build &&
-          CXX=g++-12 cmake -DSIMDJSON_DEVELOPER_MODE=ON ..  &&
-          cmake --build .   &&
-          ctest -j --output-on-failure -LE explicitonly
@@ -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@v3
-      - uses: actions/cache@v3
-        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,29 @@
+name: VS15-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-vs15
+    runs-on: windows-2016
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - {gen: Visual Studio 15 2017, arch: Win32}
+          - {gen: Visual Studio 15 2017, arch: x64}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Configure
+      run: |
+          mkdir build
+          cd build && cmake -DSIMDJSON_COMPETITION=OFF -G "${{matrix.gen}}" -A ${{matrix.arch}} ..
+    - name: Build
+      run: cmake --build build --config Release --parallel
+    - name: 'Run CTest'
+      run: |
+          cd build
+          ctest -C Release  -LE explicitonly  --output-on-failure 
@@ -0,0 +1,39 @@
+name: VS16-CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  ci:
+    if: >-
+      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
+      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
+    name: windows-vs16
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/cache@v2
+      with:
+        path: dependencies/.cache
+        key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+    - name: 'Run CMake with VS16'
+      uses: lukka/run-cmake@v2
+      with:
+        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
+        buildDirectory: "${{ github.workspace }}/../../_temp/windows"
+        cmakeBuildType: Release   
+        buildWithCMake: true
+        cmakeGenerator: VS16Win64 
+        cmakeAppendedArgs: -DSIMDJSON_COMPETITION=OFF
+        buildWithCMakeArgs: --config Release  
+        
+    - name: 'Run CTest'
+      run: ctest -C Release  -LE explicitonly  --output-on-failure 
+      working-directory: "${{ github.workspace }}/../../_temp/windows"
+  
@@ -0,0 +1,38 @@
+name: VS16-CLANG-CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  ci:
+    if: >-
+      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
+      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
+    name: windows-vs16
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/cache@v2
+      with:
+        path: dependencies/.cache
+        key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+    - name: 'Run CMake with VS16'
+      uses: lukka/run-cmake@v2
+      with:
+        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
+        buildDirectory: "${{ github.workspace }}/../../_temp/windows"
+        cmakeBuildType: Release   
+        buildWithCMake: true
+        cmakeGenerator: VS16Win64 
+        cmakeAppendedArgs:  -T ClangCL -DSIMDJSON_COMPETITION=OFF  -DSIMDJSON_BUILD_STATIC=ON
+        buildWithCMakeArgs: --config Release  
+        
+    - name: 'Run CTest'
+      run: ctest -C Release -LE explicitonly  --output-on-failure 
+      working-directory: "${{ github.workspace }}/../../_temp/windows"
@@ -0,0 +1,39 @@
+name: VS16-Ninja-CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  ci:
+    if: >-
+      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
+      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
+    name: windows-vs16
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/cache@v2
+      with:
+        path: dependencies/.cache
+        key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+    - name: 'Run CMake with VS16'
+      uses: lukka/run-cmake@v2
+      with:
+        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
+        buildDirectory: "${{ github.workspace }}/../../_temp/windows"
+        cmakeBuildType: Release   
+        buildWithCMake: true
+        cmakeGenerator: VS16Win64 
+        cmakeAppendedArgs:  -G Ninja -DSIMDJSON_COMPETITION=OFF   -DSIMDJSON_BUILD_STATIC=ON
+        buildWithCMakeArgs: --config Release  
+        
+    - name: 'Run CTest'
+      run: ctest -C Release  -LE explicitonly  --output-on-failure 
+      working-directory: "${{ github.workspace }}/../../_temp/windows"
+  
@@ -1,30 +1,36 @@
-name: VS17-NoExcept-CI
+name: VS16-NoExcept-CI

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

 jobs:
  ci:
-    name: windows-vs17
+    name: windows-vs16
    runs-on: windows-latest
    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/cache@v3
+    - 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
+    - name: 'Run CMake with VS16'
+      uses: lukka/run-cmake@v2
      with:
        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
        buildDirectory: "${{ github.workspace }}/../../_temp/windows"
-        cmakeBuildType: Release
+        cmakeBuildType: Release   
        buildWithCMake: true
-        cmakeGenerator: VS16Win64
-        cmakeAppendedArgs: -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_DEVELOPER_MODE=ON  -DSIMDJSON_EXCEPTIONS=OFF
-        buildWithCMakeArgs: --config Release
-
+        cmakeGenerator: VS16Win64 
+        cmakeAppendedArgs: -DSIMDJSON_COMPETITION=OFF  -DSIMDJSON_EXCEPTIONS=OFF
+        buildWithCMakeArgs: --config Release  
+        
    - name: 'Run CTest'
-      run: ctest -C Release  -LE explicitonly  --output-on-failure
+      run: ctest -C Release  -LE explicitonly  --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@v3
-       - 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@v3
-    - 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@v3
-    - 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
@@ -97,10 +97,3 @@ objs
 # Generated docs
 /doc/api
 *.orig
-
-# VSCode workspace files
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
@@ -48,18 +48,17 @@ matrix:
        - 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"
+        - SANITIZE="on"
+      compiler: gcc-10-sanitize

    - os: linux
      addons:
@@ -144,20 +143,19 @@ matrix:
        - 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
+    - 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}"
@@ -176,7 +174,7 @@ install:
      export ASAN_OPTIONS="detect_leaks=0";
    fi
  - if [[ "${STATIC}" == "on" ]]; then
-      export CMAKE_FLAGS="${CMAKE_FLAGS} -DBUILD_SHARED_LIBS=OFF";
+      export CMAKE_FLAGS="${CMAKE_FLAGS} -DSIMDJSON_BUILD_STATIC=ON";
    fi
  - export CTEST_FLAGS="-j4 --output-on-failure -LE explicitonly"

@@ -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,101 +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",
-        "*.inc": "cpp",
-        "compare": "cpp",
-        "concepts": "cpp",
-        "variant": "cpp",
-        "__bits": "cpp",
-        "csignal": "cpp",
-        "future": "cpp",
-        "queue": "cpp",
-        "shared_mutex": "cpp",
-        "ranges": "cpp"
-    }
-}
@@ -1,222 +1,71 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.13)

-project(
-    simdjson
-    # The version number is modified by tools/release.py
-    VERSION 2.1.0
-    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 8)
+set(PROJECT_VERSION_PATCH 2)
+set(SIMDJSON_SEMANTIC_VERSION "0.8.2" CACHE STRING "simdjson semantic version")
+set(SIMDJSON_LIB_VERSION "7.0.0" CACHE STRING "simdjson library version")
+set(SIMDJSON_LIB_SOVERSION "7" CACHE STRING "simdjson library soversion")
+set(SIMDJSON_GITHUB_REPOSITORY https://github.com/simdjson/simdjson)

-string(
-    COMPARE EQUAL
-    "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}"
-    is_top_project
-)
+include(GNUInstallDirs)
+include(cmake/simdjson-flags.cmake)
+include(cmake/simdjson-user-cmakecache.cmake)

-# ---- Options, variables ----

-# These version numbers are modified by tools/release.py
-set(SIMDJSON_LIB_VERSION "12.0.0" CACHE STRING "simdjson library version")
-set(SIMDJSON_LIB_SOVERSION "12" CACHE STRING "simdjson library soversion")
+
+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
+#
+add_subdirectory(include)
+add_subdirectory(src)
+add_subdirectory(windows)
+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})

 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)
-
-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)
-
+configure_package_config_file("${PROJECT_SOURCE_DIR}/cmake/simdjson-config.cmake.in"
+      "${PROJECT_BINARY_DIR}/simdjson-config.cmake"
+      INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/simdjson"
+      NO_SET_AND_CHECK_MACRO
+      NO_CHECK_REQUIRED_COMPONENTS_MACRO)
 write_basic_package_version_file(
-    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
-)
-
-#
-# 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(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)
-
-
-
+      "${PROJECT_BINARY_DIR}/simdjson-config-version.cmake"
+      VERSION ${SIMDJSON_SEMANTIC_VERSION}
+      COMPATIBILITY SameMinorVersion)
+install(FILES "${PROJECT_BINARY_DIR}/simdjson-config.cmake"
+              "${PROJECT_BINARY_DIR}/simdjson-config-version.cmake"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/simdjson")
 #
 # Compile tools / tests / benchmarks
 #
-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 +73,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)
@@ -62,14 +62,14 @@ Pull Requests

 Pull requests are always invited. However, we ask that you follow these guidelines:

- It is wise to discuss your ideas first as part of an issue before you start coding. If you omit this step and code first, be prepared to have your code receive scrutiny and be dropped.
- Users should provide a rationale for their changes. Does it improve performance? Does it add a feature? Does it improve maintainability? Does it fix a bug? This must be explicitly stated as part of the pull request. Do not propose changes based on taste or intuition. We do not delegate programming to tools: that some tool suggested a code change is not reason enough to change the code.
+- It is wiser to discuss your ideas first as part of an issue before you start coding. If you omit this step and code first, be prepare to have your code receive scrutiny and be dropped.
+- Users should provide a rationale for their changes. Does it improve performance? Does it add a feature? Does it improve maintainability? Does fix a bug? This must be explicitly stated as part of the pull request. Do not propose changes based on taste or intuition. We do not delegate programming to tools: that some tool suggested a code change is not reason enough to change the code.
   1. When your code improves performance, please document the gains with a benchmark using hard numbers.
-   2. If your code fixes a bug, please either fix a failing test, or propose a new test.
+   2. If your code fixes a bug, please be either fix a failing test, or propose a new test.
   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 by 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.
+- New features must be accompanied of new tests, in general.
+- Your code should pass our continuous-integration tests. It is your responsability to ensure that your proposal pass the tests. We do not merge pull requests that would break our build.
   - An exception to this would be changes to non-code files, such as documentation and assets, or trivial changes to code, such as comments, where it is encouraged to explicitly ask for skipping a CI run using the `[skip ci]` prefix in your Pull Request title **and** in the first line of the most recent commit in a push. Example for such a commit: `[skip ci] Fixed typo in power_of_ten's docs`
   This benefits the project in such a way that the CI pipeline is not burdened by running jobs on changes that don't change any behavior in the code, which reduces wait times for other Pull Requests that do change behavior and require testing.

@@ -36,10 +36,5 @@ Nong Li
 Furkan Taşkale
 Brendan Knapp
 Danila Kutenin
-Pavel Pavlov
-Hao Chen
-Nicolas Boyer
-Kim Walisch and Jatin Bhateja (AVX-512 bitset decoder)
-Fangzheng Zhang and Weiqiang Wan (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 -LE explicitonly"
+#
+# 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         = "2.1.0"
+PROJECT_NUMBER         = "0.8.2"

 # 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
 ------------------------------
@@ -86,19 +74,19 @@ Other important files and directories:
  ```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,7 +168,7 @@ systematically regenerated on releases. To ensure you have the latest code, you
 ```bash
 mkdir build
 cd build
-cmake -D SIMDJSON_DEVELOPER_MODE=ON ..
+cmake ..
 cmake --build . # needed, because currently dependencies do not work fully for the amalgamate target
 cmake --build . --target amalgamate
 ```
@@ -221,31 +209,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
 ```
@@ -281,7 +269,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/2.0.0/index.html)
+[![][license img]][license]  [![Doxygen Documentation](https://img.shields.io/badge/docs-doxygen-green.svg)](https://simdjson.org/api/0.8.0/index.html)

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

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

 * [Quick Start](#quick-start)
+  * [On Demand](#on-demand)
 * [Documentation](#documentation)
 * [Performance results](#performance-results)
 * [Real-world usage](#real-world-usage)
@@ -52,17 +54,13 @@ The simdjson library is easily consumable with a single .h and .cpp file.
   ```
 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`
@@ -70,6 +68,34 @@ int main(void) {
   100 results.
   ```

+### On Demand
+
+The new On Demand JSON parser is just as easy, but much faster due to just-in-time parsing. It is in
+alpha right now. More information can be found in the [On Demand Guide](doc/ondemand.md).
+
+1. Do step 1 of the [Quick Start](#quick-start).
+2. Create `quickstart.cpp`:
+
+   ```c++
+   #include "simdjson.h"
+   using namespace simdjson;
+   int main(void) {
+      ondemand::parser parser;
+      padded_string json = padded_string::load("twitter.json");
+      ondemand::document tweets = parser.iterate(json);
+      std::cout << uint64_t(tweets["search_metadata"]["count"]) << " results." << std::endl;
+   }
+   ```
+3. `c++ -march=native -o quickstart quickstart.cpp simdjson.cpp`
+4. `./quickstart`
+   ```
+   100 results.
+   ```
+
+You'll notice that the code here is very similar to the [main Quick Start code](#quick-start) (and
+indeed, it does the same thing). However, if you compare the performance, you should find On
+Demand much faster.
+
 Documentation
 -------------

@@ -79,31 +105,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.8.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 +180,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 +190,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
@@ -154,13 +205,13 @@ and implementation of simdjson is in our research article:

 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 +235,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,12 +1,20 @@
-add_subdirectory(dom)
-
-
 include_directories( . linux )
 link_libraries(simdjson-windows-headers test-data)
-link_libraries(simdjson)
+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 benchmark::benchmark)
  link_libraries(benchmark::benchmark)
@@ -29,3 +37,4 @@ if (TARGET benchmark::benchmark)
  endif()
 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,73 +0,0 @@
-#pragma once
-
-#include "json_benchmark/file_runner.h"
-#include <map>
-#include <string>
-
-
-namespace amazon_cellphones {
-
-const bool UNTHREADED = false;
-const bool THREADED = true;
-
-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();
-    }
-};
-
-template<bool threaded>
-struct simdjson_dom;
-
-template<typename I> simdjson_really_inline static void amazon_cellphones(benchmark::State &state) {
-  run_json_benchmark<runner<I>, runner<simdjson_dom<UNTHREADED>>>(state);
-}
-
-}   // namespace amazon_cellphones
@@ -1,51 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "amazon_cellphones.h"
-
-namespace amazon_cellphones {
-
-using namespace simdjson;
-
-template<bool threaded>
-struct simdjson_dom {
-  using StringType = std::string;
-
-  dom::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::map<StringType, brand> &result) {
-#ifdef SIMDJSON_THREADS_ENABLED
-    parser.threaded = threaded;
-#endif
-    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<UNTHREADED>)->UseManualTime();
-#ifdef SIMDJSON_THREADS_ENABLED
-BENCHMARK_TEMPLATE(amazon_cellphones, simdjson_dom<THREADED>)->UseManualTime();
-#endif
-
-} // namespace amazon_cellphones
-
-#endif // SIMDJSON_EXCEPTIONS
@@ -1,72 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "amazon_cellphones.h"
-
-namespace amazon_cellphones {
-
-using namespace simdjson;
-
-template<bool threaded>
-struct simdjson_ondemand {
-  using StringType = std::string;
-
-  ondemand::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::map<StringType, brand> &result) {
-#ifdef SIMDJSON_THREADS_ENABLED
-    parser.threaded = threaded;
-#endif
-    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<UNTHREADED>)->UseManualTime();
-#ifdef SIMDJSON_THREADS_ENABLED
-BENCHMARK_TEMPLATE(amazon_cellphones, simdjson_ondemand<THREADED>)->UseManualTime();
-#endif
-
-} // namespace amazon_cellphones
-
-#endif // SIMDJSON_EXCEPTIONS
@@ -1,5 +1,4 @@
 #include <benchmark/benchmark.h>
-#include <iostream>
 #include "simdjson.h"
 #include <sstream>

@@ -523,7 +522,7 @@ 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()) {
+          for (auto size : image["sizes"].get<dom::object>()) {
             image_sizes.emplace(size.value["w"], size.value["h"]);
          }
        }
@@ -25,26 +25,13 @@ SIMDJSON_PUSH_DISABLE_ALL_WARNINGS
 #include <benchmark/benchmark.h>

 SIMDJSON_POP_DISABLE_WARNINGS
-#include "json2msgpack/simdjson_ondemand.h"
-#include "json2msgpack/rapidjson.h"
-#include "json2msgpack/yyjson.h"
-#include "json2msgpack/sajson.h"
-#include "json2msgpack/nlohmann_json.h"
-
-#include "amazon_cellphones/simdjson_dom.h"
-#include "amazon_cellphones/simdjson_ondemand.h"
-
-#include "large_amazon_cellphones/simdjson_dom.h"
-#include "large_amazon_cellphones/simdjson_ondemand.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 "large_random/simdjson_dom.h"
 #include "large_random/simdjson_ondemand.h"
@@ -52,46 +39,34 @@ SIMDJSON_POP_DISABLE_WARNINGS
 #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 "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;
@@ -97,9 +97,9 @@ 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;
+            simdjson::active_implementation = impl;
          } else {
            std::cerr << "implementation " << optarg << " not found or not supported " << std::endl;
          }
@@ -204,13 +204,10 @@ struct feature_benchmarker {
  }
  // Rate of 1-7-structural misses per 8-structural flip
  double struct1_7_miss_rate(BenchmarkStage stage) const {
-#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
-    return 1;
-#else
    if (!has_events()) { return 1; }
    return struct7_miss[stage].best.branch_misses() - struct7[stage].best.branch_misses() / double(struct7_miss.stats->blocks_with_1_structural_flipped);
-#endif
  }
+
  // Extra cost of an 8-15 structural block over a 1-7 structural block
  double struct8_15_cost(BenchmarkStage stage) const {
    return cost_per_block(stage, struct15, struct15.stats->blocks_with_8_structurals, struct7);
@@ -221,12 +218,8 @@ struct feature_benchmarker {
  }
  // Rate of 8-15-structural misses per 8-structural flip
  double struct8_15_miss_rate(BenchmarkStage stage) const {
-#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
-    return 1;
-#else
    if (!has_events()) { return 1; }
    return double(struct15_miss[stage].best.branch_misses() - struct15[stage].best.branch_misses()) / double(struct15_miss.stats->blocks_with_8_structurals_flipped);
-#endif
  }

  // Extra cost of a 16+-structural block over an 8-15 structural block (actual varies based on # of structurals!)
@@ -239,15 +232,10 @@ struct feature_benchmarker {
  }
  // Rate of 16-structural misses per 16-structural flip
  double struct16_miss_rate(BenchmarkStage stage) const {
-#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
-    return 1;
-#else
    if (!has_events()) { return 1; }
    return double(struct23_miss[stage].best.branch_misses() - struct23[stage].best.branch_misses()) / double(struct23_miss.stats->blocks_with_16_structurals_flipped);
-#endif
  }

-
  // Extra cost of having UTF-8 in a block
  double utf8_cost(BenchmarkStage stage) const {
    return cost_per_block(stage, utf8, utf8.stats->blocks_with_utf8, struct7_full);
@@ -258,13 +246,10 @@ struct feature_benchmarker {
  }
  // Rate of UTF-8 misses per UTF-8 flip
  double utf8_miss_rate(BenchmarkStage stage) const {
-#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
-    return 1;
-#else
    if (!has_events()) { return 1; }
    return double(utf8_miss[stage].best.branch_misses() - utf8[stage].best.branch_misses()) / double(utf8_miss.stats->blocks_with_utf8_flipped);
-#endif
  }
+
  // Extra cost of having escapes in a block
  double escape_cost(BenchmarkStage stage) const {
    return cost_per_block(stage, escape, escape.stats->blocks_with_escapes, struct7_full);
@@ -275,15 +260,10 @@ struct feature_benchmarker {
  }
  // Rate of escape misses per escape flip
  double escape_miss_rate(BenchmarkStage stage) const {
-#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
-    return 1;
-#else
    if (!has_events()) { return 1; }
    return double(escape_miss[stage].best.branch_misses() - escape[stage].best.branch_misses()) / double(escape_miss.stats->blocks_with_escapes_flipped);
-#endif
  }

-
  double calc_expected_feature_cost(BenchmarkStage stage, const benchmarker& file) const {
    // Expected base ns/block (empty)
    json_stats& stats = *file.stats;
@@ -320,6 +300,7 @@ struct feature_benchmarker {
  double calc_expected(BenchmarkStage stage, const benchmarker& file) const {
    return calc_expected_feature_cost(stage, file) + calc_expected_miss_cost(stage, file);
  }
+
  void print(const option_struct& options) const {
    printf("\n");
    printf("Features in ns/block (64 bytes):\n");
@@ -378,22 +359,6 @@ struct feature_benchmarker {
  }
 };

-#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
-void print_file_effectiveness(BenchmarkStage stage, const char* filename, const benchmarker& results, const feature_benchmarker& features) {
-  double actual = results[stage].best.elapsed_ns() / double(results.stats->blocks);
-  double calc = features.calc_expected(stage, results);
-  double calc_misses = features.calc_expected_misses(stage, results);
-  double calc_miss_cost = features.calc_expected_miss_cost(stage, results);
-  printf("        | %-8s ", benchmark_stage_name(stage));
-  printf("| %-15s ",   filename);
-  printf("|    %8.3g ", features.calc_expected_feature_cost(stage, results));
-  printf("|    %8.3g ", calc_miss_cost);
-  printf("| %8.3g ",  calc);
-  printf("| %8.3g ",  actual);
-  printf("| %+8.3g ", actual - calc);
-  printf("| %13llu ", (long long unsigned)(calc_misses));
-}
-#else
 void print_file_effectiveness(BenchmarkStage stage, const char* filename, const benchmarker& results, const feature_benchmarker& features) {
  double actual = results[stage].best.elapsed_ns() / double(results.stats->blocks);
  double calc = features.calc_expected(stage, results);
@@ -417,7 +382,6 @@ void print_file_effectiveness(BenchmarkStage stage, const char* filename, const
  }
  printf("|\n");
 }
-#endif

 int main(int argc, char *argv[]) {
  // Read options
@@ -2,7 +2,7 @@
 #define __BENCHMARKER_H

 #include "event_counter.h"
-#include "simdjson.h"
+#include "simdjson.h" // For SIMDJSON_DISABLE_DEPRECATED_WARNINGS

 #include <cassert>
 #include <cctype>
@@ -321,7 +321,7 @@ struct benchmarker {
    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()));
      }
@@ -423,7 +423,7 @@ struct benchmarker {
        stage.instructions() / static_cast<double>(stats->structurals),
        stage.instructions() / static_cast<double>(stage.cycles())
      );
-#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
+
      // NOTE: removed cycles/miss because it is a somewhat misleading stat
      printf("%s%-13s: %7.0f branch misses (%6.2f%%) - %.0f cache misses (%6.2f%%) - %.2f cache references\n",
        prefix,
@@ -434,7 +434,6 @@ struct benchmarker {
        percent(stage.cache_misses(), all_stages_without_allocation.cache_misses()),
        stage.cache_references()
      );
-#endif
    }
  }

@@ -447,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 (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
  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?
@@ -101,8 +92,6 @@ if (SIMDJSON_ENABLE_DOM_CHECKPERF AND Git_FOUND AND (GIT_VERSION_STRING VERSION_
  set_property(TEST checkperf APPEND PROPERTY LABELS per_implementation explicitonly)
  set_property(TEST checkperf APPEND PROPERTY DEPENDS parse perfdiff ${SIMDJSON_USER_CMAKECACHE})
  set_property(TEST checkperf PROPERTY RUN_SERIAL TRUE)
-  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.")
@@ -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
@@ -48,7 +48,7 @@ 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|kParseInsituFlag>(json.data()), result);
+    return rapidjson_base::run(doc.ParseInsitu<kParseValidateEncodingFlag>(json.data()), result);
  }
 };
 BENCHMARK_TEMPLATE(distinct_user_id, rapidjson_insitu)->UseManualTime();
@@ -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
@@ -9,8 +9,6 @@ namespace distinct_user_id {
 struct sajson {
  size_t ast_buffer_size{0};
  size_t *ast_buffer{nullptr};
-  ~sajson() { free(ast_buffer); }
-
  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"; }
@@ -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_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,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,15 +1,6 @@
 #ifndef __EVENT_COUNTER_H
 #define __EVENT_COUNTER_H

-#ifndef SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
-#ifdef __aarch64__
-// on ARM, we use just cycles and instructions
-#define SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS 1
-#else
-// elsewhere, we try to use four counters.
-#define SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS 0
-#endif
-#endif
 #include <cassert>
 #include <cctype>
 #ifndef _MSC_VER
@@ -55,12 +46,6 @@ struct event_count {
  event_count(const event_count& other): elapsed(other.elapsed), event_counts(other.event_counts) { }

  // The types of counters (so we can read the getter more easily)
-  #if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
-  enum event_counter_types {
-    CPU_CYCLES,
-    INSTRUCTIONS
-  };
-  #else
  enum event_counter_types {
    CPU_CYCLES,
    INSTRUCTIONS,
@@ -68,16 +53,15 @@ struct event_count {
    CACHE_REFERENCES,
    CACHE_MISSES
  };
-  #endif
+
  double elapsed_sec() const { return duration<double>(elapsed).count(); }
  double elapsed_ns() const { return duration<double, std::nano>(elapsed).count(); }
  double cycles() const { return static_cast<double>(event_counts[CPU_CYCLES]); }
  double instructions() const { return static_cast<double>(event_counts[INSTRUCTIONS]); }
-#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
  double branch_misses() const { return static_cast<double>(event_counts[BRANCH_MISSES]); }
  double cache_references() const { return static_cast<double>(event_counts[CACHE_REFERENCES]); }
  double cache_misses() const { return static_cast<double>(event_counts[CACHE_MISSES]); }
-#endif
+
  event_count& operator=(const event_count& other) {
    this->elapsed = other.elapsed;
    this->event_counts = other.event_counts;
@@ -121,11 +105,9 @@ struct event_aggregate {
  double elapsed_ns() const { return total.elapsed_ns() / iterations; }
  double cycles() const { return total.cycles() / iterations; }
  double instructions() const { return total.instructions() / iterations; }
-#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
  double branch_misses() const { return total.branch_misses() / iterations; }
  double cache_references() const { return total.cache_references() / iterations; }
  double cache_misses() const { return total.cache_misses() / iterations; }
-#endif
 };

 struct event_collector {
@@ -135,16 +117,11 @@ struct event_collector {
 #if defined(__linux__)
  LinuxEvents<PERF_TYPE_HARDWARE> linux_events;
  event_collector(bool quiet = false) : linux_events(vector<int>{
-  #if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
-    PERF_COUNT_HW_CPU_CYCLES,
-    PERF_COUNT_HW_INSTRUCTIONS,
-  #else
    PERF_COUNT_HW_CPU_CYCLES,
    PERF_COUNT_HW_INSTRUCTIONS,
    PERF_COUNT_HW_BRANCH_MISSES,
    PERF_COUNT_HW_CACHE_REFERENCES,
    PERF_COUNT_HW_CACHE_MISSES
-  #endif
  }, quiet) {}
  bool has_events() {
    return linux_events.is_working();
@@ -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
@@ -42,11 +42,11 @@ 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|kParseInsituFlag>(json.data()), find_id, result);
+    return rapidjson_base::run(doc.ParseInsitu<kParseValidateEncodingFlag>(json.data()), find_id, result);
  }
 };
 BENCHMARK_TEMPLATE(find_tweet, rapidjson_insitu)->UseManualTime();

-} // namespace find_tweet
+} // namespace partial_tweets

 #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
@@ -11,8 +11,6 @@ struct sajson {

  size_t ast_buffer_size{0};
  size_t *ast_buffer{nullptr};
-  ~sajson() { free(ast_buffer); }
-
  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"; }
@@ -1,48 +0,0 @@
-#pragma once
-
-#include "json_benchmark/file_runner.h"
-
-namespace json2msgpack {
-
-using namespace json_benchmark;
-
-template <typename I> struct runner : public file_runner<I> {
-  std::string_view result;
-  std::unique_ptr<char[]> buffer;
-
-  bool setup(benchmark::State &state) {
-    bool isok = this->load_json(state, TWITTER_JSON);
-    if (isok) {
-      // Let us allocate a sizeable buffer.
-      buffer = std::unique_ptr<char[]>(new char[this->json.size() * 4 + 1024]);
-    }
-    return isok;
-  }
-
-  bool before_run(benchmark::State &state) {
-    if (!file_runner<I>::before_run(state)) {
-      return false;
-    }
-    // Clear the buffer.
-    ::memset(buffer.get(), 0, this->json.size() * 4 + 1024);
-    return true;
-  }
-
-  bool run(benchmark::State &) {
-    return this->implementation.run(this->json, buffer.get(), result);
-  }
-
-  template <typename R>
-  bool diff(benchmark::State &state, runner<R> &reference) {
-    return diff_results(state, result.size(), reference.result.size(), diff_flags::NONE);
-  }
-};
-
-struct simdjson_ondemand;
-
-template <typename I>
-simdjson_really_inline static void json2msgpack(benchmark::State &state) {
-  run_json_benchmark<runner<I>, runner<simdjson_ondemand>>(state);
-}
-
-} // namespace json2msgpack
@@ -1,117 +0,0 @@
-#pragma once
-#ifdef SIMDJSON_COMPETITION_NLOHMANN_JSON
-
-#include "json2msgpack.h"
-
-namespace json2msgpack {
-
-using namespace nlohmann;
-
-struct nlohmann_json2msgpack {
-  inline std::string_view to_msgpack(const simdjson::padded_string &json,
-                                     uint8_t *buf);
-
-private:
-  inline void write_double(const double d) noexcept;
-  inline void write_byte(const uint8_t b) noexcept;
-  inline void write_uint32(const uint32_t w) noexcept;
-  inline void write_string(const std::string& str);
-  inline void recursive_processor(basic_json<> element);
-
-  uint8_t *buff{};
-};
-
-std::string_view nlohmann_json2msgpack::to_msgpack(const simdjson::padded_string &json,
-                             uint8_t *buf) {
-  buff = buf;
-  auto val = nlohmann::json::parse(json.data(), json.data() + json.size());
-  recursive_processor(val);
-  return std::string_view(reinterpret_cast<char *>(buf), size_t(buff - buf));
-}
-
-void nlohmann_json2msgpack::write_double(const double d) noexcept {
-  *buff++ = 0xcb;
-  ::memcpy(buff, &d, sizeof(d));
-  buff += sizeof(d);
-}
-
-void nlohmann_json2msgpack::write_byte(const uint8_t b) noexcept {
-  *buff = b;
-  buff++;
-}
-
-void nlohmann_json2msgpack::write_uint32(const uint32_t w) noexcept {
-  ::memcpy(buff, &w, sizeof(w));
-  buff += sizeof(w);
-}
-
-void nlohmann_json2msgpack::write_string(const std::string & str) {
-  write_byte(0xdb);
-  write_uint32(uint32_t(str.size()));
-  ::memcpy(buff, str.data(), str.size());
-  buff += str.size();
-}
-
-void nlohmann_json2msgpack::recursive_processor(json element) {
-  switch (element.type()) {
-  case nlohmann::detail::value_t::array: {
-    uint32_t counter = 0;
-    write_byte(0xdd);
-    std::vector<json> array = element.get<std::vector<json>>();
-    write_uint32(uint32_t(array.size()));
-    for (auto child : array) {
-       recursive_processor(child);
-    }
-  } break;
-  case nlohmann::detail::value_t::object: {
-    write_byte(0xdf);
-    std::map<std::string,json> object = element.get<std::map<std::string,json>>();
-    write_uint32(uint32_t(object.size()));
-    for (auto field : object) {
-      write_string(field.first);
-      recursive_processor(field.second);
-    }
-  } break;
-
-  case nlohmann::detail::value_t::number_integer:
-  case nlohmann::detail::value_t::number_unsigned:
-  case nlohmann::detail::value_t::number_float:
-    write_double(double(element));
-    break;
-  case nlohmann::detail::value_t::string:
-    write_string(std::string(element));
-    break;
-  case nlohmann::detail::value_t::boolean:
-    write_byte(0xc2 + bool(element));
-    break;
-  case nlohmann::detail::value_t::null:
-    write_byte(0xc0);
-    break;
-  case nlohmann::detail::value_t::discarded:
-  case nlohmann::detail::value_t::binary:
-  default:
-    printf("unexpected\n");
-    break;
-  }
-}
-
-struct nlohmann_json {
-  using StringType = std::string_view;
-
-  nlohmann_json2msgpack parser{};
-
-  bool run(simdjson::padded_string &json, char *buffer,
-           std::string_view &result) {
-    result = parser.to_msgpack(json, reinterpret_cast<uint8_t *>(buffer));
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(json2msgpack, nlohmann_json)->UseManualTime();
-
-} // namespace json2msgpack
-
-#endif // SIMDJSON_COMPETITION_NLOHMANN_JSON
-
-
-
@@ -1,140 +0,0 @@
-
-
-#pragma once
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-
-#include "json2msgpack.h"
-
-namespace json2msgpack {
-
-using namespace rapidjson;
-
-template <int parseflag>
-struct rapidjson2msgpack {
-  inline std::string_view to_msgpack(char *json, uint8_t *buf);
-
-private:
-  inline void write_double(const double d) noexcept;
-  inline void write_byte(const uint8_t b) noexcept;
-  inline void write_uint32(const uint32_t w) noexcept;
-  inline void write_uint32_at(const uint32_t w, uint8_t *p) noexcept;
-  void write_string(const char * s, size_t length) noexcept;
-  inline void recursive_processor(Value &v);
-
-  uint8_t *buff{};
-};
-
-template <int parseflag>
-std::string_view rapidjson2msgpack<parseflag>::to_msgpack(char *json, uint8_t *buf) {
-  buff = buf;
-  Document doc{};
-  if(parseflag & kParseInsituFlag) {
-    doc.ParseInsitu<parseflag>(json);
-  } else {
-    doc.Parse<parseflag>(json);
-  }
-  recursive_processor(doc);
-  return std::string_view(reinterpret_cast<char *>(buf), size_t(buff - buf));
-}
-
-template <int parseflag>
-void rapidjson2msgpack<parseflag>::write_double(const double d) noexcept {
-  *buff++ = 0xcb;
-  ::memcpy(buff, &d, sizeof(d));
-  buff += sizeof(d);
-}
-
-template <int parseflag>
-void rapidjson2msgpack<parseflag>::write_byte(const uint8_t b) noexcept {
-  *buff = b;
-  buff++;
-}
-
-template <int parseflag>
-void rapidjson2msgpack<parseflag>::write_string(const char * c, size_t len) noexcept {
-  write_byte(0xdb);
-  write_uint32(uint32_t(len));
-  ::memcpy(buff, c, len);
-  buff += len;
-}
-
-template <int parseflag>
-void rapidjson2msgpack<parseflag>::write_uint32(const uint32_t w) noexcept {
-  ::memcpy(buff, &w, sizeof(w));
-  buff += sizeof(w);
-}
-
-template <int parseflag>
-void rapidjson2msgpack<parseflag>::write_uint32_at(const uint32_t w, uint8_t *p) noexcept {
-  ::memcpy(p, &w, sizeof(w));
-}
-
-template <int parseflag>
-void rapidjson2msgpack<parseflag>::recursive_processor(Value &v) {
-  switch (v.GetType()) {
-  case kArrayType:
-    write_byte(0xdd);
-    write_uint32(v.Size());
-    for (Value::ValueIterator i = v.Begin(); i != v.End(); ++i) {
-      recursive_processor(*i);
-    }
-    break;
-  case kObjectType:
-    write_byte(0xdf);
-    write_uint32(uint32_t(v.MemberEnd()-v.MemberBegin()));
-    for (Value::MemberIterator m = v.MemberBegin(); m != v.MemberEnd();
-         ++m) {
-      write_string(m->name.GetString(), m->name.GetStringLength());
-      recursive_processor(m->value);
-    }
-    break;
-  case kStringType:
-    write_string(v.GetString(), v.GetStringLength());
-    break;
-  case kNumberType:
-    write_double(v.GetDouble());
-    break;
-  case kFalseType:
-    write_byte(0xc2);
-    break;
-  case kTrueType:
-    write_byte(0xc3);
-    break;
-  case kNullType:
-    write_byte(0xc0);
-    break;
-  }
-}
-
-template <int parseflag>
-struct rapidjson_base {
-  using StringType = std::string_view;
-
-  rapidjson2msgpack<parseflag> parser{};
-
-  bool run(simdjson::padded_string &json, char *buffer,
-           std::string_view &result) {
-    result =
-        parser.to_msgpack(json.data(), reinterpret_cast<uint8_t *>(buffer));
-
-    return true;
-  }
-};
-
-
-using rapidjson_lossless = rapidjson_base<kParseValidateEncodingFlag|kParseFullPrecisionFlag>;
-
-BENCHMARK_TEMPLATE(json2msgpack, rapidjson_lossless)->UseManualTime();
-
-
-using rapidjson = rapidjson_base<kParseValidateEncodingFlag>;
-
-BENCHMARK_TEMPLATE(json2msgpack, rapidjson)->UseManualTime();
-
-using rapidjson_insitu = rapidjson_base<kParseValidateEncodingFlag|kParseInsituFlag>;
-
-BENCHMARK_TEMPLATE(json2msgpack, rapidjson_insitu)->UseManualTime();
-
-} // namespace json2msgpack
-
-#endif // SIMDJSON_COMPETITION_RAPIDJSON
@@ -1,131 +0,0 @@
-#pragma once
-#ifdef SIMDJSON_COMPETITION_SAJSON
-
-#include "json2msgpack.h"
-
-namespace json2msgpack {
-
-using namespace sajson;
-
-
-struct sajson2msgpack {
-  inline std::string_view to_msgpack(char *json, size_t size, uint8_t *buf);
-  virtual ~sajson2msgpack() { free(ast_buffer); }
-
-private:
-  inline void write_double(const double d) noexcept;
-  inline void write_byte(const uint8_t b) noexcept;
-  inline void write_uint32(const uint32_t w) noexcept;
-  inline void write_string(const char * s, size_t length) noexcept;
-  inline void recursive_processor(const sajson::value &v);
-
-  uint8_t *buff{};
-  size_t ast_buffer_size{0};
-  size_t *ast_buffer{nullptr};
-};
-
-
-std::string_view sajson2msgpack::to_msgpack(char *json, size_t size, uint8_t *buf) {
-  buff = buf;
-
-  if (!ast_buffer) {
-    ast_buffer_size = 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(size, json)
-  );
-
-  auto root = doc.get_root();
-  recursive_processor(root);
-  return std::string_view(reinterpret_cast<char *>(buf), size_t(buff - buf));
-}
-
-void sajson2msgpack::write_string(const char * c, size_t len) noexcept {
-  write_byte(0xdb);
-  write_uint32(uint32_t(len));
-  ::memcpy(buff, c, len);
-  buff += len;
-}
-
-void sajson2msgpack::write_double(const double d) noexcept {
-  *buff++ = 0xcb;
-  ::memcpy(buff, &d, sizeof(d));
-  buff += sizeof(d);
-}
-
-void sajson2msgpack::write_byte(const uint8_t b) noexcept {
-  *buff = b;
-  buff++;
-}
-
-void sajson2msgpack::write_uint32(const uint32_t w) noexcept {
-  ::memcpy(buff, &w, sizeof(w));
-  buff += sizeof(w);
-}
-
-void sajson2msgpack::recursive_processor(const sajson::value &node) {
-  using namespace sajson;
-  switch (node.get_type()) {
-  case TYPE_NULL:
-    write_byte(0xc0);
-    break;
-  case TYPE_FALSE:
-    write_byte(0xc2);
-    break;
-  case TYPE_TRUE:
-    write_byte(0xc3);
-    break;
-  case TYPE_ARRAY: {
-    auto length = node.get_length();
-    write_byte(0xdf);
-    write_uint32(uint32_t(length));
-    for (size_t i = 0; i < length; ++i) {
-      recursive_processor(node.get_array_element(i));
-    }
-    break;
-  }
-  case TYPE_OBJECT: {
-    auto length = node.get_length();
-    write_byte(0xdd);
-    write_uint32(uint32_t(length));
-    for (auto i = 0u; i < length; ++i) {
-      auto s = node.get_object_key(i);
-      write_string(s.data(), s.length());
-      recursive_processor(node.get_object_value(i));
-    }
-    break;
-  }
-  case TYPE_STRING:
-    write_string(node.as_cstring(), node.get_string_length());
-    break;
-  case TYPE_DOUBLE:
-  case TYPE_INTEGER:
-    write_double(node.get_number_value());
-    break;
-  default:
-    assert(false && "unknown node type");
-  }
-}
-
-
-struct sajson {
-  using StringType = std::string_view;
-
-  sajson2msgpack parser{};
-
-  bool run(simdjson::padded_string &json, char *buffer,
-           std::string_view &result) {
-    result =
-        parser.to_msgpack(json.data(), json.size(), reinterpret_cast<uint8_t *>(buffer));
-
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(json2msgpack, sajson)->UseManualTime();
-
-} // namespace json2msgpack
-
-#endif // SIMDJSON_COMPETITION_SAJSON
@@ -1,183 +0,0 @@
-#pragma once
-#if SIMDJSON_EXCEPTIONS
-
-#include "json2msgpack.h"
-
-namespace json2msgpack {
-
-using namespace simdjson;
-
-/**
- * @brief The simdjson2msgpack struct is used to quickly convert
- * JSON strings to msgpack views. You must provide a pointer to
- * a large memory region where the msgpack gets written. The
- * buffer should be large enough to store the msgpack output (which
- * can never be 3x larger than the input JSON) with an additional
- * simdjson::SIMDJSON_PADDING bytes.
- *
- * Recommended usage:
- *
- * simdjson2msgpack parser{};
- * simdjson::padded_string json = "[1,2]"_padded; // some JSON
- * uint8_t * buffer = new uint8_t[3*json.size() + simdjson::SIMDJSON_PADDING]; // large buffer
- *
- * std::string_view msgpack = parser.to_msgpack(json, buffer);
- *
- * The result (msgpack) is a string view to a msgpack serialization of the input JSON,
- * it points inside the buffer you provided.
- *
- * You may reuse the simdjson2msgpack instance though you should use
- * one per thread.
- */
-struct simdjson2msgpack {
-  /**
-   * @brief Converts the provided JSON into msgpack.
-   *
-   * @param json JSON input
-   * @param buf temporary buffer (must be large enough, with 32 bytes of
-   * padding)
-   * @return std::string_view msgpack output, writting to the temporary buffer
-   */
-  inline std::string_view to_msgpack(const simdjson::padded_string &json,
-                                     uint8_t *buf);
-
-private:
-  simdjson_really_inline void write_double(const double d) noexcept;
-  simdjson_really_inline void write_byte(const uint8_t b) noexcept;
-  simdjson_really_inline void write_uint32(const uint32_t w) noexcept;
-  simdjson_really_inline uint8_t *skip_uint32() noexcept;
-  simdjson_really_inline void write_uint32_at(const uint32_t w,
-                                              uint8_t *p) noexcept;
-  simdjson_really_inline void
-  write_raw_string(simdjson::ondemand::raw_json_string rjs);
-  inline void recursive_processor(simdjson::ondemand::value element);
-
-  simdjson::ondemand::parser parser;
-  simdjson::ondemand::document doc;
-  uint8_t *buff{};
-};
-
-std::string_view
-simdjson2msgpack::to_msgpack(const simdjson::padded_string &json,
-                             uint8_t *buf) {
-  buff = buf;
-  ondemand::document doc = parser.iterate(json);
-  if (doc.is_scalar()) {
-    // we have a special case where the JSON document is a single document...
-    switch (doc.type()) {
-    case simdjson::ondemand::json_type::number:
-      write_double(doc.get_double());
-      break;
-    case simdjson::ondemand::json_type::string:
-      write_raw_string(doc.get_raw_json_string());
-      break;
-    case simdjson::ondemand::json_type::boolean:
-      write_byte(0xc2 + doc.get_bool());
-      break;
-    case simdjson::ondemand::json_type::null:
-      write_byte(0xc0);
-      break;
-    case simdjson::ondemand::json_type::array:
-    case simdjson::ondemand::json_type::object:
-    default:
-      // impossible
-      break;
-    }
-  } else {
-    simdjson::ondemand::value val = doc;
-    recursive_processor(val);
-  }
-  return std::string_view(reinterpret_cast<char *>(buf), size_t(buff - buf));
-}
-
-void simdjson2msgpack::write_double(const double d) noexcept {
-  *buff++ = 0xcb;
-  ::memcpy(buff, &d, sizeof(d));
-  buff += sizeof(d);
-}
-
-void simdjson2msgpack::write_byte(const uint8_t b) noexcept {
-  *buff = b;
-  buff++;
-}
-
-void simdjson2msgpack::write_uint32(const uint32_t w) noexcept {
-  ::memcpy(buff, &w, sizeof(w));
-  buff += sizeof(w);
-}
-
-uint8_t *simdjson2msgpack::skip_uint32() noexcept {
-  uint8_t *ret = buff;
-  buff += sizeof(uint32_t);
-  return ret;
-}
-
-void simdjson2msgpack::write_uint32_at(const uint32_t w, uint8_t *p) noexcept {
-  ::memcpy(p, &w, sizeof(w));
-}
-
-void simdjson2msgpack::write_raw_string(
-    simdjson::ondemand::raw_json_string in) {
-  write_byte(0xdb);
-  uint8_t *location = skip_uint32();
-  std::string_view v = parser.unescape(in, buff);
-  write_uint32_at(uint32_t(v.size()), location);
-}
-
-void simdjson2msgpack::recursive_processor(simdjson::ondemand::value element) {
-  switch (element.type()) {
-  case simdjson::ondemand::json_type::array: {
-    uint32_t counter = 0;
-    write_byte(0xdd);
-    uint8_t *location = skip_uint32();
-    for (auto child : element.get_array()) {
-      counter++;
-      recursive_processor(child.value());
-    }
-    write_uint32_at(counter, location);
-  } break;
-  case simdjson::ondemand::json_type::object: {
-    uint32_t counter = 0;
-    write_byte(0xdf);
-    uint8_t *location = skip_uint32();
-    for (auto field : element.get_object()) {
-      counter++;
-      write_raw_string(field.key());
-      recursive_processor(field.value());
-    }
-    write_uint32_at(counter, location);
-  } break;
-  case simdjson::ondemand::json_type::number:
-    write_double(element.get_double());
-    break;
-  case simdjson::ondemand::json_type::string:
-    write_raw_string(element.get_raw_json_string());
-    break;
-  case simdjson::ondemand::json_type::boolean:
-    write_byte(0xc2 + element.get_bool());
-    break;
-  case simdjson::ondemand::json_type::null:
-    write_byte(0xc0);
-    break;
-  default:
-    SIMDJSON_UNREACHABLE();
-  }
-}
-
-struct simdjson_ondemand {
-  using StringType = std::string_view;
-
-  simdjson2msgpack parser{};
-
-  bool run(simdjson::padded_string &json, char *buffer,
-           std::string_view &result) {
-    result = parser.to_msgpack(json, reinterpret_cast<uint8_t *>(buffer));
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(json2msgpack, simdjson_ondemand)->UseManualTime();
-
-} // namespace json2msgpack
-
-#endif // SIMDJSON_EXCEPTIONS
@@ -1,122 +0,0 @@
-#pragma once
-#ifdef SIMDJSON_COMPETITION_YYJSON
-
-#include "json2msgpack.h"
-
-namespace json2msgpack {
-
-struct yyjson2msgpack {
-  inline std::string_view to_msgpack(yyjson_doc *doc, uint8_t *buf);
-
-private:
-  inline void write_double(const double d) noexcept;
-  inline void write_byte(const uint8_t b) noexcept;
-  inline void write_uint32(const uint32_t w) noexcept;
-  inline void write_string(const char *s, size_t length) noexcept;
-  inline void recursive_processor(yyjson_val *obj);
-
-  uint8_t *buff{};
-};
-
-std::string_view yyjson2msgpack::to_msgpack(yyjson_doc *doc, uint8_t *buf) {
-  buff = buf;
-  yyjson_val *root = yyjson_doc_get_root(doc);
-  recursive_processor(root);
-  return std::string_view(reinterpret_cast<char *>(buf), size_t(buff - buf));
-}
-
-void yyjson2msgpack::write_string(const char *c, size_t len) noexcept {
-  write_byte(0xdb);
-  write_uint32(uint32_t(len));
-  ::memcpy(buff, c, len);
-  buff += len;
-}
-
-void yyjson2msgpack::write_double(const double d) noexcept {
-  *buff++ = 0xcb;
-  ::memcpy(buff, &d, sizeof(d));
-  buff += sizeof(d);
-}
-
-void yyjson2msgpack::write_byte(const uint8_t b) noexcept {
-  *buff = b;
-  buff++;
-}
-
-void yyjson2msgpack::write_uint32(const uint32_t w) noexcept {
-  ::memcpy(buff, &w, sizeof(w));
-  buff += sizeof(w);
-}
-
-void yyjson2msgpack::recursive_processor(yyjson_val *obj) {
-  size_t idx, max;
-  yyjson_val *val;
-  yyjson_val *key;
-  switch (yyjson_get_type(obj)) {
-  case YYJSON_TYPE_STR:
-    write_string(yyjson_get_str(obj), yyjson_get_len(obj));
-    break;
-  case YYJSON_TYPE_ARR:
-    write_byte(0xdf);
-    write_uint32(uint32_t(yyjson_arr_size(obj)));
-    yyjson_arr_foreach(obj, idx, max, val) { recursive_processor(val); }
-   break;
-  case YYJSON_TYPE_OBJ:
-    write_byte(0xdd);
-    write_uint32(uint32_t(yyjson_obj_size(obj)));
-    yyjson_obj_foreach(obj, idx, max, key, val) {
-      write_string(yyjson_get_str(key), yyjson_get_len(key));
-      recursive_processor(val);
-    }
-    break;
-  case YYJSON_TYPE_BOOL:
-    write_byte(0xc2 + yyjson_get_bool(obj));
-    break;
-  case YYJSON_TYPE_NULL:
-    write_byte(0xc0);
-    break;
-  case YYJSON_TYPE_NUM:
-    switch (yyjson_get_subtype(obj)) {
-    case YYJSON_SUBTYPE_UINT:
-      write_double(double(yyjson_get_uint(obj)));
-      break;
-    case YYJSON_SUBTYPE_SINT:
-      write_double(double(yyjson_get_sint(obj)));
-      break;
-    case YYJSON_SUBTYPE_REAL:
-      write_double(yyjson_get_real(obj));
-      break;
-    default:
-      SIMDJSON_UNREACHABLE();
-    }
-    break;
-  default:
-    SIMDJSON_UNREACHABLE();
-  }
-}
-
-struct yyjson : yyjson2msgpack {
-  bool run(simdjson::padded_string &json, char *buffer,
-           std::string_view &result) {
-    yyjson_doc *doc = yyjson_read(json.data(), json.size(), 0);
-    result = to_msgpack(doc, reinterpret_cast<uint8_t*>(buffer));
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(json2msgpack, yyjson)->UseManualTime();
-
-struct yyjson_insitu : yyjson2msgpack {
-  bool run(simdjson::padded_string &json, char *buffer,
-           std::string_view &result) {
-    yyjson_doc *doc =
-        yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0);
-    result = to_msgpack(doc, reinterpret_cast<uint8_t*>(buffer));
-    return true;
-  }
-};
-BENCHMARK_TEMPLATE(json2msgpack, yyjson_insitu)->UseManualTime();
-
-} // namespace json2msgpack
-
-#endif // SIMDJSON_COMPETITION_YYJSON
@@ -4,6 +4,5 @@ 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,7 +1,6 @@
 #pragma once

 #include <vector>
-#include <map>
 #include <sstream>
 #include <limits>

@@ -53,56 +52,6 @@ struct result_differ<std::vector<T>, std::vector<U>> {
  }
 };

-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) {
@@ -10,9 +10,8 @@ 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;
+    std::cout << "simdjson::dom implementation:      " << simdjson::active_implementation->name() << std::endl;
+    std::cout << "simdjson::ondemand implementation: " << simdjson::builtin_implementation()->name() << std::endl;
  }
 }

@@ -58,11 +57,10 @@ template<typename B, typename R> static void run_json_benchmark(benchmark::State
  if (collector.has_events()) {
    state.counters["instructions"] = events.instructions();
    state.counters["cycles"]       = events.cycles();
-#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
    state.counters["branch_miss"]  = events.branch_misses();
    state.counters["cache_miss"]   = events.cache_misses();
    state.counters["cache_ref"]    = events.cache_references();
-#endif
+
    state.counters["instructions_per_byte"]  = events.instructions() / double(bench.bytes_per_iteration());
    state.counters["instructions_per_cycle"] = events.instructions() / events.cycles();
    state.counters["cycles_per_byte"]        = events.cycles()       / double(bench.bytes_per_iteration());
@@ -70,11 +68,9 @@ template<typename B, typename R> static void run_json_benchmark(benchmark::State

    state.counters["best_instructions"] = events.best.instructions();
    state.counters["best_cycles"]       = events.best.cycles();
-#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
    state.counters["best_branch_miss"]  = events.best.branch_misses();
    state.counters["best_cache_miss"]   = events.best.cache_misses();
    state.counters["best_cache_ref"]    = events.best.cache_references();
-#endif

    state.counters["best_instructions_per_byte"]  = events.best.instructions() / double(bench.bytes_per_iteration());
    state.counters["best_instructions_per_cycle"] = events.best.instructions() / events.best.cycles();
@@ -95,11 +91,9 @@ template<typename B, typename R> static void run_json_benchmark(benchmark::State
  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);
-#if !SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
    label << " branch_miss="  << setw(8)  << uint64_t(events.best.branch_misses())    << setw(0);
    label << " cache_miss="   << setw(8)  << uint64_t(events.best.cache_misses())     << setw(0);
    label << " cache_ref="    << setw(10) << uint64_t(events.best.cache_references()) << setw(0);
-#endif
  }

  label << " items=" << setw(10) << bench.items_per_iteration() << setw(0);
@@ -1,74 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_NLOHMANN_JSON
-
-#include "kostya.h"
-
-namespace kostya {
-
-using json = nlohmann::json;
-
-struct nlohmann_json_sax {
-    static constexpr diff_flags DiffFlags = diff_flags::NONE;
-
-    struct Handler : json::json_sax_t
-    {
-        size_t k{0};
-        double buffer[3];
-        std::vector<point>& result;
-
-        Handler(std::vector<point>& r) : result(r) { }
-
-        bool key(string_t& val) override {
-            switch(val[0]) {
-                case 'x':
-                    k = 0;
-                    break;
-                case 'y':
-                    k = 1;
-                    break;
-                case 'z':
-                    k = 2;
-                    break;
-            }
-            return true;
-        }
-        bool number_float(number_float_t val, const string_t& s) override {
-            buffer[k] = val;
-            if (k == 2) {
-                result.emplace_back(json_benchmark::point{buffer[0],buffer[1],buffer[2]});
-                k = 0;
-            }
-            return true;
-        }
-        bool number_unsigned(number_unsigned_t val) override {  // Need this event because coordinate value can be equal to 1
-            buffer[k] = double(val);
-            if (k == 2) {
-                result.emplace_back(json_benchmark::point{buffer[0],buffer[1],buffer[2]});
-                k = 0;
-            }
-            return true;
-        }
-        // Irrelevant events
-        bool null() override { return true; }
-        bool boolean(bool val) 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<point> &result) {
-        Handler handler(result);
-        json::sax_parse(json.data(), &handler);
-        return true;
-    }
-}; // nlohmann_json_sax
-BENCHMARK_TEMPLATE(kostya, nlohmann_json_sax)->UseManualTime();
-} // namespace kostya
-
-#endif // SIMDJSON_COMPETITION_NLOHMANN_JSON
@@ -51,7 +51,7 @@ BENCHMARK_TEMPLATE(kostya, rapidjson_lossless)->UseManualTime();

 struct rapidjson_insitu : rapidjson_base {
  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    return rapidjson_base::run(doc.ParseInsitu<kParseValidateEncodingFlag|kParseInsituFlag>(json.data()), result);
+    return rapidjson_base::run(doc.ParseInsitu<kParseValidateEncodingFlag>(json.data()), result);
  }
 };
 BENCHMARK_TEMPLATE(kostya, rapidjson_insitu)->UseManualTime();
@@ -1,70 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-
-#include "kostya.h"
-
-namespace kostya {
-
-using namespace rapidjson;
-
-struct rapidjson_sax {
-    static constexpr diff_flags DiffFlags = diff_flags::NONE;
-
-    struct Handler {
-        size_t k{0};
-        double buffer[3];
-        std::vector<point>& result;
-
-        Handler(std::vector<point> &r) : result(r) { }
-
-        bool Key(const char* key, SizeType length, bool copy) {
-            switch(key[0]) {
-            case 'x':
-                k = 0;
-                break;
-            case 'y':
-                k = 1;
-                break;
-            case 'z':
-                k = 2;
-                break;
-            }
-            return true;
-        }
-        bool Double(double d) {
-            buffer[k] = d;
-            if (k == 2) {
-                result.emplace_back(json_benchmark::point{buffer[0],buffer[1],buffer[2]});
-                k = 0;
-            }
-            return true;
-        }
-        bool Uint(unsigned i) {  return Double(i); }   // Need this event because coordinate value can be equal to 1
-        // Irrelevant events
-        bool Null() { return true; }
-        bool Bool(bool b) { 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<point> &result) {
-        Reader reader;
-        Handler handler(result);
-        InsituStringStream ss(json.data());
-        reader.Parse<kParseInsituFlag | kParseValidateEncodingFlag | kParseFullPrecisionFlag>(ss,handler);
-        return true;
-    }
-
-}; // rapid_jason_sax
-BENCHMARK_TEMPLATE(kostya, rapidjson_sax)->UseManualTime();
-} // namespace kostya
-
-#endif // SIMDJSON_COMPETITION_RAPIDJSON
@@ -11,7 +11,6 @@ struct sajson {

  size_t ast_buffer_size{0};
  size_t *ast_buffer{nullptr};
-  ~sajson() { free(ast_buffer); }

  simdjson_really_inline double get_double(const ::sajson::value &obj, std::string_view key) {
    using namespace sajson;
@@ -16,16 +16,14 @@ struct yyjson_base {

    switch (yyjson_get_subtype(val)) {
      case YYJSON_SUBTYPE_UINT:
-        return double(yyjson_get_uint(val));
+        return yyjson_get_uint(val);
      case YYJSON_SUBTYPE_SINT:
-        return double(yyjson_get_sint(val));
+        return yyjson_get_sint(val);
      case YYJSON_SUBTYPE_REAL:
        return yyjson_get_real(val);
      default:
        SIMDJSON_UNREACHABLE();
    }
-    SIMDJSON_UNREACHABLE();
-    return 0.0; // unreachable
  }

  bool run(yyjson_doc *doc, std::vector<point> &result) {
@@ -1,94 +0,0 @@
-#pragma once
-
-#include "json_benchmark/string_runner.h"
-#include <map>
-#include <string>
-
-namespace large_amazon_cellphones {
-
-const bool UNTHREADED = false;
-const bool THREADED = true;
-
-static const simdjson::padded_string &get_built_json();
-
-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 string_runner<I> {
-    std::map<typename I::StringType, brand> result{};
-
-    runner() : string_runner<I>(get_built_json()) {}
-
-    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, diff_flags::NONE);
-    }
-
-    size_t items_per_iteration() {
-        return result.size();
-    }
-};
-
-static std::string build_json(size_t N) {
-  std::ifstream in(AMAZON_CELLPHONES_NDJSON);
-  std::string answer((std::istreambuf_iterator<char>(in)), std::istreambuf_iterator<char>());
-  // Find position of first line to exclude it in further copies
-  size_t first_line = answer.find('\n');
-  std::string copy(answer,first_line + 1);
-  size_t count{1};
-
-  while (answer.size() < N) {
-    answer.append(copy);
-    count++;
-  }
-
-  std::cout << "Creating a source file spanning " << (answer.size() + 512) / (1024*1024) << " MB (" << count << " copies of original file)" << std::endl;
-  return answer;
-}
-
-static const simdjson::padded_string &get_built_json() {
-  static simdjson::padded_string json = build_json(10*1024*1024);
-  return json;
-}
-
-template<bool threaded>
-struct simdjson_dom;
-
-template<typename I> simdjson_really_inline static void large_amazon_cellphones(benchmark::State &state) {
-  run_json_benchmark<runner<I>, runner<simdjson_dom<UNTHREADED>>>(state);
-}
-
-}   // namespace large_amazon_cellphones
@@ -1,52 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "large_amazon_cellphones.h"
-#include <algorithm>
-
-namespace large_amazon_cellphones {
-
-using namespace simdjson;
-
-template<bool threaded>
-struct simdjson_dom {
-  using StringType = std::string;
-
-  dom::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::map<StringType, brand> &result) {
-#ifdef SIMDJSON_THREADS_ENABLED
-    parser.threaded = threaded;
-#endif
-    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, large_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(large_amazon_cellphones, simdjson_dom<UNTHREADED>)->UseManualTime();
-#ifdef SIMDJSON_THREADS_ENABLED
-BENCHMARK_TEMPLATE(large_amazon_cellphones, simdjson_dom<THREADED>)->UseManualTime();
-#endif
-
-} // namespace large_amazon_cellphones
-
-#endif // SIMDJSON_EXCEPTIONS
@@ -1,72 +0,0 @@
-#pragma once
-
-#if SIMDJSON_EXCEPTIONS
-
-#include "large_amazon_cellphones.h"
-
-namespace large_amazon_cellphones {
-
-using namespace simdjson;
-
-template<bool threaded>
-struct simdjson_ondemand {
-  using StringType = std::string;
-
-  ondemand::parser parser{};
-
-  bool run(simdjson::padded_string &json, std::map<StringType, brand> &result) {
-#ifdef SIMDJSON_THREADS_ENABLED
-    parser.threaded = threaded;
-#endif
-    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, large_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(large_amazon_cellphones, simdjson_ondemand<UNTHREADED>)->UseManualTime();
-#ifdef SIMDJSON_THREADS_ENABLED
-BENCHMARK_TEMPLATE(large_amazon_cellphones, simdjson_ondemand<THREADED>)->UseManualTime();
-#endif
-
-} // namespace amazon_cellphones
-
-#endif // SIMDJSON_EXCEPTIONS
@@ -1,73 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_NLOHMANN_JSON
-
-#include "large_random.h"
-
-namespace large_random {
-
-using json = nlohmann::json;
-
-struct nlohmann_json_sax {
-    static constexpr diff_flags DiffFlags = diff_flags::NONE;
-
-    struct Handler : json::json_sax_t
-    {
-        size_t k{0};
-        double buffer[3];
-        std::vector<point>& result;
-
-        Handler(std::vector<point> &r) : result(r) {  }
-
-        bool key(string_t& val) override {
-            switch(val[0]) {
-                case 'x':
-                    k = 0;
-                    break;
-                case 'y':
-                    k = 1;
-                    break;
-                case 'z':
-                    k = 2;
-                    break;
-            }
-            return true;
-        }
-        bool number_unsigned(number_unsigned_t val) override {
-            buffer[k] = double(val);
-            if (k == 2) {
-                result.emplace_back(json_benchmark::point{buffer[0],buffer[1],buffer[2]});
-                k = 0;
-            }
-            return true;
-        }
-        bool number_float(number_float_t val, const string_t& s) override {
-            buffer[k] = val;
-            if (k == 2) {
-                result.emplace_back(json_benchmark::point{buffer[0],buffer[1],buffer[2]});
-                k = 0;
-            }
-            return true;
-        }
-        // Irrelevant events
-        bool null() override { return true; }
-        bool boolean(bool val) 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<point> &result) {
-        Handler handler(result);
-        json::sax_parse(json.data(), &handler);
-        return true;
-    }
-}; // nlohmann_json_sax
-BENCHMARK_TEMPLATE(large_random, nlohmann_json_sax)->UseManualTime();
-} // namespace large_random
-#endif // SIMDJSON_COMPETITION_NLOHMANN_JSON
@@ -48,7 +48,7 @@ BENCHMARK_TEMPLATE(large_random, rapidjson_lossless)->UseManualTime();

 struct rapidjson_insitu : rapidjson_base {
  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    return rapidjson_base::run(doc.ParseInsitu<kParseValidateEncodingFlag|kParseInsituFlag>(json.data()), result);
+    return rapidjson_base::run(doc.ParseInsitu<kParseValidateEncodingFlag>(json.data()), result);
  }
 };
 BENCHMARK_TEMPLATE(large_random, rapidjson_insitu)->UseManualTime();
@@ -1,69 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-
-#include "large_random.h"
-
-namespace large_random {
-
-using namespace rapidjson;
-
-struct rapidjson_sax {
-    static constexpr diff_flags DiffFlags = diff_flags::NONE;
-
-    struct Handler {
-        size_t k{0};
-        double buffer[3];
-        std::vector<point>& result;
-
-        Handler(std::vector<point> &r) : result(r) { }
-
-        bool Key(const char* key, SizeType length, bool copy) {
-            switch(key[0]) {
-            case 'x':
-                k = 0;
-                break;
-            case 'y':
-                k = 1;
-                break;
-            case 'z':
-                k = 2;
-                break;
-            }
-            return true;
-        }
-        bool Double(double d) {
-            buffer[k] = d;
-            if (k == 2) {
-                result.emplace_back(json_benchmark::point{buffer[0],buffer[1],buffer[2]});
-                k = 0;
-            }
-            return true;
-        }
-        bool Uint(unsigned i) { return Double(i); }   // Need this event because coordinate value can be equal to 1
-        // Irrelevant events
-        bool Null() { return true; }
-        bool Bool(bool b) { 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<point> &result) {
-        Reader reader;
-        Handler handler(result);
-        InsituStringStream ss(json.data());
-        reader.Parse<kParseInsituFlag | kParseValidateEncodingFlag | kParseFullPrecisionFlag>(ss,handler);
-        return true;
-    }
-}; // rapid_jason_sax
-BENCHMARK_TEMPLATE(large_random, rapidjson_sax)->UseManualTime();
-} // namespace large_random
-
-#endif // SIMDJSON_COMPETITION_RAPIDJSON
@@ -11,7 +11,6 @@ struct sajson {

  size_t ast_buffer_size{0};
  size_t *ast_buffer{nullptr};
-  ~sajson() { free(ast_buffer); }

  simdjson_really_inline double get_double(const ::sajson::value &obj, std::string_view key) {
    using namespace sajson;
@@ -16,16 +16,14 @@ struct yyjson_base {

    switch (yyjson_get_subtype(val)) {
      case YYJSON_SUBTYPE_UINT:
-        return double(yyjson_get_uint(val));
+        return yyjson_get_uint(val);
      case YYJSON_SUBTYPE_SINT:
-        return double(yyjson_get_sint(val));
+        return yyjson_get_sint(val);
      case YYJSON_SUBTYPE_REAL:
        return yyjson_get_real(val);
      default:
        SIMDJSON_UNREACHABLE();
    }
-    SIMDJSON_UNREACHABLE();
-    return 0.0; // unreachable
  }

  bool run(yyjson_doc *doc, std::vector<point> &result) {
@@ -29,7 +29,6 @@ template <int TYPE = PERF_TYPE_HARDWARE> class LinuxEvents {
  size_t num_events{};
  std::vector<uint64_t> temp_result_vec{};
  std::vector<uint64_t> result{};
-  std::vector<int> fds{};
  bool quiet;

 public:
@@ -53,12 +52,10 @@ public:
    uint32_t i = 0;
    for (auto config : config_vec) {
      attribs.config = config;
-      int _fd = static_cast<int>(syscall(__NR_perf_event_open, &attribs, pid, cpu, group, flags));
-      if (_fd == -1) {
+      fd = static_cast<int>(syscall(__NR_perf_event_open, &attribs, pid, cpu, group, flags));
+      if (fd == -1) {
        report_error("perf_event_open");
      }
-      fd = _fd; // fd tracks the last _fd value.
-      fds.push_back(fd);
      ioctl(fd, PERF_EVENT_IOC_ID, &result[i++]);
      if (group == -1) {
        group = fd;
@@ -68,11 +65,7 @@ public:
    temp_result_vec.resize(num_events * 2 + 1);
  }

-  ~LinuxEvents() {
-   for (auto tfd : fds) {
-      if (tfd != -1) { close(tfd); }
-    }
-  }
+  ~LinuxEvents() { if (fd != -1) { close(fd); } }

  inline void start() {
    if (fd != -1) {
@@ -66,7 +66,7 @@ void print_usage(ostream& out) {
  out << "-H           - Make the buffers hot (reduce page allocation and related OS tasks during parsing) [default]" << endl;
  out << "-a IMPL      - Use the given parser implementation. By default, detects the most advanced" << endl;
  out << "               implementation supported on the host machine." << endl;
-  for (auto impl : simdjson::get_available_implementations()) {
+  for (auto impl : simdjson::available_implementations) {
    if(impl->supported_by_runtime_system()) {
      out << "-a " << std::left << std::setw(9) << impl->name() << " - Use the " << impl->description() << " parser implementation." << endl;
    }
@@ -116,10 +116,10 @@ struct option_struct {
        verbose = true;
        break;
      case 'a': {
-        const implementation *impl = simdjson::get_available_implementations()[optarg];
+        const implementation *impl = simdjson::available_implementations[optarg];
        if ((!impl) || (!impl->supported_by_runtime_system())) {
          std::string exit_message = string("Unsupported option value -a ") + optarg + ": expected -a  with one of ";
-          for (auto imple : simdjson::get_available_implementations()) {
+          for (auto imple : simdjson::available_implementations) {
            if(imple->supported_by_runtime_system()) {
              exit_message += imple->name();
              exit_message += " ";
@@ -127,7 +127,7 @@ struct option_struct {
          }
          exit_usage(exit_message);
        }
-        simdjson::get_active_implementation() = impl;
+        simdjson::active_implementation = impl;
        break;
      }
      case 'C':
@@ -175,7 +175,7 @@ int main(int argc, char *argv[]) {
  option_struct options(argc, argv);
  if (options.verbose) {
    verbose_stream = &cout;
-    verbose() << "Implementation: " << simdjson::get_active_implementation()->name() << endl;
+    verbose() << "Implementation: " << simdjson::active_implementation->name() << endl;
  }

  // Start collecting events. We put this early so if it prints an error message, it's the
@@ -1,159 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_NLOHMANN_JSON
-
-#include "partial_tweets.h"
-
-namespace partial_tweets {
-
-using json = nlohmann::json;
-
-struct nlohmann_json_sax {
-    using StringType=std::string;
-
-    struct Handler : json::json_sax_t
-    {
-        // 8 keys to parse for each tweet (in order of appearance): "created_at", "id", "text", "in_reply_status_id", "id"(user),
-        // "screen_name"(user), "retweet_count" and "favorite_count".
-        // Assume that the first valid key encountered will be the correct key to parse.
-        // Assume that each tweet/retweet start with a key "metadata" and has a key "retweeted" towards the end
-        // The previous assumption will be used to check for the beginning of a new tweet and the end of a retweet
-        enum state {    // Bitset to store state of search
-            key_date = (1<<0),
-            key_id = (1<<1),
-            key_text = (1<<2),
-            key_reply = (1<<3),
-            key_userid = (1<<4),
-            key_screenname = (1<<5),
-            key_rt = (1<<6),
-            key_fav = (1<<7),
-            found_date = (1<<8),
-            found_id = (1<<9),
-            found_text = (1<<10),
-            found_reply = (1<<11),
-            found_userid = (1<<12),
-            found_screenname = (1<<13),
-            found_rt = (1<<14),
-            found_fav = (1<<15)
-        };
-        int values = state::key_date;
-        bool userobject_id = false; // If in a user object (to find user.id)
-        bool userobject_screen_name = false;    // If in a user object (to find user.screen_name)
-        bool inretweet = false; // If in a retweet (all keys irrelevant in retweet object)
-        // Fields to store partial tweet info
-        uint64_t user_id;
-        uint64_t id;
-        uint64_t rt;
-        uint64_t fav;
-        uint64_t reply_status;
-        string_t screen_name;
-        string_t date;
-        string_t text;
-        std::vector<tweet<std::string>>& result;
-
-        Handler(std::vector<tweet<std::string>> &r) : result(r) { }
-
-        bool key(string_t& val) override {
-            if (!inretweet) {   // If not in a retweet object, find relevant keys
-                if (val.compare("retweeted_status") == 0) { inretweet = true; }   // Check if entering retweet
-                else if (val.compare("metadata") == 0) { values = 0; }  // Reset
-                // Check if key has been found and if key matches a valid key
-                else if (!(values & found_date) && (val.compare("created_at") == 0)) { values |= (key_date); }
-                // Must also check if not in a user object
-                else if (!(values & found_id) && !userobject_id && (val.compare("id") == 0)) { values |= (key_id); }
-                else if (!(values & found_text) && (val.compare("text") == 0)) { values |= (key_text); }
-                else if (!(values & found_reply) && (val.compare("in_reply_to_status_id") == 0)) { values |= (key_reply); }
-                // Check if entering user object
-                else if ((val.compare("user") == 0)) { userobject_id = userobject_screen_name = true; }
-                // Must also check if in a user object
-                else if (!(values & found_userid) && userobject_id && (val.compare("id") == 0)) { values |= (key_userid); }
-                // Must also check if in a user object
-                else if (!(values & found_screenname) && userobject_screen_name && (val.compare("screen_name") == 0)) { values |= (key_screenname); }
-                else if (!(values & found_rt) && (val.compare("retweet_count") == 0)) { values |= (key_rt); }
-                else if (!(values & found_fav) && (val.compare("favorite_count") == 0)) { values |= (key_fav); }
-            }
-            else if (val.compare("retweeted") == 0) { inretweet = false; }  // Check if end of retweet
-            return true;
-        }
-        bool number_unsigned(number_unsigned_t val) override {
-            if (values & key_id && !(values & found_id)) {    // id
-                id = val;
-                values &= ~(key_id);
-                values |= (found_id);
-            }
-            else if (values & key_reply && !(values & found_reply)) {   // in_reply_status_id
-                reply_status = val;
-                values &= ~(key_reply);
-                values |= (found_reply);
-            }
-            else if (values & key_userid && !(values & found_userid)) {    // user.id
-                user_id = val;
-                userobject_id = false;
-                values &= ~(key_userid);
-                values |= (found_userid);
-            }
-            else if (values & key_rt && !(values & found_rt)) {   // retweet_count
-                rt = val;
-                values &= ~(key_rt);
-                values |= (found_rt);
-            }
-            else if (values & key_fav && !(values & found_fav)) {   // favorite_count
-                fav = val;
-                values &= ~(key_fav);
-                values |= (found_fav);
-                // Assume that this is last key required, so add the partial_tweet to result
-                result.emplace_back(partial_tweets::tweet<std::string>{
-                date,id,text,reply_status,{user_id,screen_name},rt,fav});
-            }
-            return true;
-        }
-        bool string(string_t& val) override {
-            if (values & key_date && !(values & found_date)) {   //  created_at
-                date = val;
-                values &= ~(key_date);
-                values |= (found_date);
-            }
-            else if (values & key_text && !(values & found_text)) {   // text
-                text = val;
-                values &= ~(key_text);
-                values |= (found_text);
-            }
-            else if (values & key_screenname && !(values & found_screenname)) {    // user.screen_name
-                screen_name = val;
-                userobject_screen_name = false;
-                values &= ~(key_screenname);
-                values |= (found_screenname);
-            }
-            return true;
-        }
-        bool null() override {
-            if (values & key_reply && !(values & found_reply)) {    // in_reply_status (null case)
-                reply_status = 0;
-                values &= ~(key_reply);
-                values |= (found_reply);
-            }
-            return true;
-        }
-        // Irrelevant events
-        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, std::vector<tweet<std::string>> &result) {
-        Handler handler(result);
-        json::sax_parse(json.data(), &handler);
-
-        return true;
-    }
-}; // nlohmann_json_sax
-BENCHMARK_TEMPLATE(partial_tweets, nlohmann_json_sax)->UseManualTime();
-} // namespace partial_tweets
-
-#endif // SIMDJSON_COMPETITION_NLOHMANN_JSON
@@ -70,7 +70,7 @@ BENCHMARK_TEMPLATE(partial_tweets, rapidjson)->UseManualTime();

 struct rapidjson_insitu : rapidjson_base {
  bool run(simdjson::padded_string &json, std::vector<tweet<std::string_view>> &result) {
-    return rapidjson_base::run(doc.ParseInsitu<kParseValidateEncodingFlag|kParseInsituFlag>(json.data()), result);
+    return rapidjson_base::run(doc.ParseInsitu<kParseValidateEncodingFlag>(json.data()), result);
  }
 };
 BENCHMARK_TEMPLATE(partial_tweets, rapidjson_insitu)->UseManualTime();
@@ -1,165 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_RAPIDJSON
-
-#include "partial_tweets.h"
-#include <string.h>
-#include <fstream>
-
-namespace partial_tweets {
-
-using namespace rapidjson;
-
-struct rapidjson_sax {
-    using StringType=std::string_view;
-
-    // 8 keys to parse for each tweet (in order of appearance): "created_at", "id", "text", "in_reply_status_id", "id"(user),
-    // "screen_name"(user), "retweet_count" and "favorite_count".
-    // Assume that the first valid key encountered will be the correct key to parse.
-    // Assume that each tweet/retweet start with a key "metadata" and has a key "retweeted" towards the end
-    // The previous assumption will be used to check for the beginning of a new tweet and the end of a retweet
-    struct Handler {
-        enum state {    // Bitset to store state of search
-            key_date = (1<<0),
-            key_id = (1<<1),
-            key_text = (1<<2),
-            key_reply = (1<<3),
-            key_userid = (1<<4),
-            key_screenname = (1<<5),
-            key_rt = (1<<6),
-            key_fav = (1<<7),
-            found_date = (1<<8),
-            found_id = (1<<9),
-            found_text = (1<<10),
-            found_reply = (1<<11),
-            found_userid = (1<<12),
-            found_screenname = (1<<13),
-            found_rt = (1<<14),
-            found_fav = (1<<15)
-        };
-        int values = state::key_date;
-        bool userobject_id = false; // If in a user object (to find user.id)
-        bool userobject_screen_name = false;    // If in a user object (to find user.screen_name)
-        bool inretweet = false; // If in a retweet (all keys irrelevant in retweet object)
-        // Fields to store partial tweet info
-        uint64_t user_id;
-        uint64_t id;
-        uint64_t rt;
-        uint64_t fav;
-        uint64_t reply_status;
-        std::string_view screen_name;
-        std::string_view date;
-        std::string_view text;
-        std::vector<tweet<std::string_view>>& result;
-
-        Handler(std::vector<tweet<std::string_view>> &r) : result(r) { }
-
-        bool Key(const char* key, SizeType length, bool copy) {
-            if (!inretweet) {   // If not in a retweet object, find relevant keys
-                if ((length == 16) && (memcmp(key,"retweeted_status",16) == 0)) { inretweet = true; }   // Check if entering retweet
-                else if ((length == 8) && (memcmp(key,"metadata",8) == 0)) { values = 0; }  // Reset
-                // Check if key has been found and if key matches a valid key
-                else if (!(values & found_date) && (length == 10) && (memcmp(key,"created_at",10) == 0)) { values |= (key_date); }
-                // Must also check if not in a user object
-                else if (!(values & found_id) && !userobject_id && (length == 2) && (memcmp(key,"id",2) == 0)) { values |= (key_id); }
-                else if (!(values & found_text) && (length == 4) && (memcmp(key,"text",4) == 0)) { values |= (key_text); }
-                else if (!(values & found_reply) && (length == 21) && (memcmp(key,"in_reply_to_status_id",21) == 0)) { values |= (key_reply); }
-                // Check if entering user object
-                else if ((length == 4) && (memcmp(key,"user",4) == 0)) { userobject_id = userobject_screen_name = true; }
-                // Must also check if in a user object
-                else if (!(values & found_userid) && userobject_id && (length == 2) && (memcmp(key,"id",2) == 0)) { values |= (key_userid); }
-                // Must also check if in a user object
-                else if (!(values & found_screenname) && userobject_screen_name && (length == 11) && (memcmp(key,"screen_name",11) == 0)) { values |= (key_screenname); }
-                else if (!(values & found_rt) && (length == 13) && (memcmp(key,"retweet_count",13) == 0)) { values |= (key_rt); }
-                else if (!(values & found_fav) && (length == 14) && (memcmp(key,"favorite_count",14) == 0)) { values |= (key_fav); }
-            }
-            else if ((length == 9) && (memcmp(key,"retweeted",9) == 0)) { inretweet = false; }  // Check if end of retweet
-            return true;
-        }
-        bool Uint(unsigned i) {
-            if (values & key_userid && !(values & found_userid)) {    // user.id
-                user_id = i;
-                userobject_id = false;
-                values &= ~(key_userid);
-                values |= (found_userid);
-            }
-            else if (values & key_rt && !(values & found_rt)) {   // retweet_count
-                rt = i;
-                values &= ~(key_rt);
-                values |= (found_rt);
-            }
-            else if (values & key_fav && !(values & found_fav)) {   // favorite_count
-                fav = i;
-                values &= ~(key_fav);
-                values |= (found_fav);
-                // Assume that this is last key required, so add the partial_tweet to result
-                result.emplace_back(partial_tweets::tweet<std::string_view>{
-                date,id,text,reply_status,{user_id,screen_name},rt,fav});
-            }
-            return true;
-        }
-        bool Uint64(uint64_t i) {
-            if (values & key_id && !(values & found_id)) {    // id
-                id = i;
-                values &= ~(key_id);
-                values |= (found_id);
-            }
-            else if (values & key_reply && !(values & found_reply)) {   // in_reply_status_id
-                reply_status = i;
-                values &= ~(key_reply);
-                values |= (found_reply);
-            }
-            return true;
-        }
-        bool String(const char* str, SizeType length, bool copy) {
-            if (values & key_date && !(values & found_date)) {   //  created_at
-                date = {str,length};
-                values &= ~(key_date);
-                values |= (found_date);
-            }
-            else if (values & key_text && !(values & found_text)) {   // text
-                text = {str,length};
-                values &= ~(key_text);
-                values |= (found_text);
-            }
-            else if (values & key_screenname && !(values & found_screenname)) {    // user.screen_name
-                screen_name = {str,length};
-                userobject_screen_name = false;
-                values &= ~(key_screenname);
-                values |= (found_screenname);
-            }
-            return true;
-        }
-        bool Null() {
-            if (values & key_reply && !(values & found_reply)) {    // in_reply_status (null case)
-                reply_status = 0;
-                values &= ~(key_reply);
-                values |= (found_reply);
-            }
-            return true;
-        }
-        // Irrelevant events
-        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 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, std::vector<tweet<std::string_view>> &result) {
-        Reader reader;
-        Handler handler(result);
-        InsituStringStream ss(json.data());
-        reader.Parse<kParseInsituFlag | kParseValidateEncodingFlag | kParseFullPrecisionFlag>(ss,handler);
-        return true;
-    }
-
-}; // rapid_jason_sax
-BENCHMARK_TEMPLATE(partial_tweets, rapidjson_sax)->UseManualTime();
-} // namespace partial_tweets
-
-#endif // SIMDJSON_COMPETITION_RAPIDJSON
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel Lemire	61c8cfa07d	More trimming.	2021-02-10 18:43:05 -05:00
Daniel Lemire	6c8fa7c1bc	more removal	2021-02-10 18:29:01 -05:00
Daniel Lemire	1f73998f67	Removing some targets under MSVC.	2021-02-10 18:05:42 -05:00
Daniel Lemire	bac174aece	Fixes targetting Visual Studio 2017.	2021-02-10 17:57:57 -05:00
Daniel Lemire	a7fbb17ac1	Patch release.	2021-01-28 09:47:45 -05:00