Disabling again for GCC 7

.clangd

@@ -1,46 +0,0 @@
-CompileFlags:
-    CompilationDatabase: build
-    Add:
-        - -Werror -Wall -Wextra -Weffc++ -Wsign-compare -Wshadow -Wwrite-strings -Wpointer-arith -Winit-self -Wconversion -Wno-sign-conversion
-        - -Wundefined-inline
-Diagnostics:
-    Suppress:
-        - misc-unused-alias-decls
-        - misc-unused-using-decls
-        - misc-definitions-in-headers # TODO fix and remove these violations
----
-If:
-    PathMatch:
-        - include/.*
-        - src/.*
-    PathExclude:
-        - include/simdjson.h
-        - src/simdjson.cpp
-CompileFlags:
-    Add:
-        - -Wno-unneeded-internal-declaration
-        - -Wno-undefined-internal # TODO fix and remove these violations
-        - -Wno-unused-function
-        - -Wno-unused-const-variable
-Diagnostics:
-    Suppress:
-        - pp_including_mainfile_in_preamble
----
-# Amalgamated files that require or partly define an implementation
-If:
-    PathMatch:
-        - .*/(arm64|fallback|haswell|icelake|ppc64|westmere)/begin.h
-        - .*/generic/.*
-Diagnostics:
-    Suppress:
-        - pragma_attribute_no_pop_eof
----
-# clang has a bad time detecting the push/pop together in src/ for some reason
-If:
-    PathMatch:
-        - include/simdjson/.*/end.h
-        - src/(arm64|fallback|haswell|icelake|ppc64|westmere).cpp
-Diagnostics:
-    Suppress:
-        - pragma_attribute_no_pop_eof
-        - pragma_attribute_stack_mismatch

.editorconfig

@@ -1,12 +0,0 @@
-# https://editorconfig.org/
-root = true
-# Conservatively avoid changing defaults for other file types, e.g. raw json files for test cases,
-# Makefiles, etc.
-[*.{cpp,h,md}]
-charset                  = utf-8
-end_of_line              = lf
-indent_size              = 2
-indent_style             = space
-insert_final_newline     = true
-tab_width                = 2
-trim_trailing_whitespace = true

.gitattributes

@@ -78,7 +78,6 @@
 
 .gitattributes export-ignore
 .gitignore     export-ignore
-.editorconfig  export-ignore
 
 # Sources
 *.c     text eol=lf diff=c

.github/ISSUE_TEMPLATE/bug_report.md

@@ -12,26 +12,24 @@ Before submitting an issue, please ensure that you have read the documentation:
 * Basics is an overview of how to use simdjson and its APIs: https://github.com/simdjson/simdjson/blob/master/doc/basics.md
 * Performance shows some more advanced scenarios and how to tune for them: https://github.com/simdjson/simdjson/blob/master/doc/performance.md
 * Contributing: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md
