mirror of
https://github.com/simdjson/simdjson
synced 2026-06-08 17:27:07 +00:00
Compare commits
187 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| db91f62bd7 | |||
| 20cd6e30ee | |||
| e45d8edbd6 | |||
| 6efb8d81bd | |||
| f562878afc | |||
| 60aa25a0c2 | |||
| d01662560d | |||
| a63c77a977 | |||
| bbb3cb80a6 | |||
| 43219e50e0 | |||
| 49b9860899 | |||
| 0388d79770 | |||
| c0fa1aec66 | |||
| 6e61b7f6ef | |||
| a76e778804 | |||
| ccf8694510 | |||
| 9b67497ed0 | |||
| 0336684df7 | |||
| c19320dd6e | |||
| 412a5680e8 | |||
| a05a56856d | |||
| 58173a6a1f | |||
| 1721032cfd | |||
| b73877f95e | |||
| 09723897e9 | |||
| 49e231b634 | |||
| acdbbab916 | |||
| 5090247c34 | |||
| 4180e05730 | |||
| feea2bce2c | |||
| 692f43cd84 | |||
| 3240d55bcc | |||
| 66fd28fc00 | |||
| 5f638951c6 | |||
| 3e94eea939 | |||
| 0e8311f812 | |||
| 3620e9d151 | |||
| d017cd7ca4 | |||
| d9d1ff5856 | |||
| eb8f2bce14 | |||
| 2a4ff73468 | |||
| 77fc2b8447 | |||
| ba8b66a633 | |||
| 66eec5feaf | |||
| 3964f3e5d2 | |||
| ee8515122d | |||
| 5d35e7ca1f | |||
| deefc88b9c | |||
| c80dda7c58 | |||
| d2954ef68b | |||
| ac719827ff | |||
| 6ea77392a7 | |||
| e2f879751c | |||
| bf7834179c | |||
| 69ab8848bf | |||
| 7288323e36 | |||
| 3f381cf3ee | |||
| 52406402ed | |||
| 799d8e3fc9 | |||
| 6c647d9f3b | |||
| 8519e24f12 | |||
| fffb62743c | |||
| c888075f8d | |||
| 9b8aac5f22 | |||
| 40b414d184 | |||
| c85e8a7db1 | |||
| 83f390f8e7 | |||
| 82563dcf70 | |||
| 646bd3f2c3 | |||
| 4b0a908bb2 | |||
| 4c98e51c53 | |||
| 58e3d5d9cc | |||
| a22a92dc72 | |||
| c4654553dd | |||
| 5997f82c37 | |||
| bee410b315 | |||
| b115e3ef61 | |||
| 669229df5d | |||
| b6a2286e62 | |||
| 3a97c57773 | |||
| e1c6a778f8 | |||
| d413dd5b0e | |||
| a33fdc2770 | |||
| 87f5f7a250 | |||
| 9923d27994 | |||
| 876be23545 | |||
| 2028bdaeac | |||
| 1ac3a00ca9 | |||
| 6d7cc2c7c1 | |||
| 61a52287fc | |||
| 37a9aaad48 | |||
| 78325888ea | |||
| a90cb5d900 | |||
| 34a01ec3af | |||
| e510ed2774 | |||
| dabac13dde | |||
| aef7111c05 | |||
| 0c08894a54 | |||
| 2fe3a1467d | |||
| 167a46a0e7 | |||
| 2b532489cc | |||
| 85163df88c | |||
| 6a5be0f0db | |||
| 710a3c7241 | |||
| c93e02e172 | |||
| 517143aec4 | |||
| 9feda5e703 | |||
| cda198b7b9 | |||
| aad17a6a8d | |||
| 32d072a208 | |||
| 5eab555053 | |||
| 6430fbd39a | |||
| 4d2fc31b27 | |||
| 33610b59eb | |||
| 23290ae48d | |||
| eb3a085e0f | |||
| 4c8ec35a48 | |||
| 88bf5cb6d9 | |||
| 9b0435d864 | |||
| ddecadde86 | |||
| 02bee7d1b9 | |||
| 6ef555e6fb | |||
| 6952f8dfce | |||
| 03d0a4731a | |||
| 185ff4e8fe | |||
| 5bf6d9f3f0 | |||
| 2fa729922e | |||
| ebd09cb2a3 | |||
| 3978b9f159 | |||
| edc36a87ab | |||
| 6060be2fdf | |||
| 3251f61c9d | |||
| 561ffcd519 | |||
| 5541e78402 | |||
| 9a9ed0e2da | |||
| bca8d3e277 | |||
| 97196fa969 | |||
| 23fab307ca | |||
| 0a14e05ec7 | |||
| b88f831dbd | |||
| 71a73c2c47 | |||
| 07603aa7f7 | |||
| b8a6b889c7 | |||
| 7898234bb3 | |||
| f52533538a | |||
| 3bb2f0a186 | |||
| d6551bf278 | |||
| 0173eaaad7 | |||
| 5459dbd6c6 | |||
| 9c45f1f292 | |||
| 665cbba159 | |||
| a26f664907 | |||
| 17cb457ffd | |||
| 8b2af0473a | |||
| f1bfa43385 | |||
| 29fbbee852 | |||
| baa7d961ce | |||
| 6412b27c7e | |||
| 503da5ec83 | |||
| 9dd6e9c959 | |||
| 6db330c1a2 | |||
| 993ac4b87c | |||
| 35e87896f0 | |||
| f7e281cadc | |||
| 13405afd4b | |||
| 24b44309fb | |||
| e11ad58aad | |||
| 1875ed6550 | |||
| 80d26298a0 | |||
| 25b5015c09 | |||
| 26f8c566c7 | |||
| ff77ac801e | |||
| e0699994ef | |||
| 68ba9a1b2a | |||
| 6fed6bd29b | |||
| cc24bb4114 | |||
| 14ec0ca8f4 | |||
| 8dabd02c3a | |||
| c9692005fd | |||
| 2e0a9397c9 | |||
| f7922075c3 | |||
| b2e20e04c9 | |||
| adc9d18efd | |||
| bf849e3619 | |||
| c09e8dc225 | |||
| 5bf585ef02 | |||
| caff09cafc |
@@ -45,12 +45,16 @@ 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)**
|
**Configuration (please complete the following information if relevant)**
|
||||||
- OS: [e.g. Ubuntu 16.04.6 LTS]
|
- 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]
|
- Version [e.g. 22]
|
||||||
- Optimization setting (e.g., -O3)
|
- 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.
|
||||||
|
|
||||||
|
* 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**
|
**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 guide:
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
blank_issues_enabled: false
|
||||||
@@ -31,7 +31,7 @@ A clear and concise description of any alternative solutions or features you've
|
|||||||
**Additional context**
|
**Additional context**
|
||||||
Add any other context or screenshots about the feature request here.
|
Add any other context or screenshots about the feature request here.
|
||||||
|
|
||||||
** Are you willing to contribute code or documentation toward this new feature? **
|
**Are you willing to contribute code or documentation toward this new feature?**
|
||||||
If you plan to contribute to simdjson, please read our
|
If you plan to contribute to simdjson, please read our
|
||||||
* CONTRIBUTING guide: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md and our
|
* CONTRIBUTING guide: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md and our
|
||||||
* HACKING guide: https://github.com/simdjson/simdjson/blob/master/HACKING.md
|
* HACKING guide: https://github.com/simdjson/simdjson/blob/master/HACKING.md
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ We do not make changes to simdjson without clearly identifiable benefits, which
|
|||||||
|
|
||||||
Is your issue:
|
Is your issue:
|
||||||
|
|
||||||
1. A bug report? If so, please point at a reproducible test. Indicate whether you are willing or able to provide a bug fix as a pull request.
|
1. A bug report? If so, please point at a reproducible test. Indicate whether you are willing or able to provide a bug fix as a pull request. As a matter of policy, we do not consider a compiler warning to be a bug.
|
||||||
|
|
||||||
2. A build issue? If so, provide all possible details regarding your system configuration. If we cannot reproduce your issue, we cannot fix it.
|
2. A build issue? If so, provide all possible details regarding your system configuration. If we cannot reproduce your issue, we cannot fix it.
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
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: aarch64
|
||||||
|
distro: ubuntu_latest
|
||||||
|
githubToken: ${{ github.token }}
|
||||||
|
install: |
|
||||||
|
apt-get update -q -y
|
||||||
|
apt-get install -y cmake make g++
|
||||||
|
run: |
|
||||||
|
cmake -DSIMDJSON_SANITIZE_UNDEFINED=ON -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
|
||||||
|
cmake --build build -j=2
|
||||||
|
ctest --output-on-failure --test-dir build
|
||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ jobs:
|
|||||||
fuzz-seconds: 600
|
fuzz-seconds: 600
|
||||||
dry-run: false
|
dry-run: false
|
||||||
- name: Upload Crash
|
- name: Upload Crash
|
||||||
uses: actions/upload-artifact@v1
|
uses: actions/upload-artifact@v4
|
||||||
if: failure() && steps.build.outcome == 'success'
|
if: failure() && steps.build.outcome == 'success'
|
||||||
with:
|
with:
|
||||||
name: artifacts
|
name: artifacts
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ jobs:
|
|||||||
image: debian:testing
|
image: debian:testing
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ jobs:
|
|||||||
url: ${{ steps.deployment.outputs.page_url }}
|
url: ${{ steps.deployment.outputs.page_url }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- name: Install Doxygen
|
- name: Install Doxygen
|
||||||
run: sudo apt-get install doxygen graphviz -y
|
run: sudo apt-get install doxygen graphviz -y
|
||||||
- run: mkdir docs
|
- run: mkdir docs
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ jobs:
|
|||||||
whitespace:
|
whitespace:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- name: Remove whitespace and check the diff
|
- name: Remove whitespace and check the diff
|
||||||
run: |
|
run: |
|
||||||
set -eu
|
set -eu
|
||||||
@@ -24,7 +24,7 @@ jobs:
|
|||||||
echo "no trailing whitespace found, good!"
|
echo "no trailing whitespace found, good!"
|
||||||
fi
|
fi
|
||||||
- name: Archive whitespace patch
|
- name: Archive whitespace patch
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v4
|
||||||
if: always()
|
if: always()
|
||||||
with:
|
with:
|
||||||
name: whitespace-patch
|
name: whitespace-patch
|
||||||
|
|||||||
@@ -34,18 +34,18 @@ jobs:
|
|||||||
sudo apt update
|
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 lsb-release wget software-properties-common gnupg
|
||||||
wget https://apt.llvm.org/llvm.sh
|
wget https://apt.llvm.org/llvm.sh
|
||||||
sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
|
sudo apt-get purge --auto-remove llvm python3-lldb-15 llvm-15
|
||||||
chmod +x llvm.sh
|
chmod +x llvm.sh
|
||||||
sudo ./llvm.sh $CLANGVERSION
|
sudo ./llvm.sh $CLANGVERSION
|
||||||
|
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
id: cache-corpus
|
id: cache-corpus
|
||||||
with:
|
with:
|
||||||
path: out/
|
path: out/
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
name: LoongArch64-CI
|
||||||
|
|
||||||
|
on: [push, pull_request]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
loongarch64:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
platform:
|
||||||
|
- { toolchain-version: 2023.08.08 }
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- name: Install build requirements
|
||||||
|
run: |
|
||||||
|
sudo apt-get update -y
|
||||||
|
sudo apt-get install -y --no-install-recommends cmake
|
||||||
|
|
||||||
|
- uses: actions/cache/restore@v4
|
||||||
|
id: restore-cache
|
||||||
|
with:
|
||||||
|
path: /opt/cross-tools
|
||||||
|
key: loongarch64-${{ matrix.platform.toolchain-version }}
|
||||||
|
|
||||||
|
- name: Download LoongArch64 gcc+glibc toolchain
|
||||||
|
if: ${{ !steps.restore-cache.outputs.cache-hit }}
|
||||||
|
run: |
|
||||||
|
url="https://github.com/loongson/build-tools/releases/download/${{ matrix.platform.toolchain-version }}/x86_64-cross-tools-loongarch64-gcc-libc.tar.xz"
|
||||||
|
|
||||||
|
wget "$url" -O /tmp/toolchain.tar.xz
|
||||||
|
|
||||||
|
mkdir -p /opt
|
||||||
|
tar -C /opt -x -f /tmp/toolchain.tar.xz
|
||||||
|
|
||||||
|
- uses: actions/cache/save@v3
|
||||||
|
if: ${{ !steps.restore-cache.outputs.cache-hit }}
|
||||||
|
with:
|
||||||
|
path: /opt/cross-tools
|
||||||
|
key: loongarch64-${{ matrix.platform.toolchain-version }}
|
||||||
|
|
||||||
|
- name: setup Loongarch64 build environment
|
||||||
|
run: |
|
||||||
|
echo "/opt/cross-tools/bin" >> $GITHUB_PATH
|
||||||
|
echo "CC=loongarch64-unknown-linux-gnu-gcc" >> $GITHUB_ENV
|
||||||
|
echo "CXX=loongarch64-unknown-linux-gnu-g++" >> $GITHUB_ENV
|
||||||
|
- name: configure
|
||||||
|
run: cmake -B build -DCMAKE_SYSTEM_PROCESSOR=loongarch64 -DARCH=lonngarch64 -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_C_COMPILER=loongarch64-unknown-linux-gnu-gcc -DCMAKE_CXX_COMPILER=loongarch64-unknown-linux-gnu-g++
|
||||||
|
- name: build
|
||||||
|
run: cmake --build build
|
||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
@@ -31,3 +31,14 @@ jobs:
|
|||||||
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 &&
|
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 &&
|
cd ../tests/installation_tests/find &&
|
||||||
mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../build/destination .. && cmake --build .
|
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 .
|
||||||
|
|||||||
@@ -20,12 +20,15 @@ jobs:
|
|||||||
- msystem: "MINGW64"
|
- msystem: "MINGW64"
|
||||||
install: mingw-w64-x86_64-libxml2 mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-clang
|
install: mingw-w64-x86_64-libxml2 mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-clang
|
||||||
type: Debug
|
type: Debug
|
||||||
|
- msystem: "MINGW64"
|
||||||
|
install: mingw-w64-x86_64-libxml2 mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-clang
|
||||||
|
type: RelWithDebInfo
|
||||||
env:
|
env:
|
||||||
CMAKE_GENERATOR: Ninja
|
CMAKE_GENERATOR: Ninja
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -22,12 +22,15 @@ jobs:
|
|||||||
- msystem: "MINGW64"
|
- msystem: "MINGW64"
|
||||||
install: mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-gcc
|
install: mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-gcc
|
||||||
type: Debug
|
type: Debug
|
||||||
|
- msystem: "MINGW64"
|
||||||
|
install: mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-gcc
|
||||||
|
type: RelWithDebInfo
|
||||||
env:
|
env:
|
||||||
CMAKE_GENERATOR: Ninja
|
CMAKE_GENERATOR: Ninja
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -1,71 +0,0 @@
|
|||||||
name: short fuzz on the power arch
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ master ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ master ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
armv7_job:
|
|
||||||
if: >-
|
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
|
||||||
# The host should always be Linux
|
|
||||||
runs-on: ubuntu-20.04
|
|
||||||
name: Build on ubuntu-20.04 ppc64le
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
- uses: uraimo/run-on-arch-action@v2.0.5
|
|
||||||
name: Run commands
|
|
||||||
id: runcmd
|
|
||||||
env:
|
|
||||||
DEBIAN_FRONTEND: noninteractive
|
|
||||||
with:
|
|
||||||
arch: ppc64le
|
|
||||||
distro: buster
|
|
||||||
|
|
||||||
# Not required, but speeds up builds by storing container images in
|
|
||||||
# a GitHub package registry.
|
|
||||||
githubToken: ${{ github.token }}
|
|
||||||
|
|
||||||
run: |
|
|
||||||
export CLANGSUFFIX="-7"
|
|
||||||
apt-get -qq update
|
|
||||||
apt-get install -q -y clang-7 libfuzzer-7-dev git wget zip ninja-build gnupg software-properties-common
|
|
||||||
wget -q -O - "https://raw.githubusercontent.com/simdjson/debian-ppa/master/key.gpg" | apt-key add -
|
|
||||||
apt-add-repository "deb https://raw.githubusercontent.com/simdjson/debian-ppa/master simdjson main"
|
|
||||||
apt-get -qq update
|
|
||||||
apt-get purge cmake cmake-data
|
|
||||||
apt-get -t simdjson -y install cmake
|
|
||||||
mkdir -p build ; cd build
|
|
||||||
cmake .. -GNinja \
|
|
||||||
-DCMAKE_CXX_COMPILER=clang++$CLANGSUFFIX \
|
|
||||||
-DCMAKE_C_COMPILER=clang$CLANGSUFFIX \
|
|
||||||
-DBUILD_SHARED_LIBS=OFF \
|
|
||||||
-DSIMDJSON_DEVELOPER_MODE=ON \
|
|
||||||
-DSIMDJSON_ENABLE_FUZZING=On \
|
|
||||||
-DSIMDJSON_COMPETITION=OFF \
|
|
||||||
-DSIMDJSON_GOOGLE_BENCHMARKS=OFF \
|
|
||||||
-DSIMDJSON_DISABLE_DEPRECATED_API=On \
|
|
||||||
-DSIMDJSON_FUZZ_LDFLAGS=-lFuzzer \
|
|
||||||
-DCMAKE_CXX_FLAGS="-fsanitize=fuzzer-no-link -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION=" \
|
|
||||||
-DCMAKE_C_FLAGS="-fsanitize=fuzzer-no-link" \
|
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DSIMDJSON_FUZZ_LINKMAIN=Off
|
|
||||||
cd ..
|
|
||||||
builddir=build
|
|
||||||
cmake --build $builddir
|
|
||||||
wget -O corpus.tar.gz https://readonly:readonly@www.pauldreik.se/fuzzdata/index.php?project=simdjson
|
|
||||||
tar xf corpus.tar.gz
|
|
||||||
fuzzernames=$(cmake --build $builddir --target print_all_fuzzernames |tail -n1)
|
|
||||||
for fuzzer in $fuzzernames ; do
|
|
||||||
exe=$builddir/fuzz/$fuzzer
|
|
||||||
shortname=$(echo $fuzzer |cut -f2- -d_)
|
|
||||||
echo found fuzzer $shortname with executable $exe
|
|
||||||
mkdir -p out/$shortname
|
|
||||||
others=$(find out -type d -not -name $shortname -not -name out -not -name cmin)
|
|
||||||
$exe -max_total_time=20 -max_len=4000 out/$shortname $others
|
|
||||||
echo "*************************************************************************"
|
|
||||||
done
|
|
||||||
echo "all is good, no errors found in any of these fuzzers: $fuzzernames"
|
|
||||||
@@ -12,7 +12,7 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: uraimo/run-on-arch-action@v2
|
- uses: uraimo/run-on-arch-action@v2
|
||||||
name: Test
|
name: Test
|
||||||
id: runcmd
|
id: runcmd
|
||||||
@@ -24,6 +24,6 @@ jobs:
|
|||||||
apt-get update -q -y
|
apt-get update -q -y
|
||||||
apt-get install -y cmake make g++
|
apt-get install -y cmake make g++
|
||||||
run: |
|
run: |
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release -B build
|
cmake -DCMAKE_BUILD_TYPE=Release -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
|
||||||
cmake --build build -j=2
|
cmake --build build -j=2
|
||||||
ctest --output-on-failure --test-dir build
|
ctest --output-on-failure --test-dir build
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
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 -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
|
||||||
|
cmake --build build -j=2
|
||||||
|
ctest --output-on-failure --test-dir build
|
||||||
@@ -12,7 +12,7 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: uraimo/run-on-arch-action@v2
|
- uses: uraimo/run-on-arch-action@v2
|
||||||
name: Test
|
name: Test
|
||||||
id: runcmd
|
id: runcmd
|
||||||
@@ -24,6 +24,6 @@ jobs:
|
|||||||
apt-get update -q -y
|
apt-get update -q -y
|
||||||
apt-get install -y cmake make g++
|
apt-get install -y cmake make g++
|
||||||
run: |
|
run: |
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release -B build
|
cmake -DCMAKE_BUILD_TYPE=Release -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
|
||||||
cmake --build build -j=2
|
cmake --build build -j=2
|
||||||
ctest --output-on-failure --test-dir build
|
ctest --output-on-failure --test-dir build
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ jobs:
|
|||||||
CXX: g++-8
|
CXX: g++-8
|
||||||
CC: gcc-8
|
CC: gcc-8
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
@@ -27,12 +27,11 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
ctest --output-on-failure -LE explicitonly -j
|
|
||||||
- name: Use cmake with undefined sanitizer
|
- name: Use cmake with undefined sanitizer
|
||||||
run: |
|
run: |
|
||||||
mkdir builddebugundefsani &&
|
mkdir builddebugundefsani &&
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -9,13 +9,11 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
- name: Install gcc12
|
|
||||||
run: sudo apt-get install -y g++-12
|
|
||||||
- name: Use cmake
|
- name: Use cmake
|
||||||
run: |
|
run: |
|
||||||
mkdir build &&
|
mkdir build &&
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
+5
-5
@@ -1,4 +1,4 @@
|
|||||||
name: Ubuntu 20.04 CI (GCC 9) with Thread Sanitizer
|
name: Ubuntu 22.04 CI (GCC 12) with Thread Sanitizer
|
||||||
|
|
||||||
on: [push, pull_request]
|
on: [push, pull_request]
|
||||||
|
|
||||||
@@ -7,10 +7,10 @@ jobs:
|
|||||||
if: >-
|
if: >-
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
@@ -18,7 +18,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
mkdir build &&
|
mkdir build &&
|
||||||
cd build &&
|
cd build &&
|
||||||
cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE_THREADS=ON .. &&
|
CXX=g++-12 cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE_THREADS=ON .. &&
|
||||||
cmake --build . --target document_stream_tests --target ondemand_document_stream_tests --target parse_many_test &&
|
cmake --build . --target document_stream_tests --target ondemand_document_stream_tests --target parse_many_test &&
|
||||||
ctest --output-on-failure -R parse_many_test &&
|
ctest --output-on-failure -R parse_many_test &&
|
||||||
ctest --output-on-failure -R document_stream_tests
|
ctest --output-on-failure -R document_stream_tests
|
||||||
@@ -9,8 +9,8 @@ jobs:
|
|||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
name: Ubuntu 24.04 CI (CXX 20)
|
||||||
|
|
||||||
|
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-24.04
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
cxx: [g++-13, clang++-16]
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
|
||||||
|
- name: Prepare
|
||||||
|
run: cmake -DSIMDJSON_CXX_STANDARD=20 -DSIMDJSON_DEVELOPER_MODE=ON -B build
|
||||||
|
env:
|
||||||
|
CXX: ${{matrix.cxx}}
|
||||||
|
- name: Build
|
||||||
|
run: cmake --build build -j=2
|
||||||
|
- name: Test
|
||||||
|
run: ctest --output-on-failure --test-dir build
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
name: Ubuntu 24.04 CI
|
||||||
|
|
||||||
|
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-24.04
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
shared: [ON, OFF]
|
||||||
|
cxx: [g++-13, clang++-16]
|
||||||
|
sanitizer: [ON, OFF]
|
||||||
|
build_type: [RelWithDebInfo, Debug, Release]
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
|
||||||
|
- name: Prepare
|
||||||
|
run: cmake -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE=${{matrix.sanitizer}} -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
|
||||||
|
env:
|
||||||
|
CXX: ${{matrix.cxx}}
|
||||||
|
- name: Build
|
||||||
|
run: cmake --build build -j=2
|
||||||
|
- name: Test
|
||||||
|
run: ctest --output-on-failure --test-dir build
|
||||||
@@ -12,10 +12,11 @@ jobs:
|
|||||||
include:
|
include:
|
||||||
- {arch: ARM}
|
- {arch: ARM}
|
||||||
- {arch: ARM64}
|
- {arch: ARM64}
|
||||||
|
- {arch: ARM64EC}
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
- name: Use cmake
|
- name: Use cmake
|
||||||
run: |
|
run: |
|
||||||
cmake -A ${{ matrix.arch }} -DCMAKE_CROSSCOMPILING=1 -DSIMDJSON_DEVELOPER_MODE=ON -D SIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_EXCEPTIONS=OFF -B build &&
|
cmake -A ${{ matrix.arch }} -DCMAKE_SYSTEM_VERSION="10.0.22621.0" -DCMAKE_CROSSCOMPILING=1 -DSIMDJSON_DEVELOPER_MODE=ON -D SIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_EXCEPTIONS=OFF -B build &&
|
||||||
cmake --build build --verbose
|
cmake --build build --verbose
|
||||||
@@ -19,7 +19,7 @@ jobs:
|
|||||||
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF}
|
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF}
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
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
|
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
|
||||||
|
|||||||
@@ -13,32 +13,28 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- {gen: Visual Studio 17 2022, arch: Win32, shared: ON}
|
- {gen: Visual Studio 17 2022, arch: Win32, shared: ON, build_type: Release}
|
||||||
- {gen: Visual Studio 17 2022, arch: Win32, shared: OFF}
|
- {gen: Visual Studio 17 2022, arch: Win32, shared: OFF, build_type: Release}
|
||||||
- {gen: Visual Studio 17 2022, arch: x64, shared: ON}
|
- {gen: Visual Studio 17 2022, arch: x64, shared: ON, build_type: Release}
|
||||||
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF}
|
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: Debug}
|
||||||
|
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: Release}
|
||||||
|
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF, build_type: RelWithDebInfo}
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
|
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
|
||||||
- name: Build Debug
|
- name: Build Debug
|
||||||
run: cmake --build build --config Debug --verbose
|
run: cmake --build build --config ${{matrix.build_type}} --verbose
|
||||||
- name: Build Release
|
- name: Run tests
|
||||||
run: cmake --build build --config Release --verbose
|
|
||||||
- name: Run Release tests
|
|
||||||
run: |
|
run: |
|
||||||
cd build
|
cd build
|
||||||
ctest -C Release -LE explicitonly --output-on-failure
|
ctest -C ${{matrix.build_type}} -LE explicitonly --output-on-failure
|
||||||
- name: Run Debug tests
|
|
||||||
run: |
|
|
||||||
cd build
|
|
||||||
ctest -C Debug -LE explicitonly --output-on-failure
|
|
||||||
- name: Install
|
- name: Install
|
||||||
run: |
|
run: |
|
||||||
cmake --install build --config Release
|
cmake --install build --config ${{matrix.build_type}}
|
||||||
- name: Test Installation
|
- name: Test Installation
|
||||||
run: |
|
run: |
|
||||||
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -B build_install_test tests/installation_tests/find
|
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -B build_install_test tests/installation_tests/find
|
||||||
cmake --build build_install_test --config Release
|
cmake --build build_install_test --config ${{matrix.build_type}}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
name: VS17-CLANG-CI
|
||||||
|
|
||||||
|
on: [push, pull_request]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
ci:
|
||||||
|
if: >-
|
||||||
|
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
||||||
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
|
name: windows-vs17
|
||||||
|
runs-on: windows-latest
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- {gen: Visual Studio 17 2022, arch: x64, build_type: Debug}
|
||||||
|
- {gen: Visual Studio 17 2022, arch: x64, build_type: Release}
|
||||||
|
- {gen: Visual Studio 17 2022, arch: x64, build_type: RelWithDebInfo}
|
||||||
|
steps:
|
||||||
|
- name: checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Configure
|
||||||
|
run: |
|
||||||
|
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -T ClangCL -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
|
||||||
|
- name: Build
|
||||||
|
run: cmake --build build --config ${{matrix.build_type}} --verbose
|
||||||
|
- name: Run tests
|
||||||
|
run: |
|
||||||
|
cd build
|
||||||
|
ctest -C ${{matrix.build_type}} -LE explicitonly --output-on-failure
|
||||||
|
- name: Install
|
||||||
|
run: |
|
||||||
|
cmake --install build --config ${{matrix.build_type}}
|
||||||
|
- 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 ${{matrix.build_type}}
|
||||||
@@ -13,29 +13,25 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- {gen: Visual Studio 17 2022, arch: x64}
|
- {gen: Visual Studio 17 2022, arch: x64, build_type: Debug}
|
||||||
|
- {gen: Visual Studio 17 2022, arch: x64, build_type: Release}
|
||||||
|
- {gen: Visual Studio 17 2022, arch: x64, build_type: RelWithDebInfo}
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -T ClangCL -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
|
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -T ClangCL -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
|
||||||
- name: Build Debug
|
- name: Build
|
||||||
run: cmake --build build --config Debug --verbose
|
run: cmake --build build --config ${{matrix.build_type}} --verbose
|
||||||
- name: Build Release
|
- name: Run tests
|
||||||
run: cmake --build build --config Release --verbose
|
|
||||||
- name: Run Release tests
|
|
||||||
run: |
|
run: |
|
||||||
cd build
|
cd build
|
||||||
ctest -C Release -LE explicitonly --output-on-failure
|
ctest -C ${{matrix.build_type}} -LE explicitonly --output-on-failure
|
||||||
- name: Run Debug tests
|
|
||||||
run: |
|
|
||||||
cd build
|
|
||||||
ctest -C Debug -LE explicitonly --output-on-failure
|
|
||||||
- name: Install
|
- name: Install
|
||||||
run: |
|
run: |
|
||||||
cmake --install build --config Release
|
cmake --install build --config ${{matrix.build_type}}
|
||||||
- name: Test Installation
|
- name: Test Installation
|
||||||
run: |
|
run: |
|
||||||
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -B build_install_test tests/installation_tests/find
|
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -B build_install_test tests/installation_tests/find
|
||||||
cmake --build build_install_test --config Release
|
cmake --build build_install_test --config ${{matrix.build_type}}
|
||||||
@@ -7,8 +7,8 @@ jobs:
|
|||||||
name: windows-vs17
|
name: windows-vs17
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: dependencies/.cache
|
path: dependencies/.cache
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
|||||||
Vendored
+29
-1
@@ -98,6 +98,34 @@
|
|||||||
"queue": "cpp",
|
"queue": "cpp",
|
||||||
"shared_mutex": "cpp",
|
"shared_mutex": "cpp",
|
||||||
"ranges": "cpp",
|
"ranges": "cpp",
|
||||||
"span": "cpp"
|
"span": "cpp",
|
||||||
|
"__verbose_abort": "cpp",
|
||||||
|
"charconv": "cpp",
|
||||||
|
"source_location": "cpp",
|
||||||
|
"strstream": "cpp",
|
||||||
|
"typeindex": "cpp",
|
||||||
|
"*.tcc": "cpp",
|
||||||
|
"memory_resource": "cpp",
|
||||||
|
"numbers": "cpp",
|
||||||
|
"semaphore": "cpp",
|
||||||
|
"stop_token": "cpp",
|
||||||
|
"cfenv": "cpp",
|
||||||
|
"format": "cpp",
|
||||||
|
"xlocmes": "cpp",
|
||||||
|
"xlocmon": "cpp",
|
||||||
|
"xlocnum": "cpp",
|
||||||
|
"xloctime": "cpp",
|
||||||
|
"xutility": "cpp",
|
||||||
|
"coroutine": "cpp",
|
||||||
|
"xfacet": "cpp",
|
||||||
|
"xhash": "cpp",
|
||||||
|
"xiosbase": "cpp",
|
||||||
|
"xlocale": "cpp",
|
||||||
|
"xlocbuf": "cpp",
|
||||||
|
"xlocinfo": "cpp",
|
||||||
|
"xmemory": "cpp",
|
||||||
|
"xstring": "cpp",
|
||||||
|
"xtr1common": "cpp",
|
||||||
|
"xtree": "cpp"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+50
-5
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14)
|
|||||||
project(
|
project(
|
||||||
simdjson
|
simdjson
|
||||||
# The version number is modified by tools/release.py
|
# The version number is modified by tools/release.py
|
||||||
VERSION 3.2.2
|
VERSION 3.10.0
|
||||||
DESCRIPTION "Parsing gigabytes of JSON per second"
|
DESCRIPTION "Parsing gigabytes of JSON per second"
|
||||||
HOMEPAGE_URL "https://simdjson.org/"
|
HOMEPAGE_URL "https://simdjson.org/"
|
||||||
LANGUAGES CXX C
|
LANGUAGES CXX C
|
||||||
@@ -20,8 +20,10 @@ string(
|
|||||||
# ---- Options, variables ----
|
# ---- Options, variables ----
|
||||||
|
|
||||||
# These version numbers are modified by tools/release.py
|
# These version numbers are modified by tools/release.py
|
||||||
set(SIMDJSON_LIB_VERSION "16.0.0" CACHE STRING "simdjson library version")
|
set(SIMDJSON_LIB_VERSION "23.0.0" CACHE STRING "simdjson library version")
|
||||||
set(SIMDJSON_LIB_SOVERSION "16" CACHE STRING "simdjson library soversion")
|
set(SIMDJSON_LIB_SOVERSION "23" 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)
|
option(SIMDJSON_ENABLE_THREADS "Link with thread support" ON)
|
||||||
|
|
||||||
@@ -56,8 +58,17 @@ include(cmake/developer-options.cmake)
|
|||||||
|
|
||||||
# ---- simdjson library ----
|
# ---- simdjson library ----
|
||||||
|
|
||||||
add_library(simdjson src/simdjson.cpp)
|
set(SIMDJSON_SOURCES src/simdjson.cpp)
|
||||||
|
|
||||||
|
add_library(simdjson ${SIMDJSON_SOURCES})
|
||||||
add_library(simdjson::simdjson ALIAS simdjson)
|
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(
|
set_target_properties(
|
||||||
simdjson PROPERTIES
|
simdjson PROPERTIES
|
||||||
@@ -95,6 +106,24 @@ if(
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(loongarch64)$")
|
||||||
|
option(SIMDJSON_PREFER_LSX "Prefer LoongArch SX" ON)
|
||||||
|
include(CheckCXXCompilerFlag)
|
||||||
|
check_cxx_compiler_flag(-mlasx COMPILER_SUPPORTS_LASX)
|
||||||
|
check_cxx_compiler_flag(-mlsx COMPILER_SUPPORTS_LSX)
|
||||||
|
if(COMPILER_SUPPORTS_LASX AND NOT SIMDJSON_PREFER_LSX)
|
||||||
|
simdjson_add_props(
|
||||||
|
target_compile_options PRIVATE
|
||||||
|
-mlasx
|
||||||
|
)
|
||||||
|
elseif(COMPILER_SUPPORTS_LSX)
|
||||||
|
simdjson_add_props(
|
||||||
|
target_compile_options PRIVATE
|
||||||
|
-mlsx
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
# GCC and Clang have horrendous Debug builds when using SIMD.
|
# GCC and Clang have horrendous Debug builds when using SIMD.
|
||||||
# A common fix is to use '-Og' instead.
|
# A common fix is to use '-Og' instead.
|
||||||
# bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412
|
# bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412
|
||||||
@@ -117,6 +146,9 @@ if(SIMDJSON_ENABLE_THREADS)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
simdjson_apply_props(simdjson)
|
simdjson_apply_props(simdjson)
|
||||||
|
if(SIMDJSON_BUILD_STATIC_LIB)
|
||||||
|
simdjson_apply_props(simdjson_static)
|
||||||
|
endif()
|
||||||
|
|
||||||
# ---- Install rules ----
|
# ---- Install rules ----
|
||||||
|
|
||||||
@@ -138,7 +170,6 @@ install(
|
|||||||
ARCHIVE COMPONENT simdjson_Development
|
ARCHIVE COMPONENT simdjson_Development
|
||||||
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
||||||
)
|
)
|
||||||
|
|
||||||
configure_file(cmake/simdjson-config.cmake.in simdjson-config.cmake @ONLY)
|
configure_file(cmake/simdjson-config.cmake.in simdjson-config.cmake @ONLY)
|
||||||
|
|
||||||
write_basic_package_version_file(
|
write_basic_package_version_file(
|
||||||
@@ -167,6 +198,20 @@ install(
|
|||||||
COMPONENT simdjson_Development
|
COMPONENT simdjson_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
|
# pkg-config
|
||||||
include(cmake/JoinPaths.cmake)
|
include(cmake/JoinPaths.cmake)
|
||||||
join_paths(PKGCONFIG_INCLUDEDIR "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
|
join_paths(PKGCONFIG_INCLUDEDIR "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
|
||||||
|
|||||||
+2
-1
@@ -52,10 +52,11 @@ General Guidelines
|
|||||||
Contributors are encouraged to :
|
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.
|
- 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.
|
- 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.
|
||||||
- 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.
|
- 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.
|
||||||
- Provide tests for any new feature. We will not merge a new feature without tests.
|
- 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
|
Pull Requests
|
||||||
--------------
|
--------------
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ PROJECT_NAME = simdjson
|
|||||||
# could be handy for archiving the generated documentation or if some version
|
# could be handy for archiving the generated documentation or if some version
|
||||||
# control system is used.
|
# control system is used.
|
||||||
|
|
||||||
PROJECT_NUMBER = "3.2.2"
|
PROJECT_NUMBER = "3.10.0"
|
||||||
|
|
||||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
# 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
|
# for a project that appears at the top of each page and should give viewer a
|
||||||
|
|||||||
+6
-10
@@ -80,7 +80,7 @@ simdjson's source structure, from the top level, looks like this:
|
|||||||
* simdjson/internal/*.h: the `simdjson::internal` namespace. Private classes and functions used by the rest of simdjson.
|
* 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: the `simdjson::dom` namespace. Includes all public DOM classes.
|
||||||
* simdjson/dom/*.h: Declarations/definitions for individual DOM classes.
|
* simdjson/dom/*.h: Declarations/definitions for individual DOM classes.
|
||||||
* simdjson/arm64|fallback|haswell|icelake|ppc64|westmere.h: `simdjson::<implementation>` namesapce. Common implementation-specific tools like number and string parsing, as well as minification.
|
* 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/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/*.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/dependencies.h: dependencies on common, non-implementation-specific simdjson classes. This will be included before including amalgamated.h.
|
||||||
@@ -88,8 +88,8 @@ simdjson's source structure, from the top level, looks like this:
|
|||||||
* simdjson/ondemand.h: the `simdjson::ondemand` namespace. Includes all public ondemand classes.
|
* 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.h: the `simdjson::builtin` namespace. Aliased to the most universal implementation available.
|
||||||
* simdjson/builtin/ondemand.h: the `simdjson::builtin::ondemand` namespace.
|
* 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/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/*.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/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.
|
* 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
|
* **src:** The source files for non-inlined functionality (e.g. the architecture-specific parser
|
||||||
@@ -99,7 +99,7 @@ simdjson's source structure, from the top level, looks like this:
|
|||||||
* *.cpp: other misc. implementations, such as `simdjson::implementation` and the minifier.
|
* *.cpp: other misc. implementations, such as `simdjson::implementation` and the minifier.
|
||||||
* arm64|fallback|haswell|icelake|ppc64|westmere.cpp: Architecture-specific parser implementations.
|
* arm64|fallback|haswell|icelake|ppc64|westmere.cpp: Architecture-specific parser implementations.
|
||||||
* generic/*.h: `simdjson::<implementation>` namespace. Generic implementation of the parser, particularly the `dom_parser_implementation`.
|
* generic/*.h: `simdjson::<implementation>` namespace. Generic implementation of the parser, particularly the `dom_parser_implementation`.
|
||||||
* 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
|
* 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
|
||||||
* 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.
|
* 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.
|
||||||
|
|
||||||
Other important files and directories:
|
Other important files and directories:
|
||||||
@@ -283,8 +283,6 @@ If your compiler does not default on C++11 support or better you may get failing
|
|||||||
|
|
||||||
Note that the name of directory (`build`) is arbitrary, you can name it as you want (e.g., `buildgcc`) and you can have as many different such directories as you would like (one per configuration).
|
Note that the name of directory (`build`) is arbitrary, you can name it as you want (e.g., `buildgcc`) and you can have as many different such directories as you would like (one per configuration).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Usage (CMake on 64-bit Windows using Visual Studio 2019 or better)
|
## Usage (CMake on 64-bit Windows using Visual Studio 2019 or better)
|
||||||
|
|
||||||
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).
|
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).
|
||||||
@@ -304,17 +302,15 @@ Though having Visual Studio installed is necessary, one can build simdjson using
|
|||||||
- `mkdir build`
|
- `mkdir build`
|
||||||
- `cd build`
|
- `cd build`
|
||||||
- `cmake ..`
|
- `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:
|
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:
|
||||||
|
|
||||||
|
|
||||||
- `mkdir build`
|
- `mkdir build`
|
||||||
- `cd build`
|
- `cd build`
|
||||||
- `cmake -T ClangCL ..`
|
- `cmake -T ClangCL ..`
|
||||||
- `cmake --build . -config Release`
|
- `cmake --build . --config Release`
|
||||||
|
|
||||||
|
|
||||||
## Various References
|
## Various References
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
|
|
||||||
[/badge.svg)](https://simdjson.org/plots.html)
|
[/badge.svg)](https://simdjson.org/plots.html)
|
||||||

|
|
||||||
[](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:simdjson)
|
[](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:simdjson)
|
||||||

|
|
||||||
[![][license img]][license]
|
[![][license img]][license]
|
||||||
|
|
||||||
[](https://simdjson.github.io/simdjson/)
|
[](https://simdjson.github.io/simdjson/)
|
||||||
@@ -31,6 +29,7 @@ Table of Contents
|
|||||||
* [Real-world usage](#real-world-usage)
|
* [Real-world usage](#real-world-usage)
|
||||||
* [Quick Start](#quick-start)
|
* [Quick Start](#quick-start)
|
||||||
* [Documentation](#documentation)
|
* [Documentation](#documentation)
|
||||||
|
* [Godbolt](#godbolt)
|
||||||
* [Performance results](#performance-results)
|
* [Performance results](#performance-results)
|
||||||
* [Bindings and Ports of simdjson](#bindings-and-ports-of-simdjson)
|
* [Bindings and Ports of simdjson](#bindings-and-ports-of-simdjson)
|
||||||
* [About simdjson](#about-simdjson)
|
* [About simdjson](#about-simdjson)
|
||||||
@@ -42,9 +41,12 @@ Table of Contents
|
|||||||
Real-world usage
|
Real-world usage
|
||||||
----------------
|
----------------
|
||||||
|
|
||||||
|
- [Node.js](https://nodejs.org/)
|
||||||
- [ClickHouse](https://github.com/ClickHouse/ClickHouse)
|
- [ClickHouse](https://github.com/ClickHouse/ClickHouse)
|
||||||
- [Facebook/Meta Velox](https://velox-lib.io)
|
- [Meta Velox](https://velox-lib.io)
|
||||||
|
- [Google Pax](https://github.com/google/paxml)
|
||||||
- [milvus](https://github.com/milvus-io/milvus)
|
- [milvus](https://github.com/milvus-io/milvus)
|
||||||
|
- [QuestDB](https://questdb.io/blog/questdb-release-8-0-3/)
|
||||||
- [Clang Build Analyzer](https://github.com/aras-p/ClangBuildAnalyzer)
|
- [Clang Build Analyzer](https://github.com/aras-p/ClangBuildAnalyzer)
|
||||||
- [Shopify HeapProfiler](https://github.com/Shopify/heap-profiler)
|
- [Shopify HeapProfiler](https://github.com/Shopify/heap-profiler)
|
||||||
- [StarRocks](https://github.com/StarRocks/starrocks)
|
- [StarRocks](https://github.com/StarRocks/starrocks)
|
||||||
@@ -58,6 +60,7 @@ Real-world usage
|
|||||||
- [vast](https://github.com/tenzir/vast)
|
- [vast](https://github.com/tenzir/vast)
|
||||||
- [ada-url](https://github.com/ada-url/ada)
|
- [ada-url](https://github.com/ada-url/ada)
|
||||||
- [fastgron](https://github.com/adamritter/fastgron)
|
- [fastgron](https://github.com/adamritter/fastgron)
|
||||||
|
- [WasmEdge](https://wasmedge.org)
|
||||||
|
|
||||||
If you are planning to use simdjson in a product, please work from one of our releases.
|
If you are planning to use simdjson in a product, please work from one of our releases.
|
||||||
|
|
||||||
@@ -68,9 +71,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
|
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
|
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.
|
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.
|
||||||
1. Pull [simdjson.h](singleheader/simdjson.h) and [simdjson.cpp](singleheader/simdjson.cpp) into a
|
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).
|
directory, along with the sample file [twitter.json](jsonexamples/twitter.json). You can download them with the `wget` utility:
|
||||||
|
|
||||||
```
|
```
|
||||||
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
|
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
|
||||||
@@ -95,6 +98,7 @@ int main(void) {
|
|||||||
100 results.
|
100 results.
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
Documentation
|
Documentation
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
@@ -106,11 +110,12 @@ Usage documentation is available:
|
|||||||
how you can work with it.
|
how you can work with it.
|
||||||
* [API](https://simdjson.github.io/simdjson/) contains the automatically generated API documentation.
|
* [API](https://simdjson.github.io/simdjson/) 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:
|
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 handled through exceptions](https://godbolt.org/z/98Kx9Kqjn)
|
* [simdjson examples with errors without exceptions](https://godbolt.org/z/e9dWb9E4v)
|
||||||
* [simdjson examples with errors without exceptions](https://godbolt.org/z/PKG7GdbPo)
|
|
||||||
|
|
||||||
Performance results
|
Performance results
|
||||||
-------------------
|
-------------------
|
||||||
@@ -165,6 +170,8 @@ We distinguish between "bindings" (which just wrap the C++ code) and a port to a
|
|||||||
- [simdjzon](https://github.com/travisstaloch/simdjzon): zig port.
|
- [simdjzon](https://github.com/travisstaloch/simdjzon): zig port.
|
||||||
- [JSON-Simd](https://github.com/rawleyfowler/JSON-simd): Raku bindings.
|
- [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.
|
- [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.
|
||||||
|
- [simdjson-java](https://github.com/simdjson/simdjson-java): Java port.
|
||||||
|
|
||||||
About simdjson
|
About simdjson
|
||||||
--------------
|
--------------
|
||||||
@@ -173,7 +180,11 @@ The simdjson library takes advantage of modern microarchitectures, parallelizing
|
|||||||
instructions, reducing branch misprediction, and reducing data dependency to take advantage of each
|
instructions, reducing branch misprediction, and reducing data dependency to take advantage of each
|
||||||
CPU's multiple execution cores.
|
CPU's multiple execution cores.
|
||||||
|
|
||||||
Some people [enjoy reading our paper](https://arxiv.org/abs/1902.08318): A description of the design
|
Our default front-end is called On-Demand, and we wrote a paper about it:
|
||||||
|
|
||||||
|
- John Keiser, Daniel Lemire, [On-Demand JSON: A Better Way to Parse Documents?](http://arxiv.org/abs/2312.17149), Software: Practice and Experience 54 (6), 2024.
|
||||||
|
|
||||||
|
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:
|
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.
|
- Geoff Langdale, Daniel Lemire, [Parsing Gigabytes of JSON per Second](https://arxiv.org/abs/1902.08318), VLDB Journal 28 (6), 2019.
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
# Security Policy
|
||||||
|
|
||||||
|
## Reporting a Vulnerability
|
||||||
|
|
||||||
|
Please use the following contact information for reporting a vulnerability:
|
||||||
|
|
||||||
|
- [Daniel Lemire](https://github.com/lemire) - daniel@lemire.me
|
||||||
@@ -26,6 +26,9 @@ if (TARGET benchmark::benchmark)
|
|||||||
if(TARGET nlohmann_json)
|
if(TARGET nlohmann_json)
|
||||||
target_link_libraries(bench_ondemand PRIVATE nlohmann_json)
|
target_link_libraries(bench_ondemand PRIVATE nlohmann_json)
|
||||||
endif()
|
endif()
|
||||||
|
if(TARGET boostjson)
|
||||||
|
target_link_libraries(bench_ondemand PRIVATE boostjson)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -473,28 +473,6 @@ static void twitter_count(State& state) {
|
|||||||
}
|
}
|
||||||
BENCHMARK(twitter_count);
|
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) {
|
static void twitter_default_profile(State& state) {
|
||||||
// Count unique users with a default profile.
|
// Count unique users with a default profile.
|
||||||
dom::parser parser;
|
dom::parser parser;
|
||||||
@@ -578,54 +556,6 @@ static void error_code_twitter_default_profile(State& state) noexcept {
|
|||||||
}
|
}
|
||||||
BENCHMARK(error_code_twitter_default_profile);
|
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 {
|
static void error_code_twitter_image_sizes(State& state) noexcept {
|
||||||
// Count unique image sizes
|
// Count unique image sizes
|
||||||
dom::parser parser;
|
dom::parser parser;
|
||||||
@@ -680,92 +610,4 @@ static void parse_surrogate_pairs(State& state) {
|
|||||||
}
|
}
|
||||||
BENCHMARK(parse_surrogate_pairs);
|
BENCHMARK(parse_surrogate_pairs);
|
||||||
|
|
||||||
|
|
||||||
#ifndef SIMDJSON_DISABLE_DEPRECATED_API
|
|
||||||
|
|
||||||
SIMDJSON_PUSH_DISABLE_WARNINGS
|
|
||||||
SIMDJSON_DISABLE_DEPRECATED_WARNING
|
|
||||||
static void iterator_twitter_image_sizes(State& state) {
|
|
||||||
// Count unique image sizes
|
|
||||||
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<tuple<uint64_t, uint64_t>> image_sizes;
|
|
||||||
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 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(print_json);
|
|
||||||
#endif // SIMDJSON_DISABLE_DEPRECATED_API
|
|
||||||
SIMDJSON_POP_DISABLE_WARNINGS
|
|
||||||
|
|
||||||
BENCHMARK_MAIN();
|
BENCHMARK_MAIN();
|
||||||
|
|||||||
@@ -21,6 +21,10 @@ SIMDJSON_PUSH_DISABLE_ALL_WARNINGS
|
|||||||
#include <nlohmann/json.hpp>
|
#include <nlohmann/json.hpp>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef SIMDJSON_COMPETITION_BOOSTJSON
|
||||||
|
#include <boost/json.hpp>
|
||||||
|
#endif
|
||||||
|
|
||||||
// This has to be last, for reasons I don't yet understand
|
// This has to be last, for reasons I don't yet understand
|
||||||
#include <benchmark/benchmark.h>
|
#include <benchmark/benchmark.h>
|
||||||
|
|
||||||
@@ -33,6 +37,7 @@ SIMDJSON_POP_DISABLE_WARNINGS
|
|||||||
#include "json2msgpack/sajson.h"
|
#include "json2msgpack/sajson.h"
|
||||||
#endif // SIMDJSON_COMPETITION_ONDEMAND_SAJSON
|
#endif // SIMDJSON_COMPETITION_ONDEMAND_SAJSON
|
||||||
#include "json2msgpack/nlohmann_json.h"
|
#include "json2msgpack/nlohmann_json.h"
|
||||||
|
#include "json2msgpack/boostjson.h"
|
||||||
|
|
||||||
#include "partial_tweets/simdjson_ondemand.h"
|
#include "partial_tweets/simdjson_ondemand.h"
|
||||||
#include "partial_tweets/simdjson_dom.h"
|
#include "partial_tweets/simdjson_dom.h"
|
||||||
@@ -48,6 +53,7 @@ SIMDJSON_POP_DISABLE_WARNINGS
|
|||||||
#if SIMDJSON_COMPETITION_SAX
|
#if SIMDJSON_COMPETITION_SAX
|
||||||
#include "partial_tweets/nlohmann_json_sax.h"
|
#include "partial_tweets/nlohmann_json_sax.h"
|
||||||
#endif // SIMDJSON_COMPETITION_SAX
|
#endif // SIMDJSON_COMPETITION_SAX
|
||||||
|
#include "partial_tweets/boostjson.h"
|
||||||
|
|
||||||
|
|
||||||
#include "distinct_user_id/simdjson_ondemand.h"
|
#include "distinct_user_id/simdjson_ondemand.h"
|
||||||
@@ -66,6 +72,7 @@ SIMDJSON_POP_DISABLE_WARNINGS
|
|||||||
#if SIMDJSON_COMPETITION_SAX
|
#if SIMDJSON_COMPETITION_SAX
|
||||||
#include "distinct_user_id/nlohmann_json_sax.h"
|
#include "distinct_user_id/nlohmann_json_sax.h"
|
||||||
#endif // SIMDJSON_COMPETITION_SAX
|
#endif // SIMDJSON_COMPETITION_SAX
|
||||||
|
#include "distinct_user_id/boostjson.h"
|
||||||
|
|
||||||
#include "find_tweet/simdjson_ondemand.h"
|
#include "find_tweet/simdjson_ondemand.h"
|
||||||
#include "find_tweet/simdjson_dom.h"
|
#include "find_tweet/simdjson_dom.h"
|
||||||
@@ -81,6 +88,7 @@ SIMDJSON_POP_DISABLE_WARNINGS
|
|||||||
#if SIMDJSON_COMPETITION_SAX
|
#if SIMDJSON_COMPETITION_SAX
|
||||||
#include "find_tweet/nlohmann_json_sax.h"
|
#include "find_tweet/nlohmann_json_sax.h"
|
||||||
#endif // SIMDJSON_COMPETITION_SAX
|
#endif // SIMDJSON_COMPETITION_SAX
|
||||||
|
#include "find_tweet/boostjson.h"
|
||||||
|
|
||||||
#include "top_tweet/simdjson_ondemand.h"
|
#include "top_tweet/simdjson_ondemand.h"
|
||||||
#include "top_tweet/simdjson_dom.h"
|
#include "top_tweet/simdjson_dom.h"
|
||||||
@@ -96,6 +104,7 @@ SIMDJSON_POP_DISABLE_WARNINGS
|
|||||||
#if SIMDJSON_COMPETITION_SAX
|
#if SIMDJSON_COMPETITION_SAX
|
||||||
#include "top_tweet/nlohmann_json_sax.h"
|
#include "top_tweet/nlohmann_json_sax.h"
|
||||||
#endif // SIMDJSON_COMPETITION_SAX
|
#endif // SIMDJSON_COMPETITION_SAX
|
||||||
|
#include "top_tweet/boostjson.h"
|
||||||
|
|
||||||
|
|
||||||
#include "kostya/simdjson_ondemand.h"
|
#include "kostya/simdjson_ondemand.h"
|
||||||
@@ -112,6 +121,7 @@ SIMDJSON_POP_DISABLE_WARNINGS
|
|||||||
#if SIMDJSON_COMPETITION_SAX
|
#if SIMDJSON_COMPETITION_SAX
|
||||||
#include "kostya/nlohmann_json_sax.h"
|
#include "kostya/nlohmann_json_sax.h"
|
||||||
#endif // SIMDJSON_COMPETITION_SAX
|
#endif // SIMDJSON_COMPETITION_SAX
|
||||||
|
#include "kostya/boostjson.h"
|
||||||
|
|
||||||
#include "large_random/simdjson_ondemand.h"
|
#include "large_random/simdjson_ondemand.h"
|
||||||
#if SIMDJSON_COMPETITION_ONDEMAND_UNORDERED
|
#if SIMDJSON_COMPETITION_ONDEMAND_UNORDERED
|
||||||
@@ -130,6 +140,7 @@ SIMDJSON_POP_DISABLE_WARNINGS
|
|||||||
#if SIMDJSON_COMPETITION_SAX
|
#if SIMDJSON_COMPETITION_SAX
|
||||||
#include "large_random/nlohmann_json_sax.h"
|
#include "large_random/nlohmann_json_sax.h"
|
||||||
#endif // SIMDJSON_COMPETITION_SAX
|
#endif // SIMDJSON_COMPETITION_SAX
|
||||||
|
#include "large_random/boostjson.h"
|
||||||
|
|
||||||
#include "amazon_cellphones/simdjson_dom.h"
|
#include "amazon_cellphones/simdjson_dom.h"
|
||||||
#include "amazon_cellphones/simdjson_ondemand.h"
|
#include "amazon_cellphones/simdjson_ondemand.h"
|
||||||
|
|||||||
@@ -169,22 +169,6 @@ BENCHMARK(parse_gsoc)->Repetitions(10)->ComputeStatistics("max", [](const std::v
|
|||||||
})->DisplayAggregatesOnly(true);
|
})->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) {
|
static void parser_parse_error_code(State& state) {
|
||||||
dom::parser parser;
|
dom::parser parser;
|
||||||
if (parser.allocate(EMPTY_ARRAY.length())) { return; }
|
if (parser.allocate(EMPTY_ARRAY.length())) { return; }
|
||||||
@@ -213,20 +197,6 @@ BENCHMARK(parser_parse_exception);
|
|||||||
|
|
||||||
#endif // SIMDJSON_EXCEPTIONS
|
#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) {
|
static void document_parse_error_code(State& state) {
|
||||||
for (simdjson_unused auto _ : state) {
|
for (simdjson_unused auto _ : state) {
|
||||||
dom::parser parser;
|
dom::parser parser;
|
||||||
|
|||||||
+13
-9
@@ -445,7 +445,7 @@ struct benchmarker {
|
|||||||
return 100.0 * a / b;
|
return 100.0 * a / b;
|
||||||
}
|
}
|
||||||
|
|
||||||
void print(bool tabbed_output) const {
|
void print(bool tabbed_output, bool stage1_only) const {
|
||||||
if (tabbed_output) {
|
if (tabbed_output) {
|
||||||
char* filename_copy = reinterpret_cast<char*>(malloc(strlen(filename)+1));
|
char* filename_copy = reinterpret_cast<char*>(malloc(strlen(filename)+1));
|
||||||
SIMDJSON_PUSH_DISABLE_WARNINGS
|
SIMDJSON_PUSH_DISABLE_WARNINGS
|
||||||
@@ -503,17 +503,21 @@ struct benchmarker {
|
|||||||
stats->blocks_with_16_structurals_flipped, percent(stats->blocks_with_16_structurals_flipped, stats->blocks));
|
stats->blocks_with_16_structurals_flipped, percent(stats->blocks_with_16_structurals_flipped, stats->blocks));
|
||||||
}
|
}
|
||||||
printf("\n");
|
printf("\n");
|
||||||
printf("All Stages (excluding allocation)\n");
|
if(!stage1_only) {
|
||||||
print_aggregate("| " , all_stages_without_allocation.best);
|
printf("All Stages (excluding allocation)\n");
|
||||||
// frequently, allocation is a tiny fraction of the running time so we omit it
|
print_aggregate("| " , all_stages_without_allocation.best);
|
||||||
if(allocate_stage.best.elapsed_sec() > 0.01 * all_stages_without_allocation.best.elapsed_sec()) {
|
// frequently, allocation is a tiny fraction of the running time so we omit it
|
||||||
printf("|- Allocation\n");
|
if(allocate_stage.best.elapsed_sec() > 0.01 * all_stages_without_allocation.best.elapsed_sec()) {
|
||||||
print_aggregate("| ", allocate_stage.best);
|
printf("|- Allocation\n");
|
||||||
|
print_aggregate("| ", allocate_stage.best);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
printf("|- Stage 1\n");
|
printf("|- Stage 1\n");
|
||||||
print_aggregate("| ", stage1.best);
|
print_aggregate("| ", stage1.best);
|
||||||
printf("|- Stage 2\n");
|
if(!stage1_only) {
|
||||||
print_aggregate("| ", stage2.best);
|
printf("|- Stage 2\n");
|
||||||
|
print_aggregate("| ", stage2.best);
|
||||||
|
}
|
||||||
if (collector.has_events()) {
|
if (collector.has_events()) {
|
||||||
double freq1 = (stage1.best.cycles() / stage1.best.elapsed_sec()) / 1000000000.0;
|
double freq1 = (stage1.best.cycles() / stage1.best.elapsed_sec()) / 1000000000.0;
|
||||||
double freq2 = (stage2.best.cycles() / stage2.best.elapsed_sec()) / 1000000000.0;
|
double freq2 = (stage2.best.cycles() / stage2.best.elapsed_sec()) / 1000000000.0;
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
#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
|
||||||
@@ -218,7 +218,7 @@ int main(int argc, char *argv[]) {
|
|||||||
if (!options.verbose) { progress.erase(); }
|
if (!options.verbose) { progress.erase(); }
|
||||||
|
|
||||||
for (size_t i=0; i<options.files.size(); i++) {
|
for (size_t i=0; i<options.files.size(); i++) {
|
||||||
benchmarkers[i]->print(options.tabbed_output);
|
benchmarkers[i]->print(options.tabbed_output, options.stage1_only);
|
||||||
delete benchmarkers[i];
|
delete benchmarkers[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -34,11 +34,15 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "linux-perf-events.h"
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
|
#include "linux-perf-events.h"
|
||||||
#include <libgen.h>
|
#include <libgen.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if __APPLE__ && __aarch64__
|
||||||
|
#include "apple/apple_arm_events.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "simdjson.h"
|
#include "simdjson.h"
|
||||||
|
|
||||||
using std::string;
|
using std::string;
|
||||||
@@ -134,7 +138,7 @@ struct event_collector {
|
|||||||
|
|
||||||
#if defined(__linux__)
|
#if defined(__linux__)
|
||||||
LinuxEvents<PERF_TYPE_HARDWARE> linux_events;
|
LinuxEvents<PERF_TYPE_HARDWARE> linux_events;
|
||||||
event_collector(simdjson_unused bool quiet = false) : linux_events(vector<int>{
|
event_collector() : linux_events(vector<int>{
|
||||||
#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
#if SIMDJSON_SIMPLE_PERFORMANCE_COUNTERS
|
||||||
PERF_COUNT_HW_CPU_CYCLES,
|
PERF_COUNT_HW_CPU_CYCLES,
|
||||||
PERF_COUNT_HW_INSTRUCTIONS,
|
PERF_COUNT_HW_INSTRUCTIONS,
|
||||||
@@ -149,8 +153,17 @@ struct event_collector {
|
|||||||
bool has_events() {
|
bool has_events() {
|
||||||
return linux_events.is_working();
|
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
|
#else
|
||||||
event_collector(simdjson_unused bool _quiet = false) {}
|
event_collector() {}
|
||||||
bool has_events() {
|
bool has_events() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -159,6 +172,8 @@ struct event_collector {
|
|||||||
simdjson_inline void start() {
|
simdjson_inline void start() {
|
||||||
#if defined(__linux)
|
#if defined(__linux)
|
||||||
linux_events.start();
|
linux_events.start();
|
||||||
|
#elif __APPLE__ && __aarch64__
|
||||||
|
if(has_events()) { diff = apple_events.get_counters(); }
|
||||||
#endif
|
#endif
|
||||||
start_clock = steady_clock::now();
|
start_clock = steady_clock::now();
|
||||||
}
|
}
|
||||||
@@ -166,6 +181,16 @@ struct event_collector {
|
|||||||
time_point<steady_clock> end_clock = steady_clock::now();
|
time_point<steady_clock> end_clock = steady_clock::now();
|
||||||
#if defined(__linux)
|
#if defined(__linux)
|
||||||
linux_events.end(count.event_counts);
|
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
|
#endif
|
||||||
count.elapsed = end_clock - start_clock;
|
count.elapsed = end_clock - start_clock;
|
||||||
return count;
|
return count;
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
#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
|
||||||
@@ -13,7 +13,7 @@ struct nlohmann_json {
|
|||||||
auto root = nlohmann::json::parse(json.data(), json.data() + json.size());
|
auto root = nlohmann::json::parse(json.data(), json.data() + json.size());
|
||||||
for (auto tweet : root["statuses"]) {
|
for (auto tweet : root["statuses"]) {
|
||||||
if (tweet["id"] == find_id) {
|
if (tweet["id"] == find_id) {
|
||||||
result = tweet["text"];
|
result = to_string(tweet["text"]);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,104 @@
|
|||||||
|
#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
|
||||||
@@ -24,7 +24,7 @@ struct file_runner : public runner_base<I> {
|
|||||||
|
|
||||||
simdjson_warn_unused bool before_run(benchmark::State &state) {
|
simdjson_warn_unused bool before_run(benchmark::State &state) {
|
||||||
if (!runner_base<I>::after_run(state)) { return false; };
|
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());
|
std::memcpy(json.data(), original_json.data(), original_json.size());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ void maybe_display_implementation() {
|
|||||||
template<typename B, typename R> static void run_json_benchmark(benchmark::State &state) {
|
template<typename B, typename R> static void run_json_benchmark(benchmark::State &state) {
|
||||||
maybe_display_implementation();
|
maybe_display_implementation();
|
||||||
|
|
||||||
event_collector collector(true);
|
event_collector collector;
|
||||||
event_aggregate events;
|
event_aggregate events;
|
||||||
|
|
||||||
// Warmup and equality check (make sure the data is right!)
|
// Warmup and equality check (make sure the data is right!)
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ struct string_runner : public runner_base<I> {
|
|||||||
|
|
||||||
simdjson_warn_unused bool before_run(benchmark::State &state) {
|
simdjson_warn_unused bool before_run(benchmark::State &state) {
|
||||||
if (!runner_base<I>::after_run(state)) { return false; };
|
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());
|
std::memcpy(json.data(), original_json.data(), original_json.size());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
#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
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
#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
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
#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
|
||||||
@@ -13,7 +13,7 @@ class OnDemand {
|
|||||||
public:
|
public:
|
||||||
OnDemand() {
|
OnDemand() {
|
||||||
if(!displayed_implementation) {
|
if(!displayed_implementation) {
|
||||||
std::cout << "On Demand implementation: " << builtin_implementation()->name() << std::endl;
|
std::cout << "On-Demand implementation: " << builtin_implementation()->name() << std::endl;
|
||||||
displayed_implementation = true;
|
displayed_implementation = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#if SIMDJSON_COMPETITION_BOOSTJSON
|
||||||
|
|
||||||
|
#include "top_tweet.h"
|
||||||
|
|
||||||
|
namespace top_tweet {
|
||||||
|
|
||||||
|
using namespace simdjson;
|
||||||
|
|
||||||
|
struct boostjson {
|
||||||
|
using StringType=std::string;
|
||||||
|
|
||||||
|
bool run(simdjson::padded_string &json, int64_t max_retweet_count, top_tweet_result<StringType> &result) {
|
||||||
|
result.retweet_count = -1;
|
||||||
|
boost::json::value top_tweet{};
|
||||||
|
|
||||||
|
auto root = boost::json::parse(json);
|
||||||
|
for (const auto &tweet : root.at("statuses").as_array()) {
|
||||||
|
int64_t retweet_count = tweet.at("retweet_count").as_int64();
|
||||||
|
if (retweet_count <= max_retweet_count && retweet_count >= result.retweet_count) {
|
||||||
|
result.retweet_count = retweet_count;
|
||||||
|
top_tweet = tweet;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
result.text = top_tweet.at("text").as_string();
|
||||||
|
result.screen_name = top_tweet.at("user").at("screen_name").as_string();
|
||||||
|
return result.retweet_count != -1;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
BENCHMARK_TEMPLATE(top_tweet, boostjson)->UseManualTime();
|
||||||
|
|
||||||
|
} // namespace top_tweet
|
||||||
|
|
||||||
|
#endif // SIMDJSON_COMPETITION_BOOSTJSON
|
||||||
@@ -26,8 +26,8 @@ struct nlohmann_json {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
result.text = top_tweet["text"];
|
result.text = to_string(top_tweet["text"]);
|
||||||
result.screen_name = top_tweet["user"]["screen_name"];
|
result.screen_name = to_string(top_tweet["user"]["screen_name"]);
|
||||||
return result.retweet_count != -1;
|
return result.retweet_count != -1;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -114,10 +114,14 @@ set(SIMDJSON_CXX_STANDARD 17 CACHE STRING "the C++ standard to use for simdjson"
|
|||||||
set(CMAKE_CXX_STANDARD ${SIMDJSON_CXX_STANDARD})
|
set(CMAKE_CXX_STANDARD ${SIMDJSON_CXX_STANDARD})
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
set(CMAKE_MACOSX_RPATH OFF)
|
|
||||||
set(CMAKE_THREAD_PREFER_PTHREAD ON)
|
set(CMAKE_THREAD_PREFER_PTHREAD ON)
|
||||||
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||||
|
set(SIMDJSON_STRUCTURAL_INDEXER_STEP CACHE STRING "the SIMDJSON_STRUCTURAL_INDEXER_STEP variable")
|
||||||
|
|
||||||
|
if(SIMDJSON_STRUCTURAL_INDEXER_STEP)
|
||||||
|
message(STATUS "Setting SIMDJSON_STRUCTURAL_INDEXER_STEP to ${SIMDJSON_STRUCTURAL_INDEXER_STEP}.")
|
||||||
|
add_compile_definitions(SIMDJSON_STRUCTURAL_INDEXER_STEP=${SIMDJSON_STRUCTURAL_INDEXER_STEP})
|
||||||
|
endif()
|
||||||
# LTO seems to create all sorts of fun problems. Let us
|
# LTO seems to create all sorts of fun problems. Let us
|
||||||
# disable temporarily.
|
# disable temporarily.
|
||||||
#include(CheckIPOSupported)
|
#include(CheckIPOSupported)
|
||||||
|
|||||||
@@ -4,3 +4,4 @@ if("@SIMDJSON_ENABLE_THREADS@")
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
include("${CMAKE_CURRENT_LIST_DIR}/simdjsonTargets.cmake")
|
include("${CMAKE_CURRENT_LIST_DIR}/simdjsonTargets.cmake")
|
||||||
|
include("${CMAKE_CURRENT_LIST_DIR}/simdjson_staticTargets.cmake" OPTIONAL)
|
||||||
|
|||||||
Vendored
+10
-6
@@ -22,7 +22,7 @@ endif()
|
|||||||
# The bulk of our benchmarking and testing data has been moved simdjson/simdjson-data
|
# The bulk of our benchmarking and testing data has been moved simdjson/simdjson-data
|
||||||
import_dependency(simdjson-data simdjson/simdjson-data a5b13babe65c1bba7186b41b43d4cbdc20a5c470)
|
import_dependency(simdjson-data simdjson/simdjson-data a5b13babe65c1bba7186b41b43d4cbdc20a5c470)
|
||||||
add_dependency(simdjson-data)
|
add_dependency(simdjson-data)
|
||||||
|
option(SIMDJSON_USE_BOOST_JSON "Try to include BOOST_JSON, this may break your binaries under some systems." OFF)
|
||||||
# This prevents variables declared with set() from unnecessarily escaping and
|
# This prevents variables declared with set() from unnecessarily escaping and
|
||||||
# should not be called more than once
|
# should not be called more than once
|
||||||
function(competition_scope_)
|
function(competition_scope_)
|
||||||
@@ -36,8 +36,8 @@ function(competition_scope_)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
int main() {}
|
int main() {}
|
||||||
]] USE_BOOST_JSON)
|
]] SIMDJSON_FOUND_STRING_VIEW)
|
||||||
if(USE_BOOST_JSON)
|
if(SIMDJSON_FOUND_STRING_VIEW AND SIMDJSON_USE_BOOST_JSON)
|
||||||
import_dependency(boostjson boostorg/json ee8d72d)
|
import_dependency(boostjson boostorg/json ee8d72d)
|
||||||
add_library(boostjson STATIC "${boostjson_SOURCE_DIR}/src/src.cpp")
|
add_library(boostjson STATIC "${boostjson_SOURCE_DIR}/src/src.cpp")
|
||||||
target_compile_definitions(boostjson PUBLIC BOOST_JSON_STANDALONE)
|
target_compile_definitions(boostjson PUBLIC BOOST_JSON_STANDALONE)
|
||||||
@@ -104,7 +104,11 @@ int main() {}
|
|||||||
target_compile_definitions(rapidjson INTERFACE RAPIDJSON_HAS_STDSTRING)
|
target_compile_definitions(rapidjson INTERFACE RAPIDJSON_HAS_STDSTRING)
|
||||||
target_include_directories(rapidjson SYSTEM INTERFACE
|
target_include_directories(rapidjson SYSTEM INTERFACE
|
||||||
"${rapidjson_SOURCE_DIR}/include")
|
"${rapidjson_SOURCE_DIR}/include")
|
||||||
target_compile_definitions(rapidjson INTERFACE SIMDJSON_COMPETITION_RAPIDJSON)
|
if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 14)
|
||||||
|
message(STATUS "Disabling rapidjson")
|
||||||
|
else()
|
||||||
|
target_compile_definitions(rapidjson INTERFACE SIMDJSON_COMPETITION_RAPIDJSON)
|
||||||
|
endif()
|
||||||
|
|
||||||
import_dependency(sajson chadaustin/sajson 2dcfd35)
|
import_dependency(sajson chadaustin/sajson 2dcfd35)
|
||||||
add_library(sajson INTERFACE)
|
add_library(sajson INTERFACE)
|
||||||
@@ -130,7 +134,7 @@ int main() {}
|
|||||||
add_library(competition-core INTERFACE)
|
add_library(competition-core INTERFACE)
|
||||||
target_link_libraries(competition-core INTERFACE nlohmann_json rapidjson sajson cjson jsmn yyjson)
|
target_link_libraries(competition-core INTERFACE nlohmann_json rapidjson sajson cjson jsmn yyjson)
|
||||||
|
|
||||||
if(USE_BOOST_JSON)
|
if(TARGET boostjson)
|
||||||
target_compile_definitions(boostjson INTERFACE HAS_BOOST_JSON)
|
target_compile_definitions(boostjson INTERFACE HAS_BOOST_JSON)
|
||||||
target_link_libraries(competition-core INTERFACE boostjson)
|
target_link_libraries(competition-core INTERFACE boostjson)
|
||||||
endif()
|
endif()
|
||||||
@@ -151,6 +155,6 @@ if(SIMDJSON_CXXOPTS)
|
|||||||
set_off(CXXOPTS_BUILD_TESTS)
|
set_off(CXXOPTS_BUILD_TESTS)
|
||||||
set_off(CXXOPTS_ENABLE_INSTALL)
|
set_off(CXXOPTS_ENABLE_INSTALL)
|
||||||
|
|
||||||
import_dependency(cxxopts jarro2783/cxxopts 794c975)
|
import_dependency(cxxopts jarro2783/cxxopts 5965670)
|
||||||
add_dependency(cxxopts)
|
add_dependency(cxxopts)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
+1040
-126
File diff suppressed because it is too large
Load Diff
+13
-7
@@ -3,7 +3,7 @@ The Document-Object-Model (DOM) front-end
|
|||||||
|
|
||||||
An overview of what you need to know to use simdjson, with examples.
|
An overview of what you need to know to use simdjson, with examples.
|
||||||
|
|
||||||
* [DOM vs On Demand](#dom-vs-on-demand)
|
* [DOM vs On-Demand](#dom-vs-on-demand)
|
||||||
* [The Basics: Loading and Parsing JSON Documents](#the-basics-loading-and-parsing-json-documents-using-the-dom-front-end)
|
* [The Basics: Loading and Parsing JSON Documents](#the-basics-loading-and-parsing-json-documents-using-the-dom-front-end)
|
||||||
* [Using the Parsed JSON](#using-the-parsed-json)
|
* [Using the Parsed JSON](#using-the-parsed-json)
|
||||||
* [C++17 Support](#c17-support)
|
* [C++17 Support](#c17-support)
|
||||||
@@ -18,7 +18,7 @@ An overview of what you need to know to use simdjson, with examples.
|
|||||||
* [Padding and Temporary Copies](#padding-and-temporary-copies)
|
* [Padding and Temporary Copies](#padding-and-temporary-copies)
|
||||||
* [Performance Tips](#performance-tips)
|
* [Performance Tips](#performance-tips)
|
||||||
|
|
||||||
DOM vs On Demand
|
DOM vs On-Demand
|
||||||
----------------------------------------------
|
----------------------------------------------
|
||||||
|
|
||||||
The simdjson library offers two distinct approaches on how to access a JSON document. We support
|
The simdjson library offers two distinct approaches on how to access a JSON document. We support
|
||||||
@@ -71,6 +71,12 @@ For best performance, a `parser` instance should be reused over several files: o
|
|||||||
If you need a lower-level interface, you may call the function `parser.parse(const char * p, size_t l)` on a pointer `p` while specifying the
|
If you need a lower-level interface, you may call the function `parser.parse(const char * p, size_t l)` on a pointer `p` while specifying the
|
||||||
length of your input `l` in bytes. To see how to get the very best performance from a low-level approach, you way want to read our [performance notes](https://github.com/simdjson/simdjson/blob/master/doc/performance.md#padding-and-temporary-copies) on this topic (see the Padding and Temporary Copies section).
|
length of your input `l` in bytes. To see how to get the very best performance from a low-level approach, you way want to read our [performance notes](https://github.com/simdjson/simdjson/blob/master/doc/performance.md#padding-and-temporary-copies) on this topic (see the Padding and Temporary Copies section).
|
||||||
|
|
||||||
|
*Windows-specific*: Windows users who need to read files with
|
||||||
|
non-ANSI characters in the name should set their code page to
|
||||||
|
UTF-8 (65001). This should be the default with Windows 11 and better.
|
||||||
|
Further, they may use the AreFileApisANSI function to determine whether
|
||||||
|
the filename is interpreted using the ANSI or the system default OEM
|
||||||
|
codepage, and they may call SetFileApisToOEM accordingly.
|
||||||
|
|
||||||
Using the Parsed JSON
|
Using the Parsed JSON
|
||||||
---------------------
|
---------------------
|
||||||
@@ -223,13 +229,13 @@ dom::element cars = parser.parse(cars_json);
|
|||||||
cout << cars.at_pointer("/0/tire_pressure/1") << endl; // Prints 39.9
|
cout << cars.at_pointer("/0/tire_pressure/1") << endl; // Prints 39.9
|
||||||
```
|
```
|
||||||
|
|
||||||
A JSON Path is a sequence of segments each starting with the '/' character. Within arrays, an integer
|
A JSON Pointer expression is a sequence of segments each starting with the '/' character. Within arrays, an integer
|
||||||
index allows you to select the indexed node. Within objects, the string value of the key allows you to
|
index allows you to select the indexed node. Within objects, the string value of the key allows you to
|
||||||
select the value. If your keys contain the characters '/' or '~', they must be escaped as '~1' and
|
select the value. If your keys contain the characters '/' or '~', they must be escaped as '~1' and
|
||||||
'~0' respectively. An empty JSON Path refers to the whole document.
|
'~0' respectively. An empty JSON Pointer expression refers to the whole document.
|
||||||
|
|
||||||
We also extend the JSON Pointer support to include *relative* paths.
|
We also extend the JSON Pointer support to include *relative* paths.
|
||||||
You can apply a JSON path to any node and the path gets interpreted relatively, as if the current node were a whole JSON document.
|
You can apply a JSON Pointer expression to any node and the path gets interpreted relatively, as if the current node were a whole JSON document.
|
||||||
|
|
||||||
Consider the following example:
|
Consider the following example:
|
||||||
|
|
||||||
@@ -329,10 +335,10 @@ int main(void) {
|
|||||||
simdjson::dom::parser parser;
|
simdjson::dom::parser parser;
|
||||||
simdjson::dom::element tweets; // invalid until the get() succeeds
|
simdjson::dom::element tweets; // invalid until the get() succeeds
|
||||||
auto error = parser.load("twitter.json").get(tweets);
|
auto error = parser.load("twitter.json").get(tweets);
|
||||||
if(error) { std::cerr << error << std::endl; return EXIT_FAILURE; }
|
if (error) { std::cerr << error << std::endl; return EXIT_FAILURE; }
|
||||||
uint64_t identifier;
|
uint64_t identifier;
|
||||||
error = tweets["statuses"].at(0)["id"].get(identifier);
|
error = tweets["statuses"].at(0)["id"].get(identifier);
|
||||||
if(error) { std::cerr << error << std::endl; return EXIT_FAILURE; }
|
if (error) { std::cerr << error << std::endl; return EXIT_FAILURE; }
|
||||||
std::cout << identifier << std::endl;
|
std::cout << identifier << std::endl;
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,27 +11,31 @@ CPU Architecture-Specific Implementations
|
|||||||
Overview
|
Overview
|
||||||
--------
|
--------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
The simdjson library takes advantage of SIMD instruction sets such as NEON, SSE and AVX to achieve
|
The simdjson library takes advantage of SIMD instruction sets such as NEON, SSE and AVX to achieve
|
||||||
much of its speed. Because these instruction sets work differently, simdjson has to compile a
|
much of its speed. Because these instruction sets work differently, simdjson has to compile a
|
||||||
different version of the JSON parser for different CPU architectures, often with different
|
different version of the JSON parser for different CPU architectures, often with different
|
||||||
algorithms to take better advantage of a given CPU!
|
algorithms to take better advantage of a given CPU!
|
||||||
|
|
||||||
The current implementations are:
|
The current implementations are:
|
||||||
* icelake: AVX-512F, AVX-512VBMI, etc.
|
* icelake: AVX-512F, AVX-512_VBMI, AVX-512_VBMI2, AVX-512_DQ, AVX-512512_CD, AVX-512_BW, AVX-512_VL (2019 Intel Ice Lake, Intel Rocket Lake, Intel Sapphire Rapids, AMD Zen 4)
|
||||||
* haswell: AVX2 (2013 Intel Haswell or later)
|
* haswell: AVX2 (2013 Intel Haswell or later, all AMD Zen processors)
|
||||||
* westmere: SSE4.2 (2010 Westmere or later).
|
* westmere: SSE4.2 (2010 Westmere or later).
|
||||||
* arm64: 64-bit ARMv8-A NEON
|
* arm64: 64-bit ARMv8-A NEON
|
||||||
* ppc64: 64-bit POWER8 and POWER9 with VSX and ALTIVEC extensions. Both big endian and little endian are implemented, depends on the compiler you are using. The library is tested on recent, little-endian, POWER systems.
|
* ppc64: 64-bit POWER8 and POWER9 with VSX and ALTIVEC extensions. Both big endian and little endian are implemented, depending on the compiler you are using. The library is tested on recent, little-endian, POWER systems.
|
||||||
|
* lasx: Loongson Advanced SIMD EXtension (LASX), a 256-bit vector expansion for the LoongArch architecture.
|
||||||
|
* lsx: Loongson SIMD EXtension (LSX), a 128-bit vector expansion for the LoongArch architecture.
|
||||||
* fallback: A generic implementation that runs on any 64-bit processor.
|
* fallback: A generic implementation that runs on any 64-bit processor.
|
||||||
|
|
||||||
In many cases, you don't know where your compiled binary is going to run, so simdjson automatically
|
In many cases, you don't know where your compiled binary is going to run, so simdjson automatically
|
||||||
compiles *all* the implementations into the executable. On Intel, it will include 4 implementations
|
compiles *all* the implementations into the executable. On Intel, it will include 4 implementations
|
||||||
(icelake, haswell, westmere and fallback), on ARM it will include 2 (arm64 and fallback), and on PPC
|
(icelake, haswell, westmere and fallback), on 64-bit ARM it will include just one since running dispatching is unnecessary, and on PPC
|
||||||
it will include 2 (ppc64 and fallback).
|
it will include 2 (ppc64 and fallback).
|
||||||
|
|
||||||
If you know more about where you're going to run and want to save the space, you can disable any of
|
If you know more about where you're going to run and want to save the space, you can disable any of
|
||||||
these implementations at compile time with `-DSIMDJSON_IMPLEMENTATION_X=0` (where X is ICELAKE, HASWELL,
|
these implementations at compile time with `-DSIMDJSON_IMPLEMENTATION_X=0` (where X is ICELAKE, HASWELL,
|
||||||
WESTMERE, ARM64, PPC64 and FALLBACK).
|
WESTMERE, ARM64, PPC64, LSX, LASX and FALLBACK).
|
||||||
|
|
||||||
The simdjson library automatically sets header flags for each implementation as it compiles; there
|
The simdjson library automatically sets header flags for each implementation as it compiles; there
|
||||||
is no need to set architecture-specific flags yourself (e.g., `-mavx2`, `/AVX2` or
|
is no need to set architecture-specific flags yourself (e.g., `-mavx2`, `/AVX2` or
|
||||||
@@ -75,8 +79,7 @@ And look them up by name:
|
|||||||
```c++
|
```c++
|
||||||
cout << simdjson::get_available_implementations()["fallback"]->description() << endl;
|
cout << simdjson::get_available_implementations()["fallback"]->description() << endl;
|
||||||
```
|
```
|
||||||
Though the fallback implementation should always be available, others might be missing. When
|
When an implementation is not available, the bracket call `simdjson::get_available_implementations()[name]`
|
||||||
an implementation is not available, the bracket call `simdjson::get_available_implementations()[name]`
|
|
||||||
will return the null pointer.
|
will return the null pointer.
|
||||||
|
|
||||||
The available implementations have been compiled but may not necessarily be run safely on your system
|
The available implementations have been compiled but may not necessarily be run safely on your system
|
||||||
@@ -101,8 +104,8 @@ by comparing it with the null pointer.
|
|||||||
|
|
||||||
```c++
|
```c++
|
||||||
auto my_implementation = simdjson::get_available_implementations()["haswell"];
|
auto my_implementation = simdjson::get_available_implementations()["haswell"];
|
||||||
if(! my_implementation) { exit(1); }
|
if (! my_implementation) { exit(1); }
|
||||||
if(! my_implementation->supported_by_runtime_system()) { exit(1); }
|
if (! my_implementation->supported_by_runtime_system()) { exit(1); }
|
||||||
simdjson::get_active_implementation() = my_implementation;
|
simdjson::get_active_implementation() = my_implementation;
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -113,7 +116,7 @@ You should call `supported_by_runtime_system()` to compare the processor's featu
|
|||||||
|
|
||||||
```c++
|
```c++
|
||||||
for (auto implementation : simdjson::get_available_implementations()) {
|
for (auto implementation : simdjson::get_available_implementations()) {
|
||||||
if(implementation->supported_by_runtime_system()) {
|
if (implementation->supported_by_runtime_system()) {
|
||||||
cout << implementation->name() << ": " << implementation->description() << endl;
|
cout << implementation->name() << ": " << implementation->description() << endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-4
@@ -17,6 +17,9 @@ Contents
|
|||||||
|
|
||||||
- [Motivations](#motivations)
|
- [Motivations](#motivations)
|
||||||
- [How it works](#how-it-works)
|
- [How it works](#how-it-works)
|
||||||
|
- [Context](#context)
|
||||||
|
- [Design](#design)
|
||||||
|
- [Threads](#threads)
|
||||||
- [Support](#support)
|
- [Support](#support)
|
||||||
- [API](#api)
|
- [API](#api)
|
||||||
- [Use cases](#use-cases)
|
- [Use cases](#use-cases)
|
||||||
@@ -193,12 +196,12 @@ Let us illustrate the idea with code:
|
|||||||
simdjson::ondemand::parser parser;
|
simdjson::ondemand::parser parser;
|
||||||
simdjson::ondemand::document_stream stream;
|
simdjson::ondemand::document_stream stream;
|
||||||
auto error = parser.iterate_many(json).get(stream);
|
auto error = parser.iterate_many(json).get(stream);
|
||||||
if( error ) { /* do something */ }
|
if (error) { /* do something */ }
|
||||||
auto i = stream.begin();
|
auto i = stream.begin();
|
||||||
size_t count{0};
|
size_t count{0};
|
||||||
for(; i != stream.end(); ++i) {
|
for(; i != stream.end(); ++i) {
|
||||||
auto doc = *i;
|
auto doc = *i;
|
||||||
if(!i.error()) {
|
if (!i.error()) {
|
||||||
std::cout << "got full document at " << i.current_index() << std::endl;
|
std::cout << "got full document at " << i.current_index() << std::endl;
|
||||||
std::cout << i.source() << std::endl;
|
std::cout << i.source() << std::endl;
|
||||||
count++;
|
count++;
|
||||||
@@ -234,7 +237,7 @@ Consider the following example where a truncated document (`{"key":"intentionall
|
|||||||
simdjson::ondemand::parser parser;
|
simdjson::ondemand::parser parser;
|
||||||
simdjson::ondemand::document_stream stream;
|
simdjson::ondemand::document_stream stream;
|
||||||
auto error = parser.iterate_many(json,json.size()).get(stream);
|
auto error = parser.iterate_many(json,json.size()).get(stream);
|
||||||
if(error) { std::cerr << error << std::endl; return; }
|
if (error) { std::cerr << error << std::endl; return; }
|
||||||
for(auto i = stream.begin(); i != stream.end(); ++i) {
|
for(auto i = stream.begin(); i != stream.end(); ++i) {
|
||||||
std::cout << i.source() << std::endl;
|
std::cout << i.source() << std::endl;
|
||||||
}
|
}
|
||||||
@@ -266,7 +269,7 @@ Example:
|
|||||||
// we pass 'true' to the allow_comma parameter, the batch size will be set to at least
|
// we pass 'true' to the allow_comma parameter, the batch size will be set to at least
|
||||||
// the document size.
|
// the document size.
|
||||||
auto error = parser.iterate_many(json, 32, true).get(doc_stream);
|
auto error = parser.iterate_many(json, 32, true).get(doc_stream);
|
||||||
if(error) { std::cerr << error << std::endl; return; }
|
if (error) { std::cerr << error << std::endl; return; }
|
||||||
for (auto doc : doc_stream) {
|
for (auto doc : doc_stream) {
|
||||||
std::cout << doc.type() << std::endl;
|
std::cout << doc.type() << std::endl;
|
||||||
}
|
}
|
||||||
|
|||||||
+36
-36
@@ -9,8 +9,8 @@ Whether we parse JSON or XML, or any other serialized format, there are relative
|
|||||||
- Another popular approach is the schema-based deserialization model.
|
- Another popular approach is the schema-based deserialization model.
|
||||||
|
|
||||||
We propose an approach that is as easy to use and often as flexible as the DOM approach, yet as fast and
|
We propose an approach that is as easy to use and often as flexible as the DOM approach, yet as fast and
|
||||||
efficient as the schema-based or event-based approaches. We call this new approach "On Demand". The
|
efficient as the schema-based or event-based approaches. We call this new approach "On-Demand". The
|
||||||
simdjson On Demand API offers a familiar, friendly DOM API and
|
simdjson On-Demand API offers a familiar, friendly DOM API and
|
||||||
provides the performance of just-in-time parsing on top of the simdjson superior performance.
|
provides the performance of just-in-time parsing on top of the simdjson superior performance.
|
||||||
|
|
||||||
To achieve ease of use, we mimicked the *form* of a traditional DOM API: you can iterate over
|
To achieve ease of use, we mimicked the *form* of a traditional DOM API: you can iterate over
|
||||||
@@ -18,7 +18,7 @@ arrays, look up fields in objects, and extract native values like `double`, `uin
|
|||||||
|
|
||||||
To achieve performance, we introduced some key limitations that make the DOM API *streaming*:
|
To achieve performance, we introduced some key limitations that make the DOM API *streaming*:
|
||||||
array/object iteration cannot be restarted, and string/number values can only be parsed once. If
|
array/object iteration cannot be restarted, and string/number values can only be parsed once. If
|
||||||
these limitations are acceptable to you, the On Demand API could help you write maintainable
|
these limitations are acceptable to you, the On-Demand API could help you write maintainable
|
||||||
applications with a computation efficiency that is difficult to surpass.
|
applications with a computation efficiency that is difficult to surpass.
|
||||||
|
|
||||||
A code example illustrates our API from a programmer's point of view:
|
A code example illustrates our API from a programmer's point of view:
|
||||||
@@ -72,24 +72,24 @@ This streaming approach means that unused fields and values are not parsed or
|
|||||||
converted, thus saving space and time. In our example, the `"name"`, `"followers_count"`,
|
converted, thus saving space and time. In our example, the `"name"`, `"followers_count"`,
|
||||||
and `"friends_count"` keys and matching values are skipped.
|
and `"friends_count"` keys and matching values are skipped.
|
||||||
|
|
||||||
Further, the On Demand API does not parse a value *at all* until you try to convert it (e.g., to `double`,
|
Further, the On-Demand API does not parse a value *at all* until you try to convert it (e.g., to `double`,
|
||||||
`int`, `string`, or `bool`). In our example, when accessing the key-value pair `"retweet_count": 82`, the parser
|
`int`, `string`, or `bool`). In our example, when accessing the key-value pair `"retweet_count": 82`, the parser
|
||||||
may not convert the pair of characters `82` to the binary integer 82. Because the programmer specifies the data
|
may not convert the pair of characters `82` to the binary integer 82. Because the programmer specifies the data
|
||||||
type, we avoid branch mispredictions related to data type determination and improve the performance.
|
type, we avoid branch mispredictions related to data type determination and improve the performance.
|
||||||
|
|
||||||
|
|
||||||
We expect users of an On Demand API to work in terms of a JSON dialect, which is a set of expectations and
|
We expect users of an On-Demand API to work in terms of a JSON dialect, which is a set of expectations and
|
||||||
specifications that come in addition to the [JSON specification](https://www.rfc-editor.org/rfc/rfc8259.txt).
|
specifications that come in addition to the [JSON specification](https://www.rfc-editor.org/rfc/rfc8259.txt).
|
||||||
The On Demand approach is designed around several principles:
|
The On-Demand approach is designed around several principles:
|
||||||
|
|
||||||
* **Streaming (\*):** It avoids preparsing values, keeping the memory usage and the latency down.
|
* **Streaming (\*):** It avoids preparsing values, keeping the memory usage and the latency down.
|
||||||
* **Forward-Only:** To prevent reiteration of the same values and to keep the number of variables down (literally), only a single index is maintained and everything uses it (even if you have nested for loops). This means when you are going through an array of arrays, for example, that the inner array loop will advance the index to the next comma, and the array can just pick it up and look at it.
|
* **Forward-Only:** To prevent reiteration of the same values and to keep the number of variables down (literally), only a single index is maintained and everything uses it (even if you have nested for loops). This means when you are going through an array of arrays, for example, that the inner array loop will advance the index to the next comma, and the array can just pick it up and look at it.
|
||||||
* **Natural Iteration:** A JSON array or object can be iterated with a normal C++ for loop. Nested arrays and objects are supported by nested for loops.
|
* **Natural Iteration:** A JSON array or object can be iterated with a normal C++ for loop. Nested arrays and objects are supported by nested for loops.
|
||||||
* **Use-Specific Parsing:** Parsing is always specific to the type required by the programmer. For example, if the programmer asks for an unsigned integer, we just start parsing digits. If there were no digits, we toss an error. There are even different parsers for `double`, `uint64_t` and `int64_t` values. This use-specific parsing avoids the branchiness of a generic "type switch," and makes the code more inlineable and compact.
|
* **Use-Specific Parsing:** Parsing is always specific to the type required by the programmer. For example, if the programmer asks for an unsigned integer, we just start parsing digits. If there were no digits, we toss an error. There are even different parsers for `double`, `uint64_t` and `int64_t` values. This use-specific parsing avoids the branchiness of a generic "type switch," and makes the code more inlineable and compact.
|
||||||
* **Validate What You Use:** On Demand deliberately validates the values you use and the structure leading to it, but nothing else. The goal is a guarantee that the value you asked for is the correct one and is not malformed: there must be no confusion over whether you got the right value.
|
* **Validate What You Use:** On-Demand deliberately validates the values you use and the structure leading to it, but nothing else. The goal is a guarantee that the value you asked for is the correct one and is not malformed: there must be no confusion over whether you got the right value.
|
||||||
|
|
||||||
|
|
||||||
To understand why On Demand is different, it is helpful to review the major
|
To understand why On-Demand is different, it is helpful to review the major
|
||||||
approaches to parsing and parser APIs in use today.
|
approaches to parsing and parser APIs in use today.
|
||||||
|
|
||||||
### DOM Parsers
|
### DOM Parsers
|
||||||
@@ -106,7 +106,7 @@ DOM tree is often easy enough that many users use the DOM as-is instead of creat
|
|||||||
their own custom data structures.
|
their own custom data structures.
|
||||||
|
|
||||||
The DOM approach was the only way to parse JSON documents up to version 0.6 of the simdjson library.
|
The DOM approach was the only way to parse JSON documents up to version 0.6 of the simdjson library.
|
||||||
Our DOM API looks similar to our On Demand example, except
|
Our DOM API looks similar to our On-Demand example, except
|
||||||
it calls `parse` instead of `iterate`:
|
it calls `parse` instead of `iterate`:
|
||||||
|
|
||||||
```c++
|
```c++
|
||||||
@@ -152,7 +152,7 @@ a tweet right now, or is this from some other place in the document
|
|||||||
entirely? Though an event-based approach may allow superior performance, it is demanding of the programmer
|
entirely? Though an event-based approach may allow superior performance, it is demanding of the programmer
|
||||||
who must efficiently keep track of its current state within the JSON input.
|
who must efficiently keep track of its current state within the JSON input.
|
||||||
|
|
||||||
The following is event-based example of the Twitter problem we have reviewed in the DOM and On Demand
|
The following is event-based example of the Twitter problem we have reviewed in the DOM and On-Demand
|
||||||
examples. To make it short enough to use as an example at all, it has heavily redacted: it only solves
|
examples. To make it short enough to use as an example at all, it has heavily redacted: it only solves
|
||||||
a part of the problem (does not get user.screen_name), it has bugs (it does not handle sub-objects
|
a part of the problem (does not get user.screen_name), it has bugs (it does not handle sub-objects
|
||||||
in a tweet at all), and it uses a theoretical, simple event-based API that minimizes ceremony.
|
in a tweet at all), and it uses a theoretical, simple event-based API that minimizes ceremony.
|
||||||
@@ -257,7 +257,7 @@ stress the branch prediction. Though branch predictors improve with each new gen
|
|||||||
the cost of branch mispredictions also tends to increase as pipelines expand, and the processors become
|
the cost of branch mispredictions also tends to increase as pipelines expand, and the processors become
|
||||||
able to schedule longer streams of instructions.
|
able to schedule longer streams of instructions.
|
||||||
|
|
||||||
On Demand parsing is tailor-made to solve this problem at the source, parsing values only after the
|
On-Demand parsing is tailor-made to solve this problem at the source, parsing values only after the
|
||||||
user declares their type by asking for a `double`, an `int`, a `string`, etc. It attempts to do so while
|
user declares their type by asking for a `double`, an `int`, a `string`, etc. It attempts to do so while
|
||||||
preserving most of the flexibility of DOM parsing.
|
preserving most of the flexibility of DOM parsing.
|
||||||
|
|
||||||
@@ -297,7 +297,7 @@ To help visualize the algorithm, we'll walk through the example C++ given at the
|
|||||||
|
|
||||||
Since this is the first time this parser has been used, `iterate()` first allocates internal
|
Since this is the first time this parser has been used, `iterate()` first allocates internal
|
||||||
parser buffers if this is the first time through. When reusing an existing parser, allocation
|
parser buffers if this is the first time through. When reusing an existing parser, allocation
|
||||||
only happens if the new document is bigger than internal buffers can handle. The On Demand
|
only happens if the new document is bigger than internal buffers can handle. The On-Demand
|
||||||
API only ever allocates memory in the `iterate()` function call.
|
API only ever allocates memory in the `iterate()` function call.
|
||||||
|
|
||||||
The simdjson library then preprocesses the JSON text at high speed, finding all tokens (i.e. the starting
|
The simdjson library then preprocesses the JSON text at high speed, finding all tokens (i.e. the starting
|
||||||
@@ -492,7 +492,7 @@ To help visualize the algorithm, we'll walk through the example C++ given at the
|
|||||||
Because of the cast to uint64_t, simdjson knows it's parsing an unsigned integer. This lets
|
Because of the cast to uint64_t, simdjson knows it's parsing an unsigned integer. This lets
|
||||||
us use a fast parser which *only* knows how to parse digits. It validates that it is an integer
|
us use a fast parser which *only* knows how to parse digits. It validates that it is an integer
|
||||||
by rejecting negative numbers, strings, and other values based on the fact that they are not the
|
by rejecting negative numbers, strings, and other values based on the fact that they are not the
|
||||||
digits 0-9. This type specificity is part of why parsing with on demand is so fast: you lose all
|
digits 0-9. This type specificity is part of why parsing with On-Demand is so fast: you lose all
|
||||||
the code that has to understand those other types.
|
the code that has to understand those other types.
|
||||||
|
|
||||||
The iterator is advanced to the `}`, and depth decreased back to 3 (root > statuses > tweet).
|
The iterator is advanced to the `}`, and depth decreased back to 3 (root > statuses > tweet).
|
||||||
@@ -597,7 +597,7 @@ To help visualize the algorithm, we'll walk through the example C++ given at the
|
|||||||
|
|
||||||
This means you can very efficiently do things like read a single value from a JSON file, or take
|
This means you can very efficiently do things like read a single value from a JSON file, or take
|
||||||
the top N, for example. It also means the things you don't use won't be fully validated. This is
|
the top N, for example. It also means the things you don't use won't be fully validated. This is
|
||||||
a general principle of On Demand: don't validate what you don't use. We still fully validate
|
a general principle of On-Demand: don't validate what you don't use. We still fully validate
|
||||||
values you do use, however, as well as the objects and arrays that lead to them, so that you can
|
values you do use, however, as well as the objects and arrays that lead to them, so that you can
|
||||||
be sure you get the information you need.
|
be sure you get the information you need.
|
||||||
|
|
||||||
@@ -654,7 +654,7 @@ for(auto field : doc.get_object()) {
|
|||||||
|
|
||||||
### Iteration Safety
|
### Iteration Safety
|
||||||
|
|
||||||
The On Demand API is powerful. To compensate, we add some safeguards to ensure that it can be used without fear
|
The On-Demand API is powerful. To compensate, we add some safeguards to ensure that it can be used without fear
|
||||||
in production systems:
|
in production systems:
|
||||||
|
|
||||||
- If the value fails to be parsed as one type, the program can try to parse it as something else until the program succeeds. Thus
|
- If the value fails to be parsed as one type, the program can try to parse it as something else until the program succeeds. Thus
|
||||||
@@ -667,7 +667,7 @@ in production systems:
|
|||||||
if it was `nullptr` but did not care what the actual value was--it will iterate. The destructor automates
|
if it was `nullptr` but did not care what the actual value was--it will iterate. The destructor automates
|
||||||
the iteration.
|
the iteration.
|
||||||
|
|
||||||
Some care is needed when using the On Demand API in scenarios where you need to access several sibling arrays or objects because
|
Some care is needed when using the On-Demand API in scenarios where you need to access several sibling arrays or objects because
|
||||||
only one object or array can be active at any one time. Let us consider the following example:
|
only one object or array can be active at any one time. Let us consider the following example:
|
||||||
|
|
||||||
```C++
|
```C++
|
||||||
@@ -679,14 +679,14 @@ in production systems:
|
|||||||
ondemand::object c1 = parent["child1"];
|
ondemand::object c1 = parent["child1"];
|
||||||
// c1 owns the focus
|
// c1 owns the focus
|
||||||
//
|
//
|
||||||
if(std::string_view(c1["name"]) != "John") { ... }
|
if (std::string_view(c1["name"]) != "John") { ... }
|
||||||
// c2 attempts to grab the focus from parent but fails
|
// c2 attempts to grab the focus from parent but fails
|
||||||
ondemand::object c2 = parent["child2"];
|
ondemand::object c2 = parent["child2"];
|
||||||
// c2 is now in an unsafe state and the following line would be unsafe
|
// c2 is now in an unsafe state and the following line would be unsafe
|
||||||
// if(std::string_view(c2["name"]) != "Daniel") { return false; }
|
// if (std::string_view(c2["name"]) != "Daniel") { return false; }
|
||||||
```
|
```
|
||||||
|
|
||||||
A correct usage is given by the following example:
|
A correct usage is given by the following example:
|
||||||
|
|
||||||
```C++
|
```C++
|
||||||
ondemand::parser parser;
|
ondemand::parser parser;
|
||||||
@@ -697,7 +697,7 @@ in production systems:
|
|||||||
{
|
{
|
||||||
ondemand::object c1 = parent["child1"];
|
ondemand::object c1 = parent["child1"];
|
||||||
// c1 grabbed the focus from parent
|
// c1 grabbed the focus from parent
|
||||||
if(std::string_view(c1["name"]) != "John") { return false; }
|
if (std::string_view(c1["name"]) != "John") { return false; }
|
||||||
}
|
}
|
||||||
// c1 went out of scope, so its destructor was called and the focus
|
// c1 went out of scope, so its destructor was called and the focus
|
||||||
// was handed back to parent.
|
// was handed back to parent.
|
||||||
@@ -705,40 +705,40 @@ in production systems:
|
|||||||
ondemand::object c2 = parent["child2"];
|
ondemand::object c2 = parent["child2"];
|
||||||
// c2 grabbed the focus from parent
|
// c2 grabbed the focus from parent
|
||||||
// the following is safe:
|
// the following is safe:
|
||||||
if(std::string_view(c2["name"]) != "Daniel") { return false; }
|
if (std::string_view(c2["name"]) != "Daniel") { return false; }
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
### Benefits of the On Demand Approach
|
### Benefits of the On-Demand Approach
|
||||||
|
|
||||||
We expect that the On Demand approach has many of the performance benefits of the schema-based approach, while providing a flexibility that is similar to that of the DOM-based approach.
|
We expect that the On-Demand approach has many of the performance benefits of the schema-based approach, while providing a flexibility that is similar to that of the DOM-based approach.
|
||||||
|
|
||||||
* Faster than DOM in some cases. Reduced memory usage.
|
* Faster than DOM in some cases. Reduced memory usage.
|
||||||
* Straightforward, programmer-friendly interface (arrays and objects).
|
* Straightforward, programmer-friendly interface (arrays and objects).
|
||||||
* Highly expressive, beyond deserialization and pointer queries: many tasks can be accomplished with little code.
|
* Highly expressive, beyond deserialization and pointer queries: many tasks can be accomplished with little code.
|
||||||
|
|
||||||
### Limitations of the On Demand Approach
|
### Limitations of the On-Demand Approach
|
||||||
|
|
||||||
The On Demand approach has some limitations:
|
The On-Demand approach has some limitations:
|
||||||
|
|
||||||
* Because it operates in streaming mode, you only have access to the current element in the JSON document. Furthermore, the document is traversed in order so the code is sensitive to the order of the JSON nodes in the same manner as an event-based approach (e.g., SAX). (The one exception to this is field lookup, which is more *performant* when the order of lookups matches the order of fields in the document, but which will still work with out-of-order fields, with a performance hit.)
|
* Because it operates in streaming mode, you only have access to the current element in the JSON document. Furthermore, the document is traversed in order so the code is sensitive to the order of the JSON nodes in the same manner as an event-based approach (e.g., SAX). (The one exception to this is field lookup, which is more *performant* when the order of lookups matches the order of fields in the document, but which will still work with out-of-order fields, with a performance hit.)
|
||||||
* The On Demand approach is less safe than DOM: we only validate the components of the JSON document that are used and it is possible to begin ingesting an invalid document only to find out later that the document is invalid. Are you fine ingesting a large JSON document that starts with well formed JSON but ends with invalid JSON content?
|
* The On-Demand approach is less safe than DOM: we only validate the components of the JSON document that are used and it is possible to begin ingesting an invalid document only to find out later that the document is invalid. Are you fine ingesting a large JSON document that starts with well formed JSON but ends with invalid JSON content?
|
||||||
|
|
||||||
There are currently additional technical limitations which we expect to resolve in future releases of the simdjson library:
|
There are currently additional technical limitations which we expect to resolve in future releases of the simdjson library:
|
||||||
|
|
||||||
* The simdjson library offers runtime dispatching which allows you to compile one binary and have it run at full speed on different processors, taking advantage of the specific features of the processor. The On Demand API has limited runtime dispatch support. Under x64 systems, to fully benefit from the On Demand API, we recommend that you compile your code for a specific processor. E.g., if your processor supports AVX2 instructions, you should compile your binary executable with AVX2 instruction support (by using your compiler's commands). If you are sufficiently technically proficient, you can implement runtime dispatching within your application, by compiling your On Demand code for different processors.
|
* The simdjson library offers runtime dispatching which allows you to compile one binary and have it run at full speed on different processors, taking advantage of the specific features of the processor. The On-Demand API has limited runtime dispatch support. Under x64 systems, to fully benefit from the On-Demand API, we recommend that you compile your code for a specific processor. E.g., if your processor supports AVX2 instructions, you should compile your binary executable with AVX2 instruction support (by using your compiler's commands). If you are sufficiently technically proficient, you can implement runtime dispatching within your application, by compiling your On-Demand code for different processors.
|
||||||
* There is an initial phase which scans the entire document quickly, irrespective of the size of the document. We plan to break this phase into distinct steps for large files in a future release as we have done with other components of our API (e.g., `parse_many`).
|
* There is an initial phase which scans the entire document quickly, irrespective of the size of the document. We plan to break this phase into distinct steps for large files in a future release as we have done with other components of our API (e.g., `parse_many`).
|
||||||
|
|
||||||
### Applicability of the On Demand Approach
|
### Applicability of the On-Demand Approach
|
||||||
|
|
||||||
At this time we recommend the On Demand API in the following cases:
|
At this time we recommend the On-Demand API in the following cases:
|
||||||
|
|
||||||
1. The 64-bit hardware (CPU) used to run the software is known at compile time. If you need runtime dispatching because you cannot be certain of the hardware used to run your software, you will be better served with the core simdjson API. (This only applies to x64 (AMD/Intel). On 64-bit ARM hardware, runtime dispatching is unnecessary.)
|
1. The 64-bit hardware (CPU) used to run the software is known at compile time. If you need runtime dispatching because you cannot be certain of the hardware used to run your software, you will be better served with the core simdjson API. (This only applies to x64 (AMD/Intel). On 64-bit ARM hardware, runtime dispatching is unnecessary.)
|
||||||
2. The used parts of JSON files do not need to be validated and the layout of the nodes follows a strict JSON dialect. If you are receiving JSON from other systems, you might be better served with core simdjson API as it fully validates the JSON inputs and allows you to navigate through the document at will.
|
2. The used parts of JSON files do not need to be validated and the layout of the nodes follows a strict JSON dialect. If you are receiving JSON from other systems, you might be better served with core simdjson API as it fully validates the JSON inputs and allows you to navigate through the document at will.
|
||||||
3. Speed and efficiency are of the utmost importance. Keep in mind that the core simdjson API is highly efficient so adopting the On Demand API is not necessary for high efficiency.
|
3. Speed and efficiency are of the utmost importance. Keep in mind that the core simdjson API is highly efficient so adopting the On-Demand API is not necessary for high efficiency.
|
||||||
4. As a developer, you value a clean, flexible and maintainable API.
|
4. As a developer, you value a clean, flexible and maintainable API.
|
||||||
|
|
||||||
Good applications for the On Demand API might be:
|
Good applications for the On-Demand API might be:
|
||||||
|
|
||||||
* You are working from pre-existing large JSON files that have been vetted. You expect them to be well formed according to a known JSON dialect and to have a consistent layout. For example, you might be doing biomedical research or machine learning on top of static data dumps in JSON.
|
* You are working from pre-existing large JSON files that have been vetted. You expect them to be well formed according to a known JSON dialect and to have a consistent layout. For example, you might be doing biomedical research or machine learning on top of static data dumps in JSON.
|
||||||
* Both the generation and the consumption of JSON data is within your system. Your team controls both the software that produces the JSON and the software the parses it, your team knows and control the hardware. Thus you can fully test your system.
|
* Both the generation and the consumption of JSON data is within your system. Your team controls both the software that produces the JSON and the software the parses it, your team knows and control the hardware. Thus you can fully test your system.
|
||||||
@@ -746,13 +746,13 @@ Good applications for the On Demand API might be:
|
|||||||
|
|
||||||
## Checking Your CPU Selection (x64 systems)
|
## Checking Your CPU Selection (x64 systems)
|
||||||
|
|
||||||
The On Demand API uses advanced architecture-specific code for many common processors to make JSON preprocessing and string parsing faster. By default, however, most c++ compilers will compile to the least common denominator (since the program could theoretically be run anywhere). Since On Demand is inlined into your own code, it cannot always use these advanced versions unless the compiler is told to target them.
|
The On-Demand API uses advanced architecture-specific code for many common processors to make JSON preprocessing and string parsing faster. By default, however, most c++ compilers will compile to the least common denominator (since the program could theoretically be run anywhere). Since On-Demand is inlined into your own code, it cannot always use these advanced versions unless the compiler is told to target them.
|
||||||
|
|
||||||
On relevant systems, the On Demand API provides some support for runtime dispatching: that is, it will attempt to detect, at runtime, the instructions that your processor supports and optimize the code accordingly. However, it cannot always make full use of the features of your processor.
|
On relevant systems, the On-Demand API provides some support for runtime dispatching: that is, it will attempt to detect, at runtime, the instructions that your processor supports and optimize the code accordingly. However, it cannot always make full use of the features of your processor.
|
||||||
|
|
||||||
Some users wish to run at the best possible speed. Under recent Intel and AMD processors, these users should take additional steps to verify that their code is well optimized.
|
Some users wish to run at the best possible speed. Under recent Intel and AMD processors, these users should take additional steps to verify that their code is well optimized.
|
||||||
|
|
||||||
Given that the On Demand API offer limited runtime dispatching, it matters that your code is compiled against a specific CPU target. You should verify that the code is compiled against the target you expect. Thankfully, the simdjson library will tell you exactly what it detects as an implementation: `icelake` (AVX512 x64 processors), `haswell` (AVX2 x64 processors), `westmere` (SSE4 x64 processors), `arm64` (64-bit ARM), `ppc64` (64-bit POWER), `fallback` (others). Under x64 processors, many programmers will want to target `haswell` whereas under ARM, most programmers will want to target `arm64` (and it should do so automatically). The `fallback` is probably only good for testing purposes, not for deployment.
|
Given that the On-Demand API offer limited runtime dispatching, it matters that your code is compiled against a specific CPU target. You should verify that the code is compiled against the target you expect. Thankfully, the simdjson library will tell you exactly what it detects as an implementation: `icelake` (AVX512 x64 processors), `haswell` (AVX2 x64 processors), `westmere` (SSE4 x64 processors), `arm64` (64-bit ARM), `ppc64` (64-bit POWER), `lasx` (LoongArch), `lsx` (LoongArch), `fallback` (others). Under x64 processors, many programmers will want to target `haswell` whereas under ARM, most programmers will want to target `arm64` (and it should do so automatically). The `fallback` is probably only good for testing purposes, not for deployment.
|
||||||
|
|
||||||
```C++
|
```C++
|
||||||
std::cout << simdjson::builtin_implementation()->name() << std::endl;
|
std::cout << simdjson::builtin_implementation()->name() << std::endl;
|
||||||
@@ -777,6 +777,6 @@ In these examples, the `-march=haswell` flags targets a haswell processor and th
|
|||||||
|
|
||||||
Instead of specifying a specific microarchitecture, you can let your compiler do the work. The `-march=native` flags says "target the current computer," which is a reasonable default for many applications which both compile and run on the same processor.
|
Instead of specifying a specific microarchitecture, you can let your compiler do the work. The `-march=native` flags says "target the current computer," which is a reasonable default for many applications which both compile and run on the same processor.
|
||||||
|
|
||||||
Passing `-march=native` to the compiler may make On Demand faster by allowing it to use optimizations specific to your machine. You cannot do this, however, if you are compiling code that might be run on less advanced machines. That is, be mindful that when compiling with the `-march=native` flag, the resulting binary will run on the current system but may not run on other systems (e.g., on an old processor).
|
Passing `-march=native` to the compiler may make On-Demand faster by allowing it to use optimizations specific to your machine. You cannot do this, however, if you are compiling code that might be run on less advanced machines. That is, be mindful that when compiling with the `-march=native` flag, the resulting binary will run on the current system but may not run on other systems (e.g., on an old processor).
|
||||||
|
|
||||||
If you are compiling on an ARM or POWER system, you do not need to be concerned with CPU selection during compilation. The `-march=native` flag useful for best performance on x64 (e.g., Intel) systems but it is generally unsupported on some platforms such as ARM (aarch64) or POWER.
|
If you are compiling on an ARM or POWER system, you do not need to be concerned with CPU selection during compilation. The `-march=native` flag is useful for best performance on x64 (e.g., Intel) systems but it is generally unsupported on some platforms such as ARM (aarch64) or POWER.
|
||||||
|
|||||||
+3
-3
@@ -184,12 +184,12 @@ Let us illustrate the idea with code:
|
|||||||
simdjson::dom::parser parser;
|
simdjson::dom::parser parser;
|
||||||
simdjson::dom::document_stream stream;
|
simdjson::dom::document_stream stream;
|
||||||
auto error = parser.parse_many(json).get(stream);
|
auto error = parser.parse_many(json).get(stream);
|
||||||
if( error ) { /* do something */ }
|
if (error) { /* do something */ }
|
||||||
auto i = stream.begin();
|
auto i = stream.begin();
|
||||||
size_t count{0};
|
size_t count{0};
|
||||||
for(; i != stream.end(); ++i) {
|
for(; i != stream.end(); ++i) {
|
||||||
auto doc = *i;
|
auto doc = *i;
|
||||||
if(!doc.error()) {
|
if (!doc.error()) {
|
||||||
std::cout << "got full document at " << i.current_index() << std::endl;
|
std::cout << "got full document at " << i.current_index() << std::endl;
|
||||||
std::cout << i.source() << std::endl;
|
std::cout << i.source() << std::endl;
|
||||||
count++;
|
count++;
|
||||||
@@ -225,7 +225,7 @@ Consider the following example where a truncated document (`{"key":"intentionall
|
|||||||
simdjson::dom::parser parser;
|
simdjson::dom::parser parser;
|
||||||
simdjson::dom::document_stream stream;
|
simdjson::dom::document_stream stream;
|
||||||
auto error = parser.parse_many(json,json.size()).get(stream);
|
auto error = parser.parse_many(json,json.size()).get(stream);
|
||||||
if(error) { std::cerr << error << std::endl; return; }
|
if (error) { std::cerr << error << std::endl; return; }
|
||||||
for(auto doc : stream) {
|
for(auto doc : stream) {
|
||||||
std::cout << doc << std::endl;
|
std::cout << doc << std::endl;
|
||||||
}
|
}
|
||||||
|
|||||||
+110
-2
@@ -14,6 +14,7 @@ testing and get the best performance.
|
|||||||
* [Number parsing](#number-parsing)
|
* [Number parsing](#number-parsing)
|
||||||
* [Visual Studio](#visual-studio)
|
* [Visual Studio](#visual-studio)
|
||||||
* [Power Usage and Downclocking](#power-usage-and-downclocking)
|
* [Power Usage and Downclocking](#power-usage-and-downclocking)
|
||||||
|
* [Free Padding](#free-padding)
|
||||||
|
|
||||||
|
|
||||||
NDEBUG directive
|
NDEBUG directive
|
||||||
@@ -74,7 +75,7 @@ or simply
|
|||||||
Server Loops: Long-Running Processes and Memory Capacity
|
Server Loops: Long-Running Processes and Memory Capacity
|
||||||
---------------------------------
|
---------------------------------
|
||||||
|
|
||||||
The On Demand approach also automatically expands its memory capacity when larger documents are parsed. However, for longer processes where very large files are processed (such as server loops), this capacity is not resized down. On Demand also lets you adjust the maximal capacity that the parser can process:
|
The On-Demand approach also automatically expands its memory capacity when larger documents are parsed. However, for longer processes where very large files are processed (such as server loops), this capacity is not resized down. On-Demand also lets you adjust the maximal capacity that the parser can process:
|
||||||
|
|
||||||
* You can set an upper bound (*max_capacity*) when construction the parser:
|
* You can set an upper bound (*max_capacity*) when construction the parser:
|
||||||
```C++
|
```C++
|
||||||
@@ -159,7 +160,7 @@ When compiling with Visual Studio, we recommend the flags `/Ob2 /O2` or better.
|
|||||||
|
|
||||||
Recent versions of Microsoft Visual Studio on Windows provides support for the LLVM Clang compiler. You only need to install the "Clang compiler" optional component (ClangCL). You may also get a copy of the 64-bit LLVM CLang compiler for [Windows directly from LLVM](https://releases.llvm.org/download.html). The simdjson library fully supports the LLVM Clang compiler under Windows. In fact, you may get better performance out of simdjson with the LLVM Clang compiler than with the regular Visual Studio compiler. Meanwhile the [LLVM CLang compiler is binary compatible with Visual Studio](https://clang.llvm.org/docs/MSVCCompatibility.html) which means that you can combine their binaries (executables and libraries).
|
Recent versions of Microsoft Visual Studio on Windows provides support for the LLVM Clang compiler. You only need to install the "Clang compiler" optional component (ClangCL). You may also get a copy of the 64-bit LLVM CLang compiler for [Windows directly from LLVM](https://releases.llvm.org/download.html). The simdjson library fully supports the LLVM Clang compiler under Windows. In fact, you may get better performance out of simdjson with the LLVM Clang compiler than with the regular Visual Studio compiler. Meanwhile the [LLVM CLang compiler is binary compatible with Visual Studio](https://clang.llvm.org/docs/MSVCCompatibility.html) which means that you can combine their binaries (executables and libraries).
|
||||||
|
|
||||||
Under Windows, we also support the GNU GCC compiler via MSYS2. The performance of 64-bit MSYS2 under Windows excellent (on par with Linux).
|
Under Windows, we also support the GNU GCC compiler via MSYS2. The performance of 64-bit MSYS2 under Windows is excellent (on par with Linux).
|
||||||
|
|
||||||
|
|
||||||
Power Usage and Downclocking
|
Power Usage and Downclocking
|
||||||
@@ -179,3 +180,110 @@ The simdjson library does not generally make use of heavy 256-bit instructions.
|
|||||||
the macro `SIMDJSON_AVX512_ALLOWED` to `0` in C++ prior to importing the headers.
|
the macro `SIMDJSON_AVX512_ALLOWED` to `0` in C++ prior to importing the headers.
|
||||||
|
|
||||||
You may still be worried about which SIMD instruction set is used by simdjson. Thankfully, [you can always determine and change which architecture-specific implementation is used](implementation-selection.md) by simdjson. Thus even if your CPU supports AVX2, you do not need to use AVX2. You are in control.
|
You may still be worried about which SIMD instruction set is used by simdjson. Thankfully, [you can always determine and change which architecture-specific implementation is used](implementation-selection.md) by simdjson. Thus even if your CPU supports AVX2, you do not need to use AVX2. You are in control.
|
||||||
|
|
||||||
|
|
||||||
|
Free Padding
|
||||||
|
-------
|
||||||
|
|
||||||
|
For performance reasons, the simdjson library requires that the JSON input contain at least
|
||||||
|
`simdjson::SIMDJSON_PADDING` bytes at the end of the stream. The value `simdjson::SIMDJSON_PADDING` is
|
||||||
|
small (e.g., 64 bytes). On modern systems, you can safely read beyond an allocated buffers,
|
||||||
|
as long as you remain within an allocated page. Pages on modern systems span at least 4 kilobytes,
|
||||||
|
but can be significantly larger. E.g., Apple systems favour pages spanning 16 kilobytes.
|
||||||
|
|
||||||
|
In effect, it means that you can almost always read a few bytes beyond your current buffer---without
|
||||||
|
allocating extra memory. However, tools such as valgrind or memory sanitizers will flag such behavior as unsafe.
|
||||||
|
Nevertheless, you can still make sure of this capability in your code if you are an expert
|
||||||
|
programmer and you are willing to silence sanitizer warnings. The following code provides
|
||||||
|
a portable example.
|
||||||
|
|
||||||
|
|
||||||
|
The conditional compilation checks for the `_MSC_VER` macro (indicating Microsoft Visual Studio)
|
||||||
|
and includes platform-specific headers accordingly.
|
||||||
|
The `page_size()` function determines the default size of a memory page in bytes on the system.
|
||||||
|
On Windows (when `_WIN32` is defined), it uses `GetSystemInfo()` to retrieve system information and obtain the page size.
|
||||||
|
On other platforms (non-Windows), it uses `sysconf(_SC_PAGESIZE)` to get the page size.
|
||||||
|
The function returns the page size.
|
||||||
|
The `need_allocation()` function checks whether the buffer (given by `buf`) plus the specified length (`len`) is near a page boundary.
|
||||||
|
If the buffer extends beyond the current page when padded by `simdjson::SIMDJSON_PADDING`, it returns true, indicating that reallocation is needed.
|
||||||
|
Otherwise, it returns false.
|
||||||
|
The `get_padded_string_view()` creates a `padded_string_view` from the input buffer.
|
||||||
|
If reallocation is needed (unlikely case), it allocates a new padded_string and assigns it to `jsonbuffer`.
|
||||||
|
Otherwise (very likely), it creates a `padded_string_view` directly from the buffer.
|
||||||
|
The `simdjson::SIMDJSON_PADDING` ensures that there is additional padding for parsing efficiency.
|
||||||
|
The calling code just needs to provide `jsonbuffer` (an instance of `simdjson::padded_string`)
|
||||||
|
and pass `get_padded_string_view(buf, len, jsonbuffer)` to `parser.iterate`. Most of the time,
|
||||||
|
this code will not allocate new memory.
|
||||||
|
|
||||||
|
|
||||||
|
```cpp
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <windows.h>
|
||||||
|
#include <sysinfoapi.h>
|
||||||
|
#else
|
||||||
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
|
#include "simdjson.h"
|
||||||
|
#include <cstdio>
|
||||||
|
|
||||||
|
// Returns the default size of the page in bytes on this system.
|
||||||
|
long page_size() {
|
||||||
|
#ifdef _WIN32
|
||||||
|
SYSTEM_INFO sysInfo;
|
||||||
|
GetSystemInfo(&sysInfo);
|
||||||
|
long pagesize = sysInfo.dwPageSize;
|
||||||
|
#else
|
||||||
|
long pagesize = sysconf(_SC_PAGESIZE);
|
||||||
|
#endif
|
||||||
|
return pagesize;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Returns true if the buffer + len + simdjson::SIMDJSON_PADDING crosses the
|
||||||
|
// page boundary.
|
||||||
|
bool need_allocation(const char *buf, size_t len) {
|
||||||
|
return ((reinterpret_cast<uintptr_t>(buf + len - 1) % page_size()) <
|
||||||
|
simdjson::SIMDJSON_PADDING);
|
||||||
|
}
|
||||||
|
|
||||||
|
simdjson::padded_string_view
|
||||||
|
get_padded_string_view(const char *buf, size_t len,
|
||||||
|
simdjson::padded_string &jsonbuffer) {
|
||||||
|
if (need_allocation(buf, len)) { // unlikely case
|
||||||
|
jsonbuffer = simdjson::padded_string(buf, len);
|
||||||
|
return jsonbuffer;
|
||||||
|
} else { // no reallcation needed (very likely)
|
||||||
|
return simdjson::padded_string_view(buf, len,
|
||||||
|
len + simdjson::SIMDJSON_PADDING);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
printf("page_size: %ld\n", page_size());
|
||||||
|
const char *jsonpoiner = R"(
|
||||||
|
{
|
||||||
|
"key": "value"
|
||||||
|
}
|
||||||
|
)";
|
||||||
|
size_t len = strlen(jsonpoiner);
|
||||||
|
simdjson::padded_string jsonbuffer; // only allocate if needed
|
||||||
|
simdjson::ondemand::parser parser;
|
||||||
|
simdjson::ondemand::document doc;
|
||||||
|
simdjson::error_code error =
|
||||||
|
parser.iterate(get_padded_string_view(jsonpoiner, len, jsonbuffer))
|
||||||
|
.get(doc);
|
||||||
|
if (error) {
|
||||||
|
printf("error: %s\n", simdjson::error_message(error));
|
||||||
|
return EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
std::string_view value;
|
||||||
|
error = doc["key"].get_string().get(value);
|
||||||
|
if (error) {
|
||||||
|
return EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
printf("Value: \"%.*s\"\n", (int)value.size(), value.data());
|
||||||
|
if (value != "value") {
|
||||||
|
return EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
return EXIT_SUCCESS;
|
||||||
|
}
|
||||||
|
```
|
||||||
+1
-1
@@ -29,7 +29,7 @@ It is sometimes useful to start with an example. Consider the following JSON doc
|
|||||||
The following is a dump of the content of the tape, with the first number of each line representing the index of a tape element.
|
The following is a dump of the content of the tape, with the first number of each line representing the index of a tape element.
|
||||||
|
|
||||||
### The Tape
|
### The Tape
|
||||||
| index | element (64 bit word) |
|
| index | element (64-bit word) |
|
||||||
| ----- | ------------------------------------------------------------------- |
|
| ----- | ------------------------------------------------------------------- |
|
||||||
| 0 | r // pointing to 39 (right after last node) |
|
| 0 | r // pointing to 39 (right after last node) |
|
||||||
| 1 | { // pointing to next tape location 38 (first node after the scope) |
|
| 1 | { // pointing to next tape location 38 (first node after the scope) |
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
|||||||
add_quickstart_test(quickstart2_noexceptions quickstart2_noexceptions.cpp NO_EXCEPTIONS LABELS acceptance)
|
add_quickstart_test(quickstart2_noexceptions quickstart2_noexceptions.cpp NO_EXCEPTIONS LABELS acceptance)
|
||||||
add_quickstart_test(quickstart2_noexceptions11 quickstart2_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11)
|
add_quickstart_test(quickstart2_noexceptions11 quickstart2_noexceptions.cpp NO_EXCEPTIONS CXX_STANDARD c++11)
|
||||||
|
|
||||||
# On Demand Quick Start
|
# On-Demand Quick Start
|
||||||
if (SIMDJSON_EXCEPTIONS)
|
if (SIMDJSON_EXCEPTIONS)
|
||||||
add_quickstart_test(quickstart_ondemand quickstart_ondemand.cpp LABELS quickstart_ondemand acceptance)
|
add_quickstart_test(quickstart_ondemand quickstart_ondemand.cpp LABELS quickstart_ondemand acceptance)
|
||||||
add_quickstart_test(quickstart_ondemand11 quickstart_ondemand.cpp CXX_STANDARD c++11 LABELS quickstart_ondemand acceptance)
|
add_quickstart_test(quickstart_ondemand11 quickstart_ondemand.cpp CXX_STANDARD c++11 LABELS quickstart_ondemand acceptance)
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ fi
|
|||||||
# Different levels may uncover different types of bugs, see this interesting
|
# Different levels may uncover different types of bugs, see this interesting
|
||||||
# thread: https://github.com/google/oss-fuzz/issues/2295#issuecomment-481493392
|
# thread: https://github.com/google/oss-fuzz/issues/2295#issuecomment-481493392
|
||||||
# Oss-fuzz uses -O1 so it may be relevant to use something else than that,
|
# Oss-fuzz uses -O1 so it may be relevant to use something else than that,
|
||||||
# to do something oss-fuzz doesn't.
|
# to do something oss-fuzz does not do.
|
||||||
variant=sanitizers-O3
|
variant=sanitizers-O3
|
||||||
|
|
||||||
if [ ! -d build-$variant ] ; then
|
if [ ! -d build-$variant ] ; then
|
||||||
|
|||||||
@@ -7,11 +7,11 @@
|
|||||||
|
|
||||||
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
|
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
|
||||||
|
|
||||||
// Split data into two strings, json pointer and the document string.
|
// Split data into two strings, JSON Pointer and the document string.
|
||||||
// Might end up with none, either or both being empty, important for
|
// Might end up with none, either or both being empty, important for
|
||||||
// covering edge cases such as
|
// covering edge cases such as
|
||||||
// https://github.com/simdjson/simdjson/issues/1142 Inputs missing the
|
// https://github.com/simdjson/simdjson/issues/1142 Inputs missing the
|
||||||
// separator line will get an empty json pointer but the all the input put in
|
// separator line will get an empty JSON Pointer but the all the input put in
|
||||||
// the document string. This means test data from other fuzzers that take json
|
// the document string. This means test data from other fuzzers that take json
|
||||||
// input works for this fuzzer as well.
|
// input works for this fuzzer as well.
|
||||||
FuzzData fd(Data, Size);
|
FuzzData fd(Data, Size);
|
||||||
|
|||||||
@@ -9,10 +9,10 @@
|
|||||||
|
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
||||||
#if _M_ARM64
|
#if SIMDJSON_REGULAR_VISUAL_STUDIO && SIMDJSON_IS_ARM64
|
||||||
// __umulh requires intrin.h
|
// __umulh requires intrin.h
|
||||||
#include <intrin.h>
|
#include <intrin.h>
|
||||||
#endif // _M_ARM64
|
#endif // SIMDJSON_REGULAR_VISUAL_STUDIO && SIMDJSON_IS_ARM64
|
||||||
|
|
||||||
namespace simdjson {
|
namespace simdjson {
|
||||||
namespace arm64 {
|
namespace arm64 {
|
||||||
@@ -32,13 +32,13 @@ static simdjson_inline uint32_t parse_eight_digits_unrolled(const uint8_t *chars
|
|||||||
simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t value2) {
|
simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t value2) {
|
||||||
internal::value128 answer;
|
internal::value128 answer;
|
||||||
#if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
|
#if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
|
||||||
#ifdef _M_ARM64
|
#if SIMDJSON_IS_ARM64
|
||||||
// ARM64 has native support for 64-bit multiplications, no need to emultate
|
// ARM64 has native support for 64-bit multiplications, no need to emultate
|
||||||
answer.high = __umulh(value1, value2);
|
answer.high = __umulh(value1, value2);
|
||||||
answer.low = value1 * value2;
|
answer.low = value1 * value2;
|
||||||
#else
|
#else
|
||||||
answer.low = _umul128(value1, value2, &answer.high); // _umul128 not available on ARM64
|
answer.low = _umul128(value1, value2, &answer.high); // _umul128 not available on ARM64
|
||||||
#endif // _M_ARM64
|
#endif // SIMDJSON_IS_ARM64
|
||||||
#else // SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
|
#else // SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
|
||||||
__uint128_t r = (static_cast<__uint128_t>(value1)) * value2;
|
__uint128_t r = (static_cast<__uint128_t>(value1)) * value2;
|
||||||
answer.low = uint64_t(r);
|
answer.low = uint64_t(r);
|
||||||
|
|||||||
@@ -17,89 +17,53 @@ namespace {
|
|||||||
// Start of private section with Visual Studio workaround
|
// Start of private section with Visual Studio workaround
|
||||||
|
|
||||||
|
|
||||||
/**
|
#ifndef simdjson_make_uint8x16_t
|
||||||
* make_uint8x16_t initializes a SIMD register (uint8x16_t).
|
#define simdjson_make_uint8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \
|
||||||
* This is needed because, incredibly, the syntax uint8x16_t x = {1,2,3...}
|
x13, x14, x15, x16) \
|
||||||
* is not recognized under Visual Studio! This is a workaround.
|
([=]() { \
|
||||||
* Using a std::initializer_list<uint8_t> as a parameter resulted in
|
uint8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \
|
||||||
* inefficient code. With the current approach, if the parameters are
|
x9, x10, x11, x12, x13, x14, x15, x16}; \
|
||||||
* compile-time constants,
|
return vld1q_u8(array); \
|
||||||
* GNU GCC compiles it to ldr, the same as uint8x16_t x = {1,2,3...}.
|
}())
|
||||||
* You should not use this function except for compile-time constants:
|
#endif
|
||||||
* it is not efficient.
|
#ifndef simdjson_make_int8x16_t
|
||||||
*/
|
#define simdjson_make_int8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \
|
||||||
simdjson_inline uint8x16_t make_uint8x16_t(uint8_t x1, uint8_t x2, uint8_t x3, uint8_t x4,
|
x13, x14, x15, x16) \
|
||||||
uint8_t x5, uint8_t x6, uint8_t x7, uint8_t x8,
|
([=]() { \
|
||||||
uint8_t x9, uint8_t x10, uint8_t x11, uint8_t x12,
|
int8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \
|
||||||
uint8_t x13, uint8_t x14, uint8_t x15, uint8_t x16) {
|
x9, x10, x11, x12, x13, x14, x15, x16}; \
|
||||||
// Doing a load like so end ups generating worse code.
|
return vld1q_s8(array); \
|
||||||
// uint8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8,
|
}())
|
||||||
// x9, x10,x11,x12,x13,x14,x15,x16};
|
#endif
|
||||||
// return vld1q_u8(array);
|
|
||||||
uint8x16_t x{};
|
|
||||||
// incredibly, Visual Studio does not allow x[0] = x1
|
|
||||||
x = vsetq_lane_u8(x1, x, 0);
|
|
||||||
x = vsetq_lane_u8(x2, x, 1);
|
|
||||||
x = vsetq_lane_u8(x3, x, 2);
|
|
||||||
x = vsetq_lane_u8(x4, x, 3);
|
|
||||||
x = vsetq_lane_u8(x5, x, 4);
|
|
||||||
x = vsetq_lane_u8(x6, x, 5);
|
|
||||||
x = vsetq_lane_u8(x7, x, 6);
|
|
||||||
x = vsetq_lane_u8(x8, x, 7);
|
|
||||||
x = vsetq_lane_u8(x9, x, 8);
|
|
||||||
x = vsetq_lane_u8(x10, x, 9);
|
|
||||||
x = vsetq_lane_u8(x11, x, 10);
|
|
||||||
x = vsetq_lane_u8(x12, x, 11);
|
|
||||||
x = vsetq_lane_u8(x13, x, 12);
|
|
||||||
x = vsetq_lane_u8(x14, x, 13);
|
|
||||||
x = vsetq_lane_u8(x15, x, 14);
|
|
||||||
x = vsetq_lane_u8(x16, x, 15);
|
|
||||||
return x;
|
|
||||||
}
|
|
||||||
|
|
||||||
simdjson_inline uint8x8_t make_uint8x8_t(uint8_t x1, uint8_t x2, uint8_t x3, uint8_t x4,
|
#ifndef simdjson_make_uint8x8_t
|
||||||
uint8_t x5, uint8_t x6, uint8_t x7, uint8_t x8) {
|
#define simdjson_make_uint8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
|
||||||
uint8x8_t x{};
|
([=]() { \
|
||||||
x = vset_lane_u8(x1, x, 0);
|
uint8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
|
||||||
x = vset_lane_u8(x2, x, 1);
|
return vld1_u8(array); \
|
||||||
x = vset_lane_u8(x3, x, 2);
|
}())
|
||||||
x = vset_lane_u8(x4, x, 3);
|
#endif
|
||||||
x = vset_lane_u8(x5, x, 4);
|
#ifndef simdjson_make_int8x8_t
|
||||||
x = vset_lane_u8(x6, x, 5);
|
#define simdjson_make_int8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
|
||||||
x = vset_lane_u8(x7, x, 6);
|
([=]() { \
|
||||||
x = vset_lane_u8(x8, x, 7);
|
int8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
|
||||||
return x;
|
return vld1_s8(array); \
|
||||||
}
|
}())
|
||||||
|
#endif
|
||||||
// We have to do the same work for make_int8x16_t
|
#ifndef simdjson_make_uint16x8_t
|
||||||
simdjson_inline int8x16_t make_int8x16_t(int8_t x1, int8_t x2, int8_t x3, int8_t x4,
|
#define simdjson_make_uint16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
|
||||||
int8_t x5, int8_t x6, int8_t x7, int8_t x8,
|
([=]() { \
|
||||||
int8_t x9, int8_t x10, int8_t x11, int8_t x12,
|
uint16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
|
||||||
int8_t x13, int8_t x14, int8_t x15, int8_t x16) {
|
return vld1q_u16(array); \
|
||||||
// Doing a load like so end ups generating worse code.
|
}())
|
||||||
// int8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8,
|
#endif
|
||||||
// x9, x10,x11,x12,x13,x14,x15,x16};
|
#ifndef simdjson_make_int16x8_t
|
||||||
// return vld1q_s8(array);
|
#define simdjson_make_int16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
|
||||||
int8x16_t x{};
|
([=]() { \
|
||||||
// incredibly, Visual Studio does not allow x[0] = x1
|
int16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
|
||||||
x = vsetq_lane_s8(x1, x, 0);
|
return vld1q_s16(array); \
|
||||||
x = vsetq_lane_s8(x2, x, 1);
|
}())
|
||||||
x = vsetq_lane_s8(x3, x, 2);
|
#endif
|
||||||
x = vsetq_lane_s8(x4, x, 3);
|
|
||||||
x = vsetq_lane_s8(x5, x, 4);
|
|
||||||
x = vsetq_lane_s8(x6, x, 5);
|
|
||||||
x = vsetq_lane_s8(x7, x, 6);
|
|
||||||
x = vsetq_lane_s8(x8, x, 7);
|
|
||||||
x = vsetq_lane_s8(x9, x, 8);
|
|
||||||
x = vsetq_lane_s8(x10, x, 9);
|
|
||||||
x = vsetq_lane_s8(x11, x, 10);
|
|
||||||
x = vsetq_lane_s8(x12, x, 11);
|
|
||||||
x = vsetq_lane_s8(x13, x, 12);
|
|
||||||
x = vsetq_lane_s8(x14, x, 13);
|
|
||||||
x = vsetq_lane_s8(x15, x, 14);
|
|
||||||
x = vsetq_lane_s8(x16, x, 15);
|
|
||||||
return x;
|
|
||||||
}
|
|
||||||
|
|
||||||
// End of private section with Visual Studio workaround
|
// End of private section with Visual Studio workaround
|
||||||
} // namespace
|
} // namespace
|
||||||
@@ -158,7 +122,7 @@ simdjson_inline int8x16_t make_int8x16_t(int8_t x1, int8_t x2, int8_t x3, int
|
|||||||
// purposes (cutting it down to uint16_t costs performance in some compilers).
|
// purposes (cutting it down to uint16_t costs performance in some compilers).
|
||||||
simdjson_inline uint32_t to_bitmask() const {
|
simdjson_inline uint32_t to_bitmask() const {
|
||||||
#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
|
#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
|
||||||
const uint8x16_t bit_mask = make_uint8x16_t(0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80,
|
const uint8x16_t bit_mask = simdjson_make_uint8x16_t(0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80,
|
||||||
0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80);
|
0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80);
|
||||||
#else
|
#else
|
||||||
const uint8x16_t bit_mask = {0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80,
|
const uint8x16_t bit_mask = {0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80,
|
||||||
@@ -170,7 +134,7 @@ simdjson_inline int8x16_t make_int8x16_t(int8_t x1, int8_t x2, int8_t x3, int
|
|||||||
tmp = vpaddq_u8(tmp, tmp);
|
tmp = vpaddq_u8(tmp, tmp);
|
||||||
return vgetq_lane_u16(vreinterpretq_u16_u8(tmp), 0);
|
return vgetq_lane_u16(vreinterpretq_u16_u8(tmp), 0);
|
||||||
}
|
}
|
||||||
simdjson_inline bool any() const { return vmaxvq_u8(*this) != 0; }
|
simdjson_inline bool any() const { return vmaxvq_u32(vreinterpretq_u32_u8(*this)) != 0; }
|
||||||
};
|
};
|
||||||
|
|
||||||
// Unsigned bytes
|
// Unsigned bytes
|
||||||
@@ -192,7 +156,7 @@ simdjson_inline int8x16_t make_int8x16_t(int8_t x1, int8_t x2, int8_t x3, int
|
|||||||
simdjson_inline simd8(
|
simdjson_inline simd8(
|
||||||
uint8_t v0, uint8_t v1, uint8_t v2, uint8_t v3, uint8_t v4, uint8_t v5, uint8_t v6, uint8_t v7,
|
uint8_t v0, uint8_t v1, uint8_t v2, uint8_t v3, uint8_t v4, uint8_t v5, uint8_t v6, uint8_t v7,
|
||||||
uint8_t v8, uint8_t v9, uint8_t v10, uint8_t v11, uint8_t v12, uint8_t v13, uint8_t v14, uint8_t v15
|
uint8_t v8, uint8_t v9, uint8_t v10, uint8_t v11, uint8_t v12, uint8_t v13, uint8_t v14, uint8_t v15
|
||||||
) : simd8(make_uint8x16_t(
|
) : simd8(simdjson_make_uint8x16_t(
|
||||||
v0, v1, v2, v3, v4, v5, v6, v7,
|
v0, v1, v2, v3, v4, v5, v6, v7,
|
||||||
v8, v9, v10,v11,v12,v13,v14,v15
|
v8, v9, v10,v11,v12,v13,v14,v15
|
||||||
)) {}
|
)) {}
|
||||||
@@ -283,7 +247,7 @@ simdjson_inline int8x16_t make_int8x16_t(int8_t x1, int8_t x2, int8_t x3, int
|
|||||||
uint8x16_t shufmask = vreinterpretq_u8_u64(shufmask64);
|
uint8x16_t shufmask = vreinterpretq_u8_u64(shufmask64);
|
||||||
// we increment by 0x08 the second half of the mask
|
// we increment by 0x08 the second half of the mask
|
||||||
#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
|
#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
|
||||||
uint8x16_t inc = make_uint8x16_t(0, 0, 0, 0, 0, 0, 0, 0, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08);
|
uint8x16_t inc = simdjson_make_uint8x16_t(0, 0, 0, 0, 0, 0, 0, 0, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08);
|
||||||
#else
|
#else
|
||||||
uint8x16_t inc = {0, 0, 0, 0, 0, 0, 0, 0, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08};
|
uint8x16_t inc = {0, 0, 0, 0, 0, 0, 0, 0, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08};
|
||||||
#endif
|
#endif
|
||||||
@@ -313,7 +277,7 @@ simdjson_inline int8x16_t make_int8x16_t(int8_t x1, int8_t x2, int8_t x3, int
|
|||||||
uint8x8_t compactmask2 = vcreate_u8(thintable_epi8[mask2]);
|
uint8x8_t compactmask2 = vcreate_u8(thintable_epi8[mask2]);
|
||||||
// we increment by 0x08 the second half of the mask
|
// we increment by 0x08 the second half of the mask
|
||||||
#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
|
#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
|
||||||
uint8x8_t inc = make_uint8x8_t(0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08);
|
uint8x8_t inc = simdjson_make_uint8x8_t(0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08);
|
||||||
#else
|
#else
|
||||||
uint8x8_t inc = {0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08};
|
uint8x8_t inc = {0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08};
|
||||||
#endif
|
#endif
|
||||||
@@ -368,7 +332,7 @@ simdjson_inline int8x16_t make_int8x16_t(int8_t x1, int8_t x2, int8_t x3, int
|
|||||||
simdjson_inline simd8(
|
simdjson_inline simd8(
|
||||||
int8_t v0, int8_t v1, int8_t v2, int8_t v3, int8_t v4, int8_t v5, int8_t v6, int8_t v7,
|
int8_t v0, int8_t v1, int8_t v2, int8_t v3, int8_t v4, int8_t v5, int8_t v6, int8_t v7,
|
||||||
int8_t v8, int8_t v9, int8_t v10, int8_t v11, int8_t v12, int8_t v13, int8_t v14, int8_t v15
|
int8_t v8, int8_t v9, int8_t v10, int8_t v11, int8_t v12, int8_t v13, int8_t v14, int8_t v15
|
||||||
) : simd8(make_int8x16_t(
|
) : simd8(simdjson_make_int8x16_t(
|
||||||
v0, v1, v2, v3, v4, v5, v6, v7,
|
v0, v1, v2, v3, v4, v5, v6, v7,
|
||||||
v8, v9, v10,v11,v12,v13,v14,v15
|
v8, v9, v10,v11,v12,v13,v14,v15
|
||||||
)) {}
|
)) {}
|
||||||
@@ -486,7 +450,7 @@ simdjson_inline int8x16_t make_int8x16_t(int8_t x1, int8_t x2, int8_t x3, int
|
|||||||
|
|
||||||
simdjson_inline uint64_t to_bitmask() const {
|
simdjson_inline uint64_t to_bitmask() const {
|
||||||
#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
|
#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
|
||||||
const uint8x16_t bit_mask = make_uint8x16_t(
|
const uint8x16_t bit_mask = simdjson_make_uint8x16_t(
|
||||||
0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80,
|
0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80,
|
||||||
0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80
|
0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -20,6 +20,10 @@
|
|||||||
#include "simdjson/ppc64.h"
|
#include "simdjson/ppc64.h"
|
||||||
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(westmere)
|
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(westmere)
|
||||||
#include "simdjson/westmere.h"
|
#include "simdjson/westmere.h"
|
||||||
|
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lsx)
|
||||||
|
#include "simdjson/lsx.h"
|
||||||
|
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lasx)
|
||||||
|
#include "simdjson/lasx.h"
|
||||||
#else
|
#else
|
||||||
#error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
|
#error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ namespace simdjson {
|
|||||||
namespace ppc64 {}
|
namespace ppc64 {}
|
||||||
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(westmere)
|
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(westmere)
|
||||||
namespace westmere {}
|
namespace westmere {}
|
||||||
|
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lsx)
|
||||||
|
namespace lsx {}
|
||||||
|
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lasx)
|
||||||
|
namespace lasx {}
|
||||||
#else
|
#else
|
||||||
#error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
|
#error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -19,6 +19,10 @@
|
|||||||
#include "simdjson/ppc64/implementation.h"
|
#include "simdjson/ppc64/implementation.h"
|
||||||
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(westmere)
|
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(westmere)
|
||||||
#include "simdjson/westmere/implementation.h"
|
#include "simdjson/westmere/implementation.h"
|
||||||
|
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lsx)
|
||||||
|
#include "simdjson/lsx/implementation.h"
|
||||||
|
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lasx)
|
||||||
|
#include "simdjson/lasx/implementation.h"
|
||||||
#else
|
#else
|
||||||
#error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
|
#error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -20,6 +20,10 @@
|
|||||||
#include "simdjson/ppc64/ondemand.h"
|
#include "simdjson/ppc64/ondemand.h"
|
||||||
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(westmere)
|
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(westmere)
|
||||||
#include "simdjson/westmere/ondemand.h"
|
#include "simdjson/westmere/ondemand.h"
|
||||||
|
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lsx)
|
||||||
|
#include "simdjson/lsx/ondemand.h"
|
||||||
|
#elif SIMDJSON_BUILTIN_IMPLEMENTATION_IS(lasx)
|
||||||
|
#include "simdjson/lasx/ondemand.h"
|
||||||
#else
|
#else
|
||||||
#error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
|
#error Unknown SIMDJSON_BUILTIN_IMPLEMENTATION
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -13,6 +13,16 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// C++ 23
|
||||||
|
#if !defined(SIMDJSON_CPLUSPLUS23) && (SIMDJSON_CPLUSPLUS >= 202302L)
|
||||||
|
#define SIMDJSON_CPLUSPLUS23 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// C++ 20
|
||||||
|
#if !defined(SIMDJSON_CPLUSPLUS20) && (SIMDJSON_CPLUSPLUS >= 202002L)
|
||||||
|
#define SIMDJSON_CPLUSPLUS20 1
|
||||||
|
#endif
|
||||||
|
|
||||||
// C++ 17
|
// C++ 17
|
||||||
#if !defined(SIMDJSON_CPLUSPLUS17) && (SIMDJSON_CPLUSPLUS >= 201703L)
|
#if !defined(SIMDJSON_CPLUSPLUS17) && (SIMDJSON_CPLUSPLUS >= 201703L)
|
||||||
#define SIMDJSON_CPLUSPLUS17 1
|
#define SIMDJSON_CPLUSPLUS17 1
|
||||||
@@ -32,4 +42,24 @@
|
|||||||
#error simdjson requires a compiler compliant with the C++11 standard
|
#error simdjson requires a compiler compliant with the C++11 standard
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef SIMDJSON_IF_CONSTEXPR
|
||||||
|
#if SIMDJSON_CPLUSPLUS17
|
||||||
|
#define SIMDJSON_IF_CONSTEXPR if constexpr
|
||||||
|
#else
|
||||||
|
#define SIMDJSON_IF_CONSTEXPR if
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __has_include
|
||||||
|
#if __has_include(<version>)
|
||||||
|
#include <version>
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cpp_concepts
|
||||||
|
#include <utility>
|
||||||
|
#define SIMDJSON_SUPPORTS_DESERIALIZATION 1
|
||||||
|
#else // __cpp_concepts
|
||||||
|
#define SIMDJSON_SUPPORTS_DESERIALIZATION 0
|
||||||
|
#endif
|
||||||
#endif // SIMDJSON_COMPILER_CHECK_H
|
#endif // SIMDJSON_COMPILER_CHECK_H
|
||||||
|
|||||||
@@ -10,18 +10,12 @@
|
|||||||
#include "simdjson/dom/parser.h"
|
#include "simdjson/dom/parser.h"
|
||||||
#include "simdjson/dom/serialization.h"
|
#include "simdjson/dom/serialization.h"
|
||||||
|
|
||||||
// Deprecated API
|
|
||||||
#include "simdjson/dom/jsonparser.h"
|
|
||||||
#include "simdjson/dom/parsedjson.h"
|
|
||||||
#include "simdjson/dom/parsedjson_iterator.h"
|
|
||||||
|
|
||||||
// Inline functions
|
// Inline functions
|
||||||
#include "simdjson/dom/array-inl.h"
|
#include "simdjson/dom/array-inl.h"
|
||||||
#include "simdjson/dom/document_stream-inl.h"
|
#include "simdjson/dom/document_stream-inl.h"
|
||||||
#include "simdjson/dom/document-inl.h"
|
#include "simdjson/dom/document-inl.h"
|
||||||
#include "simdjson/dom/element-inl.h"
|
#include "simdjson/dom/element-inl.h"
|
||||||
#include "simdjson/dom/object-inl.h"
|
#include "simdjson/dom/object-inl.h"
|
||||||
#include "simdjson/dom/parsedjson_iterator-inl.h"
|
|
||||||
#include "simdjson/dom/parser-inl.h"
|
#include "simdjson/dom/parser-inl.h"
|
||||||
#include "simdjson/internal/tape_ref-inl.h"
|
#include "simdjson/internal/tape_ref-inl.h"
|
||||||
#include "simdjson/dom/serialization-inl.h"
|
#include "simdjson/dom/serialization-inl.h"
|
||||||
|
|||||||
@@ -123,6 +123,10 @@ inline simdjson_result<element> array::at(size_t index) const noexcept {
|
|||||||
return INDEX_OUT_OF_BOUNDS;
|
return INDEX_OUT_OF_BOUNDS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline array::operator element() const noexcept {
|
||||||
|
return element(tape);
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// array::iterator inline implementation
|
// array::iterator inline implementation
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -19,11 +19,14 @@ public:
|
|||||||
public:
|
public:
|
||||||
using value_type = element;
|
using value_type = element;
|
||||||
using difference_type = std::ptrdiff_t;
|
using difference_type = std::ptrdiff_t;
|
||||||
|
using pointer = void;
|
||||||
|
using reference = value_type;
|
||||||
|
using iterator_category = std::forward_iterator_tag;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the actual value
|
* Get the actual value
|
||||||
*/
|
*/
|
||||||
inline value_type operator*() const noexcept;
|
inline reference operator*() const noexcept;
|
||||||
/**
|
/**
|
||||||
* Get the next value.
|
* Get the next value.
|
||||||
*
|
*
|
||||||
@@ -123,6 +126,11 @@ public:
|
|||||||
*/
|
*/
|
||||||
inline simdjson_result<element> at(size_t index) const noexcept;
|
inline simdjson_result<element> at(size_t index) const noexcept;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implicitly convert object to element
|
||||||
|
*/
|
||||||
|
inline operator element() const noexcept;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
simdjson_inline array(const internal::tape_ref &tape) noexcept;
|
simdjson_inline array(const internal::tape_ref &tape) noexcept;
|
||||||
internal::tape_ref tape;
|
internal::tape_ref tape;
|
||||||
|
|||||||
@@ -223,7 +223,11 @@ simdjson_inline std::string_view document_stream::iterator::source() const noexc
|
|||||||
return std::string_view(start, next_doc_index - current_index() + 1);
|
return std::string_view(start, next_doc_index - current_index() + 1);
|
||||||
} else {
|
} else {
|
||||||
size_t next_doc_index = stream->batch_start + stream->parser->implementation->structural_indexes[stream->parser->implementation->next_structural_index];
|
size_t next_doc_index = stream->batch_start + stream->parser->implementation->structural_indexes[stream->parser->implementation->next_structural_index];
|
||||||
return std::string_view(reinterpret_cast<const char*>(stream->buf) + current_index(), next_doc_index - current_index() - 1);
|
size_t svlen = next_doc_index - current_index();
|
||||||
|
while(svlen > 1 && (std::isspace(start[svlen-1]) || start[svlen-1] == '\0')) {
|
||||||
|
svlen--;
|
||||||
|
}
|
||||||
|
return std::string_view(start, svlen);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -224,8 +224,7 @@ private:
|
|||||||
* Parse the next document found in the buffer previously given to document_stream.
|
* Parse the next document found in the buffer previously given to document_stream.
|
||||||
*
|
*
|
||||||
* The content should be a valid JSON document encoded as UTF-8. If there is a
|
* The content should be a valid JSON document encoded as UTF-8. If there is a
|
||||||
* UTF-8 BOM, the caller is responsible for omitting it, UTF-8 BOM are
|
* UTF-8 BOM, the parser skips it.
|
||||||
* discouraged.
|
|
||||||
*
|
*
|
||||||
* You do NOT need to pre-allocate a parser. This function takes care of
|
* You do NOT need to pre-allocate a parser. This function takes care of
|
||||||
* pre-allocating a capacity defined by the batch_size defined when creating the
|
* pre-allocating a capacity defined by the batch_size defined when creating the
|
||||||
|
|||||||
@@ -375,6 +375,23 @@ inline simdjson_result<element> element::operator[](const char *key) const noexc
|
|||||||
return at_key(key);
|
return at_key(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline bool is_pointer_well_formed(std::string_view json_pointer) noexcept {
|
||||||
|
if (simdjson_unlikely(json_pointer[0] != '/')) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
size_t escape = json_pointer.find('~');
|
||||||
|
if (escape == std::string_view::npos) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (escape == json_pointer.size() - 1) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (json_pointer[escape + 1] != '0' && json_pointer[escape + 1] != '1') {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
inline simdjson_result<element> element::at_pointer(std::string_view json_pointer) const noexcept {
|
inline simdjson_result<element> element::at_pointer(std::string_view json_pointer) const noexcept {
|
||||||
SIMDJSON_DEVELOPMENT_ASSERT(tape.usable()); // https://github.com/simdjson/simdjson/issues/1914
|
SIMDJSON_DEVELOPMENT_ASSERT(tape.usable()); // https://github.com/simdjson/simdjson/issues/1914
|
||||||
switch (tape.tape_ref_type()) {
|
switch (tape.tape_ref_type()) {
|
||||||
@@ -383,7 +400,10 @@ inline simdjson_result<element> element::at_pointer(std::string_view json_pointe
|
|||||||
case internal::tape_type::START_ARRAY:
|
case internal::tape_type::START_ARRAY:
|
||||||
return array(tape).at_pointer(json_pointer);
|
return array(tape).at_pointer(json_pointer);
|
||||||
default: {
|
default: {
|
||||||
if(!json_pointer.empty()) { // a non-empty string is invalid on an atom
|
if (!json_pointer.empty()) { // a non-empty string can be invalid, or accessing a primitive (issue 2154)
|
||||||
|
if (is_pointer_well_formed(json_pointer)) {
|
||||||
|
return NO_SUCH_FIELD;
|
||||||
|
}
|
||||||
return INVALID_JSON_POINTER;
|
return INVALID_JSON_POINTER;
|
||||||
}
|
}
|
||||||
// an empty string means that we return the current node
|
// an empty string means that we return the current node
|
||||||
@@ -410,6 +430,12 @@ inline simdjson_result<element> element::at_key(std::string_view key) const noex
|
|||||||
inline simdjson_result<element> element::at_key_case_insensitive(std::string_view key) const noexcept {
|
inline simdjson_result<element> element::at_key_case_insensitive(std::string_view key) const noexcept {
|
||||||
return get<object>().at_key_case_insensitive(key);
|
return get<object>().at_key_case_insensitive(key);
|
||||||
}
|
}
|
||||||
|
inline bool element::operator<(const element &other) const noexcept {
|
||||||
|
return tape.json_index < other.tape.json_index;
|
||||||
|
}
|
||||||
|
inline bool element::operator==(const element &other) const noexcept {
|
||||||
|
return tape.json_index == other.tape.json_index;
|
||||||
|
}
|
||||||
|
|
||||||
inline bool element::dump_raw_tape(std::ostream &out) const noexcept {
|
inline bool element::dump_raw_tape(std::ostream &out) const noexcept {
|
||||||
SIMDJSON_DEVELOPMENT_ASSERT(tape.usable()); // https://github.com/simdjson/simdjson/issues/1914
|
SIMDJSON_DEVELOPMENT_ASSERT(tape.usable()); // https://github.com/simdjson/simdjson/issues/1914
|
||||||
|
|||||||
@@ -211,7 +211,11 @@ public:
|
|||||||
inline simdjson_result<T> get() const noexcept {
|
inline simdjson_result<T> get() const noexcept {
|
||||||
// Unless the simdjson library provides an inline implementation, calling this method should
|
// Unless the simdjson library provides an inline implementation, calling this method should
|
||||||
// immediately fail.
|
// immediately fail.
|
||||||
static_assert(!sizeof(T), "The get method with given type is not implemented by the simdjson library.");
|
static_assert(!sizeof(T), "The get method with given type is not implemented by the simdjson library. "
|
||||||
|
"The supported types are Boolean (bool), numbers (double, uint64_t, int64_t), "
|
||||||
|
"strings (std::string_view, const char *), arrays (dom::array) and objects (dom::object). "
|
||||||
|
"We recommend you use get_double(), get_bool(), get_uint64(), get_int64(), "
|
||||||
|
"get_object(), get_array() or get_string() instead of the get template.");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -289,7 +293,7 @@ public:
|
|||||||
*
|
*
|
||||||
* @return The integer value.
|
* @return The integer value.
|
||||||
* @exception simdjson_error(INCORRECT_TYPE) if the JSON element is not an integer
|
* @exception simdjson_error(INCORRECT_TYPE) if the JSON element is not an integer
|
||||||
* @exception simdjson_error(NUMBER_OUT_OF_RANGE) if the integer doesn't fit in 64 bits or is negative
|
* @exception simdjson_error(NUMBER_OUT_OF_RANGE) if the integer does not fit in 64 bits or is negative
|
||||||
*/
|
*/
|
||||||
inline operator uint64_t() const noexcept(false);
|
inline operator uint64_t() const noexcept(false);
|
||||||
/**
|
/**
|
||||||
@@ -297,7 +301,7 @@ public:
|
|||||||
*
|
*
|
||||||
* @return The integer value.
|
* @return The integer value.
|
||||||
* @exception simdjson_error(INCORRECT_TYPE) if the JSON element is not an integer
|
* @exception simdjson_error(INCORRECT_TYPE) if the JSON element is not an integer
|
||||||
* @exception simdjson_error(NUMBER_OUT_OF_RANGE) if the integer doesn't fit in 64 bits
|
* @exception simdjson_error(NUMBER_OUT_OF_RANGE) if the integer does not fit in 64 bits
|
||||||
*/
|
*/
|
||||||
inline operator int64_t() const noexcept(false);
|
inline operator int64_t() const noexcept(false);
|
||||||
/**
|
/**
|
||||||
@@ -305,7 +309,6 @@ public:
|
|||||||
*
|
*
|
||||||
* @return The double value.
|
* @return The double value.
|
||||||
* @exception simdjson_error(INCORRECT_TYPE) if the JSON element is not a number
|
* @exception simdjson_error(INCORRECT_TYPE) if the JSON element is not a number
|
||||||
* @exception simdjson_error(NUMBER_OUT_OF_RANGE) if the integer doesn't fit in 64 bits or is negative
|
|
||||||
*/
|
*/
|
||||||
inline operator double() const noexcept(false);
|
inline operator double() const noexcept(false);
|
||||||
/**
|
/**
|
||||||
@@ -451,6 +454,22 @@ public:
|
|||||||
*/
|
*/
|
||||||
inline simdjson_result<element> at_key_case_insensitive(std::string_view key) const noexcept;
|
inline simdjson_result<element> at_key_case_insensitive(std::string_view key) const noexcept;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* operator< defines a total order for element allowing to use them in
|
||||||
|
* ordered C++ STL containers
|
||||||
|
*
|
||||||
|
* @return TRUE if the key appears before the other one in the tape
|
||||||
|
*/
|
||||||
|
inline bool operator<(const element &other) const noexcept;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* operator== allows to verify if two element values reference the
|
||||||
|
* same JSON item
|
||||||
|
*
|
||||||
|
* @return TRUE if the two values references the same JSON element
|
||||||
|
*/
|
||||||
|
inline bool operator==(const element &other) const noexcept;
|
||||||
|
|
||||||
/** @private for debugging. Prints out the root element. */
|
/** @private for debugging. Prints out the root element. */
|
||||||
inline bool dump_raw_tape(std::ostream &out) const noexcept;
|
inline bool dump_raw_tape(std::ostream &out) const noexcept;
|
||||||
|
|
||||||
|
|||||||
@@ -1,121 +0,0 @@
|
|||||||
// TODO Remove this -- deprecated API and files
|
|
||||||
|
|
||||||
#ifndef SIMDJSON_DOM_JSONPARSER_H
|
|
||||||
#define SIMDJSON_DOM_JSONPARSER_H
|
|
||||||
|
|
||||||
#include "simdjson/dom/base.h"
|
|
||||||
#include "simdjson/dom/parser.h"
|
|
||||||
#include "simdjson/dom/element.h"
|
|
||||||
|
|
||||||
#include "simdjson/dom/parser-inl.h"
|
|
||||||
|
|
||||||
namespace simdjson {
|
|
||||||
|
|
||||||
//
|
|
||||||
// C API (json_parse and build_parsed_json) declarations
|
|
||||||
//
|
|
||||||
|
|
||||||
#ifndef SIMDJSON_DISABLE_DEPRECATED_API
|
|
||||||
[[deprecated("Use parser.parse() instead")]]
|
|
||||||
inline int json_parse(const uint8_t *buf, size_t len, dom::parser &parser, bool realloc_if_needed = true) noexcept {
|
|
||||||
error_code code = parser.parse(buf, len, realloc_if_needed).error();
|
|
||||||
// The deprecated json_parse API is a signal that the user plans to *use* the error code / valid
|
|
||||||
// bits in the parser instead of heeding the result code. The normal parser unsets those in
|
|
||||||
// anticipation of making the error code ephemeral.
|
|
||||||
// Here we put the code back into the parser, until we've removed this method.
|
|
||||||
parser.valid = code == SUCCESS;
|
|
||||||
parser.error = code;
|
|
||||||
return code;
|
|
||||||
}
|
|
||||||
[[deprecated("Use parser.parse() instead")]]
|
|
||||||
inline int json_parse(const char *buf, size_t len, dom::parser &parser, bool realloc_if_needed = true) noexcept {
|
|
||||||
error_code code = parser.parse(buf, len, realloc_if_needed).error();
|
|
||||||
// The deprecated json_parse API is a signal that the user plans to *use* the error code / valid
|
|
||||||
// bits in the parser instead of heeding the result code. The normal parser unsets those in
|
|
||||||
// anticipation of making the error code ephemeral.
|
|
||||||
// Here we put the code back into the parser, until we've removed this method.
|
|
||||||
parser.valid = code == SUCCESS;
|
|
||||||
parser.error = code;
|
|
||||||
return code;
|
|
||||||
}
|
|
||||||
[[deprecated("Use parser.parse() instead")]]
|
|
||||||
inline int json_parse(const std::string &s, dom::parser &parser, bool realloc_if_needed = true) noexcept {
|
|
||||||
error_code code = parser.parse(s.data(), s.length(), realloc_if_needed).error();
|
|
||||||
// The deprecated json_parse API is a signal that the user plans to *use* the error code / valid
|
|
||||||
// bits in the parser instead of heeding the result code. The normal parser unsets those in
|
|
||||||
// anticipation of making the error code ephemeral.
|
|
||||||
// Here we put the code back into the parser, until we've removed this method.
|
|
||||||
parser.valid = code == SUCCESS;
|
|
||||||
parser.error = code;
|
|
||||||
return code;
|
|
||||||
}
|
|
||||||
[[deprecated("Use parser.parse() instead")]]
|
|
||||||
inline int json_parse(const padded_string &s, dom::parser &parser) noexcept {
|
|
||||||
error_code code = parser.parse(s).error();
|
|
||||||
// The deprecated json_parse API is a signal that the user plans to *use* the error code / valid
|
|
||||||
// bits in the parser instead of heeding the result code. The normal parser unsets those in
|
|
||||||
// anticipation of making the error code ephemeral.
|
|
||||||
// Here we put the code back into the parser, until we've removed this method.
|
|
||||||
parser.valid = code == SUCCESS;
|
|
||||||
parser.error = code;
|
|
||||||
return code;
|
|
||||||
}
|
|
||||||
|
|
||||||
[[deprecated("Use parser.parse() instead")]]
|
|
||||||
simdjson_warn_unused inline dom::parser build_parsed_json(const uint8_t *buf, size_t len, bool realloc_if_needed = true) noexcept {
|
|
||||||
dom::parser parser;
|
|
||||||
error_code code = parser.parse(buf, len, realloc_if_needed).error();
|
|
||||||
// The deprecated json_parse API is a signal that the user plans to *use* the error code / valid
|
|
||||||
// bits in the parser instead of heeding the result code. The normal parser unsets those in
|
|
||||||
// anticipation of making the error code ephemeral.
|
|
||||||
// Here we put the code back into the parser, until we've removed this method.
|
|
||||||
parser.valid = code == SUCCESS;
|
|
||||||
parser.error = code;
|
|
||||||
return parser;
|
|
||||||
}
|
|
||||||
[[deprecated("Use parser.parse() instead")]]
|
|
||||||
simdjson_warn_unused inline dom::parser build_parsed_json(const char *buf, size_t len, bool realloc_if_needed = true) noexcept {
|
|
||||||
dom::parser parser;
|
|
||||||
error_code code = parser.parse(buf, len, realloc_if_needed).error();
|
|
||||||
// The deprecated json_parse API is a signal that the user plans to *use* the error code / valid
|
|
||||||
// bits in the parser instead of heeding the result code. The normal parser unsets those in
|
|
||||||
// anticipation of making the error code ephemeral.
|
|
||||||
// Here we put the code back into the parser, until we've removed this method.
|
|
||||||
parser.valid = code == SUCCESS;
|
|
||||||
parser.error = code;
|
|
||||||
return parser;
|
|
||||||
}
|
|
||||||
[[deprecated("Use parser.parse() instead")]]
|
|
||||||
simdjson_warn_unused inline dom::parser build_parsed_json(const std::string &s, bool realloc_if_needed = true) noexcept {
|
|
||||||
dom::parser parser;
|
|
||||||
error_code code = parser.parse(s.data(), s.length(), realloc_if_needed).error();
|
|
||||||
// The deprecated json_parse API is a signal that the user plans to *use* the error code / valid
|
|
||||||
// bits in the parser instead of heeding the result code. The normal parser unsets those in
|
|
||||||
// anticipation of making the error code ephemeral.
|
|
||||||
// Here we put the code back into the parser, until we've removed this method.
|
|
||||||
parser.valid = code == SUCCESS;
|
|
||||||
parser.error = code;
|
|
||||||
return parser;
|
|
||||||
}
|
|
||||||
[[deprecated("Use parser.parse() instead")]]
|
|
||||||
simdjson_warn_unused inline dom::parser build_parsed_json(const padded_string &s) noexcept {
|
|
||||||
dom::parser parser;
|
|
||||||
error_code code = parser.parse(s).error();
|
|
||||||
// The deprecated json_parse API is a signal that the user plans to *use* the error code / valid
|
|
||||||
// bits in the parser instead of heeding the result code. The normal parser unsets those in
|
|
||||||
// anticipation of making the error code ephemeral.
|
|
||||||
// Here we put the code back into the parser, until we've removed this method.
|
|
||||||
parser.valid = code == SUCCESS;
|
|
||||||
parser.error = code;
|
|
||||||
return parser;
|
|
||||||
}
|
|
||||||
#endif // SIMDJSON_DISABLE_DEPRECATED_API
|
|
||||||
|
|
||||||
/** @private We do not want to allow implicit conversion from C string to std::string. */
|
|
||||||
int json_parse(const char *buf, dom::parser &parser) noexcept = delete;
|
|
||||||
/** @private We do not want to allow implicit conversion from C string to std::string. */
|
|
||||||
dom::parser build_parsed_json(const char *buf) noexcept = delete;
|
|
||||||
|
|
||||||
} // namespace simdjson
|
|
||||||
|
|
||||||
#endif // SIMDJSON_DOM_JSONPARSER_H
|
|
||||||
@@ -153,6 +153,10 @@ inline simdjson_result<element> object::at_key_case_insensitive(std::string_view
|
|||||||
return NO_SUCH_FIELD;
|
return NO_SUCH_FIELD;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline object::operator element() const noexcept {
|
||||||
|
return element(tape);
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// object::iterator inline implementation
|
// object::iterator inline implementation
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -18,13 +18,16 @@ public:
|
|||||||
|
|
||||||
class iterator {
|
class iterator {
|
||||||
public:
|
public:
|
||||||
using value_type = key_value_pair;
|
using value_type = const key_value_pair;
|
||||||
using difference_type = std::ptrdiff_t;
|
using difference_type = std::ptrdiff_t;
|
||||||
|
using pointer = void;
|
||||||
|
using reference = value_type;
|
||||||
|
using iterator_category = std::forward_iterator_tag;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the actual key/value pair
|
* Get the actual key/value pair
|
||||||
*/
|
*/
|
||||||
inline const value_type operator*() const noexcept;
|
inline reference operator*() const noexcept;
|
||||||
/**
|
/**
|
||||||
* Get the next key/value pair.
|
* Get the next key/value pair.
|
||||||
*
|
*
|
||||||
@@ -197,6 +200,11 @@ public:
|
|||||||
*/
|
*/
|
||||||
inline simdjson_result<element> at_key_case_insensitive(std::string_view key) const noexcept;
|
inline simdjson_result<element> at_key_case_insensitive(std::string_view key) const noexcept;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implicitly convert object to element
|
||||||
|
*/
|
||||||
|
inline operator element() const noexcept;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
simdjson_inline object(const internal::tape_ref &tape) noexcept;
|
simdjson_inline object(const internal::tape_ref &tape) noexcept;
|
||||||
|
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
// TODO Remove this -- deprecated API and files
|
|
||||||
|
|
||||||
#ifndef SIMDJSON_DOM_PARSEDJSON_H
|
|
||||||
#define SIMDJSON_DOM_PARSEDJSON_H
|
|
||||||
|
|
||||||
#include "simdjson/dom/base.h"
|
|
||||||
|
|
||||||
namespace simdjson {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use `dom::parser` instead.
|
|
||||||
*/
|
|
||||||
using ParsedJson [[deprecated("Use dom::parser instead")]] = dom::parser;
|
|
||||||
|
|
||||||
} // namespace simdjson
|
|
||||||
|
|
||||||
#endif // SIMDJSON_DOM_PARSEDJSON_H
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user