-* We follow the [JSON specification as described by RFC 8259](https://www.rfc-editor.org/rfc/rfc8259.txt) (T. Bray, 2017). If you wish to support features that are not part of RFC 8259, then you should not refer to your issue as a bug.
+* We follow the [JSON specification as described by RFC 8259](https://www.rfc-editor.org/rfc/rfc8259.txt) (T. Bray, 2017).
 
 
 **Describe the bug**
-A clear and concise description of what the bug is. A bug is a failure to build with normal compiler settings or a misbehaviour: when running the code, you get a result that differs from the expected result from our documentation.
+A clear and concise description of what the bug is.
 
-A compiler or static-analyzer warning is not a bug. It is possible with tools such as Visual Studio to require that rarely enabled warnings are considered errors. Do not report such cases as bugs. We do accept pull requests if you want to silence warnings issued by code analyzers, however.
+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').
 
-An unexpected poor software performance can be accepted as a bug (a 'performance 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. In particular, we recommend your run tests with the simdjson library and you code compiled in debug mode. The simdjson then sets the SIMDJSON_DEVELOPMENT_CHECKS macro to 1, and this triggers additional checks on your code and on the internals of the library. If possible, we recommend that you run tests with sanitizers (e.g., see [No more leaks with sanitize flags in gcc and clang](https://lemire.me/blog/2016/04/20/no-more-leaks-with-sanitize-flags-in-gcc-and-clang/)).  You can compile the library with sanitizers for debugging purposes (e.g., set SIMDJSON_SANITIZE to ON using CMake), but you should also turn on sanitizers on your own code. You may also use tools like valgrind or the commercial equivalent.
+We recommend that you run your tests using different optimization levels.
 
 Before reporting a bug, please ensure that you have read our documentation.
 
 **To Reproduce**
-Steps to reproduce the behaviour: provide a code sample if possible. Please provide a complete test with data. Remember that a bug is either a failure to build or an unexpected result when running the code.
+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.
 
@@ -45,18 +43,14 @@ It is fine to report bugs against our main branch, but if that is what you are d
 
 **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]
+ - 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.
+We support up-to-date 64-bit ARM and x64 FreeBSD, macOS, Windows and Linux systems. Please ensure that your configuration is supported before labelling the issue as a bug. In particular, we do not support legacy 32-bit systems.
-
-* We do not support unreleased or experimental compilers. If you encounter an issue with a
-pre-release version of a compiler, do not report it as a bug to simdjson. However, we always
-invite contributions either in the form an analysis or of a code contribution.
 
 **Indicate whether you are willing or able to provide a bug fix as a pull request**
 
-If you plan to contribute to simdjson, please read our guide:
+If you plan to contribute to simdjson, please read our
 * CONTRIBUTING guide: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md and our
 * HACKING guide: https://github.com/simdjson/simdjson/blob/master/HACKING.md

.github/workflows/alpine.yml

@@ -9,7 +9,7 @@ jobs:
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           path: dependencies/.cache
@@ -31,4 +31,4 @@ jobs:
           ./alpine.sh cmake --build build_for_alpine
       - name: test
         run: |
-          ./alpine.sh bash -c "cd build_for_alpine && ctest  -LE explicitonly --output-on-failure"
+          ./alpine.sh bash -c "cd build_for_alpine && ctest  -LE explicitonly"

.github/workflows/debian.yaml

@@ -1,33 +0,0 @@
-name: Debian
-
-on: [push, pull_request]
-
-defaults:
-  run:
-    shell: sh
-
-permissions:
-  contents: read
-
-jobs:
-  pkg-config:
-    runs-on: ubuntu-latest
-    container:
-      image: debian:testing
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Install dependencies
-      run: |
-        apt -y update
-        apt -y --no-install-recommends install g++ cmake make pkg-config
-
-    - name: Build and install
-      run: |
-        cmake -B build
-        cmake --build build
-        cmake --install build
-
-    - name: Test pkg-config
-      run: g++ examples/quickstart/quickstart.cpp $(pkg-config --cflags --libs simdjson)

.github/workflows/documentation.yml

@@ -1,34 +0,0 @@
-name: Doxygen GitHub Pages
-
-on:
-  push:
-    branches:
-      - master
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-permissions:
-  contents: write
-  pages: write
-  id-token: write
-
-jobs:
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install Doxygen
-        run: sudo apt-get install doxygen graphviz -y
-      - run: mkdir docs
-      - name: Install theme
-        run: ./tools/prepare_doxygen.sh
-      - name: Generate Doxygen Documentation
-        run: doxygen
-      - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: doc/api/html

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

@@ -6,7 +6,7 @@ jobs:
   whitespace:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Remove whitespace and check the diff
         run: |
           set -eu

.github/workflows/fuzzers.yml

@@ -24,7 +24,7 @@ jobs:
       implementations: haswell westmere fallback
       UBSAN_OPTIONS: halt_on_error=1
       MAXLEN: -max_len=4000
-      CLANGVERSION: 15
+      CLANGVERSION: 11
       # which optimization level to use for the sanitizer build (see build_fuzzer.variants.sh)
       OPTLEVEL: -O3
 
@@ -32,13 +32,12 @@ jobs:
     - name: Install packages necessary for building
       run: |
         sudo apt update
-        sudo apt-get install --quiet ninja-build valgrind zip unzip lsb-release wget software-properties-common gnupg
+        sudo apt-get install --quiet ninja-build valgrind zip unzip
         wget https://apt.llvm.org/llvm.sh
-        sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
         chmod +x llvm.sh
         sudo ./llvm.sh $CLANGVERSION
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
 
     - uses: actions/cache@v3
       with:
@@ -125,7 +124,7 @@ jobs:
         done
 
     - name: Save the corpus as a github artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       with:
         name: corpus
         path: corpus.tar
@@ -148,7 +147,7 @@ jobs:
       run: tar cf valgrind.tar valgrind-*.txt
 
     - name: Save valgrind output as a github artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       if: always()
       with:
         name: valgrindresults
@@ -156,7 +155,7 @@ jobs:
         if-no-files-found: ignore
 
     - name: Archive any crashes as an artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       if: always()
       with:
         name: crashes

.github/workflows/macos-11.yml

@@ -1,32 +1,33 @@
-name: Ubuntu 22.04 CI (GCC 12, CXX 20)
+name: Macos (Xcode 11)
 
 on: [push, pull_request]
 
 jobs:
-  ubuntu-build:
+  macos-build:
     if: >-
       ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-22.04
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - 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 &&
-          CXX=g++-12 cmake -DSIMDJSON_CXX_STANDARD=20 -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
+          cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
           cmake --build .   &&
-          ctest --output-on-failure -LE explicitonly -j   &&
+          ctest -j --output-on-failure -LE explicitonly   &&
           cd .. &&
           mkdir build &&
           cd build &&
-          CXX=g++-12 cmake -DSIMDJSON_CXX_STANDARD=20  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
+          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
           cmake --build .   &&
-          ctest --output-on-failure -LE explicitonly -j   &&
+          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 &&

.github/workflows/macos.yml

@@ -9,7 +9,7 @@ jobs:
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           path: dependencies/.cache
@@ -20,25 +20,14 @@ jobs:
           cd builddebug &&
           cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
           cmake --build .   &&
-          ctest --output-on-failure -LE explicitonly -j   &&
+          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 --output-on-failure -LE explicitonly -j   &&
+          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 .
-      - name: Use cmake (shared)
-        run: |
-          mkdir buildshared &&
-          cd buildshared &&
-          cmake  -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
-          cmake --build .   &&
-          ctest --output-on-failure -LE explicitonly -j   &&
-          cmake --install . &&
-          echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
-          cd ../tests/installation_tests/find &&
-          mkdir buildshared && cd buildshared && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../buildshared/destination .. &&  cmake --build .

.github/workflows/msys2-clang.yml

@@ -24,7 +24,7 @@ jobs:
       CMAKE_GENERATOR: Ninja
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           path: dependencies/.cache

.github/workflows/msys2.yml

@@ -26,7 +26,7 @@ jobs:
       CMAKE_GENERATOR: Ninja
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           path: dependencies/.cache

.github/workflows/power-fuzz.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-20.04
     name: Build on ubuntu-20.04 ppc64le
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2.1.0
       - uses: uraimo/run-on-arch-action@v2.0.5
         name: Run commands
         id: runcmd

.github/workflows/ppc64.yml

@@ -1,29 +0,0 @@
-name: Ubuntu ppc64le (GCC 11)
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: uraimo/run-on-arch-action@v2
-        name: Test
-        id: runcmd
-        with:
-          arch: ppc64le
-          distro: ubuntu_latest
-          githubToken: ${{ github.token }}
-          install: |
-            apt-get update -q -y
-            apt-get install -y cmake make g++
-          run: |
-            cmake -DCMAKE_BUILD_TYPE=Release -B build
-            cmake --build build -j=2
-            ctest --output-on-failure --test-dir build

.github/workflows/riscv64.yml

@@ -1,29 +0,0 @@
-name: Ubuntu riscv64 (GCC 11)
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: uraimo/run-on-arch-action@v2
-        name: Test
-        id: runcmd
-        with:
-          arch: riscv64
-          distro: ubuntu_latest
-          githubToken: ${{ github.token }}
-          install: |
-            apt-get update -q -y
-            apt-get install -y cmake make g++
-          run: |
-            cmake -DCMAKE_BUILD_TYPE=Release -B build
-            cmake --build build -j=2
-            ctest --output-on-failure --test-dir build

.github/workflows/s390x.yml

@@ -1,29 +0,0 @@
-name: Ubuntu s390x (GCC 11)
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: uraimo/run-on-arch-action@v2
-        name: Test
-        id: runcmd
-        with:
-          arch: s390x
-          distro: ubuntu_latest
-          githubToken: ${{ github.token }}
-          install: |
-            apt-get update -q -y
-            apt-get install -y cmake make g++
-          run: |
-            cmake -DCMAKE_BUILD_TYPE=Release -B build
-            cmake --build build -j=2
-            ctest --output-on-failure --test-dir build

.github/workflows/ubuntu18-checkperf.yml

@@ -0,0 +1,29 @@
+name: Performance check on Ubuntu 18.04 CI (GCC 7)
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  ubuntu-build:
+    if: >-
+      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
+      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        with:
+          path: dependencies/.cache
+          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+      - name: Use cmake
+        run: |
+          mkdir build &&
+          cd build &&
+          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_ENABLE_DOM_CHECKPERF=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
+          cmake --build . --target checkperf  &&
+          ctest --output-on-failure -R checkperf  ubuntu18-checkperf.yml

.github/workflows/ubuntu18-oldclang.yml

@@ -1,4 +1,4 @@
-name: Ubuntu 22.04 CI (CLANG 14)
+name: Ubuntu 18.04 CI (LLVM 7)
 
 on: [push, pull_request]
 
@@ -7,17 +7,25 @@ jobs:
     if: >-
       ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
+
+    env:
+      CC: clang-7
+      CXX: clang++-7
     steps:
-      - uses: actions/checkout@v4
+      - 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 &&
-          CXX=clang++-14 cmake -DSIMDJSON_DEVELOPER_MODE=ON ..  &&
+          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
           cmake --build .   &&
-          ctest --output-on-failure -LE explicitonly -j
+          ctest -j --output-on-failure -LE explicitonly

.github/workflows/ubuntu18-threadsani.yml

@@ -1,15 +1,16 @@
-name: Ubuntu 22.04 CI (GCC 13)
+name: Ubuntu 18.04 CI (GCC 7) with Thread Sanitizer
 
 on: [push, pull_request]
 
+
 jobs:
   ubuntu-build:
     if: >-
       ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           path: dependencies/.cache
@@ -18,6 +19,7 @@ jobs:
         run: |
           mkdir build &&
           cd build &&
-          CXX=g++-13 cmake -DSIMDJSON_DEVELOPER_MODE=ON ..  &&
+          cmake  -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE_THREADS=ON ..  &&
-          cmake --build .   &&
+          cmake --build . --target document_stream_tests --target ondemand_document_stream_tests --target parse_many_test  &&
-          ctest --output-on-failure -LE explicitonly -j
+          ctest --output-on-failure  -R parse_many_test  &&
+          ctest --output-on-failure  -R document_stream_tests

.github/workflows/ubuntu18.yml

@@ -0,0 +1,25 @@
+name: Ubuntu 18.04 CI (GCC 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
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        with:
+          path: dependencies/.cache
+          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
+      - 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   &&
+          make install  &&
+          echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json

.github/workflows/ubuntu20-checkperf.yml

@@ -15,7 +15,7 @@ jobs:
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           path: dependencies/.cache

.github/workflows/ubuntu20-gcc8.yml

@@ -12,7 +12,7 @@ jobs:
       CXX: g++-8
       CC: gcc-8
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           path: dependencies/.cache
@@ -25,13 +25,13 @@ jobs:
           cd builddebug &&
           cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
           cmake --build .   &&
-          ctest --output-on-failure -LE explicitonly -j   &&
+          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 --output-on-failure -LE explicitonly -j   &&
+          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 &&

.github/workflows/ubuntu20-noexcept.yml

@@ -9,7 +9,7 @@ jobs:
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           path: dependencies/.cache
@@ -20,13 +20,13 @@ jobs:
           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 --output-on-failure -LE explicitonly -j   &&
+          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 --output-on-failure -LE explicitonly -j   &&
+          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 &&

.github/workflows/ubuntu20-nothread.yml

@@ -9,7 +9,7 @@ jobs:
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           path: dependencies/.cache
@@ -20,13 +20,13 @@ jobs:
           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 --output-on-failure -LE explicitonly -j   &&
+          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 --output-on-failure -LE explicitonly -j   &&
+          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 &&

.github/workflows/ubuntu20-sani.yml

@@ -3,39 +3,21 @@ name: Ubuntu 20.04 CI (GCC 9) With Memory Sanitizer
 on: [push, pull_request]
 
 jobs:
-  ubuntu-build-address-sanitizier:
+  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@v4
+      - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           path: dependencies/.cache
           key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake with address sanitizer
+      - 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 --output-on-failure -LE explicitonly -j
+          ctest -j --output-on-failure -LE explicitonly
-  ubuntu-build-undefined-sanitizer:
-    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@v4
-      - uses: actions/cache@v3
-        with:
-          path: dependencies/.cache
-          key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake with undefined sanitizer
-        run: |
-          mkdir builddebugundefsani &&
-          cd builddebugundefsani &&
-          cmake -DSIMDJSON_SANITIZE_UNDEFINED=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF ..  &&
-          cmake --build .   &&
-          ctest --output-on-failure -LE explicitonly -j

.github/workflows/ubuntu20-threadsani.yml

@@ -1,4 +1,4 @@
-name: Ubuntu 22.04 CI (GCC 11) with Thread Sanitizer
+name: Ubuntu 20.04 CI (GCC 9) with Thread Sanitizer
 
 on: [push, pull_request]
 
@@ -7,9 +7,9 @@ jobs:
     if: >-
       ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           path: dependencies/.cache

.github/workflows/ubuntu20.yml

@@ -9,38 +9,24 @@ jobs:
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           path: dependencies/.cache
           key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake to build just the library
-        run: |
-          mkdir buildjustlib &&
-          cd buildjustlib &&
-          cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_DEVELOPER_MODE=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
-          cmake --build .   &&
-          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 &&
-          cd ../tests/installation_tests/find &&
-          mkdir buildjustlib &&
-          cd buildjustlib &&
-          cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../buildjustlib/destination .. &&
-          cmake --build .
       - 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 --output-on-failure -LE explicitonly -j   &&
+          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 --output-on-failure -LE explicitonly -j   &&
+          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 &&

.github/workflows/ubuntu22-clang13.yml

@@ -9,15 +9,17 @@ jobs:
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - 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 --output-on-failure -LE explicitonly -j
+          ctest -j --output-on-failure -LE explicitonly

.github/workflows/ubuntu22-gcc12.yml

@@ -9,15 +9,17 @@ jobs:
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - 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 --output-on-failure -LE explicitonly -j
+          ctest -j --output-on-failure -LE explicitonly

.github/workflows/ubuntu22-glibcxxassertions.yml

@@ -1,24 +0,0 @@
-name: Ubuntu 22.04 CI GCC 12 with GLIBCXX_ASSERTIONS
-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@v4
-      - 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 -DCMAKE_BUILD_TYPE=Debug  -DSIMDJSON_GLIBCXX_ASSERTIONS=ON -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON ..  &&
-          cmake --build .   &&
-          ctest . -E avoid_

.github/workflows/ubuntu22.yml

@@ -9,38 +9,24 @@ jobs:
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           path: dependencies/.cache
           key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
-      - name: Use cmake to build just the library
-        run: |
-          mkdir buildjustlib &&
-          cd buildjustlib &&
-          cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_DEVELOPER_MODE=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination ..  &&
-          cmake --build .   &&
-          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 &&
-          cd ../tests/installation_tests/find &&
-          mkdir buildjustlib &&
-          cd buildjustlib &&
-          cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../buildjustlib/destination .. &&
-          cmake --build .
       - 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 --output-on-failure -LE explicitonly -j   &&
+          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 --output-on-failure -LE explicitonly -j   &&
+          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 &&

.github/workflows/vs17-arm-ci.yml

@@ -14,7 +14,7 @@ jobs:
            - {arch: ARM64}
      steps:
        - name: checkout
-         uses: actions/checkout@v4
+         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  &&

.github/workflows/vs17-ci-cxx20.yml

@@ -1,44 +0,0 @@
-name: VS17-CI CXX20
-
-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@v4
-    - name: Configure
-      run: |
-        cmake -DSIMDJSON_CXX_STANDARD=20 -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
-    - 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

.github/workflows/vs17-ci.yml

@@ -19,7 +19,7 @@ jobs:
           - {gen: Visual Studio 17 2022, arch: x64, shared: OFF}
     steps:
     - name: checkout
-      uses: actions/checkout@v4
+      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

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

@@ -16,7 +16,7 @@ jobs:
           - {gen: Visual Studio 17 2022, arch: x64}
     steps:
     - name: checkout
-      uses: actions/checkout@v4
+      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

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

@@ -7,7 +7,7 @@ jobs:
     name: windows-vs17
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - uses: actions/cache@v3
       with:
         path: dependencies/.cache

.gitignore

@@ -104,6 +104,3 @@ objs
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
-
-# clangd
-.cache

.vscode/extensions.json

@@ -4,15 +4,10 @@
 
 	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
-		// C++
+		// Syntax
-		"llvm-vs-code-extensions.vscode-clangd",
+		"ms-vscode.cpptools",
-		"xaver.clang-format",
-		// Python
-		"ms-python.python",
-		// .github/*
-		"github.vscode-github-actions",
-		// cmake
 		"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.

.vscode/settings.json

@@ -5,7 +5,6 @@
     ],
     "files.trimTrailingWhitespace": true,
     "files.associations": {
-        ".clangd": "yaml",
         "array": "cpp",
         "iterator": "cpp",
         "chrono": "cpp",
@@ -87,22 +86,6 @@
         "vector": "cpp",
         "*.ipp": "cpp",
         "__functional_base_03": "cpp",
-        "filesystem": "cpp",
+        "filesystem": "cpp"
-        "*.inc": "cpp",
-        "compare": "cpp",
-        "concepts": "cpp",
-        "variant": "cpp",
-        "__bits": "cpp",
-        "csignal": "cpp",
-        "future": "cpp",
-        "queue": "cpp",
-        "shared_mutex": "cpp",
-        "ranges": "cpp",
-        "span": "cpp",
-        "__verbose_abort": "cpp",
-        "charconv": "cpp",
-        "source_location": "cpp",
-        "strstream": "cpp",
-        "typeindex": "cpp"
     }
 }

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14)
 project(
     simdjson
     # The version number is modified by tools/release.py
-    VERSION 3.7.0
+    VERSION 2.0.4
     DESCRIPTION "Parsing gigabytes of JSON per second"
     HOMEPAGE_URL "https://simdjson.org/"
     LANGUAGES CXX C
@@ -20,10 +20,8 @@ string(
 # ---- Options, variables ----
 
 # These version numbers are modified by tools/release.py
-set(SIMDJSON_LIB_VERSION "20.0.0" CACHE STRING "simdjson library version")
+set(SIMDJSON_LIB_VERSION "11.0.0" CACHE STRING "simdjson library version")
-set(SIMDJSON_LIB_SOVERSION "20" CACHE STRING "simdjson library soversion")
+set(SIMDJSON_LIB_SOVERSION "11" CACHE STRING "simdjson library soversion")
-
-option(SIMDJSON_BUILD_STATIC_LIB "Build simdjson_static library along with simdjson" OFF)
 
 option(SIMDJSON_ENABLE_THREADS "Link with thread support" ON)
 
@@ -58,17 +56,8 @@ include(cmake/developer-options.cmake)
 
 # ---- simdjson library ----
 
-set(SIMDJSON_SOURCES src/simdjson.cpp)
+add_library(simdjson src/simdjson.cpp)
-
-add_library(simdjson ${SIMDJSON_SOURCES})
 add_library(simdjson::simdjson ALIAS simdjson)
-set(SIMDJSON_LIBRARIES simdjson)
-
-if(SIMDJSON_BUILD_STATIC_LIB)
-  add_library(simdjson_static STATIC ${SIMDJSON_SOURCES})
-  add_library(simdjson::simdjson_static ALIAS simdjson_static)
-  list(APPEND SIMDJSON_LIBRARIES simdjson_static)
-endif()
 
 set_target_properties(
     simdjson PROPERTIES
@@ -106,21 +95,6 @@ if(
   )
 endif()
 
-# GCC and Clang have horrendous Debug builds when using SIMD.
-# A common fix is to use '-Og' instead.
-# bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412
-if(
-    (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
-        CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
-        CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-)
-  message(STATUS "Adding -Og to compile flag")
-  simdjson_add_props(
-      target_compile_options PRIVATE
-      $<$<CONFIG:DEBUG>:-Og>
-  )
-endif()
-
 if(SIMDJSON_ENABLE_THREADS)
   find_package(Threads REQUIRED)
   simdjson_add_props(target_link_libraries PUBLIC Threads::Threads)
@@ -128,9 +102,6 @@ if(SIMDJSON_ENABLE_THREADS)
 endif()
 
 simdjson_apply_props(simdjson)
-if(SIMDJSON_BUILD_STATIC_LIB)
-  simdjson_apply_props(simdjson_static)
-endif()
 
 # ---- Install rules ----
 
@@ -152,6 +123,7 @@ install(
     ARCHIVE COMPONENT simdjson_Development
     INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 )
+
 configure_file(cmake/simdjson-config.cmake.in simdjson-config.cmake @ONLY)
 
 write_basic_package_version_file(
@@ -177,39 +149,7 @@ install(
     EXPORT simdjsonTargets
     NAMESPACE simdjson::
     DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
-    COMPONENT simdjson_Development
+    COMPONENT example_Development
-)
-
-if(SIMDJSON_BUILD_STATIC_LIB)
-  install(
-      TARGETS simdjson_static
-      EXPORT simdjson_staticTargets
-      ARCHIVE COMPONENT simdjson_Development
-  )
-  install(
-      EXPORT simdjson_staticTargets
-      NAMESPACE simdjson::
-      DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
-      COMPONENT simdjson_Development
-  )
-endif()
-
-# pkg-config
-include(cmake/JoinPaths.cmake)
-join_paths(PKGCONFIG_INCLUDEDIR "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
-join_paths(PKGCONFIG_LIBDIR "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
-
-if(SIMDJSON_ENABLE_THREADS)
-  set(PKGCONFIG_CFLAGS "-DSIMDJSON_THREADS_ENABLED=1")
-  if(CMAKE_THREAD_LIBS_INIT)
-    set(PKGCONFIG_LIBS_PRIVATE "Libs.private: ${CMAKE_THREAD_LIBS_INIT}")
-  endif()
-endif()
-
-configure_file("simdjson.pc.in" "simdjson.pc" @ONLY)
-install(
-    FILES "${CMAKE_CURRENT_BINARY_DIR}/simdjson.pc"
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
 )
 
 #
@@ -230,14 +170,11 @@ endif()
 
 # ---- Developer mode extras ----
 
-if(is_top_project AND NOT SIMDJSON_DEVELOPER_MODE)
-  message(STATUS "Building only the library. Advanced users and contributors may want to turn SIMDJSON_DEVELOPER_MODE to ON, e.g., via -D SIMDJSON_DEVELOPER_MODE=ON.")
-elseif(SIMDJSON_DEVELOPER_MODE AND NOT is_top_project)
-  message(AUTHOR_WARNING "Developer mode in simdjson is intended for the developers of simdjson")
-endif()
-
 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)
@@ -278,9 +215,7 @@ add_subdirectory(singleheader)
 #
 add_subdirectory(tests)
 add_subdirectory(examples)
-if(CMAKE_SIZEOF_VOID_P EQUAL 8) # we only include the benchmarks on 64-bit systems.
 add_subdirectory(benchmark)
-endif()
 add_subdirectory(fuzz)
 
 #

CONTRIBUTING.md

@@ -52,11 +52,10 @@ General Guidelines
 Contributors are encouraged to :
 
 - Document their changes. Though we do not enforce a rule regarding code comments, we prefer that non-trivial algorithms and techniques be somewhat documented in the code.
-- Follow as much as possible the existing code style. We do not enforce a specific code style, but we prefer consistency. We avoid contractions (isn't, aren't) in the comments.
+- Follow as much as possible the existing code style. We do not enforce a specific code style, but we prefer consistency.
 - Modify as few lines of code as possible when working on an issue. The more lines you modify, the harder it is for your fellow human beings to understand what is going on.
-- Tools may report "problems" with the code, but we never delegate programming to tools: if there is a problem with the code, we need to understand it. Thus we will not "fix" code merely to please a static analyzer.
+- Tools may report "problems" with the code, but we never delegate programming to tools: if there is a problem with the code, we need to understand it. Thus we will not "fix" code merely to please a static analyzer if we do not understand.
 - Provide tests for any new feature. We will not merge a new feature without tests.
-- Run before/after benchmarks so that we can appreciate the effect of the changes on the performance.
 
 Pull Requests
 --------------

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = simdjson
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "3.7.0"
+PROJECT_NUMBER         = "2.0.4"
 
 # 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
@@ -829,7 +829,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = doc include/simdjson include/simdjson/dom include/simdjson/generic
+INPUT                  = doc include
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1246,10 +1246,7 @@ HTML_STYLESHEET        =
 # list). For an example see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-
+HTML_EXTRA_STYLESHEET  =
-HTML_EXTRA_STYLESHEET  = theme/doxygen-awesome.css \
-                         theme/doxygen-awesome-sidebar-only.css \
-                         theme/doxygen-awesome-sidebar-only-darkmode-toggle.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1259,10 +1256,7 @@ HTML_EXTRA_STYLESHEET  = theme/doxygen-awesome.css \
 # files will be copied as-is; there are no commands or markers available.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_FILES       = theme/doxygen-awesome-darkmode-toggle.js \
+HTML_EXTRA_FILES       =
-                         theme/doxygen-awesome-interactive-toc.js \
-                         theme/doxygen-awesome-fragment-copy-button.js \
-                         theme/doxygen-awesome-paragraph-link.js
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
@@ -1549,7 +1543,7 @@ DISABLE_INDEX          = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_TREEVIEW      = YES
+GENERATE_TREEVIEW      = NO
 
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.

HACKING.md

@@ -1,4 +1,3 @@
-
 Hacking simdjson
 ================
 
@@ -6,26 +5,6 @@ Here is wisdom about how to build, test and run simdjson from within the reposit
 
 If you plan to contribute to simdjson, please read our [CONTRIBUTING](https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md) guide.
 
-- [Hacking simdjson](#hacking-simdjson)
-  - [Build Quickstart](#build-quickstart)
-  - [Design notes](#design-notes)
-  - [Developer mode](#developer-mode)
-  - [Directory Structure and Source](#directory-structure-and-source)
-  - [Runtime Dispatching](#runtime-dispatching)
-  - [Regenerating Single-Header Files](#regenerating-single-header-files)
-  - [Usage (CMake on 64-bit platforms like Linux, FreeBSD or macOS)](#usage-cmake-on-64-bit-platforms-like-linux-freebsd-or-macos)
-  - [Usage (CMake on 64-bit Windows using Visual Studio 2019 or better)](#usage-cmake-on-64-bit-windows-using-visual-studio-2019-or-better)
-  - [Various References](#various-references)
-
-Build Quickstart
-------------------------------
-
-```bash
-mkdir build
-cd build
-cmake -D SIMDJSON_DEVELOPER_MODE=ON ..
-cmake --build .
-```
 
 Design notes
 ------------------------------
@@ -73,34 +52,26 @@ simdjson's source structure, from the top level, looks like this:
 
 * **CMakeLists.txt:** The main build system.
 * **include:** User-facing declarations and inline definitions (most user-facing functions are inlined).
-  * simdjson.h: the `simdjson` namespace. A "main include" that includes files from include/simdjson/. This is equivalent to
+  * simdjson.h: A "main include" that includes files from include/simdjson/. This is equivalent to
     the distributed simdjson.h.
   * simdjson/*.h: Declarations for public simdjson classes and functions.
   * simdjson/*-inl.h: Definitions for public simdjson classes and functions.
-    * simdjson/internal/*.h: the `simdjson::internal` namespace. Private classes and functions used by the rest of simdjson.
-  * simdjson/dom.h: the `simdjson::dom` namespace. Includes all public DOM classes.
-    * simdjson/dom/*.h: Declarations/definitions for individual DOM classes.
-  * simdjson/arm64|fallback|haswell|icelake|ppc64|westmere.h: `simdjson::<implementation>` namespace. Common implementation-specific tools like number and string parsing, as well as minification.
-    * simdjson/arm64|fallback|haswell|icelake|ppc64|westmere/*.h: implementation-specific functions such as , etc.
-    * simdjson/generic/*.h: the bulk of the actual code, written generically and compiled for each implementation, using functions defined in the implementation's .h files.
-      * simdjson/generic/dependencies.h: dependencies on common, non-implementation-specific simdjson classes. This will be included before including amalgamated.h.
-      * simdjson/generic/amalgamated.h: all generic ondemand classes for an implementation.
-  * simdjson/ondemand.h: the `simdjson::ondemand` namespace. Includes all public ondemand classes.
-    * simdjson/builtin.h: the `simdjson::builtin` namespace. Aliased to the most universal implementation available.
-    * simdjson/builtin/ondemand.h: the `simdjson::builtin::ondemand` namespace.
-    * simdjson/arm64|fallback|haswell|icelake|ppc64|westmere/ondemand.h: the `simdjson::<implementation>::ondemand` namespace. on demand compiled for the specific implementation.
-    * simdjson/generic/ondemand/*.h: individual on demand classes, generically written.
-      * simdjson/generic/ondemand/dependencies.h: dependencies on common, non-implementation-specific simdjson classes. This will be included before including amalgamated.h.
-      * simdjson/generic/ondemand/amalgamated.h: all generic ondemand classes for an implementation.
 * **src:** The source files for non-inlined functionality (e.g. the architecture-specific parser
   implementations).
   * simdjson.cpp: A "main source" that includes all implementation files from src/. This is
     equivalent to the distributed simdjson.cpp.
-  * *.cpp: other misc. implementations, such as `simdjson::implementation` and the minifier.
+  * arm64/|fallback/|haswell/|ppc64/|westmere/: Architecture-specific implementations. All functions are
-  * arm64|fallback|haswell|icelake|ppc64|westmere.cpp: Architecture-specific parser implementations.
+    Each architecture defines its own namespace, e.g. simdjson::haswell.
-    * generic/*.h: `simdjson::<implementation>` namespace. Generic implementation of the parser, particularly the `dom_parser_implementation`.
+  * generic/: Generic implementations of the simdjson parser. These files may be included and
-    * generic/stage1/*.h: `simdjson::<implementation>::stage1` namespace. Generic implementation of the simd-heavy tokenizer/indexer pass of the simdjson parser. Used for the On Demand interface
+    compiled multiple times, from whichever architectures use them. They assume they are already
-    * generic/stage2/*.h: `simdjson::<implementation>::stage2` namespace. Generic implementation of the tape creator, which consumes the index from stage 1 and actually parses numbers and string and such. Used for the DOM interface.
+    enclosed in a namespace, e.g.:
+    ```c++
+    namespace simdjson {
+      namespace haswell {
+        #include "generic/stage1/json_structural_indexer.h"
+      }
+    }
+    ```
 
 Other important files and directories:
 * **.drone.yml:** Definitions for Drone CI.
@@ -111,7 +82,7 @@ Other important files and directories:
 * **singleheader/amalgamate.py:** Generates `singleheader/simdjson.h` and `singleheader/simdjson.cpp` for release (python script).
 * **benchmark:** This is where we do benchmarking. Benchmarking is core to every change we make; the
   cardinal rule is don't regress performance without knowing exactly why, and what you're trading
-  for it. Many of our benchmarks are microbenchmarks. We are effectively doing controlled scientific experiments for the purpose of understanding what affects our performance. So we simplify as much as possible. We try to avoid irrelevant factors such as page faults, interrupts, unnecessary system calls. We recommend checking the performance as follows:
+  for it. Many of our benchmarks are microbenchmarks. We are effectively doing controlled scientific experiments for the purpose of understanding what affects our performance. So we simplify as much as possible. We try to avoid irrelevant factors such as page faults, interrupts, unnnecessary system calls. We recommend checking the performance as follows:
   ```bash
   mkdir build
   cd build
@@ -222,7 +193,7 @@ point it gets included (but only once per header). singleheader/simdjson.cpp is
 src/simdjson.cpp the same way, except files under generic/ may be included and copy/pasted multiple
 times.
 
-## Usage (CMake on 64-bit platforms like Linux, FreeBSD or macOS)
+### Usage (CMake on 64-bit platforms like Linux, FreeBSD or macOS)
 
 Requirements: In addition to git, we require a recent version of CMake as well as bash.
 
@@ -285,9 +256,7 @@ Note that the name of directory (`build`) is arbitrary, you can name it as you w
 
 
 
-## Usage (CMake on 64-bit Windows using Visual Studio 2019 or better)
+### Usage (CMake on 64-bit Windows using Visual Studio 2019)
-
-Recent versions of Visual Studio support CMake natively, [please refer to the Visual Studio documentation](https://learn.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio?view=msvc-170).
 
 We assume you have a common 64-bit Windows PC with at least Visual Studio 2019.
 
@@ -304,7 +273,7 @@ Though having Visual Studio installed is necessary, one can build simdjson using
 - `mkdir build`
 - `cd build`
 - `cmake ..`
-- `cmake --build . --config Release`
+- `cmake --build . -config Release`
 
 
 Furthermore, if you have installed LLVM clang on Windows, for example as a component of Visual Studio 2019, you can configure and build simdjson using LLVM clang on Windows using cmake:
@@ -313,10 +282,10 @@ Furthermore, if you have installed LLVM clang on Windows, for example as a compo
 - `mkdir build`
 - `cd build`
 - `cmake -T ClangCL ..`
-- `cmake --build . --config Release`
+- `cmake --build . -config Release`
 
 
-## Various References
+### Various References
 
 - [How to implement atoi using SIMD?](https://stackoverflow.com/questions/35127060/how-to-implement-atoi-using-simd)
 - [Parsing JSON is a Minefield 💣](http://seriot.ch/parsing_json.php)

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 The simdjson authors
+   Copyright 2018-2019 The simdjson authors 
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,9 +1,9 @@
 
+![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)
-[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/simdjson.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:simdjson)
+![VS16-CI](https://github.com/simdjson/simdjson/workflows/VS16-CI/badge.svg)
-[![][license img]][license]
+![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)
-[![Doxygen Documentation](https://img.shields.io/badge/docs-doxygen-green.svg)](https://simdjson.github.io/simdjson/)
 
 simdjson : Parsing gigabytes of JSON per second
 ===============================================
@@ -26,42 +26,16 @@ This library is part of the [Awesome Modern C++](https://awesomecpp.com) list.
 Table of Contents
 -----------------
 
-* [Real-world usage](#real-world-usage)
 * [Quick Start](#quick-start)
 * [Documentation](#documentation)
-* [Godbolt](#godbolt)
 * [Performance results](#performance-results)
+* [Real-world usage](#real-world-usage)
 * [Bindings and Ports of simdjson](#bindings-and-ports-of-simdjson)
 * [About simdjson](#about-simdjson)
 * [Funding](#funding)
 * [Contributing to simdjson](#contributing-to-simdjson)
 * [License](#license)
 
-
-Real-world usage
-----------------
-
-- [Node.js](https://nodejs.org/)
-- [ClickHouse](https://github.com/ClickHouse/ClickHouse)
-- [Meta Velox](https://velox-lib.io)
-- [Google Pax](https://github.com/google/paxml)
-- [milvus](https://github.com/milvus-io/milvus)
-- [Clang Build Analyzer](https://github.com/aras-p/ClangBuildAnalyzer)
-- [Shopify HeapProfiler](https://github.com/Shopify/heap-profiler)
-- [StarRocks](https://github.com/StarRocks/starrocks)
-- [Microsoft FishStore](https://github.com/microsoft/FishStore)
-- [Intel PCM](https://github.com/intel/pcm)
-- [WatermelonDB](https://github.com/Nozbe/WatermelonDB)
-- [Apache Doris](https://github.com/apache/doris)
-- [Dgraph](https://github.com/dgraph-io/dgraph)
-- [UJRPC](https://github.com/unum-cloud/ujrpc)
-- [fastgltf](https://github.com/spnda/fastgltf)
-- [vast](https://github.com/tenzir/vast)
-- [ada-url](https://github.com/ada-url/ada)
-- [fastgron](https://github.com/adamritter/fastgron)
-
-If you are planning to use simdjson in a product, please work from one of our releases.
-
 Quick Start
 -----------
 
@@ -69,9 +43,9 @@ The simdjson library is easily consumable with a single .h and .cpp file.
 
 0. Prerequisites: `g++` (version 7 or better) or `clang++` (version 6 or better), and a 64-bit
    system with a command-line shell (e.g., Linux, macOS, freeBSD). We also support programming
-   environments like Visual Studio and Xcode, but different steps are needed. Users of clang++ may need to specify the C++ version (e.g., `c++ -std=c++17`) since clang++ tends to default on C++98.
+   environments like Visual Studio and Xcode, but different steps are needed.
 1. Pull [simdjson.h](singleheader/simdjson.h) and [simdjson.cpp](singleheader/simdjson.cpp) into a
-   directory, along with the sample file [twitter.json](jsonexamples/twitter.json). You can download them with the `wget` utility:
+   directory, along with the sample file [twitter.json](jsonexamples/twitter.json).
 
    ```
    wget https://raw.githubusercontent.com/simdjson/simdjson/master/singleheader/simdjson.h https://raw.githubusercontent.com/simdjson/simdjson/master/singleheader/simdjson.cpp https://raw.githubusercontent.com/simdjson/simdjson/master/jsonexamples/twitter.json
@@ -88,15 +62,14 @@ int main(void) {
     ondemand::document tweets = parser.iterate(json);
     std::cout << uint64_t(tweets["search_metadata"]["count"]) << " results." << std::endl;
 }
+
    ```
 3. `c++ -o quickstart quickstart.cpp simdjson.cpp`
 4. `./quickstart`
-
    ```
    100 results.
    ```
 
-
 Documentation
 -------------
 
@@ -106,14 +79,7 @@ Usage documentation is available:
 * [Performance](doc/performance.md) shows some more advanced scenarios and how to tune for them.
 * [Implementation Selection](doc/implementation-selection.md) describes runtime CPU detection and
   how you can work with it.
-* [API](https://simdjson.github.io/simdjson/) contains the automatically generated API documentation.
+* [API](https://simdjson.org/api/1.0.0/annotated.html) contains the automatically generated API documentation.
-
-Godbolt
--------------
-
-Some users may want to browse code along with the compiled assembly. You want to check out the following lists of examples:
-* [simdjson examples with errors handled through exceptions](https://godbolt.org/z/7G5qE4sr9)
-* [simdjson examples with errors without exceptions](https://godbolt.org/z/e9dWb9E4v)
 
 Performance results
 -------------------
@@ -142,6 +108,15 @@ For NDJSON files, we can exceed 3 GB/s with [our  multithreaded parsing function
 
 
 
+Real-world usage
+----------------
+
+- [Microsoft FishStore](https://github.com/microsoft/FishStore)
+- [Yandex ClickHouse](https://github.com/yandex/ClickHouse)
+- [Clang Build Analyzer](https://github.com/aras-p/ClangBuildAnalyzer)
+- [Shopify HeapProfiler](https://github.com/Shopify/heap-profiler)
+
+If you are planning to use simdjson in a product, please work from one of our releases.
 
 Bindings and Ports of simdjson
 ------------------------------
@@ -162,13 +137,9 @@ 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.
-- [simdjsone](https://github.com/saleyn/simdjsone): erlang bindings.
 - [lua-simdjson](https://github.com/FourierTransformer/lua-simdjson): lua bindings.
 - [hermes-json](https://hackage.haskell.org/package/hermes-json): haskell bindings.
-- [simdjzon](https://github.com/travisstaloch/simdjzon): zig port.
+
-- [JSON-Simd](https://github.com/rawleyfowler/JSON-simd): Raku bindings.
-- [JSON::SIMD](https://metacpan.org/pod/JSON::SIMD): Perl bindings; fully-featured JSON module that uses simdjson for decoding.
-- [gemmaJSON](https://github.com/sainttttt/gemmaJSON): Nim JSON parser based on simdjson bindings.
 
 About simdjson
 --------------
@@ -177,11 +148,7 @@ The simdjson library takes advantage of modern microarchitectures, parallelizing
 instructions, reducing branch misprediction, and reducing data dependency to take advantage of each
 CPU's multiple execution cores.
 
-Our default front-end is called On Demand, and we wrote a paper about it:
+Some people [enjoy reading our paper](https://arxiv.org/abs/1902.08318): A description of the design
-
-- John Keiser, Daniel Lemire, [On-Demand JSON: A Better Way to Parse Documents?](http://arxiv.org/abs/2312.17149), Software: Practice and Experience (to appear)
-
-Some people [enjoy reading the first (2019) simdjson paper](https://arxiv.org/abs/1902.08318): A description of the design
 and implementation of simdjson is in our research article:
 - Geoff Langdale, Daniel Lemire, [Parsing Gigabytes of JSON per Second](https://arxiv.org/abs/1902.08318), VLDB Journal 28 (6), 2019.
 
@@ -215,7 +182,7 @@ License
 
 This code is made available under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html).
 
-Under Windows, we build some tools using the windows/dirent_portable.h file (which is outside our library code): it is under the liberal (business-friendly) MIT license.
+Under Windows, we build some tools using the windows/dirent_portable.h file (which is outside our library code): it 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.
 

RELEASES.md

@@ -0,0 +1,69 @@
+# 0.5
+
+## Highlights
+
+Performance
+* Faster and simpler UTF-8 validation with the lookup4 algorithm https://github.com/simdjson/simdjson/pull/993
+* We improved the performance of simdjson under Visual Studio by about 25%. Users will still get better performance with clang-cl (+30%) but the gap has been reduced. https://github.com/simdjson/simdjson/pull/1031
+
+Code usability
+* In `parse_many`, when parsing streams of JSON documetns, we give to the users runtime control as to whether threads are used (via the parser.threaded attribute). https://github.com/simdjson/simdjson/issues/925
+* Prefixed public macros to avoid name clashes with other libraries. https://github.com/simdjson/simdjson/issues/1035
+* Better documentation regarding package managers (brew, MSYS2, conan, apt, vcpkg, FreeBSD package manager, etc.).
+* Better documentation regarding  CMake usage.
+
+Standards
+* We improved standard compliance with respect to both the JSON RFC 8259 and JSON Pointer RFC 6901. We added the at_pointer method to nodes for standard-compliant JSON Pointer queries. The legacy `at(std::string_view)` method remains but is deprecated since it is not standard-compliant as per  RFC 6901.
+* We removed computed GOTOs without sacrificing performance thus improving the C++ standard compliance (since computed GOTOs are compiler-specific extensions).
+* Better support for C++20 https://github.com/simdjson/simdjson/pull/1050
+
+# 0.4
+
+## Highlights
+
+- Test coverage has been greatly improved and we have resolved many static-analysis warnings on different systems.
+- We added a fast (8GB/s) minifier that works directly on JSON strings.
+- We added fast (10GB/s) UTF-8 validator that works directly on strings (any strings, including non-JSON).
+- The array and object elements have a constant-time size() method.
+- Performance improvements to the API (type(), get<>()).
+- The parse_many function (ndjson) has been entirely reworked. It now uses a single secondary thread instead of several new threads.
+- We have introduced a faster UTF-8 validation algorithm (lookup3) for all kernels (ARM, x64 SSE, x64 AVX).
+- C++11 support for older compilers and systems.
+- FreeBSD support (and tests).
+- We support the clang front-end compiler (clangcl) under Visual Studio.
+- It is now possible to target ARM platforms under Visual Studio.
+- The simdjson library will never abort or print to standard output/error.
+
+# 0.3
+
+## Highlights
+
+- **Multi-Document Parsing:** Read a bundle of JSON documents (ndjson) 2-4x faster than doing it
+  individually. [API docs](https://github.com/simdjson/simdjson/blob/master/doc/basics.md#newline-delimited-json-ndjson-and-json-lines) / [Design Details](https://github.com/simdjson/simdjson/blob/master/doc/parse_many.md)
+- **Simplified API:** The API has been completely revamped for ease of use, including a new JSON
+  navigation API and fluent support for error code *and* exception styles of error handling with a
+  single API. [Docs](https://github.com/simdjson/simdjson/blob/master/doc/basics.md#the-basics-loading-and-parsing-json-documents)
+- **Exact Float Parsing:** Now simdjson parses floats flawlessly *without* any performance loss,
+  thanks to [great work by @michaeleisel and @lemire](https://github.com/simdjson/simdjson/pull/558).
+  [Blog Post](https://lemire.me/blog/2020/03/10/fast-float-parsing-in-practice/)
+- **Even Faster:** The fastest parser got faster! With a [shiny new UTF-8 validator](https://github.com/simdjson/simdjson/pull/387)
+  and meticulously refactored SIMD core, simdjson 0.3 is 15% faster than before, running at 2.5 GB/s
+  (where 0.2 ran at 2.2 GB/s).
+
+## Minor Highlights
+
+- Fallback implementation: simdjson now has a non-SIMD fallback implementation, and can run even on
+  very old 64-bit machines.
+- Automatic allocation: as part of API simplification, the parser no longer has to be preallocated--
+  it will adjust automatically when it encounters larger files.
+- Runtime selection API: We've exposed simdjson's runtime CPU detection and implementation selection
+  as an API, so you can tell what implementation we detected and test with other implementations.
+- Error handling your way: Whether you use exceptions or check error codes, simdjson lets you handle
+  errors in your style. APIs that can fail return simdjson_result<T>, letting you check the error
+  code before using the result. But if you are more comfortable with exceptions, skip the error code
+  and cast straight to T, and exceptions will be thrown automatically if an error happens. Use the
+  same API either way!
+- Error chaining: We also worked to keep non-exception error-handling short and sweet. Instead of
+  having to check the error code after every single operation, now you can *chain* JSON navigation
+  calls like looking up an object field or array element, or casting to a string, so that you only
+  have to check the error code once at the very end.

SECURITY.md

@@ -1,7 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Please use the following contact information for reporting a vulnerability:
-
-- [Daniel Lemire](https://github.com/lemire) - daniel@lemire.me

benchmark/CMakeLists.txt

@@ -26,9 +26,6 @@ if (TARGET benchmark::benchmark)
     if(TARGET nlohmann_json)
       target_link_libraries(bench_ondemand PRIVATE nlohmann_json)
     endif()
-    if(TARGET boostjson)
-      target_link_libraries(bench_ondemand PRIVATE boostjson)
-    endif()
   endif()
 endif()
 

benchmark/amazon_cellphones/amazon_cellphones.h

@@ -15,11 +15,11 @@ using namespace json_benchmark;
 struct brand {
     double cumulative_rating;
     uint64_t reviews_count;
-    simdjson_inline bool operator==(const brand &other) const {
+    simdjson_really_inline bool operator==(const brand &other) const {
         return cumulative_rating == other.cumulative_rating &&
             reviews_count == other.reviews_count;
     }
-    simdjson_inline bool operator!=(const brand &other) const { return !(*this == other); }
+    simdjson_really_inline bool operator!=(const brand &other) const { return !(*this == other); }
 };
 
 simdjson_unused static std::ostream &operator<<(std::ostream &o, const brand &b) {
@@ -66,7 +66,7 @@ struct runner : public file_runner<I> {
 template<bool threaded>
 struct simdjson_dom;
 
-template<typename I> simdjson_inline static void amazon_cellphones(benchmark::State &state) {
+template<typename I> simdjson_really_inline static void amazon_cellphones(benchmark::State &state) {
   run_json_benchmark<runner<I>, runner<simdjson_dom<UNTHREADED>>>(state);
 }
 

benchmark/bench_dom_api.cpp

@@ -473,6 +473,28 @@ static void twitter_count(State& state) {
 }
 BENCHMARK(twitter_count);
 
+#ifndef SIMDJSON_DISABLE_DEPRECATED_API
+SIMDJSON_PUSH_DISABLE_WARNINGS
+SIMDJSON_DISABLE_DEPRECATED_WARNING
+static void iterator_twitter_count(State& state) {
+  // Prints the number of results in twitter.json
+  padded_string json = padded_string::load(TWITTER_JSON);
+  ParsedJson pj = build_parsed_json(json);
+  for (simdjson_unused auto _ : state) {
+    ParsedJson::Iterator iter(pj);
+    // uint64_t result_count = doc["search_metadata"]["count"];
+    if (!iter.move_to_key("search_metadata")) { return; }
+    if (!iter.move_to_key("count")) { return; }
+    if (!iter.is_integer()) { return; }
+    int64_t result_count = iter.get_integer();
+
+    if (result_count != 100) { return; }
+  }
+}
+BENCHMARK(iterator_twitter_count);
+SIMDJSON_POP_DISABLE_WARNINGS
+#endif // SIMDJSON_DISABLE_DEPRECATED_API
+
 static void twitter_default_profile(State& state) {
   // Count unique users with a default profile.
   dom::parser parser;
@@ -499,7 +521,7 @@ static void twitter_image_sizes(State& state) {
     set<tuple<uint64_t, uint64_t>> image_sizes;
     for (dom::object tweet : doc["statuses"]) {
       dom::array media;
-      if (! (error = tweet["entities"]["media"].get(media))) {
+      if (not (error = tweet["entities"]["media"].get(media))) {
         for (dom::object image : media) {
           for (auto size : image["sizes"].get_object()) {
              image_sizes.emplace(size.value["w"], size.value["h"]);
@@ -542,7 +564,7 @@ static void error_code_twitter_default_profile(State& state) noexcept {
     for (dom::element tweet : tweets) {
       dom::object user;
       if ((error = tweet["user"].get(user))) { return; }
-      bool default_profile{};
+      bool default_profile;
       if ((error = user["default_profile"].get(default_profile))) { return; }
       if (default_profile) {
         std::string_view screen_name;
@@ -556,6 +578,54 @@ static void error_code_twitter_default_profile(State& state) noexcept {
 }
 BENCHMARK(error_code_twitter_default_profile);
 
+#ifndef SIMDJSON_DISABLE_DEPRECATED_API
+
+SIMDJSON_PUSH_DISABLE_WARNINGS
+SIMDJSON_DISABLE_DEPRECATED_WARNING
+
+static void iterator_twitter_default_profile(State& state) {
+  // Count unique users with a default profile.
+  padded_string json;
+  auto error = padded_string::load(TWITTER_JSON).get(json);
+  if (error) { std::cerr << error << std::endl; return; }
+  ParsedJson pj = build_parsed_json(json);
+  for (simdjson_unused auto _ : state) {
+    set<string_view> default_users;
+    ParsedJson::Iterator iter(pj);
+
+    // for (dom::object tweet : doc["statuses"]) {
+    if (!(iter.move_to_key("statuses") && iter.is_array())) { return; }
+    if (iter.down()) { // first status
+      do {
+
+        // dom::object user = tweet["user"];
+        if (!(iter.move_to_key("user") && iter.is_object())) { return; }
+
+        // if (user["default_profile"]) {
+        if (iter.move_to_key("default_profile")) {
+          if (iter.is_true()) {
+            if (!iter.up()) { return; } // back to user
+
+            // default_users.insert(user["screen_name"]);
+            if (!(iter.move_to_key("screen_name") && iter.is_string())) { return; }
+            default_users.emplace(iter.get_string(), iter.get_string_length());
+          }
+          if (!iter.up()) { return; } // back to user
+        }
+
+        if (!iter.up()) { return; } // back to status
+
+      } while (iter.next()); // next status
+    }
+
+    if (default_users.size() != 86) { return; }
+  }
+}
+
+SIMDJSON_POP_DISABLE_WARNINGS
+BENCHMARK(iterator_twitter_default_profile);
+#endif // SIMDJSON_DISABLE_DEPRECATED_API
+
 static void error_code_twitter_image_sizes(State& state) noexcept {
   // Count unique image sizes
   dom::parser parser;
@@ -568,7 +638,7 @@ static void error_code_twitter_image_sizes(State& state) noexcept {
     if ((error = doc["statuses"].get(statuses))) { return; }
     for (dom::element tweet : statuses) {
       dom::array images;
-      if (! (error = tweet["entities"]["media"].get(images))) {
+      if (not (error = tweet["entities"]["media"].get(images))) {
         for (dom::element image : images) {
           dom::object sizes;
           if ((error = image["sizes"].get(sizes))) { return; }
@@ -586,28 +656,91 @@ static void error_code_twitter_image_sizes(State& state) noexcept {
 }
 BENCHMARK(error_code_twitter_image_sizes);
 
-static void parse_surrogate_pairs(State& state) {
+#ifndef SIMDJSON_DISABLE_DEPRECATED_API
-  // NOTE: This mostly exists to show there's a tiny benefit to
+
-  // loading and comparing both bytes of "\\u" simultaneously.
+SIMDJSON_PUSH_DISABLE_WARNINGS
-  // (which should also reduce the compiled code size).
+SIMDJSON_DISABLE_DEPRECATED_WARNING
-  // The repeated surrogate pairs make this easier to measure.
+static void iterator_twitter_image_sizes(State& state) {
-  dom::parser parser;
+  // Count unique image sizes
-  const std::string_view data = "\"\\uD834\\uDD1E\\uD834\\uDD1E\\uD834\\uDD1E\\uD834\\uDD1E\\uD834\\uDD1E\\uD834\\uDD1E\\uD834\\uDD1E\\uD834\\uDD1E\\uD834\\uDD1E\\uD834\\uDD1E\"";
+  padded_string json;
-  padded_string docdata{data};
+  auto error = padded_string::load(TWITTER_JSON).get(json);
-  // we do not want mem. alloc. in the loop.
+  if (error) { std::cerr << error << std::endl; return; }
-  auto error = parser.allocate(docdata.size());
+  ParsedJson pj = build_parsed_json(json);
-  if (error) {
-    cout << error << endl;
-    return;
-  }
   for (simdjson_unused auto _ : state) {
-    dom::element doc;
+    set<tuple<uint64_t, uint64_t>> image_sizes;
-    if ((error = parser.parse(docdata).get(doc))) {
+    ParsedJson::Iterator iter(pj);
-      cerr << "could not parse string" << error << endl;
+
-      return;
+    // for (dom::object tweet : doc["statuses"]) {
+    if (!(iter.move_to_key("statuses") && iter.is_array())) { return; }
+    if (iter.down()) { // first status
+      do {
+
+        // dom::object media;
+        // not_found = tweet["entities"]["media"].get(media);
+        // if (!not_found) {
+        if (iter.move_to_key("entities")) {
+          if (!iter.is_object()) { return; }
+          if (iter.move_to_key("media")) {
+            if (!iter.is_array()) { return; }
+
+            //   for (dom::object image : media) {
+            if (iter.down()) { // first media
+              do {
+
+                // for (auto [key, size] : dom::object(image["sizes"])) {
+                if (!(iter.move_to_key("sizes") && iter.is_object())) { return; }
+                if (iter.down()) { // first size
+                  do {
+                    iter.move_to_value();
+
+                    // image_sizes.insert({ size["w"], size["h"] });
+                    if (!(iter.move_to_key("w")) && !iter.is_integer()) { return; }
+                    uint64_t width = iter.get_integer();
+                    if (!iter.up()) { return; } // back to size
+                    if (!(iter.move_to_key("h")) && !iter.is_integer()) { return; }
+                    uint64_t height = iter.get_integer();
+                    if (!iter.up()) { return; } // back to size
+                    image_sizes.emplace(width, height);
+
+                  } while (iter.next()); // next size
+                  if (!iter.up()) { return; } // back to sizes
+                }
+                if (!iter.up()) { return; } // back to image
+              } while (iter.next()); // next image
+              if (!iter.up()) { return; } // back to media
+            }
+            if (!iter.up()) { return; } // back to entities
+          }
+          if (!iter.up()) { return; } // back to status
+        }
+      } while (iter.next()); // next status
+    }
+
+    if (image_sizes.size() != 15) { return; };
   }
 }
+BENCHMARK(iterator_twitter_image_sizes);
+
+#endif // SIMDJSON_DISABLE_DEPRECATED_API
+
+#ifndef SIMDJSON_DISABLE_DEPRECATED_API
+static void print_json(State& state) noexcept {
+  // Prints the number of results in twitter.json
+  dom::parser parser;
+
+  padded_string json;
+  auto error = padded_string::load(TWITTER_JSON).get(json);
+  if (error) { std::cerr << error << std::endl; return; }
+
+  int code = json_parse(json, parser);
+  if (code) { cerr << error_message(code) << endl; return; }
+  for (simdjson_unused auto _ : state) {
+    std::stringstream s;
+    if (!parser.print_json(s)) { cerr << "print_json failed" << endl; return; }
   }
-BENCHMARK(parse_surrogate_pairs);
+}
+BENCHMARK(print_json);
+#endif // SIMDJSON_DISABLE_DEPRECATED_API
+SIMDJSON_POP_DISABLE_WARNINGS
 
 BENCHMARK_MAIN();

benchmark/bench_ondemand.cpp

@@ -21,126 +21,10 @@ SIMDJSON_PUSH_DISABLE_ALL_WARNINGS
 #include <nlohmann/json.hpp>
 #endif
 
-#ifdef SIMDJSON_COMPETITION_BOOSTJSON
-#include <boost/json.hpp>
-#endif
-
 // This has to be last, for reasons I don't yet understand
 #include <benchmark/benchmark.h>
 
 SIMDJSON_POP_DISABLE_WARNINGS
-#include "json2msgpack/simdjson_ondemand.h"
-#include "json2msgpack/simdjson_dom.h"
-#include "json2msgpack/yyjson.h"
-#include "json2msgpack/rapidjson.h"
-#if SIMDJSON_COMPETITION_ONDEMAND_SAJSON
-#include "json2msgpack/sajson.h"
-#endif // SIMDJSON_COMPETITION_ONDEMAND_SAJSON
-#include "json2msgpack/nlohmann_json.h"
-#include "json2msgpack/boostjson.h"
-
-#include "partial_tweets/simdjson_ondemand.h"
-#include "partial_tweets/simdjson_dom.h"
-#include "partial_tweets/yyjson.h"
-#if SIMDJSON_COMPETITION_ONDEMAND_SAJSON
-#include "partial_tweets/sajson.h"
-#endif // SIMDJSON_COMPETITION_ONDEMAND_SAJSON
-#include "partial_tweets/rapidjson.h"
-#if SIMDJSON_COMPETITION_SAX
-#include "partial_tweets/rapidjson_sax.h"
-#endif // SIMDJSON_COMPETITION_SAX
-#include "partial_tweets/nlohmann_json.h"
-#if SIMDJSON_COMPETITION_SAX
-#include "partial_tweets/nlohmann_json_sax.h"
-#endif // SIMDJSON_COMPETITION_SAX
-#include "partial_tweets/boostjson.h"
-
-
-#include "distinct_user_id/simdjson_ondemand.h"
-#include "distinct_user_id/simdjson_ondemand_json_pointer.h"
-#include "distinct_user_id/simdjson_dom.h"
-#include "distinct_user_id/simdjson_dom_json_pointer.h"
-#include "distinct_user_id/yyjson.h"
-#if SIMDJSON_COMPETITION_ONDEMAND_SAJSON
-#include "distinct_user_id/sajson.h"
-#endif // SIMDJSON_COMPETITION_ONDEMAND_SAJSON
-#include "distinct_user_id/rapidjson.h"
-#if SIMDJSON_COMPETITION_SAX
-#include "distinct_user_id/rapidjson_sax.h"
-#endif // SIMDJSON_COMPETITION_SAX
-#include "distinct_user_id/nlohmann_json.h"
-#if SIMDJSON_COMPETITION_SAX
-#include "distinct_user_id/nlohmann_json_sax.h"
-#endif // SIMDJSON_COMPETITION_SAX
-#include "distinct_user_id/boostjson.h"
-
-#include "find_tweet/simdjson_ondemand.h"
-#include "find_tweet/simdjson_dom.h"
-#include "find_tweet/yyjson.h"
-#if SIMDJSON_COMPETITION_ONDEMAND_SAJSON
-#include "find_tweet/sajson.h"
-#endif // SIMDJSON_COMPETITION_ONDEMAND_SAJSON
-#include "find_tweet/rapidjson.h"
-#if SIMDJSON_COMPETITION_SAX
-#include "find_tweet/rapidjson_sax.h"
-#endif // SIMDJSON_COMPETITION_SAX
-#include "find_tweet/nlohmann_json.h"
-#if SIMDJSON_COMPETITION_SAX
-#include "find_tweet/nlohmann_json_sax.h"
-#endif // SIMDJSON_COMPETITION_SAX
-#include "find_tweet/boostjson.h"
-
-#include "top_tweet/simdjson_ondemand.h"
-#include "top_tweet/simdjson_dom.h"
-#include "top_tweet/yyjson.h"
-#if SIMDJSON_COMPETITION_ONDEMAND_SAJSON
-#include "top_tweet/sajson.h"
-#endif // SIMDJSON_COMPETITION_ONDEMAND_SAJSON
-#include "top_tweet/rapidjson.h"
-#if SIMDJSON_COMPETITION_SAX
-#include "top_tweet/rapidjson_sax.h"
-#endif // SIMDJSON_COMPETITION_SAX
-#include "top_tweet/nlohmann_json.h"
-#if SIMDJSON_COMPETITION_SAX
-#include "top_tweet/nlohmann_json_sax.h"
-#endif // SIMDJSON_COMPETITION_SAX
-#include "top_tweet/boostjson.h"
-
-
-#include "kostya/simdjson_ondemand.h"
-#include "kostya/simdjson_dom.h"
-#include "kostya/yyjson.h"
-#if SIMDJSON_COMPETITION_ONDEMAND_SAJSON
-#include "kostya/sajson.h"
-#endif // SIMDJSON_COMPETITION_ONDEMAND_SAJSON
-#include "kostya/rapidjson.h"
-#if SIMDJSON_COMPETITION_SAX
-#include "kostya/rapidjson_sax.h"
-#endif // SIMDJSON_COMPETITION_SAX
-#include "kostya/nlohmann_json.h"
-#if SIMDJSON_COMPETITION_SAX
-#include "kostya/nlohmann_json_sax.h"
-#endif // SIMDJSON_COMPETITION_SAX
-#include "kostya/boostjson.h"
-
-#include "large_random/simdjson_ondemand.h"
-#if SIMDJSON_COMPETITION_ONDEMAND_UNORDERED
-#include "large_random/simdjson_ondemand_unordered.h"
-#endif // SIMDJSON_COMPETITION_ONDEMAND_UNORDERED
-#include "large_random/simdjson_dom.h"
-#include "large_random/yyjson.h"
-#if SIMDJSON_COMPETITION_ONDEMAND_SAJSON
-#include "large_random/sajson.h"
-#endif // SIMDJSON_COMPETITION_ONDEMAND_SAJSON
-#include "large_random/rapidjson.h"
-#if SIMDJSON_COMPETITION_SAX
-#include "large_random/rapidjson_sax.h"
-#endif // SIMDJSON_COMPETITION_SAX
-#include "large_random/nlohmann_json.h"
-#if SIMDJSON_COMPETITION_SAX
-#include "large_random/nlohmann_json_sax.h"
-#endif // SIMDJSON_COMPETITION_SAX
-#include "large_random/boostjson.h"
 
 #include "amazon_cellphones/simdjson_dom.h"
 #include "amazon_cellphones/simdjson_ondemand.h"
@@ -148,4 +32,61 @@ SIMDJSON_POP_DISABLE_WARNINGS
 #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"
+#include "large_random/simdjson_ondemand_unordered.h"
+#include "large_random/yyjson.h"
+#include "large_random/sajson.h"
+#include "large_random/rapidjson.h"
+#include "large_random/rapidjson_sax.h"
+#include "large_random/nlohmann_json.h"
+#include "large_random/nlohmann_json_sax.h"
+
+#include "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();

benchmark/bench_parse_call.cpp

@@ -169,6 +169,22 @@ BENCHMARK(parse_gsoc)->Repetitions(10)->ComputeStatistics("max", [](const std::v
   })->DisplayAggregatesOnly(true);
 
 
+
+#ifndef SIMDJSON_DISABLE_DEPRECATED_API
+SIMDJSON_PUSH_DISABLE_WARNINGS
+SIMDJSON_DISABLE_DEPRECATED_WARNING
+static void json_parse(State& state) {
+  ParsedJson pj;
+  if (!pj.allocate_capacity(EMPTY_ARRAY.length())) { return; }
+  for (simdjson_unused auto _ : state) {
+    auto error = json_parse(EMPTY_ARRAY, pj);
+    if (error) { return; }
+  }
+}
+SIMDJSON_POP_DISABLE_WARNINGS
+BENCHMARK(json_parse);
+#endif // SIMDJSON_DISABLE_DEPRECATED_API
+
 static void parser_parse_error_code(State& state) {
   dom::parser parser;
   if (parser.allocate(EMPTY_ARRAY.length())) { return; }
@@ -197,6 +213,20 @@ BENCHMARK(parser_parse_exception);
 
 #endif // SIMDJSON_EXCEPTIONS
 
+#ifndef SIMDJSON_DISABLE_DEPRECATED_API
+SIMDJSON_PUSH_DISABLE_WARNINGS
+SIMDJSON_DISABLE_DEPRECATED_WARNING
+static void build_parsed_json(State& state) {
+  for (simdjson_unused auto _ : state) {
+    dom::parser parser = simdjson::build_parsed_json(EMPTY_ARRAY);
+    if (!parser.valid) { return; }
+  }
+}
+SIMDJSON_POP_DISABLE_WARNINGS
+
+BENCHMARK(build_parsed_json);
+#endif
+
 static void document_parse_error_code(State& state) {
   for (simdjson_unused auto _ : state) {
     dom::parser parser;

benchmark/benchfeatures.cpp

@@ -164,7 +164,7 @@ struct feature_benchmarker {
 
   }
 
-  simdjson_inline void run_iterations(size_t iterations, bool stage1_only=false) {
+  simdjson_really_inline void run_iterations(size_t iterations, bool stage1_only=false) {
     struct7.run_iterations(iterations, stage1_only);
     struct7_miss.run_iterations(iterations, stage1_only);
     struct7_full.run_iterations(iterations, stage1_only);

benchmark/benchmarker.h

@@ -308,7 +308,7 @@ struct benchmarker {
     return all_stages_without_allocation.iterations;
   }
 
-  simdjson_inline void run_iteration(bool stage1_only, bool hotbuffers=false) {
+  simdjson_really_inline void run_iteration(bool stage1_only, bool hotbuffers=false) {
     // Allocate dom::parser
     collector.start();
     dom::parser parser;
@@ -384,7 +384,7 @@ struct benchmarker {
     loop << all_loop_count;
   }
 
-  simdjson_inline void run_iterations(size_t iterations, bool stage1_only, bool hotbuffers=false) {
+  simdjson_really_inline void run_iterations(size_t iterations, bool stage1_only, bool hotbuffers=false) {
     for (size_t i = 0; i<iterations; i++) {
       run_iteration(stage1_only, hotbuffers);
     }
@@ -445,7 +445,7 @@ struct benchmarker {
     return 100.0 * a / b;
   }
 
-  void print(bool tabbed_output, bool stage1_only) const {
+  void print(bool tabbed_output) const {
     if (tabbed_output) {
       char* filename_copy = reinterpret_cast<char*>(malloc(strlen(filename)+1));
       SIMDJSON_PUSH_DISABLE_WARNINGS
@@ -503,7 +503,6 @@ struct benchmarker {
           stats->blocks_with_16_structurals_flipped, percent(stats->blocks_with_16_structurals_flipped, stats->blocks));
       }
       printf("\n");
-      if(!stage1_only) {
       printf("All Stages (excluding allocation)\n");
       print_aggregate("|    "   , all_stages_without_allocation.best);
       // frequently, allocation is a tiny fraction of the running time so we omit it
@@ -511,20 +510,17 @@ struct benchmarker {
         printf("|- Allocation\n");
         print_aggregate("|    ", allocate_stage.best);
       }
-      }
       printf("|- Stage 1\n");
       print_aggregate("|    ", stage1.best);
-      if(!stage1_only) {
       printf("|- Stage 2\n");
       print_aggregate("|    ", stage2.best);
-      }
       if (collector.has_events()) {
         double freq1 = (stage1.best.cycles() / stage1.best.elapsed_sec()) / 1000000000.0;
         double freq2 = (stage2.best.cycles() / stage2.best.elapsed_sec()) / 1000000000.0;
         double freqall = (all_stages_without_allocation.best.cycles() / all_stages_without_allocation.best.elapsed_sec()) / 1000000000.0;
         double freqmin = min(freq1, freq2);
         double freqmax = max(freq1, freq2);
-        if((freqall < 0.95 * freqmin) || (freqall > 1.05 * freqmax)) {
+        if((freqall < 0.95 * freqmin) or (freqall > 1.05 * freqmax)) {
           printf("\nWarning: The processor frequency fluctuates in an expected way!!!\n"
           "Range for stage 1 and stage 2 : [%.3f GHz, %.3f GHz], overall: %.3f GHz.\n",
           freqmin, freqmax, freqall);

benchmark/distinct_user_id/boostjson.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_BOOSTJSON
-
-#include "distinct_user_id.h"
-
-namespace distinct_user_id {
-
-struct boostjson {
-  bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
-
-    auto root = boost::json::parse(json);
-    for (const auto &tweet : root.at("statuses").as_array()) {
-      result.push_back(tweet.at("user").at("id").to_number<uint64_t>());
-
-      if (tweet.as_object().if_contains("retweeted_status")) {
-        result.push_back(tweet.at("retweeted_status").at("user").at("id").to_number<uint64_t>());
-      }
-    }
-
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(distinct_user_id, boostjson)->UseManualTime();
-
-} // namespace distinct_user_id
-
-#endif // SIMDJSON_COMPETITION_BOOSTJSON

benchmark/distinct_user_id/distinct_user_id.h

@@ -46,7 +46,7 @@ struct runner : public file_runner<I> {
 
 struct simdjson_dom;
 
-template<typename I> simdjson_inline static void distinct_user_id(benchmark::State &state) {
+template<typename I> simdjson_really_inline static void distinct_user_id(benchmark::State &state) {
   run_json_benchmark<runner<I>, runner<simdjson_dom>>(state);
 }
 

benchmark/distinct_user_id/rapidjson.h

@@ -46,14 +46,13 @@ struct rapidjson : rapidjson_base {
 };
 BENCHMARK_TEMPLATE(distinct_user_id, rapidjson)->UseManualTime();
 
-#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
 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();
-#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
+
 } // namespace partial_tweets
 
 #endif // SIMDJSON_COMPETITION_RAPIDJSON

benchmark/distinct_user_id/sajson.h

@@ -9,14 +9,12 @@ 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) {
-
-  simdjson_inline std::string_view get_string_view(const ::sajson::value &obj, std::string_view key) {
     auto val = obj.get_value_of_key({key.data(), key.length()});
     if (val.get_type() != ::sajson::TYPE_STRING) { throw "field is not a string"; }
     return { val.as_cstring(), val.get_string_length() };
   }
-  simdjson_inline uint64_t get_str_uint64(const ::sajson::value &obj, std::string_view key) {
+  simdjson_really_inline uint64_t get_str_uint64(const ::sajson::value &obj, std::string_view key) {
     // Since sajson only supports 53-bit numbers, and IDs in twitter.json can be > 53 bits, we read the corresponding id_str and parse that.
     auto val = obj.get_value_of_key({key.data(), key.length()});
     if (val.get_type() != ::sajson::TYPE_STRING) { throw "field not a string"; }

benchmark/distinct_user_id/yyjson.h

@@ -49,14 +49,13 @@ struct yyjson : yyjson_base {
 };
 BENCHMARK_TEMPLATE(distinct_user_id, yyjson)->UseManualTime();
 
-#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
 struct yyjson_insitu : yyjson_base {
   bool run(simdjson::padded_string &json, std::vector<uint64_t> &result) {
     return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), result);
   }
 };
 BENCHMARK_TEMPLATE(distinct_user_id, yyjson_insitu)->UseManualTime();
-#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
+
 } // namespace distinct_user_id
 
 #endif // SIMDJSON_COMPETITION_YYJSON

benchmark/dom/parse.cpp

@@ -218,7 +218,7 @@ int main(int argc, char *argv[]) {
   if (!options.verbose) { progress.erase(); }
 
   for (size_t i=0; i<options.files.size(); i++) {
-    benchmarkers[i]->print(options.tabbed_output, options.stage1_only);
+    benchmarkers[i]->print(options.tabbed_output);
     delete benchmarkers[i];
   }
 

benchmark/dom/statisticalmodel.cpp

@@ -41,7 +41,7 @@ using stat_t = struct stat_s;
 
 
 
-simdjson_inline void simdjson_process_atom(stat_t &s,
+simdjson_really_inline void simdjson_process_atom(stat_t &s,
                                          simdjson::dom::element element) {
   if (element.is<int64_t>()) {
     s.integer_count++;

benchmark/event_counter.h

@@ -34,15 +34,11 @@
 #include <string>
 #include <vector>
 
-#ifdef __linux__
 #include "linux-perf-events.h"
+#ifdef __linux__
 #include <libgen.h>
 #endif
 
-#if __APPLE__ &&  __aarch64__
-#include "apple/apple_arm_events.h"
-#endif
-
 #include "simdjson.h"
 
 using std::string;
@@ -138,7 +134,7 @@ struct event_collector {
 
 #if defined(__linux__)
   LinuxEvents<PERF_TYPE_HARDWARE> linux_events;
-  event_collector() : linux_events(vector<int>{
+  event_collector(bool quiet = false) : linux_events(vector<int>{
   #if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
     PERF_COUNT_HW_CPU_CYCLES,
     PERF_COUNT_HW_INSTRUCTIONS,
@@ -149,48 +145,27 @@ struct event_collector {
     PERF_COUNT_HW_CACHE_REFERENCES,
     PERF_COUNT_HW_CACHE_MISSES
   #endif
-  }) {}
+  }, quiet) {}
   bool has_events() {
     return linux_events.is_working();
   }
-#elif __APPLE__ &&  __aarch64__
-  AppleEvents apple_events;
-  performance_counters diff;
-  event_collector() : diff(0) {
-    apple_events.setup_performance_counters();
-  }
-  bool has_events() {
-    return apple_events.setup_performance_counters();
-  }
 #else
-  event_collector() {}
+  event_collector(simdjson_unused bool _quiet = false) {}
   bool has_events() {
     return false;
   }
 #endif
 
-  simdjson_inline void start() {
+  simdjson_really_inline void start() {
 #if defined(__linux)
     linux_events.start();
-#elif __APPLE__ &&  __aarch64__
-    if(has_events()) { diff = apple_events.get_counters(); }
 #endif
     start_clock = steady_clock::now();
   }
-  simdjson_inline event_count& end() {
+  simdjson_really_inline event_count& end() {
     time_point<steady_clock> end_clock = steady_clock::now();
 #if defined(__linux)
     linux_events.end(count.event_counts);
-#elif __APPLE__ &&  __aarch64__
-    if(has_events()) {
-      performance_counters end = apple_events.get_counters();
-      diff = end - diff;
-    }
-    count.event_counts[0] = diff.cycles;
-    count.event_counts[1] = diff.instructions;
-    count.event_counts[2] = diff.missed_branches;
-    count.event_counts[3] = 0;
-    count.event_counts[4] = 0;
 #endif
     count.elapsed = end_clock - start_clock;
     return count;

benchmark/find_tweet/boostjson.h

@@ -1,30 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_BOOSTJSON
-
-#include "find_tweet.h"
-
-namespace find_tweet {
-
-struct boostjson {
-  using StringType=std::string;
-
-  bool run(simdjson::padded_string &json, uint64_t find_id, std::string &result) {
-
-    auto root = boost::json::parse(json);
-    for (const auto &tweet : root.at("statuses").as_array()) {
-      if (tweet.at("id") == find_id) {
-        result = tweet.at("text").as_string();
-        return true;
-      }
-    }
-
-    return false;
-  }
-};
-
-BENCHMARK_TEMPLATE(find_tweet, boostjson)->UseManualTime();
-
-} // namespace find_tweet
-
-#endif // SIMDJSON_COMPETITION_BOOSTJSON

benchmark/find_tweet/find_tweet.h

@@ -33,7 +33,7 @@ struct runner : public file_runner<I> {
 
 struct simdjson_dom;
 
-template<typename I> simdjson_inline static void find_tweet(benchmark::State &state) {
+template<typename I> simdjson_really_inline static void find_tweet(benchmark::State &state) {
   run_json_benchmark<runner<I>, runner<simdjson_dom>>(state);
 }
 

benchmark/find_tweet/rapidjson.h

@@ -40,14 +40,13 @@ struct rapidjson : rapidjson_base {
 };
 BENCHMARK_TEMPLATE(find_tweet, rapidjson)->UseManualTime();
 
-#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
 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();
-#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
+
 } // namespace find_tweet
 
 #endif // SIMDJSON_COMPETITION_RAPIDJSON

benchmark/find_tweet/sajson.h

@@ -11,14 +11,12 @@ 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) {
-
-  simdjson_inline std::string_view get_string_view(const ::sajson::value &obj, std::string_view key) {
     auto val = obj.get_value_of_key({key.data(), key.length()});
     if (val.get_type() != ::sajson::TYPE_STRING) { throw "field is not a string"; }
     return { val.as_cstring(), val.get_string_length() };
   }
-  simdjson_inline uint64_t get_str_uint64(const ::sajson::value &obj, std::string_view key) {
+  simdjson_really_inline uint64_t get_str_uint64(const ::sajson::value &obj, std::string_view key) {
     // Since sajson only supports 53-bit numbers, and IDs in twitter.json can be > 53 bits, we read the corresponding id_str and parse that.
     auto val = obj.get_value_of_key({key.data(), key.length()});
     if (val.get_type() != ::sajson::TYPE_STRING) { throw "field not a string"; }

benchmark/find_tweet/yyjson.h

@@ -40,14 +40,14 @@ struct yyjson : yyjson_base {
   }
 };
 BENCHMARK_TEMPLATE(find_tweet, yyjson)->UseManualTime();
-#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
+
 struct yyjson_insitu : yyjson_base {
   bool run(simdjson::padded_string &json, uint64_t find_id, std::string_view &result) {
     return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), find_id, result);
   }
 };
 BENCHMARK_TEMPLATE(find_tweet, yyjson_insitu)->UseManualTime();
-#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
+
 } // namespace find_tweet
 
 #endif // SIMDJSON_COMPETITION_YYJSON

benchmark/json2msgpack/boostjson.h

@@ -1,104 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_BOOSTJSON
-
-#include "json2msgpack.h"
-
-namespace json2msgpack {
-
-struct boostjson2msgpack {
-  inline std::string_view to_msgpack(const boost::json::value &root, uint8_t *buf) {
-    buff = buf;
-    recursive_processor(root);
-    return std::string_view(reinterpret_cast<char *>(buf), size_t(buff - buf));
-  }
-
-private:
-  uint8_t *buff{};
-
-  inline void write_double(const double d) noexcept {
-    *buff++ = 0xcb;
-    ::memcpy(buff, &d, sizeof(d));
-    buff += sizeof(d);
-  }
-
-  inline void write_byte(const uint8_t b) noexcept {
-    *buff = b;
-    buff++;
-  }
-
-  inline void write_uint32(const uint32_t w) noexcept {
-    ::memcpy(buff, &w, sizeof(w));
-    buff += sizeof(w);
-  }
-
-  inline void write_string(const std::string & str) {
-    write_byte(0xdb);
-    write_uint32(uint32_t(str.size()));
-    ::memcpy(buff, str.data(), str.size());
-    buff += str.size();
-  }
-
-  inline void recursive_processor(const boost::json::value &element) {
-    switch(element.kind()) {
-    case boost::json::kind::array: {
-      write_byte(0xdd);
-      const auto &array = element.as_array();
-      write_uint32(static_cast<uint32_t>(array.size()));
-      for (const auto &child : array) {
-        recursive_processor(child);
-      }
-    } break;
-
-    case boost::json::kind::object: {
-      write_byte(0xdf);
-      const auto &object = element.as_object();
-      write_uint32(static_cast<uint32_t>(object.size()));
-      for (const auto &child : object) {
-        write_string(child.key_c_str());
-        recursive_processor(child.value());
-      }
-    } break;
-
-    case boost::json::kind::int64:
-    case boost::json::kind::uint64:
-    case boost::json::kind::double_:
-      write_double(element.to_number<double>());
-      break;
-
-    case boost::json::kind::string:
-      write_string(element.as_string().c_str());
-      break;
-
-    case boost::json::kind::bool_:
-      write_byte(0xc2 + element.as_bool());
-      break;
-
-    case boost::json::kind::null:
-      write_byte(0xc0);
-      break;
-
-    default:
-      printf("unexpected\n");
-      break;
-    }
-  }
-};
-
-struct boostjson {
-  using StringType=std::string;
-
-  boostjson2msgpack parser{};
-
-  bool run(simdjson::padded_string &json, char *buffer, std::string_view &result) {
-    auto root = boost::json::parse(json);
-    result = parser.to_msgpack(root, reinterpret_cast<uint8_t *>(buffer));
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(json2msgpack, boostjson)->UseManualTime();
-
-} // namespace json2msgpack
-
-#endif // SIMDJSON_COMPETITION_BOOSTJSON

benchmark/json2msgpack/json2msgpack.h

@@ -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_inline static void json2msgpack(benchmark::State &state) {
-  run_json_benchmark<runner<I>, runner<simdjson_ondemand>>(state);
-}
-
-} // namespace json2msgpack

benchmark/json2msgpack/nlohmann_json.h

@@ -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
-
-
-

benchmark/json2msgpack/rapidjson.h

@@ -1,142 +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 = rapidjson_base<kParseValidateEncodingFlag|kParseFullPrecisionFlag>;
-
-BENCHMARK_TEMPLATE(json2msgpack, rapidjson)->UseManualTime();
-
-#if SIMDJSON_COMPETITION_ONDEMAND_APPROX
-using rapidjson_approx = rapidjson_base<kParseValidateEncodingFlag>;
-
-BENCHMARK_TEMPLATE(json2msgpack, rapidjson_approx)->UseManualTime();
-#endif // SIMDJSON_COMPETITION_ONDEMAND_APPROX
-
-#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
-using rapidjson_insitu = rapidjson_base<kParseValidateEncodingFlag|kParseInsituFlag>;
-
-BENCHMARK_TEMPLATE(json2msgpack, rapidjson_insitu)->UseManualTime();
-#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
-} // namespace json2msgpack
-
-#endif // SIMDJSON_COMPETITION_RAPIDJSON

benchmark/json2msgpack/sajson.h

@@ -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

benchmark/json2msgpack/simdjson_dom.h

@@ -1,138 +0,0 @@
-#pragma once
-#if SIMDJSON_EXCEPTIONS
-
-
-#include "json2msgpack.h"
-
-namespace json2msgpack {
-
-using namespace simdjson;
-
-struct simdjsondom2msgpack {
-  /**
-   * @brief Converts the provided JSON into msgpack.
-   *
-   * @param json JSON input
-   * @param buf temporary buffer (must be large enough, with simdjson::SIMDJSON_PADDING bytes
-   * of padding)
-   * @return std::string_view msgpack output, writing 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_string(const std::string_view v) 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;
-
-  inline void recursive_processor(simdjson::dom::element element);
-
-  dom::parser parser;
-  uint8_t *buff{};
-};
-
-std::string_view
-simdjsondom2msgpack::to_msgpack(const simdjson::padded_string &json,
-                             uint8_t *buf) {
-  buff = buf;
-
-  recursive_processor(parser.parse(json));
-  return std::string_view(reinterpret_cast<char *>(buf), size_t(buff - buf));
-}
-void simdjsondom2msgpack::write_string(const std::string_view v) noexcept {
-  write_byte(0xdb);
-  write_uint32(uint32_t(v.size()));
-  ::memcpy(buff, v.data(), v.size());
-  buff += v.size();
-}
-void simdjsondom2msgpack::write_double(const double d) noexcept {
-  *buff++ = 0xcb;
-  ::memcpy(buff, &d, sizeof(d));
-  buff += sizeof(d);
-}
-
-void simdjsondom2msgpack::write_byte(const uint8_t b) noexcept {
-  *buff = b;
-  buff++;
-}
-
-void simdjsondom2msgpack::write_uint32(const uint32_t w) noexcept {
-  ::memcpy(buff, &w, sizeof(w));
-  buff += sizeof(w);
-}
-
-uint8_t *simdjsondom2msgpack::skip_uint32() noexcept {
-  uint8_t *ret = buff;
-  buff += sizeof(uint32_t);
-  return ret;
-}
-
-void simdjsondom2msgpack::write_uint32_at(const uint32_t w, uint8_t *p) noexcept {
-  ::memcpy(p, &w, sizeof(w));
-}
-
-
-void simdjsondom2msgpack::recursive_processor(simdjson::dom::element element) {
-  switch (element.type()) {
-    case dom::element_type::ARRAY: {
-      uint32_t counter = 0;
-      write_byte(0xdd);
-      uint8_t *location = skip_uint32();
-      for (auto child : dom::array(element)) {
-        counter++;
-        recursive_processor(child);
-      }
-      write_uint32_at(counter, location);}
-      break;
-    case dom::element_type::OBJECT:{
-      uint32_t counter = 0;
-      write_byte(0xdf);
-      uint8_t *location = skip_uint32();
-      for (dom::key_value_pair field : dom::object(element)) {
-        counter++;
-        write_string(field.key);
-        recursive_processor(field.value);
-      }
-      write_uint32_at(counter, location);
-      }
-      break;
-    case dom::element_type::INT64:
-    case dom::element_type::UINT64:
-    case dom::element_type::DOUBLE:
-      write_double( double(element));
-      break;
-    case dom::element_type::STRING:
-      write_string(std::string_view(element));
-      break;
-    case dom::element_type::BOOL:
-      write_byte(0xc2 + bool(element));
-      break;
-    case dom::element_type::NULL_VALUE:
-      write_byte(0xc0);
-      break;
-    default:
-      break;
-  }
-}
-
-struct simdjson_dom {
-  using StringType = std::string_view;
-
-  simdjsondom2msgpack 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_dom)->UseManualTime();
-
-} // namespace json2msgpack
-
-#endif // SIMDJSON_EXCEPTIONS

benchmark/json2msgpack/simdjson_ondemand.h

@@ -1,250 +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 simdjson::SIMDJSON_PADDING bytes
-   * of padding)
-   * @return std::string_view msgpack output, writing to the temporary buffer
-   */
-  inline std::string_view to_msgpack(const simdjson::padded_string &json,
-                                     uint8_t *buf);
-
-private:
-  simdjson_inline void write_double(const double d) noexcept;
-  simdjson_inline void write_byte(const uint8_t b) noexcept;
-  simdjson_inline void write_uint32(const uint32_t w) noexcept;
-  simdjson_inline uint8_t *skip_uint32() noexcept;
-  simdjson_inline void write_uint32_at(const uint32_t w,
-                                              uint8_t *p) noexcept;
-  simdjson_inline void
-  write_raw_string(simdjson::ondemand::raw_json_string rjs);
-  inline void recursive_processor(simdjson::ondemand::value element);
-  inline void recursive_processor_ref(simdjson::ondemand::value& element);
-
-  simdjson::ondemand::parser parser;
-  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:
-      // We check that the value is indeed null
-      // otherwise: an error is thrown.
-      if(doc.is_null()) {
-        write_byte(0xc0);
-      }
-      break;
-    case simdjson::ondemand::json_type::array:
-    case simdjson::ondemand::json_type::object:
-    default:
-      // impossible
-      SIMDJSON_UNREACHABLE();
-    }
-  } else {
-    simdjson::ondemand::value val = doc;
-#define SIMDJSON_GCC_COMPILER ((__GNUC__) && !(__clang__) && !(__INTEL_COMPILER))
-#if SIMDJSON_GCC_COMPILER
-    // the GCC compiler does well with by-value passing.
-    // GCC has superior recursive inlining:
-    // https://stackoverflow.com/questions/29186186/why-does-gcc-generate-a-faster-program-than-clang-in-this-recursive-fibonacci-co
-    // https://godbolt.org/z/TeK4doE51
-    recursive_processor(val);
-#else
-    recursive_processor_ref(val);
-#endif
-  }
-  if (!doc.at_end()) {
-     throw "There are unexpectedly tokens after the end of the json in the json2msgpack sample data";
-  }
-  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:
-    // We check that the value is indeed null
-    // otherwise: an error is thrown.
-    if(element.is_null()) {
-      write_byte(0xc0);
-    }
-    break;
-  default:
-    SIMDJSON_UNREACHABLE();
-  }
-}
-
-
-void simdjson2msgpack::recursive_processor_ref(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++;
-      simdjson::ondemand::value v = child.value();
-      recursive_processor_ref(v);
-    }
-    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());
-      simdjson::ondemand::value v = field.value();
-      recursive_processor_ref(v);
-    }
-    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:
-    // We check that the value is indeed null
-    // otherwise: an error is thrown.
-    if(element.is_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

benchmark/json2msgpack/yyjson.h

@@ -1,123 +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();
-
-#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
-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();
-#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
-} // namespace json2msgpack
-
-#endif // SIMDJSON_COMPETITION_YYJSON

benchmark/json_benchmark/file_runner.h

@@ -24,7 +24,7 @@ struct file_runner : public runner_base<I> {
 
   simdjson_warn_unused bool before_run(benchmark::State &state) {
     if (!runner_base<I>::after_run(state)) { return false; };
-    // Copy the original JSON in case we did *in situ* last time
+    // Copy the original json in case we did *in situ* last time
     std::memcpy(json.data(), original_json.data(), original_json.size());
     return true;
   }

benchmark/json_benchmark/run_json_benchmark.h

@@ -19,7 +19,7 @@ void maybe_display_implementation() {
 template<typename B, typename R> static void run_json_benchmark(benchmark::State &state) {
   maybe_display_implementation();
 
-  event_collector collector;
+  event_collector collector(true);
   event_aggregate events;
 
   // Warmup and equality check (make sure the data is right!)

benchmark/json_benchmark/string_runner.h

@@ -13,7 +13,7 @@ struct string_runner : public runner_base<I> {
 
   simdjson_warn_unused bool before_run(benchmark::State &state) {
     if (!runner_base<I>::after_run(state)) { return false; };
-    // Copy the original JSON in case we did *in situ*
+    // Copy the original json in case we did *in situ*
     std::memcpy(json.data(), original_json.data(), original_json.size());
     return true;
   }

benchmark/kostya/boostjson.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_BOOSTJSON
-
-#include "kostya.h"
-
-namespace kostya {
-
-struct boostjson {
-  static constexpr diff_flags DiffFlags = diff_flags::IMPRECISE_FLOATS;
-
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    auto root = boost::json::parse(json);
-    for (const auto &point : root.at("coordinates").as_array()) {
-      result.emplace_back(json_benchmark::point{
-        point.at("x").to_number<double>(),
-        point.at("y").to_number<double>(),
-        point.at("z").to_number<double>()
-      });
-    }
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(kostya, boostjson)->UseManualTime();
-
-} // namespace kostya
-
-#endif // SIMDJSON_COMPETITION_BOOSTJSON

benchmark/kostya/kostya.h

@@ -79,7 +79,7 @@ static const simdjson::padded_string &get_built_json_array() {
 
 struct simdjson_dom;
 
-template<typename I> simdjson_inline static void kostya(benchmark::State &state) {
+template<typename I> simdjson_really_inline static void kostya(benchmark::State &state) {
   run_json_benchmark<runner<I>, runner<simdjson_dom>>(state);
 }
 

benchmark/kostya/nlohmann_json_sax.h

@@ -42,7 +42,7 @@ struct nlohmann_json_sax {
             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);
+            buffer[k] = val;
             if (k == 2) {
                 result.emplace_back(json_benchmark::point{buffer[0],buffer[1],buffer[2]});
                 k = 0;

benchmark/kostya/rapidjson.h

@@ -13,7 +13,7 @@ struct rapidjson_base {
 
   Document doc;
 
-  simdjson_inline double get_double(Value &object, std::string_view key) {
+  simdjson_really_inline double get_double(Value &object, std::string_view key) {
     auto field = object.FindMember(key.data());
     if (field == object.MemberEnd()) { throw "Missing double field"; }
     if (!field->value.IsNumber()) { throw "Field is not double"; }
@@ -34,29 +34,28 @@ struct rapidjson_base {
     return true;
   }
 };
-#if SIMDJSON_COMPETITION_ONDEMAND_APPROX
+
-struct rapidjson_approx : rapidjson_base {
+struct rapidjson : rapidjson_base {
   bool run(simdjson::padded_string &json, std::vector<point> &result) {
     return rapidjson_base::run(doc.Parse<kParseValidateEncodingFlag>(json.data()), result);
   }
 };
-BENCHMARK_TEMPLATE(kostya, rapidjson_approx)->UseManualTime();
+BENCHMARK_TEMPLATE(kostya, rapidjson)->UseManualTime();
-#endif // SIMDJSON_COMPETITION_ONDEMAND_APPROX
 
-struct rapidjson : rapidjson_base {
+struct rapidjson_lossless : rapidjson_base {
   bool run(simdjson::padded_string &json, std::vector<point> &result) {
     return rapidjson_base::run(doc.Parse<kParseValidateEncodingFlag | kParseFullPrecisionFlag>(json.data()), result);
   }
 };
-BENCHMARK_TEMPLATE(kostya, rapidjson)->UseManualTime();
+BENCHMARK_TEMPLATE(kostya, rapidjson_lossless)->UseManualTime();
-#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
+
 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();
-#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
+
 } // namespace kostya
 
 #endif // SIMDJSON_COMPETITION_RAPIDJSON

benchmark/kostya/sajson.h

@@ -11,9 +11,8 @@ struct sajson {
 
   size_t ast_buffer_size{0};
   size_t *ast_buffer{nullptr};
-  ~sajson() { free(ast_buffer); }
 
-  simdjson_inline double get_double(const ::sajson::value &obj, std::string_view key) {
+  simdjson_really_inline double get_double(const ::sajson::value &obj, std::string_view key) {
     using namespace sajson;
 
     auto val = obj.get_value_of_key({key.data(), key.length()});

benchmark/kostya/yyjson.h

@@ -9,7 +9,7 @@ namespace kostya {
 struct yyjson_base {
   static constexpr diff_flags DiffFlags = diff_flags::NONE;
 
-  simdjson_inline double get_double(yyjson_val *obj, std::string_view key) {
+  simdjson_really_inline double get_double(yyjson_val *obj, std::string_view key) {
     yyjson_val *val = yyjson_obj_getn(obj, key.data(), key.length());
     if (!val) { throw "missing point field!"; }
     if (yyjson_get_type(val) != YYJSON_TYPE_NUM) { throw "Number is not a type!"; }
@@ -53,14 +53,14 @@ struct yyjson : yyjson_base {
   }
 };
 BENCHMARK_TEMPLATE(kostya, yyjson)->UseManualTime();
-#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
+
 struct yyjson_insitu : yyjson_base {
   bool run(simdjson::padded_string &json, std::vector<point> &result) {
     return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), result);
   }
 };
 BENCHMARK_TEMPLATE(kostya, yyjson_insitu)->UseManualTime();
-#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
+
 } // namespace kostya
 
 #endif // SIMDJSON_COMPETITION_YYJSON

benchmark/large_amazon_cellphones/large_amazon_cellphones.h

@@ -16,11 +16,11 @@ using namespace json_benchmark;
 struct brand {
     double cumulative_rating;
     uint64_t reviews_count;
-    simdjson_inline bool operator==(const brand &other) const {
+    simdjson_really_inline bool operator==(const brand &other) const {
         return cumulative_rating == other.cumulative_rating &&
             reviews_count == other.reviews_count;
     }
-    simdjson_inline bool operator!=(const brand &other) const { return !(*this == other); }
+    simdjson_really_inline bool operator!=(const brand &other) const { return !(*this == other); }
 };
 
 simdjson_unused static std::ostream &operator<<(std::ostream &o, const brand &b) {
@@ -87,7 +87,7 @@ static const simdjson::padded_string &get_built_json() {
 template<bool threaded>
 struct simdjson_dom;
 
-template<typename I> simdjson_inline static void large_amazon_cellphones(benchmark::State &state) {
+template<typename I> simdjson_really_inline static void large_amazon_cellphones(benchmark::State &state) {
   run_json_benchmark<runner<I>, runner<simdjson_dom<UNTHREADED>>>(state);
 }
 

benchmark/large_random/boostjson.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_BOOSTJSON
-
-#include "large_random.h"
-
-namespace large_random {
-
-struct boostjson {
-  static constexpr diff_flags DiffFlags = diff_flags::IMPRECISE_FLOATS;
-
-  bool run(simdjson::padded_string &json, std::vector<point> &result) {
-    auto root = boost::json::parse(json);
-    for (const auto &point : root.as_array()) {
-      result.emplace_back(json_benchmark::point{
-        point.at("x").to_number<double>(),
-        point.at("y").to_number<double>(),
-        point.at("z").to_number<double>()
-      });
-    }
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(large_random, boostjson)->UseManualTime();
-
-} // namespace large_random
-
-#endif // SIMDJSON_COMPETITION_BOOSTJSON

benchmark/large_random/nlohmann_json_sax.h

@@ -34,7 +34,7 @@ struct nlohmann_json_sax {
             return true;
         }
         bool number_unsigned(number_unsigned_t val) override {
-            buffer[k] = double(val);
+            buffer[k] = val;
             if (k == 2) {
                 result.emplace_back(json_benchmark::point{buffer[0],buffer[1],buffer[2]});
                 k = 0;

benchmark/large_random/rapidjson.h

@@ -13,7 +13,7 @@ struct rapidjson_base {
 
   Document doc;
 
-  simdjson_inline double get_double(Value &object, std::string_view key) {
+  simdjson_really_inline double get_double(Value &object, std::string_view key) {
     auto field = object.FindMember(key.data());
     if (field == object.MemberEnd()) { throw "Missing double field"; }
     if (!field->value.IsNumber()) { throw "Field is not double"; }
@@ -31,30 +31,28 @@ struct rapidjson_base {
     return true;
   }
 };
-#if SIMDJSON_COMPETITION_ONDEMAND_APPROX
+
-struct rapidjson_approx : rapidjson_base {
+struct rapidjson : rapidjson_base {
   bool run(simdjson::padded_string &json, std::vector<point> &result) {
     return rapidjson_base::run(doc.Parse<kParseValidateEncodingFlag>(json.data()), result);
   }
 };
-BENCHMARK_TEMPLATE(large_random, rapidjson_approx)->UseManualTime();
+BENCHMARK_TEMPLATE(large_random, rapidjson)->UseManualTime();
-#endif // SIMDJSON_COMPETITION_ONDEMAND_APPROX
 
-struct rapidjson : rapidjson_base {
+struct rapidjson_lossless : rapidjson_base {
   bool run(simdjson::padded_string &json, std::vector<point> &result) {
     return rapidjson_base::run(doc.Parse<kParseValidateEncodingFlag | kParseFullPrecisionFlag>(json.data()), result);
   }
 };
-BENCHMARK_TEMPLATE(large_random, rapidjson)->UseManualTime();
+BENCHMARK_TEMPLATE(large_random, rapidjson_lossless)->UseManualTime();
 
-#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
 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();
-#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
+
 
 } // namespace large_random
 

benchmark/large_random/sajson.h

@@ -11,9 +11,8 @@ struct sajson {
 
   size_t ast_buffer_size{0};
   size_t *ast_buffer{nullptr};
-  ~sajson() { free(ast_buffer); }
 
-  simdjson_inline double get_double(const ::sajson::value &obj, std::string_view key) {
+  simdjson_really_inline double get_double(const ::sajson::value &obj, std::string_view key) {
     using namespace sajson;
 
     auto val = obj.get_value_of_key({key.data(), key.length()});

benchmark/large_random/yyjson.h

@@ -9,7 +9,7 @@ namespace large_random {
 struct yyjson_base {
   static constexpr diff_flags DiffFlags = diff_flags::NONE;
 
-  simdjson_inline double get_double(yyjson_val *obj, std::string_view key) {
+  simdjson_really_inline double get_double(yyjson_val *obj, std::string_view key) {
     yyjson_val *val = yyjson_obj_getn(obj, key.data(), key.length());
     if (!val) { throw "missing point field!"; }
     if (yyjson_get_type(val) != YYJSON_TYPE_NUM) { throw "Number is not a type!"; }
@@ -51,14 +51,14 @@ struct yyjson : yyjson_base {
   }
 };
 BENCHMARK_TEMPLATE(large_random, yyjson)->UseManualTime();
-#if SIMDJSON_COMPETITION_ONDEMAND_INSITU
+
 struct yyjson_insitu : yyjson_base {
   bool run(simdjson::padded_string &json, std::vector<point> &result) {
     return yyjson_base::run(yyjson_read_opts(json.data(), json.size(), YYJSON_READ_INSITU, 0, 0), result);
   }
 };
 BENCHMARK_TEMPLATE(large_random, yyjson_insitu)->UseManualTime();
-#endif // SIMDJSON_COMPETITION_ONDEMAND_INSITU
+
 } // namespace large_random
 
 #endif // SIMDJSON_COMPETITION_YYJSON

benchmark/largerandom/iter.h

@@ -10,28 +10,28 @@ using namespace simdjson;
 
 class Iter {
 public:
-  simdjson_inline bool Run(const padded_string &json);
+  simdjson_really_inline bool Run(const padded_string &json);
 
-  simdjson_inline const std::vector<my_point> &Result() { return container; }
+  simdjson_really_inline const std::vector<my_point> &Result() { return container; }
-  simdjson_inline size_t ItemCount() { return container.size(); }
+  simdjson_really_inline size_t ItemCount() { return container.size(); }
 
 private:
   ondemand::parser parser{};
   std::vector<my_point> container{};
 
-  simdjson_inline double first_double(ondemand::json_iterator &iter) {
+  simdjson_really_inline double first_double(ondemand::json_iterator &iter) {
     if (iter.start_object().error() || iter.field_key().error() || iter.field_value()) { throw "Invalid field"; }
     return iter.consume_double();
   }
 
-  simdjson_inline double next_double(ondemand::json_iterator &iter) {
+  simdjson_really_inline double next_double(ondemand::json_iterator &iter) {
     if (!iter.has_next_field() || iter.field_key().error() || iter.field_value()) { throw "Invalid field"; }
     return iter.consume_double();
   }
 
 };
 
-simdjson_inline bool Iter::Run(const padded_string &json) {
+simdjson_really_inline bool Iter::Run(const padded_string &json) {
   container.clear();
 
   auto iter = parser.iterate_raw(json).value();

benchmark/largerandom/ondemand.h

@@ -10,16 +10,16 @@ using namespace simdjson;
 
 class OnDemand {
 public:
-  simdjson_inline bool Run(const padded_string &json);
+  simdjson_really_inline bool Run(const padded_string &json);
-  simdjson_inline const std::vector<my_point> &Result() { return container; }
+  simdjson_really_inline const std::vector<my_point> &Result() { return container; }
-  simdjson_inline size_t ItemCount() { return container.size(); }
+  simdjson_really_inline size_t ItemCount() { return container.size(); }
 
 private:
   ondemand::parser parser{};
   std::vector<my_point> container{};
 };
 
-simdjson_inline bool OnDemand::Run(const padded_string &json) {
+simdjson_really_inline bool OnDemand::Run(const padded_string &json) {
   container.clear();
 
   auto doc = parser.iterate(json);

benchmark/largerandom/sax.h

@@ -11,13 +11,13 @@ using namespace simdjson::builtin::stage2;
 
 class Sax {
 public:
-  simdjson_inline bool Run(const padded_string &json) noexcept;
+  simdjson_really_inline bool Run(const padded_string &json) noexcept;
 
-  simdjson_inline const std::vector<my_point> &Result() { return container; }
+  simdjson_really_inline const std::vector<my_point> &Result() { return container; }
-  simdjson_inline size_t ItemCount() { return container.size(); }
+  simdjson_really_inline size_t ItemCount() { return container.size(); }
 
 private:
-  simdjson_inline error_code RunNoExcept(const padded_string &json) noexcept;
+  simdjson_really_inline error_code RunNoExcept(const padded_string &json) noexcept;
   error_code Allocate(size_t new_capacity);
   std::unique_ptr<uint8_t[]> string_buf{};
   size_t capacity{};
@@ -34,21 +34,21 @@ public:
 
   explicit sax_point_reader_visitor(std::vector<my_point> &_points) : points(_points) {}
 
-  simdjson_inline error_code visit_object_start(json_iterator &) {
+  simdjson_really_inline error_code visit_object_start(json_iterator &) {
     idx = 0;
     return SUCCESS;
   }
-  simdjson_inline error_code visit_primitive(json_iterator &, const uint8_t *value) {
+  simdjson_really_inline error_code visit_primitive(json_iterator &, const uint8_t *value) {
     if(idx == GOT_SOMETHING_ELSE) { return simdjson::SUCCESS; }
     return numberparsing::parse_double(value).get(buffer[idx]);
   }
-  simdjson_inline error_code visit_object_end(json_iterator &)  {
+  simdjson_really_inline error_code visit_object_end(json_iterator &)  {
     points.emplace_back(my_point{buffer[0], buffer[1], buffer[2]});
     return SUCCESS;
   }
 
-  simdjson_inline error_code visit_document_start(json_iterator &) { return SUCCESS; }
+  simdjson_really_inline error_code visit_document_start(json_iterator &) { return SUCCESS; }
-  simdjson_inline error_code visit_key(json_iterator &, const uint8_t * key) {
+  simdjson_really_inline error_code visit_key(json_iterator &, const uint8_t * key) {
     switch(key[1]) {
       // Technically, we should check the other characters
       // in the key, but we are cheating to go as fast
@@ -67,13 +67,13 @@ public:
     }
     return SUCCESS;
   }
-  simdjson_inline error_code visit_array_start(json_iterator &)  { return SUCCESS; }
+  simdjson_really_inline error_code visit_array_start(json_iterator &)  { return SUCCESS; }
-  simdjson_inline error_code visit_array_end(json_iterator &) { return SUCCESS; }
+  simdjson_really_inline error_code visit_array_end(json_iterator &) { return SUCCESS; }
-  simdjson_inline error_code visit_document_end(json_iterator &)  { return SUCCESS; }
+  simdjson_really_inline error_code visit_document_end(json_iterator &)  { return SUCCESS; }
-  simdjson_inline error_code visit_empty_array(json_iterator &)  { return SUCCESS; }
+  simdjson_really_inline error_code visit_empty_array(json_iterator &)  { return SUCCESS; }
-  simdjson_inline error_code visit_empty_object(json_iterator &)  { return SUCCESS; }
+  simdjson_really_inline error_code visit_empty_object(json_iterator &)  { return SUCCESS; }
-  simdjson_inline error_code visit_root_primitive(json_iterator &, const uint8_t *)  { return SUCCESS; }
+  simdjson_really_inline error_code visit_root_primitive(json_iterator &, const uint8_t *)  { return SUCCESS; }
-  simdjson_inline error_code increment_count(json_iterator &) { return SUCCESS; }
+  simdjson_really_inline error_code increment_count(json_iterator &) { return SUCCESS; }
 };
 
 // NOTE: this assumes the dom_parser is already allocated

benchmark/linux/linux-perf-events.h

@@ -1,13 +1,22 @@
+// https://github.com/WojciechMula/toys/blob/master/000helpers/linux-perf-events.h
 #pragma once
 #ifdef __linux__
-
+#ifdef __has_include
+#if __has_include(<asm/unistd.h>)
 #include <asm/unistd.h>       // for __NR_perf_event_open
+#else
+#warning "Header asm/unistd.h cannot be found though it is a linux system. Are linux headers missing?"
+#endif
+#else // no __has_include
+// Please insure that linux headers have been installed.
+#include <asm/unistd.h>       // for __NR_perf_event_open
+#endif
 #include <linux/perf_event.h> // for perf event constants
 #include <sys/ioctl.h>        // for ioctl
 #include <unistd.h>           // for syscall
 
 #include <cerrno>  // for errno
-#include <cstring> // for memset
+#include <cstring> // for std::memset
 #include <stdexcept>
 
 #include <iostream>
@@ -19,11 +28,13 @@ template <int TYPE = PERF_TYPE_HARDWARE> class LinuxEvents {
   perf_event_attr attribs{};
   size_t num_events{};
   std::vector<uint64_t> temp_result_vec{};
-  std::vector<uint64_t> ids{};
+  std::vector<uint64_t> result{};
+  std::vector<int> fds{};
+  bool quiet;
 
 public:
-  explicit LinuxEvents(std::vector<int> config_vec) : fd(0), working(true) {
+  explicit LinuxEvents(std::vector<int> config_vec, bool _quiet=false) : fd(0), working(true), quiet{_quiet} {
-    memset(&attribs, 0, sizeof(attribs));
+    std::memset(&attribs, 0, sizeof(attribs));
     attribs.type = TYPE;
     attribs.size = sizeof(attribs);
     attribs.disabled = 1;
@@ -38,7 +49,7 @@ public:
 
     int group = -1; // no group
     num_events = config_vec.size();
-    ids.resize(config_vec.size());
+    result.resize(config_vec.size());
     uint32_t i = 0;
     for (auto config : config_vec) {
       attribs.config = config;
@@ -46,17 +57,22 @@ public:
       if (_fd == -1) {
         report_error("perf_event_open");
       }
-      ioctl(_fd, PERF_EVENT_IOC_ID, &ids[i++]);
+      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;
+        group = fd;
-        fd = _fd;
       }
     }
 
     temp_result_vec.resize(num_events * 2 + 1);
   }
 
-  ~LinuxEvents() { if (fd != -1) { close(fd); } }
+  ~LinuxEvents() {
+   for (auto tfd : fds) {
+      if (tfd != -1) { close(tfd); }
+    }
+  }
 
   inline void start() {
     if (fd != -1) {
@@ -81,16 +97,10 @@ public:
       }
     }
     // our actual results are in slots 1,3,5, ... of this structure
+    // we really should be checking our result obtained earlier to be safe
     for (uint32_t i = 1; i < temp_result_vec.size(); i += 2) {
       results[i / 2] = temp_result_vec[i];
     }
-    for (uint32_t i = 2; i < temp_result_vec.size(); i += 2) {
-      if(ids[i/2-1] != temp_result_vec[i]) {
-        report_error("event mismatch");
-      }
-    }
-
-
   }
 
   bool is_working() {
@@ -98,7 +108,12 @@ public:
   }
 
 private:
-  void report_error(const std::string &) {
+  void report_error(const std::string &context) {
+    if (!quiet) {
+      if (working) {
+        std::cerr << (context + ": " + std::string(strerror(errno))) << std::endl;
+      }
+    }
     working = false;
   }
 };

benchmark/partial_tweets/boostjson.h

@@ -1,43 +0,0 @@
-#pragma once
-
-#ifdef SIMDJSON_COMPETITION_BOOSTJSON
-
-#include "partial_tweets.h"
-
-namespace partial_tweets {
-
-struct boostjson {
-  using StringType=std::string;
-
-  bool run(simdjson::padded_string &json, std::vector<tweet<StringType>> &result) {
-
-    auto root = boost::json::parse(json);
-    for (const auto &tweet : root.at("statuses").as_array()) {
-      const auto &user = tweet.at("user");
-
-      auto in_reply_to_status_id = tweet.as_object().if_contains("in_reply_to_status_id")
-        ? tweet.at("in_reply_to_status_id") : boost::json::value();
-
-      result.emplace_back(partial_tweets::tweet<StringType>{
-        tweet.at("created_at").as_string().c_str(),
-        tweet.at("id").to_number<uint64_t>(),
-        tweet.at("text").as_string().c_str(),
-        in_reply_to_status_id.is_null() ? 0 : in_reply_to_status_id.to_number<uint64_t>(),
-        {
-          user.at("id").to_number<uint64_t>(),
-          user.at("screen_name").as_string().c_str()
-        },
-        tweet.at("retweet_count").to_number<uint64_t>(),
-        tweet.at("favorite_count").to_number<uint64_t>()
-      });
-    }
-
-    return true;
-  }
-};
-
-BENCHMARK_TEMPLATE(partial_tweets, boostjson)->UseManualTime();
-
-} // namespace partial_tweets
-
-#endif // SIMDJSON_COMPETITION_BOOSTJSON

benchmark/partial_tweets/nlohmann_json.h

@@ -9,7 +9,7 @@ namespace partial_tweets {
 struct nlohmann_json {
   using StringType=std::string;
 
-  simdjson_inline uint64_t nullable_int(nlohmann::json value) {
+  simdjson_really_inline uint64_t nullable_int(nlohmann::json value) {
     if (value.is_null()) { return 0; }
     return value;
   }

benchmark/partial_tweets/ondemand.h

@@ -17,27 +17,27 @@ public:
       displayed_implementation = true;
     }
   }
-  simdjson_inline bool Run(const padded_string &json);
+  simdjson_really_inline bool Run(const padded_string &json);
-  simdjson_inline const std::vector<tweet> &Result() { return tweets; }
+  simdjson_really_inline const std::vector<tweet> &Result() { return tweets; }
-  simdjson_inline size_t ItemCount() { return tweets.size(); }
+  simdjson_really_inline size_t ItemCount() { return tweets.size(); }
 
 private:
   ondemand::parser parser{};
   std::vector<tweet> tweets{};
 
-  simdjson_inline uint64_t nullable_int(ondemand::value value) {
+  simdjson_really_inline uint64_t nullable_int(ondemand::value value) {
     if (value.is_null()) { return 0; }
     return value;
   }
 
-  simdjson_inline twitter_user read_user(ondemand::object user) {
+  simdjson_really_inline twitter_user read_user(ondemand::object user) {
     return { user.find_field("id"), user.find_field("screen_name") };
   }
 
   static inline bool displayed_implementation = false;
 };
 
-simdjson_inline bool OnDemand::Run(const padded_string &json) {
+simdjson_really_inline bool OnDemand::Run(const padded_string &json) {
   tweets.clear();
 
   // Walk the document, parsing the tweets as we go

benchmark/partial_tweets/partial_tweets.h

@@ -39,7 +39,7 @@ struct runner : public file_runner<I> {
 
 struct simdjson_dom;
 
-template<typename I> simdjson_inline static void partial_tweets(benchmark::State &state) {
+template<typename I> simdjson_really_inline static void partial_tweets(benchmark::State &state) {
   run_json_benchmark<runner<I>, runner<simdjson_dom>>(state);
 }