mirror of
https://github.com/simdjson/simdjson
synced 2026-06-08 17:27:07 +00:00
Compare commits
392 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b7b01fd788 | |||
| 2c07a242ea | |||
| a63c77a977 | |||
| 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 | |||
| f043db4dca | |||
| e3bd0828d1 | |||
| 9408298e0e | |||
| 573bbac2d2 | |||
| ac78c625df | |||
| 390a66c6e8 | |||
| 210e0a56a1 | |||
| 084f662f32 | |||
| c878ff2500 | |||
| 06afe9ecb3 | |||
| e658502adb | |||
| 6e7d415040 | |||
| 2ccd5b9c97 | |||
| 1cdcbf79b3 | |||
| 7013ed98cc | |||
| b383c717d7 | |||
| b8743bced0 | |||
| ae9ba2bed2 | |||
| 939844d79f | |||
| 4f4e81668e | |||
| bb54946b78 | |||
| 4dec6ed5a7 | |||
| 1dfd48195d | |||
| 23afc6b695 | |||
| e3cac71afe | |||
| cbe562c1d5 | |||
| 30437d0ff6 | |||
| 1e97af7dfb | |||
| 80bc9e5051 | |||
| a74e87df17 | |||
| 3274299647 | |||
| 22ca25faa6 | |||
| 37399fd41b | |||
| a170145d5b | |||
| 7d1d635883 | |||
| ddfa8ae928 | |||
| 25dfb078c7 | |||
| 9f0710e3ad | |||
| 19b9cd9b05 | |||
| 7540248396 | |||
| ab09e96de9 | |||
| 66252e4925 | |||
| 944778c186 | |||
| 62868a2f53 | |||
| 3c446c551b | |||
| efe3d4b7d7 | |||
| 28db262b47 | |||
| bf076bfb5f | |||
| 7bf1ecff9e | |||
| e25a40facf | |||
| a442842f0d | |||
| 421ed4f390 | |||
| 7dff5fa37c | |||
| 9a0527c380 | |||
| b160cf0610 | |||
| 553ee69b7c | |||
| bf70cd0ebf | |||
| cf0551edf5 | |||
| ddb094d550 | |||
| 975fdda03c | |||
| c5c43e9c7f | |||
| 031ee32969 | |||
| b613326d69 | |||
| 53dad74d8e | |||
| e4da19f5cf | |||
| 342b58986a | |||
| 7edc475886 | |||
| d2f8e84fc1 | |||
| 08000518cb | |||
| 90040d96a5 | |||
| 2934892c0b | |||
| 92174c927d | |||
| b399c0165e | |||
| 445ae024ba | |||
| 65f9822542 | |||
| 74bb7b2533 | |||
| fd97288561 | |||
| 1da0d8ac65 | |||
| 85661a2901 | |||
| 3fcdb65d88 | |||
| 8b00d91a2c | |||
| 7db3f97ba8 | |||
| 412a8f7c4d | |||
| d4b31c9feb | |||
| ecdcf276b2 | |||
| 6d92563280 | |||
| 0998233d58 | |||
| cb735818ec | |||
| 41ee548e3f | |||
| e9d5d5088a | |||
| 78151e80e5 | |||
| 083a5d7351 | |||
| 25fcc8b432 | |||
| a9c120f779 | |||
| b1487e34c3 | |||
| 2a68a32012 | |||
| 21a2ccaeb8 | |||
| 6cbb6ac89b | |||
| e9f0f1bb9b | |||
| 7ef1ebd4fb | |||
| 8de540e267 | |||
| ebc51fbd1a | |||
| 84a31c1615 | |||
| f77ac963f4 | |||
| ae3d912f8d | |||
| abf3d7d440 | |||
| 3c313b8530 | |||
| f435fddda1 | |||
| 14d927128b | |||
| 48152a0326 | |||
| b5cf53232c | |||
| b3d0b732e6 | |||
| 3c29f40f2f | |||
| 4a89d79984 | |||
| 9cb639dcd7 | |||
| 4699dd0ce2 | |||
| cfd337bb50 | |||
| 9bef628982 | |||
| 59025bc8b1 | |||
| ffe96dde19 | |||
| f9664cf184 | |||
| 830323f383 | |||
| eb8e15d9c0 | |||
| 3571f3a8d0 | |||
| 4b13020d65 | |||
| 75c6c950e5 | |||
| 5ad7698af1 | |||
| f6f359d3eb | |||
| 185e157e0c | |||
| 3f3f6cde7c | |||
| 005054916d | |||
| 338224849d | |||
| ada52641b4 | |||
| ede9d57f22 | |||
| 7bf33f6c8a | |||
| d62b789cb3 | |||
| 33dbd44098 | |||
| e0dcf8adc9 | |||
| 34dcd33a88 | |||
| 17a1a8e187 | |||
| 77ad00b63c | |||
| 25e7f1765a | |||
| 8d01255ceb | |||
| 8ec016b093 | |||
| 9e726b9856 | |||
| 312f1f26d3 | |||
| ba50571d66 | |||
| 4a587cb898 | |||
| bdf9123c92 | |||
| 6e4c29b7c5 | |||
| ec0b48b772 | |||
| d65acbd47b | |||
| 75240ad8e1 | |||
| 3efb44dc0f | |||
| 5c5cd5b42d | |||
| 12a1b6db53 | |||
| 37e87f6f99 | |||
| cd13b02bf0 | |||
| 624174d916 | |||
| 8a247f1321 | |||
| 7aa35bffd3 | |||
| d6c910686b | |||
| 22cc523fd4 | |||
| 3177cd1b5d | |||
| 63d9ce3c58 | |||
| 8e8180560d | |||
| 1594af5d5d | |||
| b207338365 | |||
| 68be9c2170 | |||
| 5347771091 | |||
| 8bf8315651 | |||
| 269ae7ad6b | |||
| 2aa91f741f | |||
| 5430544bbb | |||
| 7b55f16682 | |||
| d8fec59e85 | |||
| 57b6034a0c | |||
| 7500d7bb4f | |||
| 82c9876aec | |||
| b9234be80f | |||
| 0a2563e13e | |||
| 727ec73c33 | |||
| 9a55a830ec | |||
| 8c89ae0cd9 | |||
| 8c71ca1b1d | |||
| c72b4bc0f4 | |||
| 8a26cb3c8e | |||
| bf2ba5c675 | |||
| f151300a76 | |||
| 9aa3563d99 | |||
| 9444c1a04f | |||
| 883901a81b | |||
| a2c96c9cca | |||
| c63da0ef2c | |||
| c61cefda85 | |||
| bffcbb444d | |||
| 0b2891aaab | |||
| 983fb41802 | |||
| 0d2455029d | |||
| e94f027310 | |||
| 2b766e4c09 | |||
| a5db75e1a6 | |||
| 4bd66cb891 | |||
| 960a7ebba1 | |||
| d520062f8e | |||
| db08d78ed0 | |||
| 46292b8d4b | |||
| 46241287c6 | |||
| 137cb14bcc | |||
| 5e6be3ed7a | |||
| c6ab52eebb |
@@ -0,0 +1,46 @@
|
|||||||
|
CompileFlags:
|
||||||
|
CompilationDatabase: build
|
||||||
|
Add:
|
||||||
|
- -Werror -Wall -Wextra -Weffc++ -Wsign-compare -Wshadow -Wwrite-strings -Wpointer-arith -Winit-self -Wconversion -Wno-sign-conversion
|
||||||
|
- -Wundefined-inline
|
||||||
|
Diagnostics:
|
||||||
|
Suppress:
|
||||||
|
- misc-unused-alias-decls
|
||||||
|
- misc-unused-using-decls
|
||||||
|
- misc-definitions-in-headers # TODO fix and remove these violations
|
||||||
|
---
|
||||||
|
If:
|
||||||
|
PathMatch:
|
||||||
|
- include/.*
|
||||||
|
- src/.*
|
||||||
|
PathExclude:
|
||||||
|
- include/simdjson.h
|
||||||
|
- src/simdjson.cpp
|
||||||
|
CompileFlags:
|
||||||
|
Add:
|
||||||
|
- -Wno-unneeded-internal-declaration
|
||||||
|
- -Wno-undefined-internal # TODO fix and remove these violations
|
||||||
|
- -Wno-unused-function
|
||||||
|
- -Wno-unused-const-variable
|
||||||
|
Diagnostics:
|
||||||
|
Suppress:
|
||||||
|
- pp_including_mainfile_in_preamble
|
||||||
|
---
|
||||||
|
# Amalgamated files that require or partly define an implementation
|
||||||
|
If:
|
||||||
|
PathMatch:
|
||||||
|
- .*/(arm64|fallback|haswell|icelake|ppc64|westmere)/begin.h
|
||||||
|
- .*/generic/.*
|
||||||
|
Diagnostics:
|
||||||
|
Suppress:
|
||||||
|
- pragma_attribute_no_pop_eof
|
||||||
|
---
|
||||||
|
# clang has a bad time detecting the push/pop together in src/ for some reason
|
||||||
|
If:
|
||||||
|
PathMatch:
|
||||||
|
- include/simdjson/.*/end.h
|
||||||
|
- src/(arm64|fallback|haswell|icelake|ppc64|westmere).cpp
|
||||||
|
Diagnostics:
|
||||||
|
Suppress:
|
||||||
|
- pragma_attribute_no_pop_eof
|
||||||
|
- pragma_attribute_stack_mismatch
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
# https://editorconfig.org/
|
||||||
|
root = true
|
||||||
|
# Conservatively avoid changing defaults for other file types, e.g. raw json files for test cases,
|
||||||
|
# Makefiles, etc.
|
||||||
|
[*.{cpp,h,md}]
|
||||||
|
charset = utf-8
|
||||||
|
end_of_line = lf
|
||||||
|
indent_size = 2
|
||||||
|
indent_style = space
|
||||||
|
insert_final_newline = true
|
||||||
|
tab_width = 2
|
||||||
|
trim_trailing_whitespace = true
|
||||||
@@ -78,6 +78,7 @@
|
|||||||
|
|
||||||
.gitattributes export-ignore
|
.gitattributes export-ignore
|
||||||
.gitignore export-ignore
|
.gitignore export-ignore
|
||||||
|
.editorconfig export-ignore
|
||||||
|
|
||||||
# Sources
|
# Sources
|
||||||
*.c text eol=lf diff=c
|
*.c text eol=lf diff=c
|
||||||
|
|||||||
@@ -12,24 +12,26 @@ Before submitting an issue, please ensure that you have read the documentation:
|
|||||||
* Basics is an overview of how to use simdjson and its APIs: https://github.com/simdjson/simdjson/blob/master/doc/basics.md
|
* Basics is an overview of how to use simdjson and its APIs: https://github.com/simdjson/simdjson/blob/master/doc/basics.md
|
||||||
* Performance shows some more advanced scenarios and how to tune for them: https://github.com/simdjson/simdjson/blob/master/doc/performance.md
|
* Performance shows some more advanced scenarios and how to tune for them: https://github.com/simdjson/simdjson/blob/master/doc/performance.md
|
||||||
* Contributing: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md
|
* Contributing: https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md
|
||||||
* We follow the [JSON specification as described by RFC 8259](https://www.rfc-editor.org/rfc/rfc8259.txt) (T. Bray, 2017).
|
* We follow the [JSON specification as described by RFC 8259](https://www.rfc-editor.org/rfc/rfc8259.txt) (T. Bray, 2017). If you wish to support features that are not part of RFC 8259, then you should not refer to your issue as a bug.
|
||||||
|
|
||||||
|
|
||||||
**Describe the bug**
|
**Describe the bug**
|
||||||
A clear and concise description of what the bug is.
|
A clear and concise description of what the bug is. A bug is a failure to build with normal compiler settings or a misbehaviour: when running the code, you get a result that differs from the expected result from our documentation.
|
||||||
|
|
||||||
A compiler or static-analyzer warning is not a bug.
|
A compiler or static-analyzer warning is not a bug. It is possible with tools such as Visual Studio to require that rarely enabled warnings are considered errors. Do not report such cases as bugs. We do accept pull requests if you want to silence warnings issued by code analyzers, however.
|
||||||
|
|
||||||
We are committed to providing good documentation. We accept the lack of documentation or a misleading documentation as a bug (a 'documentation bug').
|
We are committed to providing good documentation. We accept the lack of documentation or a misleading documentation as a bug (a 'documentation bug').
|
||||||
|
|
||||||
|
An unexpected poor software performance can be accepted as a bug (a 'performance bug').
|
||||||
|
|
||||||
We accept the identification of an issue by a sanitizer or some checker tool (e.g., valgrind) as a bug, but you must first ensure that it is not a false positive.
|
We accept the identification of an issue by a sanitizer or some checker tool (e.g., valgrind) as a bug, but you must first ensure that it is not a false positive.
|
||||||
|
|
||||||
We recommend that you run your tests using different optimization levels.
|
We recommend that you run your tests using different optimization levels. In particular, we recommend your run tests with the simdjson library and you code compiled in debug mode. The simdjson then sets the SIMDJSON_DEVELOPMENT_CHECKS macro to 1, and this triggers additional checks on your code and on the internals of the library. If possible, we recommend that you run tests with sanitizers (e.g., see [No more leaks with sanitize flags in gcc and clang](https://lemire.me/blog/2016/04/20/no-more-leaks-with-sanitize-flags-in-gcc-and-clang/)). You can compile the library with sanitizers for debugging purposes (e.g., set SIMDJSON_SANITIZE to ON using CMake), but you should also turn on sanitizers on your own code. You may also use tools like valgrind or the commercial equivalent.
|
||||||
|
|
||||||
Before reporting a bug, please ensure that you have read our documentation.
|
Before reporting a bug, please ensure that you have read our documentation.
|
||||||
|
|
||||||
**To Reproduce**
|
**To Reproduce**
|
||||||
Steps to reproduce the behaviour: provide a code sample if possible.
|
Steps to reproduce the behaviour: provide a code sample if possible. Please provide a complete test with data. Remember that a bug is either a failure to build or an unexpected result when running the code.
|
||||||
|
|
||||||
If we cannot reproduce the issue, then we cannot address it. Note that a stack trace from your own program is not enough. A sample of your source code is insufficient: please provide a complete test for us to reproduce the issue. Please reduce the issue: use as small and as simple an example of the bug as possible.
|
If we cannot reproduce the issue, then we cannot address it. Note that a stack trace from your own program is not enough. A sample of your source code is insufficient: please provide a complete test for us to reproduce the issue. Please reduce the issue: use as small and as simple an example of the bug as possible.
|
||||||
|
|
||||||
@@ -43,14 +45,18 @@ 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. In particular, we do not support legacy 32-bit systems.
|
We support up-to-date 64-bit ARM and x64 FreeBSD, macOS, Windows and Linux systems. Please ensure that your configuration is supported before labelling the issue as a bug.
|
||||||
|
|
||||||
|
* 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
|
If you plan to contribute to simdjson, please read our guide:
|
||||||
* 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
|
||||||
|
|||||||
@@ -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') }}
|
||||||
@@ -31,4 +31,4 @@ jobs:
|
|||||||
./alpine.sh cmake --build build_for_alpine
|
./alpine.sh cmake --build build_for_alpine
|
||||||
- name: test
|
- name: test
|
||||||
run: |
|
run: |
|
||||||
./alpine.sh bash -c "cd build_for_alpine && ctest -LE explicitonly"
|
./alpine.sh bash -c "cd build_for_alpine && ctest -LE explicitonly --output-on-failure"
|
||||||
|
|||||||
@@ -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: |
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
name: Doxygen GitHub Pages
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
# Allows you to run this workflow manually from the Actions tab
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
pages: write
|
||||||
|
id-token: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
deploy:
|
||||||
|
environment:
|
||||||
|
name: github-pages
|
||||||
|
url: ${{ steps.deployment.outputs.page_url }}
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- name: Install Doxygen
|
||||||
|
run: sudo apt-get install doxygen graphviz -y
|
||||||
|
- run: mkdir docs
|
||||||
|
- name: Install theme
|
||||||
|
run: ./tools/prepare_doxygen.sh
|
||||||
|
- name: Generate Doxygen Documentation
|
||||||
|
run: doxygen
|
||||||
|
- name: Deploy to GitHub Pages
|
||||||
|
uses: peaceiris/actions-gh-pages@v3
|
||||||
|
with:
|
||||||
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
publish_dir: doc/api/html
|
||||||
@@ -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
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ jobs:
|
|||||||
implementations: haswell westmere fallback
|
implementations: haswell westmere fallback
|
||||||
UBSAN_OPTIONS: halt_on_error=1
|
UBSAN_OPTIONS: halt_on_error=1
|
||||||
MAXLEN: -max_len=4000
|
MAXLEN: -max_len=4000
|
||||||
CLANGVERSION: 11
|
CLANGVERSION: 15
|
||||||
# which optimization level to use for the sanitizer build (see build_fuzzer.variants.sh)
|
# which optimization level to use for the sanitizer build (see build_fuzzer.variants.sh)
|
||||||
OPTLEVEL: -O3
|
OPTLEVEL: -O3
|
||||||
|
|
||||||
@@ -32,30 +32,31 @@ jobs:
|
|||||||
- name: Install packages necessary for building
|
- name: Install packages necessary for building
|
||||||
run: |
|
run: |
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt-get install --quiet ninja-build valgrind zip unzip
|
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-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/
|
||||||
key: corpus-${{ github.run_id }}
|
key: corpus-${{ github.run_id }}
|
||||||
restore-keys: corpus-
|
restore-keys: corpus-
|
||||||
|
|
||||||
- name: show statistics for the cached corpus
|
- name: show statistics for the cached corpus
|
||||||
run: |
|
run: |
|
||||||
echo number of files in github action corpus cache:
|
echo number of files in github action corpus cache:
|
||||||
find out -type f |wc -l
|
find out -type f |wc -l
|
||||||
|
|
||||||
- name: Create and prepare the initial seed corpus
|
- name: Create and prepare the initial seed corpus
|
||||||
run: |
|
run: |
|
||||||
fuzz/build_corpus.sh
|
fuzz/build_corpus.sh
|
||||||
@@ -92,7 +93,7 @@ jobs:
|
|||||||
export SIMDJSON_FORCE_IMPLEMENTATION=$implementation
|
export SIMDJSON_FORCE_IMPLEMENTATION=$implementation
|
||||||
build-sanitizers$OPTLEVEL/fuzz/fuzz_$fuzzer out/$fuzzer $others seedcorpus -max_total_time=20 $MAXLEN
|
build-sanitizers$OPTLEVEL/fuzz/fuzz_$fuzzer out/$fuzzer $others seedcorpus -max_total_time=20 $MAXLEN
|
||||||
done
|
done
|
||||||
echo now have $(ls out/$fuzzer |wc -l) files in corpus
|
echo now have $(ls out/$fuzzer |wc -l) files in corpus
|
||||||
done
|
done
|
||||||
|
|
||||||
- name: Fuzz differential impl. fuzzers with sanitizer+asserts (good at detecting errors)
|
- name: Fuzz differential impl. fuzzers with sanitizer+asserts (good at detecting errors)
|
||||||
@@ -119,12 +120,12 @@ jobs:
|
|||||||
|
|
||||||
- name: Package the corpus into an artifact
|
- name: Package the corpus into an artifact
|
||||||
run: |
|
run: |
|
||||||
for fuzzer in $defaultimplfuzzers $implfuzzers; do
|
for fuzzer in $defaultimplfuzzers $implfuzzers; do
|
||||||
tar rf corpus.tar out/$fuzzer
|
tar rf corpus.tar out/$fuzzer
|
||||||
done
|
done
|
||||||
|
|
||||||
- name: Save the corpus as a github artifact
|
- name: Save the corpus as a github artifact
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: corpus
|
name: corpus
|
||||||
path: corpus.tar
|
path: corpus.tar
|
||||||
@@ -141,13 +142,13 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
for fuzzer in $defaultimplfuzzers $implfuzzers; do
|
for fuzzer in $defaultimplfuzzers $implfuzzers; do
|
||||||
find out/$fuzzer -type f |sort|head -n200|xargs -n40 valgrind build-replay/fuzz/fuzz_$fuzzer 2>&1|tee valgrind-$fuzzer.txt
|
find out/$fuzzer -type f |sort|head -n200|xargs -n40 valgrind build-replay/fuzz/fuzz_$fuzzer 2>&1|tee valgrind-$fuzzer.txt
|
||||||
done
|
done
|
||||||
|
|
||||||
- name: Compress the valgrind output
|
- name: Compress the valgrind output
|
||||||
run: tar cf valgrind.tar valgrind-*.txt
|
run: tar cf valgrind.tar valgrind-*.txt
|
||||||
|
|
||||||
- name: Save valgrind output as a github artifact
|
- name: Save valgrind output as a github artifact
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v3
|
||||||
if: always()
|
if: always()
|
||||||
with:
|
with:
|
||||||
name: valgrindresults
|
name: valgrindresults
|
||||||
@@ -155,7 +156,7 @@ jobs:
|
|||||||
if-no-files-found: ignore
|
if-no-files-found: ignore
|
||||||
|
|
||||||
- name: Archive any crashes as an artifact
|
- name: Archive any crashes as an artifact
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v3
|
||||||
if: always()
|
if: always()
|
||||||
with:
|
with:
|
||||||
name: crashes
|
name: crashes
|
||||||
|
|||||||
@@ -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') }}
|
||||||
@@ -20,14 +20,25 @@ jobs:
|
|||||||
cd builddebug &&
|
cd builddebug &&
|
||||||
cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly &&
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
cd .. &&
|
cd .. &&
|
||||||
mkdir build &&
|
mkdir build &&
|
||||||
cd build &&
|
cd build &&
|
||||||
cmake -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
cmake -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly &&
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
cmake --install . &&
|
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 &&
|
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@v2.1.0
|
|
||||||
- uses: uraimo/run-on-arch-action@v2.0.5
|
|
||||||
name: Run commands
|
|
||||||
id: runcmd
|
|
||||||
env:
|
|
||||||
DEBIAN_FRONTEND: noninteractive
|
|
||||||
with:
|
|
||||||
arch: ppc64le
|
|
||||||
distro: buster
|
|
||||||
|
|
||||||
# Not required, but speeds up builds by storing container images in
|
|
||||||
# a GitHub package registry.
|
|
||||||
githubToken: ${{ github.token }}
|
|
||||||
|
|
||||||
run: |
|
|
||||||
export CLANGSUFFIX="-7"
|
|
||||||
apt-get -qq update
|
|
||||||
apt-get install -q -y clang-7 libfuzzer-7-dev git wget zip ninja-build gnupg software-properties-common
|
|
||||||
wget -q -O - "https://raw.githubusercontent.com/simdjson/debian-ppa/master/key.gpg" | apt-key add -
|
|
||||||
apt-add-repository "deb https://raw.githubusercontent.com/simdjson/debian-ppa/master simdjson main"
|
|
||||||
apt-get -qq update
|
|
||||||
apt-get purge cmake cmake-data
|
|
||||||
apt-get -t simdjson -y install cmake
|
|
||||||
mkdir -p build ; cd build
|
|
||||||
cmake .. -GNinja \
|
|
||||||
-DCMAKE_CXX_COMPILER=clang++$CLANGSUFFIX \
|
|
||||||
-DCMAKE_C_COMPILER=clang$CLANGSUFFIX \
|
|
||||||
-DBUILD_SHARED_LIBS=OFF \
|
|
||||||
-DSIMDJSON_DEVELOPER_MODE=ON \
|
|
||||||
-DSIMDJSON_ENABLE_FUZZING=On \
|
|
||||||
-DSIMDJSON_COMPETITION=OFF \
|
|
||||||
-DSIMDJSON_GOOGLE_BENCHMARKS=OFF \
|
|
||||||
-DSIMDJSON_DISABLE_DEPRECATED_API=On \
|
|
||||||
-DSIMDJSON_FUZZ_LDFLAGS=-lFuzzer \
|
|
||||||
-DCMAKE_CXX_FLAGS="-fsanitize=fuzzer-no-link -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION=" \
|
|
||||||
-DCMAKE_C_FLAGS="-fsanitize=fuzzer-no-link" \
|
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DSIMDJSON_FUZZ_LINKMAIN=Off
|
|
||||||
cd ..
|
|
||||||
builddir=build
|
|
||||||
cmake --build $builddir
|
|
||||||
wget -O corpus.tar.gz https://readonly:readonly@www.pauldreik.se/fuzzdata/index.php?project=simdjson
|
|
||||||
tar xf corpus.tar.gz
|
|
||||||
fuzzernames=$(cmake --build $builddir --target print_all_fuzzernames |tail -n1)
|
|
||||||
for fuzzer in $fuzzernames ; do
|
|
||||||
exe=$builddir/fuzz/$fuzzer
|
|
||||||
shortname=$(echo $fuzzer |cut -f2- -d_)
|
|
||||||
echo found fuzzer $shortname with executable $exe
|
|
||||||
mkdir -p out/$shortname
|
|
||||||
others=$(find out -type d -not -name $shortname -not -name out -not -name cmin)
|
|
||||||
$exe -max_total_time=20 -max_len=4000 out/$shortname $others
|
|
||||||
echo "*************************************************************************"
|
|
||||||
done
|
|
||||||
echo "all is good, no errors found in any of these fuzzers: $fuzzernames"
|
|
||||||
@@ -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: ppc64le
|
||||||
|
distro: ubuntu_latest
|
||||||
|
githubToken: ${{ github.token }}
|
||||||
|
install: |
|
||||||
|
apt-get update -q -y
|
||||||
|
apt-get install -y cmake make g++
|
||||||
|
run: |
|
||||||
|
cmake -DCMAKE_BUILD_TYPE=Release -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
|
||||||
|
cmake --build build -j=2
|
||||||
|
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
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
name: Ubuntu s390x (GCC 11)
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: uraimo/run-on-arch-action@v2
|
||||||
|
name: Test
|
||||||
|
id: runcmd
|
||||||
|
with:
|
||||||
|
arch: s390x
|
||||||
|
distro: ubuntu_latest
|
||||||
|
githubToken: ${{ github.token }}
|
||||||
|
install: |
|
||||||
|
apt-get update -q -y
|
||||||
|
apt-get install -y cmake make g++
|
||||||
|
run: |
|
||||||
|
cmake -DCMAKE_BUILD_TYPE=Release -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -B build
|
||||||
|
cmake --build build -j=2
|
||||||
|
ctest --output-on-failure --test-dir build
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
name: Performance check on Ubuntu 18.04 CI (GCC 7)
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
ubuntu-build:
|
|
||||||
if: >-
|
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
|
||||||
runs-on: ubuntu-18.04
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
- uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: dependencies/.cache
|
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
|
||||||
- name: Use cmake
|
|
||||||
run: |
|
|
||||||
mkdir build &&
|
|
||||||
cd build &&
|
|
||||||
cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_ENABLE_DOM_CHECKPERF=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
|
||||||
cmake --build . --target checkperf &&
|
|
||||||
ctest --output-on-failure -R checkperf ubuntu18-checkperf.yml
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
name: Ubuntu 18.04 CI (LLVM 7)
|
|
||||||
|
|
||||||
on: [push, pull_request]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
ubuntu-build:
|
|
||||||
if: >-
|
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
|
||||||
runs-on: ubuntu-18.04
|
|
||||||
|
|
||||||
env:
|
|
||||||
CC: clang-7
|
|
||||||
CXX: clang++-7
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
- uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: dependencies/.cache
|
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
|
||||||
- name: install clang 7
|
|
||||||
run: |
|
|
||||||
sudo apt update
|
|
||||||
sudo apt install clang-7
|
|
||||||
- name: Use cmake
|
|
||||||
run: |
|
|
||||||
mkdir build &&
|
|
||||||
cd build &&
|
|
||||||
cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
|
||||||
cmake --build . &&
|
|
||||||
ctest -j --output-on-failure -LE explicitonly
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
name: Ubuntu 18.04 CI (GCC 7) with Thread Sanitizer
|
|
||||||
|
|
||||||
on: [push, pull_request]
|
|
||||||
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
ubuntu-build:
|
|
||||||
if: >-
|
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
|
||||||
runs-on: ubuntu-18.04
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
- uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: dependencies/.cache
|
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
|
||||||
- name: Use cmake
|
|
||||||
run: |
|
|
||||||
mkdir build &&
|
|
||||||
cd build &&
|
|
||||||
cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE_THREADS=ON .. &&
|
|
||||||
cmake --build . --target document_stream_tests --target ondemand_document_stream_tests --target parse_many_test &&
|
|
||||||
ctest --output-on-failure -R parse_many_test &&
|
|
||||||
ctest --output-on-failure -R document_stream_tests
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
name: Ubuntu 18.04 CI (GCC 7)
|
|
||||||
|
|
||||||
on: [push, pull_request]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
ubuntu-build:
|
|
||||||
if: >-
|
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
|
||||||
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
|
||||||
runs-on: ubuntu-18.04
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
- uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: dependencies/.cache
|
|
||||||
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
|
||||||
- name: Use cmake
|
|
||||||
run: |
|
|
||||||
mkdir build &&
|
|
||||||
cd build &&
|
|
||||||
cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
|
||||||
cmake --build . &&
|
|
||||||
ctest -j --output-on-failure -LE explicitonly &&
|
|
||||||
make install &&
|
|
||||||
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json
|
|
||||||
@@ -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') }}
|
||||||
@@ -25,13 +25,13 @@ jobs:
|
|||||||
cd builddebug &&
|
cd builddebug &&
|
||||||
cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly &&
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
cd .. &&
|
cd .. &&
|
||||||
mkdir build &&
|
mkdir build &&
|
||||||
cd build &&
|
cd build &&
|
||||||
cmake -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
cmake -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly &&
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
cmake --install . &&
|
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 &&
|
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 &&
|
||||||
|
|||||||
@@ -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') }}
|
||||||
@@ -20,13 +20,13 @@ jobs:
|
|||||||
cd builddebug &&
|
cd builddebug &&
|
||||||
cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_EXCEPTIONS=OFF -DBUILD_SHARED_LIBS=OFF .. &&
|
cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_EXCEPTIONS=OFF -DBUILD_SHARED_LIBS=OFF .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly &&
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
cd .. &&
|
cd .. &&
|
||||||
mkdir build &&
|
mkdir build &&
|
||||||
cd build &&
|
cd build &&
|
||||||
cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_EXCEPTIONS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_EXCEPTIONS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly &&
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
make install &&
|
make install &&
|
||||||
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
|
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
|
||||||
mkdir testfindpackage &&
|
mkdir testfindpackage &&
|
||||||
|
|||||||
@@ -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') }}
|
||||||
@@ -20,13 +20,13 @@ jobs:
|
|||||||
cd builddebug &&
|
cd builddebug &&
|
||||||
cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_ENABLE_THREADS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_ENABLE_THREADS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly &&
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
cd .. &&
|
cd .. &&
|
||||||
mkdir build &&
|
mkdir build &&
|
||||||
cd build &&
|
cd build &&
|
||||||
cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_ENABLE_THREADS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_ENABLE_THREADS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly &&
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
make install &&
|
make install &&
|
||||||
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
|
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json &&
|
||||||
mkdir testfindpackage &&
|
mkdir testfindpackage &&
|
||||||
|
|||||||
@@ -3,21 +3,39 @@ name: Ubuntu 20.04 CI (GCC 9) With Memory Sanitizer
|
|||||||
on: [push, pull_request]
|
on: [push, pull_request]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
ubuntu-build:
|
ubuntu-build-address-sanitizier:
|
||||||
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-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') }}
|
||||||
- name: Use cmake
|
- name: Use cmake with address sanitizer
|
||||||
run: |
|
run: |
|
||||||
mkdir builddebug &&
|
mkdir builddebug &&
|
||||||
cd builddebug &&
|
cd builddebug &&
|
||||||
cmake -DSIMDJSON_SANITIZE=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
cmake -DSIMDJSON_SANITIZE=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly
|
ctest --output-on-failure -LE explicitonly -j
|
||||||
|
ubuntu-build-undefined-sanitizer:
|
||||||
|
if: >-
|
||||||
|
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
||||||
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
|
runs-on: ubuntu-20.04
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: dependencies/.cache
|
||||||
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
- name: Use cmake with undefined sanitizer
|
||||||
|
run: |
|
||||||
|
mkdir builddebugundefsani &&
|
||||||
|
cd builddebugundefsani &&
|
||||||
|
cmake -DSIMDJSON_SANITIZE_UNDEFINED=ON -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
||||||
|
cmake --build . &&
|
||||||
|
ctest --output-on-failure -LE explicitonly -j
|
||||||
|
|||||||
@@ -9,24 +9,38 @@ 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') }}
|
||||||
|
- name: Use cmake to build just the library
|
||||||
|
run: |
|
||||||
|
mkdir buildjustlib &&
|
||||||
|
cd buildjustlib &&
|
||||||
|
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_DEVELOPER_MODE=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
||||||
|
cmake --build . &&
|
||||||
|
cmake --install . &&
|
||||||
|
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp &&
|
||||||
|
c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson &&
|
||||||
|
cd ../tests/installation_tests/find &&
|
||||||
|
mkdir buildjustlib &&
|
||||||
|
cd buildjustlib &&
|
||||||
|
cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../buildjustlib/destination .. &&
|
||||||
|
cmake --build .
|
||||||
- name: Use cmake
|
- name: Use cmake
|
||||||
run: |
|
run: |
|
||||||
mkdir builddebug &&
|
mkdir builddebug &&
|
||||||
cd builddebug &&
|
cd builddebug &&
|
||||||
cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly &&
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
cd .. &&
|
cd .. &&
|
||||||
mkdir build &&
|
mkdir build &&
|
||||||
cd build &&
|
cd build &&
|
||||||
cmake -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
cmake -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly &&
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
cmake --install . &&
|
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 &&
|
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 &&
|
||||||
|
|||||||
@@ -9,17 +9,15 @@ 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 clang++-13
|
|
||||||
run: sudo apt-get install -y clang++-13
|
|
||||||
- name: Use cmake
|
- name: Use cmake
|
||||||
run: |
|
run: |
|
||||||
mkdir build &&
|
mkdir build &&
|
||||||
cd build &&
|
cd build &&
|
||||||
CXX=clang++-13 cmake -DSIMDJSON_DEVELOPER_MODE=ON .. &&
|
CXX=clang++-13 cmake -DSIMDJSON_DEVELOPER_MODE=ON .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly
|
ctest --output-on-failure -LE explicitonly -j
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
name: Ubuntu 22.04 CI (CLANG 14)
|
||||||
|
|
||||||
|
on: [push, pull_request]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
ubuntu-build:
|
||||||
|
if: >-
|
||||||
|
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
||||||
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: dependencies/.cache
|
||||||
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
- name: Use cmake
|
||||||
|
run: |
|
||||||
|
mkdir build &&
|
||||||
|
cd build &&
|
||||||
|
CXX=clang++-14 cmake -DSIMDJSON_DEVELOPER_MODE=ON .. &&
|
||||||
|
cmake --build . &&
|
||||||
|
ctest --output-on-failure -LE explicitonly -j
|
||||||
@@ -1,33 +1,32 @@
|
|||||||
name: Macos (Xcode 11)
|
name: Ubuntu 22.04 CI (GCC 12, CXX 20)
|
||||||
|
|
||||||
on: [push, pull_request]
|
on: [push, pull_request]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
macos-build:
|
ubuntu-build:
|
||||||
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: macos-latest
|
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: Use cmake
|
- name: Use cmake
|
||||||
run: |
|
run: |
|
||||||
xcversion select 11.7
|
|
||||||
mkdir builddebug &&
|
mkdir builddebug &&
|
||||||
cd builddebug &&
|
cd builddebug &&
|
||||||
cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
CXX=g++-12 cmake -DSIMDJSON_CXX_STANDARD=20 -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly &&
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
cd .. &&
|
cd .. &&
|
||||||
mkdir build &&
|
mkdir build &&
|
||||||
cd build &&
|
cd build &&
|
||||||
cmake -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
CXX=g++-12 cmake -DSIMDJSON_CXX_STANDARD=20 -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly &&
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
cmake --install . &&
|
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 &&
|
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 &&
|
||||||
@@ -9,17 +9,15 @@ 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 &&
|
||||||
cd build &&
|
cd build &&
|
||||||
CXX=g++-12 cmake -DSIMDJSON_DEVELOPER_MODE=ON .. &&
|
CXX=g++-12 cmake -DSIMDJSON_DEVELOPER_MODE=ON .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly
|
ctest --output-on-failure -LE explicitonly -j
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
name: Ubuntu 22.04 CI GCC 12 with GLIBCXX_ASSERTIONS
|
||||||
|
on: [push, pull_request]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
ubuntu-build:
|
||||||
|
if: >-
|
||||||
|
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
||||||
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: dependencies/.cache
|
||||||
|
key: ${{ hashFiles('dependencies/CMakeLists.txt') }}
|
||||||
|
- name: Install gcc12
|
||||||
|
run: sudo apt-get install -y g++-12
|
||||||
|
- name: Use cmake
|
||||||
|
run: |
|
||||||
|
mkdir build &&
|
||||||
|
cd build &&
|
||||||
|
CXX=g++-12 cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GLIBCXX_ASSERTIONS=ON -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON .. &&
|
||||||
|
cmake --build . &&
|
||||||
|
ctest . -E avoid_
|
||||||
+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,24 +9,38 @@ 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: Use cmake to build just the library
|
||||||
|
run: |
|
||||||
|
mkdir buildjustlib &&
|
||||||
|
cd buildjustlib &&
|
||||||
|
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DSIMDJSON_DEVELOPER_MODE=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
||||||
|
cmake --build . &&
|
||||||
|
cmake --install . &&
|
||||||
|
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp &&
|
||||||
|
c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson &&
|
||||||
|
cd ../tests/installation_tests/find &&
|
||||||
|
mkdir buildjustlib &&
|
||||||
|
cd buildjustlib &&
|
||||||
|
cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../buildjustlib/destination .. &&
|
||||||
|
cmake --build .
|
||||||
- name: Use cmake
|
- name: Use cmake
|
||||||
run: |
|
run: |
|
||||||
mkdir builddebug &&
|
mkdir builddebug &&
|
||||||
cd builddebug &&
|
cd builddebug &&
|
||||||
cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly &&
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
cd .. &&
|
cd .. &&
|
||||||
mkdir build &&
|
mkdir build &&
|
||||||
cd build &&
|
cd build &&
|
||||||
cmake -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
cmake -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_DEVELOPER_MODE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
|
||||||
cmake --build . &&
|
cmake --build . &&
|
||||||
ctest -j --output-on-failure -LE explicitonly &&
|
ctest --output-on-failure -LE explicitonly -j &&
|
||||||
cmake --install . &&
|
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 &&
|
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 &&
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
name: VS17-CI CXX20
|
||||||
|
|
||||||
|
on: [push, pull_request]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
ci:
|
||||||
|
if: >-
|
||||||
|
! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
|
||||||
|
! contains(toJSON(github.event.commits.*.message), '[skip github]')
|
||||||
|
name: windows-vs17
|
||||||
|
runs-on: windows-latest
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- {gen: Visual Studio 17 2022, arch: Win32, shared: ON}
|
||||||
|
- {gen: Visual Studio 17 2022, arch: Win32, shared: OFF}
|
||||||
|
- {gen: Visual Studio 17 2022, arch: x64, shared: ON}
|
||||||
|
- {gen: Visual Studio 17 2022, arch: x64, shared: OFF}
|
||||||
|
steps:
|
||||||
|
- name: checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Configure
|
||||||
|
run: |
|
||||||
|
cmake -DSIMDJSON_CXX_STANDARD=20 -G "${{matrix.gen}}" -A ${{matrix.arch}} -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_COMPETITION=OFF -DBUILD_SHARED_LIBS=${{matrix.shared}} -B build
|
||||||
|
- name: Build Debug
|
||||||
|
run: cmake --build build --config Debug --verbose
|
||||||
|
- name: Build Release
|
||||||
|
run: cmake --build build --config Release --verbose
|
||||||
|
- name: Run Release tests
|
||||||
|
run: |
|
||||||
|
cd build
|
||||||
|
ctest -C Release -LE explicitonly --output-on-failure
|
||||||
|
- name: Run Debug tests
|
||||||
|
run: |
|
||||||
|
cd build
|
||||||
|
ctest -C Debug -LE explicitonly --output-on-failure
|
||||||
|
- name: Install
|
||||||
|
run: |
|
||||||
|
cmake --install build --config Release
|
||||||
|
- name: Test Installation
|
||||||
|
run: |
|
||||||
|
cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -B build_install_test tests/installation_tests/find
|
||||||
|
cmake --build build_install_test --config Release
|
||||||
@@ -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') }}
|
||||||
|
|||||||
@@ -104,3 +104,6 @@ objs
|
|||||||
!.vscode/tasks.json
|
!.vscode/tasks.json
|
||||||
!.vscode/launch.json
|
!.vscode/launch.json
|
||||||
!.vscode/extensions.json
|
!.vscode/extensions.json
|
||||||
|
|
||||||
|
# clangd
|
||||||
|
.cache
|
||||||
Vendored
+8
-3
@@ -4,10 +4,15 @@
|
|||||||
|
|
||||||
// List of extensions which should be recommended for users of this workspace.
|
// List of extensions which should be recommended for users of this workspace.
|
||||||
"recommendations": [
|
"recommendations": [
|
||||||
// Syntax
|
// C++
|
||||||
"ms-vscode.cpptools",
|
"llvm-vs-code-extensions.vscode-clangd",
|
||||||
"ms-vscode.cmake-tools",
|
"xaver.clang-format",
|
||||||
|
// Python
|
||||||
"ms-python.python",
|
"ms-python.python",
|
||||||
|
// .github/*
|
||||||
|
"github.vscode-github-actions",
|
||||||
|
// cmake
|
||||||
|
"ms-vscode.cmake-tools",
|
||||||
"twxs.cmake"
|
"twxs.cmake"
|
||||||
],
|
],
|
||||||
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
|
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
|
||||||
|
|||||||
Vendored
+31
-1
@@ -5,6 +5,7 @@
|
|||||||
],
|
],
|
||||||
"files.trimTrailingWhitespace": true,
|
"files.trimTrailingWhitespace": true,
|
||||||
"files.associations": {
|
"files.associations": {
|
||||||
|
".clangd": "yaml",
|
||||||
"array": "cpp",
|
"array": "cpp",
|
||||||
"iterator": "cpp",
|
"iterator": "cpp",
|
||||||
"chrono": "cpp",
|
"chrono": "cpp",
|
||||||
@@ -96,6 +97,35 @@
|
|||||||
"future": "cpp",
|
"future": "cpp",
|
||||||
"queue": "cpp",
|
"queue": "cpp",
|
||||||
"shared_mutex": "cpp",
|
"shared_mutex": "cpp",
|
||||||
"ranges": "cpp"
|
"ranges": "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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+75
-10
@@ -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 2.2.3
|
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 "13.0.0" CACHE STRING "simdjson library version")
|
set(SIMDJSON_LIB_VERSION "23.0.0" CACHE STRING "simdjson library version")
|
||||||
set(SIMDJSON_LIB_SOVERSION "13" 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,39 @@ 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.
|
||||||
|
# A common fix is to use '-Og' instead.
|
||||||
|
# bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412
|
||||||
|
if(
|
||||||
|
(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
|
||||||
|
CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
|
||||||
|
CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
|
||||||
|
)
|
||||||
|
message(STATUS "Adding -Og to compile flag")
|
||||||
|
simdjson_add_props(
|
||||||
|
target_compile_options PRIVATE
|
||||||
|
$<$<CONFIG:DEBUG>:-Og>
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(SIMDJSON_ENABLE_THREADS)
|
if(SIMDJSON_ENABLE_THREADS)
|
||||||
find_package(Threads REQUIRED)
|
find_package(Threads REQUIRED)
|
||||||
simdjson_add_props(target_link_libraries PUBLIC Threads::Threads)
|
simdjson_add_props(target_link_libraries PUBLIC Threads::Threads)
|
||||||
@@ -102,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 ----
|
||||||
|
|
||||||
@@ -123,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(
|
||||||
@@ -149,9 +195,23 @@ install(
|
|||||||
EXPORT simdjsonTargets
|
EXPORT simdjsonTargets
|
||||||
NAMESPACE simdjson::
|
NAMESPACE simdjson::
|
||||||
DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
|
DESTINATION "${SIMDJSON_INSTALL_CMAKEDIR}"
|
||||||
COMPONENT example_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}")
|
||||||
@@ -188,11 +248,14 @@ endif()
|
|||||||
|
|
||||||
# ---- Developer mode extras ----
|
# ---- Developer mode extras ----
|
||||||
|
|
||||||
|
if(is_top_project AND NOT SIMDJSON_DEVELOPER_MODE)
|
||||||
|
message(STATUS "Building only the library. Advanced users and contributors may want to turn SIMDJSON_DEVELOPER_MODE to ON, e.g., via -D SIMDJSON_DEVELOPER_MODE=ON.")
|
||||||
|
elseif(SIMDJSON_DEVELOPER_MODE AND NOT is_top_project)
|
||||||
|
message(AUTHOR_WARNING "Developer mode in simdjson is intended for the developers of simdjson")
|
||||||
|
endif()
|
||||||
|
|
||||||
if(NOT SIMDJSON_DEVELOPER_MODE)
|
if(NOT SIMDJSON_DEVELOPER_MODE)
|
||||||
message(STATUS "Building only the library. Advanced users may want to turn SIMDJSON_DEVELOPER_MODE to ON, e.g., via -D SIMDJSON_DEVELOPER_MODE=ON.")
|
|
||||||
return()
|
return()
|
||||||
elseif(NOT is_top_project)
|
|
||||||
message(AUTHOR_WARNING "Developer mode is intended for developers of simdjson")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
simdjson_apply_props(simdjson-internal-flags)
|
simdjson_apply_props(simdjson-internal-flags)
|
||||||
@@ -233,7 +296,9 @@ add_subdirectory(singleheader)
|
|||||||
#
|
#
|
||||||
add_subdirectory(tests)
|
add_subdirectory(tests)
|
||||||
add_subdirectory(examples)
|
add_subdirectory(examples)
|
||||||
add_subdirectory(benchmark)
|
if(CMAKE_SIZEOF_VOID_P EQUAL 8) # we only include the benchmarks on 64-bit systems.
|
||||||
|
add_subdirectory(benchmark)
|
||||||
|
endif()
|
||||||
add_subdirectory(fuzz)
|
add_subdirectory(fuzz)
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
+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 = "2.2.3"
|
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
|
||||||
@@ -829,7 +829,7 @@ WARN_LOGFILE =
|
|||||||
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
|
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
|
||||||
# Note: If this tag is empty the current directory is searched.
|
# Note: If this tag is empty the current directory is searched.
|
||||||
|
|
||||||
INPUT = doc include
|
INPUT = doc include/simdjson include/simdjson/dom include/simdjson/generic
|
||||||
|
|
||||||
# This tag can be used to specify the character encoding of the source files
|
# This tag can be used to specify the character encoding of the source files
|
||||||
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
|
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
|
||||||
@@ -1246,7 +1246,10 @@ HTML_STYLESHEET =
|
|||||||
# list). For an example see the documentation.
|
# list). For an example see the documentation.
|
||||||
# This tag requires that the tag GENERATE_HTML is set to YES.
|
# This tag requires that the tag GENERATE_HTML is set to YES.
|
||||||
|
|
||||||
HTML_EXTRA_STYLESHEET =
|
|
||||||
|
HTML_EXTRA_STYLESHEET = theme/doxygen-awesome.css \
|
||||||
|
theme/doxygen-awesome-sidebar-only.css \
|
||||||
|
theme/doxygen-awesome-sidebar-only-darkmode-toggle.css
|
||||||
|
|
||||||
# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
|
# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
|
||||||
# other source files which should be copied to the HTML output directory. Note
|
# other source files which should be copied to the HTML output directory. Note
|
||||||
@@ -1256,7 +1259,10 @@ HTML_EXTRA_STYLESHEET =
|
|||||||
# files will be copied as-is; there are no commands or markers available.
|
# files will be copied as-is; there are no commands or markers available.
|
||||||
# This tag requires that the tag GENERATE_HTML is set to YES.
|
# This tag requires that the tag GENERATE_HTML is set to YES.
|
||||||
|
|
||||||
HTML_EXTRA_FILES =
|
HTML_EXTRA_FILES = theme/doxygen-awesome-darkmode-toggle.js \
|
||||||
|
theme/doxygen-awesome-interactive-toc.js \
|
||||||
|
theme/doxygen-awesome-fragment-copy-button.js \
|
||||||
|
theme/doxygen-awesome-paragraph-link.js
|
||||||
|
|
||||||
# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
|
# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
|
||||||
# will adjust the colors in the style sheet and background images according to
|
# will adjust the colors in the style sheet and background images according to
|
||||||
@@ -1543,7 +1549,7 @@ DISABLE_INDEX = NO
|
|||||||
# The default value is: NO.
|
# The default value is: NO.
|
||||||
# This tag requires that the tag GENERATE_HTML is set to YES.
|
# This tag requires that the tag GENERATE_HTML is set to YES.
|
||||||
|
|
||||||
GENERATE_TREEVIEW = NO
|
GENERATE_TREEVIEW = YES
|
||||||
|
|
||||||
# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
|
# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
|
||||||
# doxygen will group on one line in the generated HTML documentation.
|
# doxygen will group on one line in the generated HTML documentation.
|
||||||
|
|||||||
+50
-23
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
Hacking simdjson
|
Hacking simdjson
|
||||||
================
|
================
|
||||||
|
|
||||||
@@ -5,6 +6,26 @@ Here is wisdom about how to build, test and run simdjson from within the reposit
|
|||||||
|
|
||||||
If you plan to contribute to simdjson, please read our [CONTRIBUTING](https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md) guide.
|
If you plan to contribute to simdjson, please read our [CONTRIBUTING](https://github.com/simdjson/simdjson/blob/master/CONTRIBUTING.md) guide.
|
||||||
|
|
||||||
|
- [Hacking simdjson](#hacking-simdjson)
|
||||||
|
- [Build Quickstart](#build-quickstart)
|
||||||
|
- [Design notes](#design-notes)
|
||||||
|
- [Developer mode](#developer-mode)
|
||||||
|
- [Directory Structure and Source](#directory-structure-and-source)
|
||||||
|
- [Runtime Dispatching](#runtime-dispatching)
|
||||||
|
- [Regenerating Single-Header Files](#regenerating-single-header-files)
|
||||||
|
- [Usage (CMake on 64-bit platforms like Linux, FreeBSD or macOS)](#usage-cmake-on-64-bit-platforms-like-linux-freebsd-or-macos)
|
||||||
|
- [Usage (CMake on 64-bit Windows using Visual Studio 2019 or better)](#usage-cmake-on-64-bit-windows-using-visual-studio-2019-or-better)
|
||||||
|
- [Various References](#various-references)
|
||||||
|
|
||||||
|
Build Quickstart
|
||||||
|
------------------------------
|
||||||
|
|
||||||
|
```bash
|
||||||
|
mkdir build
|
||||||
|
cd build
|
||||||
|
cmake -D SIMDJSON_DEVELOPER_MODE=ON ..
|
||||||
|
cmake --build .
|
||||||
|
```
|
||||||
|
|
||||||
Design notes
|
Design notes
|
||||||
------------------------------
|
------------------------------
|
||||||
@@ -52,26 +73,34 @@ simdjson's source structure, from the top level, looks like this:
|
|||||||
|
|
||||||
* **CMakeLists.txt:** The main build system.
|
* **CMakeLists.txt:** The main build system.
|
||||||
* **include:** User-facing declarations and inline definitions (most user-facing functions are inlined).
|
* **include:** User-facing declarations and inline definitions (most user-facing functions are inlined).
|
||||||
* simdjson.h: A "main include" that includes files from include/simdjson/. This is equivalent to
|
* simdjson.h: the `simdjson` namespace. A "main include" that includes files from include/simdjson/. This is equivalent to
|
||||||
the distributed simdjson.h.
|
the distributed simdjson.h.
|
||||||
* simdjson/*.h: Declarations for public simdjson classes and functions.
|
* simdjson/*.h: Declarations for public simdjson classes and functions.
|
||||||
* simdjson/*-inl.h: Definitions for public simdjson classes and functions.
|
* simdjson/*-inl.h: Definitions for public simdjson classes and functions.
|
||||||
|
* simdjson/internal/*.h: the `simdjson::internal` namespace. Private classes and functions used by the rest of simdjson.
|
||||||
|
* simdjson/dom.h: the `simdjson::dom` namespace. Includes all public DOM classes.
|
||||||
|
* simdjson/dom/*.h: Declarations/definitions for individual DOM classes.
|
||||||
|
* simdjson/arm64|fallback|haswell|icelake|ppc64|westmere.h: `simdjson::<implementation>` namespace. Common implementation-specific tools like number and string parsing, as well as minification.
|
||||||
|
* simdjson/arm64|fallback|haswell|icelake|ppc64|westmere/*.h: implementation-specific functions such as , etc.
|
||||||
|
* simdjson/generic/*.h: the bulk of the actual code, written generically and compiled for each implementation, using functions defined in the implementation's .h files.
|
||||||
|
* simdjson/generic/dependencies.h: dependencies on common, non-implementation-specific simdjson classes. This will be included before including amalgamated.h.
|
||||||
|
* simdjson/generic/amalgamated.h: all generic ondemand classes for an implementation.
|
||||||
|
* simdjson/ondemand.h: the `simdjson::ondemand` namespace. Includes all public ondemand classes.
|
||||||
|
* simdjson/builtin.h: the `simdjson::builtin` namespace. Aliased to the most universal implementation available.
|
||||||
|
* simdjson/builtin/ondemand.h: the `simdjson::builtin::ondemand` namespace.
|
||||||
|
* simdjson/arm64|fallback|haswell|icelake|ppc64|westmere/ondemand.h: the `simdjson::<implementation>::ondemand` namespace. On-Demand compiled for the specific implementation.
|
||||||
|
* simdjson/generic/ondemand/*.h: individual On-Demand classes, generically written.
|
||||||
|
* simdjson/generic/ondemand/dependencies.h: dependencies on common, non-implementation-specific simdjson classes. This will be included before including amalgamated.h.
|
||||||
|
* simdjson/generic/ondemand/amalgamated.h: all generic ondemand classes for an implementation.
|
||||||
* **src:** The source files for non-inlined functionality (e.g. the architecture-specific parser
|
* **src:** The source files for non-inlined functionality (e.g. the architecture-specific parser
|
||||||
implementations).
|
implementations).
|
||||||
* simdjson.cpp: A "main source" that includes all implementation files from src/. This is
|
* simdjson.cpp: A "main source" that includes all implementation files from src/. This is
|
||||||
equivalent to the distributed simdjson.cpp.
|
equivalent to the distributed simdjson.cpp.
|
||||||
* arm64/|fallback/|haswell/|ppc64/|westmere/: Architecture-specific implementations. All functions are
|
* *.cpp: other misc. implementations, such as `simdjson::implementation` and the minifier.
|
||||||
Each architecture defines its own namespace, e.g. simdjson::haswell.
|
* arm64|fallback|haswell|icelake|ppc64|westmere.cpp: Architecture-specific parser implementations.
|
||||||
* generic/: Generic implementations of the simdjson parser. These files may be included and
|
* generic/*.h: `simdjson::<implementation>` namespace. Generic implementation of the parser, particularly the `dom_parser_implementation`.
|
||||||
compiled multiple times, from whichever architectures use them. They assume they are already
|
* 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
|
||||||
enclosed in a namespace, e.g.:
|
* 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.
|
||||||
```c++
|
|
||||||
namespace simdjson {
|
|
||||||
namespace haswell {
|
|
||||||
#include "generic/stage1/json_structural_indexer.h"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Other important files and directories:
|
Other important files and directories:
|
||||||
* **.drone.yml:** Definitions for Drone CI.
|
* **.drone.yml:** Definitions for Drone CI.
|
||||||
@@ -193,7 +222,7 @@ point it gets included (but only once per header). singleheader/simdjson.cpp is
|
|||||||
src/simdjson.cpp the same way, except files under generic/ may be included and copy/pasted multiple
|
src/simdjson.cpp the same way, except files under generic/ may be included and copy/pasted multiple
|
||||||
times.
|
times.
|
||||||
|
|
||||||
### Usage (CMake on 64-bit platforms like Linux, FreeBSD or macOS)
|
## Usage (CMake on 64-bit platforms like Linux, FreeBSD or macOS)
|
||||||
|
|
||||||
Requirements: In addition to git, we require a recent version of CMake as well as bash.
|
Requirements: In addition to git, we require a recent version of CMake as well as bash.
|
||||||
|
|
||||||
@@ -254,9 +283,9 @@ 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)
|
||||||
|
|
||||||
|
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).
|
||||||
### Usage (CMake on 64-bit Windows using Visual Studio 2019)
|
|
||||||
|
|
||||||
We assume you have a common 64-bit Windows PC with at least Visual Studio 2019.
|
We assume you have a common 64-bit Windows PC with at least Visual Studio 2019.
|
||||||
|
|
||||||
@@ -273,19 +302,17 @@ 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
|
|
||||||
|
|
||||||
- [How to implement atoi using SIMD?](https://stackoverflow.com/questions/35127060/how-to-implement-atoi-using-simd)
|
- [How to implement atoi using SIMD?](https://stackoverflow.com/questions/35127060/how-to-implement-atoi-using-simd)
|
||||||
- [Parsing JSON is a Minefield 💣](http://seriot.ch/parsing_json.php)
|
- [Parsing JSON is a Minefield 💣](http://seriot.ch/parsing_json.php)
|
||||||
|
|||||||
@@ -186,7 +186,7 @@
|
|||||||
same "printed page" as the copyright notice for easier
|
same "printed page" as the copyright notice for easier
|
||||||
identification within third-party archives.
|
identification within third-party archives.
|
||||||
|
|
||||||
Copyright 2018-2019 The simdjson authors
|
Copyright 2018-2023 The simdjson authors
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
|
|
||||||
/badge.svg)
|
|
||||||
[/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)
|
||||||

|
[![][license img]][license]
|
||||||
[![][license img]][license] [](https://simdjson.org/api/2.0.0/index.html)
|
|
||||||
|
[](https://simdjson.github.io/simdjson/)
|
||||||
|
|
||||||
simdjson : Parsing gigabytes of JSON per second
|
simdjson : Parsing gigabytes of JSON per second
|
||||||
===============================================
|
===============================================
|
||||||
@@ -26,16 +26,44 @@ This library is part of the [Awesome Modern C++](https://awesomecpp.com) list.
|
|||||||
Table of Contents
|
Table of Contents
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
|
* [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)
|
||||||
* [Real-world usage](#real-world-usage)
|
|
||||||
* [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)
|
||||||
* [Funding](#funding)
|
* [Funding](#funding)
|
||||||
* [Contributing to simdjson](#contributing-to-simdjson)
|
* [Contributing to simdjson](#contributing-to-simdjson)
|
||||||
* [License](#license)
|
* [License](#license)
|
||||||
|
|
||||||
|
|
||||||
|
Real-world usage
|
||||||
|
----------------
|
||||||
|
|
||||||
|
- [Node.js](https://nodejs.org/)
|
||||||
|
- [ClickHouse](https://github.com/ClickHouse/ClickHouse)
|
||||||
|
- [Meta Velox](https://velox-lib.io)
|
||||||
|
- [Google Pax](https://github.com/google/paxml)
|
||||||
|
- [milvus](https://github.com/milvus-io/milvus)
|
||||||
|
- [QuestDB](https://questdb.io/blog/questdb-release-8-0-3/)
|
||||||
|
- [Clang Build Analyzer](https://github.com/aras-p/ClangBuildAnalyzer)
|
||||||
|
- [Shopify HeapProfiler](https://github.com/Shopify/heap-profiler)
|
||||||
|
- [StarRocks](https://github.com/StarRocks/starrocks)
|
||||||
|
- [Microsoft FishStore](https://github.com/microsoft/FishStore)
|
||||||
|
- [Intel PCM](https://github.com/intel/pcm)
|
||||||
|
- [WatermelonDB](https://github.com/Nozbe/WatermelonDB)
|
||||||
|
- [Apache Doris](https://github.com/apache/doris)
|
||||||
|
- [Dgraph](https://github.com/dgraph-io/dgraph)
|
||||||
|
- [UJRPC](https://github.com/unum-cloud/ujrpc)
|
||||||
|
- [fastgltf](https://github.com/spnda/fastgltf)
|
||||||
|
- [vast](https://github.com/tenzir/vast)
|
||||||
|
- [ada-url](https://github.com/ada-url/ada)
|
||||||
|
- [fastgron](https://github.com/adamritter/fastgron)
|
||||||
|
- [WasmEdge](https://wasmedge.org)
|
||||||
|
|
||||||
|
If you are planning to use simdjson in a product, please work from one of our releases.
|
||||||
|
|
||||||
Quick Start
|
Quick Start
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
@@ -43,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
|
||||||
@@ -62,13 +90,14 @@ int main(void) {
|
|||||||
ondemand::document tweets = parser.iterate(json);
|
ondemand::document tweets = parser.iterate(json);
|
||||||
std::cout << uint64_t(tweets["search_metadata"]["count"]) << " results." << std::endl;
|
std::cout << uint64_t(tweets["search_metadata"]["count"]) << " results." << std::endl;
|
||||||
}
|
}
|
||||||
|
```
|
||||||
```
|
|
||||||
3. `c++ -o quickstart quickstart.cpp simdjson.cpp`
|
3. `c++ -o quickstart quickstart.cpp simdjson.cpp`
|
||||||
4. `./quickstart`
|
4. `./quickstart`
|
||||||
```
|
|
||||||
|
```
|
||||||
100 results.
|
100 results.
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
Documentation
|
Documentation
|
||||||
-------------
|
-------------
|
||||||
@@ -79,7 +108,14 @@ Usage documentation is available:
|
|||||||
* [Performance](doc/performance.md) shows some more advanced scenarios and how to tune for them.
|
* [Performance](doc/performance.md) shows some more advanced scenarios and how to tune for them.
|
||||||
* [Implementation Selection](doc/implementation-selection.md) describes runtime CPU detection and
|
* [Implementation Selection](doc/implementation-selection.md) describes runtime CPU detection and
|
||||||
how you can work with it.
|
how you can work with it.
|
||||||
* [API](https://simdjson.org/api/1.0.0/annotated.html) contains the automatically generated API documentation.
|
* [API](https://simdjson.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:
|
||||||
|
* [simdjson examples with errors handled through exceptions](https://godbolt.org/z/7G5qE4sr9)
|
||||||
|
* [simdjson examples with errors without exceptions](https://godbolt.org/z/e9dWb9E4v)
|
||||||
|
|
||||||
Performance results
|
Performance results
|
||||||
-------------------
|
-------------------
|
||||||
@@ -108,17 +144,6 @@ For NDJSON files, we can exceed 3 GB/s with [our multithreaded parsing function
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
Real-world usage
|
|
||||||
----------------
|
|
||||||
|
|
||||||
- [ClickHouse](https://github.com/ClickHouse/ClickHouse)
|
|
||||||
- [Clang Build Analyzer](https://github.com/aras-p/ClangBuildAnalyzer)
|
|
||||||
- [Shopify HeapProfiler](https://github.com/Shopify/heap-profiler)
|
|
||||||
- [StarRocks](https://github.com/StarRocks/starrocks)
|
|
||||||
- [Microsoft FishStore](https://github.com/microsoft/FishStore)
|
|
||||||
|
|
||||||
|
|
||||||
If you are planning to use simdjson in a product, please work from one of our releases.
|
|
||||||
|
|
||||||
Bindings and Ports of simdjson
|
Bindings and Ports of simdjson
|
||||||
------------------------------
|
------------------------------
|
||||||
@@ -139,9 +164,14 @@ We distinguish between "bindings" (which just wrap the C++ code) and a port to a
|
|||||||
- [simdjson-go](https://github.com/minio/simdjson-go): Go port using Golang assembly.
|
- [simdjson-go](https://github.com/minio/simdjson-go): Go port using Golang assembly.
|
||||||
- [rcppsimdjson](https://github.com/eddelbuettel/rcppsimdjson): R bindings.
|
- [rcppsimdjson](https://github.com/eddelbuettel/rcppsimdjson): R bindings.
|
||||||
- [simdjson_erlang](https://github.com/ChomperT/simdjson_erlang): erlang bindings.
|
- [simdjson_erlang](https://github.com/ChomperT/simdjson_erlang): erlang bindings.
|
||||||
|
- [simdjsone](https://github.com/saleyn/simdjsone): erlang bindings.
|
||||||
- [lua-simdjson](https://github.com/FourierTransformer/lua-simdjson): lua bindings.
|
- [lua-simdjson](https://github.com/FourierTransformer/lua-simdjson): lua bindings.
|
||||||
- [hermes-json](https://hackage.haskell.org/package/hermes-json): haskell bindings.
|
- [hermes-json](https://hackage.haskell.org/package/hermes-json): haskell bindings.
|
||||||
- [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://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
|
||||||
--------------
|
--------------
|
||||||
@@ -150,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.
|
||||||
|
|
||||||
@@ -184,7 +218,7 @@ License
|
|||||||
|
|
||||||
This code is made available under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html).
|
This code is made available under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html).
|
||||||
|
|
||||||
Under Windows, we build some tools using the windows/dirent_portable.h file (which is outside our library code): it under the liberal (business-friendly) MIT license.
|
Under Windows, we build some tools using the windows/dirent_portable.h file (which is outside our library code): it is under the liberal (business-friendly) MIT license.
|
||||||
|
|
||||||
For compilers that do not support [C++17](https://en.wikipedia.org/wiki/C%2B%2B17), we bundle the string-view library which is published under the [Boost license](http://www.boost.org/LICENSE_1_0.txt). Like the Apache license, the Boost license is a permissive license allowing commercial redistribution.
|
For compilers that do not support [C++17](https://en.wikipedia.org/wiki/C%2B%2B17), we bundle the string-view library which is published under the [Boost license](http://www.boost.org/LICENSE_1_0.txt). Like the Apache license, the Boost license is a permissive license allowing commercial redistribution.
|
||||||
|
|
||||||
|
|||||||
-69
@@ -1,69 +0,0 @@
|
|||||||
# 0.5
|
|
||||||
|
|
||||||
## Highlights
|
|
||||||
|
|
||||||
Performance
|
|
||||||
* Faster and simpler UTF-8 validation with the lookup4 algorithm https://github.com/simdjson/simdjson/pull/993
|
|
||||||
* We improved the performance of simdjson under Visual Studio by about 25%. Users will still get better performance with clang-cl (+30%) but the gap has been reduced. https://github.com/simdjson/simdjson/pull/1031
|
|
||||||
|
|
||||||
Code usability
|
|
||||||
* In `parse_many`, when parsing streams of JSON documetns, we give to the users runtime control as to whether threads are used (via the parser.threaded attribute). https://github.com/simdjson/simdjson/issues/925
|
|
||||||
* Prefixed public macros to avoid name clashes with other libraries. https://github.com/simdjson/simdjson/issues/1035
|
|
||||||
* Better documentation regarding package managers (brew, MSYS2, conan, apt, vcpkg, FreeBSD package manager, etc.).
|
|
||||||
* Better documentation regarding CMake usage.
|
|
||||||
|
|
||||||
Standards
|
|
||||||
* We improved standard compliance with respect to both the JSON RFC 8259 and JSON Pointer RFC 6901. We added the at_pointer method to nodes for standard-compliant JSON Pointer queries. The legacy `at(std::string_view)` method remains but is deprecated since it is not standard-compliant as per RFC 6901.
|
|
||||||
* We removed computed GOTOs without sacrificing performance thus improving the C++ standard compliance (since computed GOTOs are compiler-specific extensions).
|
|
||||||
* Better support for C++20 https://github.com/simdjson/simdjson/pull/1050
|
|
||||||
|
|
||||||
# 0.4
|
|
||||||
|
|
||||||
## Highlights
|
|
||||||
|
|
||||||
- Test coverage has been greatly improved and we have resolved many static-analysis warnings on different systems.
|
|
||||||
- We added a fast (8GB/s) minifier that works directly on JSON strings.
|
|
||||||
- We added fast (10GB/s) UTF-8 validator that works directly on strings (any strings, including non-JSON).
|
|
||||||
- The array and object elements have a constant-time size() method.
|
|
||||||
- Performance improvements to the API (type(), get<>()).
|
|
||||||
- The parse_many function (ndjson) has been entirely reworked. It now uses a single secondary thread instead of several new threads.
|
|
||||||
- We have introduced a faster UTF-8 validation algorithm (lookup3) for all kernels (ARM, x64 SSE, x64 AVX).
|
|
||||||
- C++11 support for older compilers and systems.
|
|
||||||
- FreeBSD support (and tests).
|
|
||||||
- We support the clang front-end compiler (clangcl) under Visual Studio.
|
|
||||||
- It is now possible to target ARM platforms under Visual Studio.
|
|
||||||
- The simdjson library will never abort or print to standard output/error.
|
|
||||||
|
|
||||||
# 0.3
|
|
||||||
|
|
||||||
## Highlights
|
|
||||||
|
|
||||||
- **Multi-Document Parsing:** Read a bundle of JSON documents (ndjson) 2-4x faster than doing it
|
|
||||||
individually. [API docs](https://github.com/simdjson/simdjson/blob/master/doc/basics.md#newline-delimited-json-ndjson-and-json-lines) / [Design Details](https://github.com/simdjson/simdjson/blob/master/doc/parse_many.md)
|
|
||||||
- **Simplified API:** The API has been completely revamped for ease of use, including a new JSON
|
|
||||||
navigation API and fluent support for error code *and* exception styles of error handling with a
|
|
||||||
single API. [Docs](https://github.com/simdjson/simdjson/blob/master/doc/basics.md#the-basics-loading-and-parsing-json-documents)
|
|
||||||
- **Exact Float Parsing:** Now simdjson parses floats flawlessly *without* any performance loss,
|
|
||||||
thanks to [great work by @michaeleisel and @lemire](https://github.com/simdjson/simdjson/pull/558).
|
|
||||||
[Blog Post](https://lemire.me/blog/2020/03/10/fast-float-parsing-in-practice/)
|
|
||||||
- **Even Faster:** The fastest parser got faster! With a [shiny new UTF-8 validator](https://github.com/simdjson/simdjson/pull/387)
|
|
||||||
and meticulously refactored SIMD core, simdjson 0.3 is 15% faster than before, running at 2.5 GB/s
|
|
||||||
(where 0.2 ran at 2.2 GB/s).
|
|
||||||
|
|
||||||
## Minor Highlights
|
|
||||||
|
|
||||||
- Fallback implementation: simdjson now has a non-SIMD fallback implementation, and can run even on
|
|
||||||
very old 64-bit machines.
|
|
||||||
- Automatic allocation: as part of API simplification, the parser no longer has to be preallocated--
|
|
||||||
it will adjust automatically when it encounters larger files.
|
|
||||||
- Runtime selection API: We've exposed simdjson's runtime CPU detection and implementation selection
|
|
||||||
as an API, so you can tell what implementation we detected and test with other implementations.
|
|
||||||
- Error handling your way: Whether you use exceptions or check error codes, simdjson lets you handle
|
|
||||||
errors in your style. APIs that can fail return simdjson_result<T>, letting you check the error
|
|
||||||
code before using the result. But if you are more comfortable with exceptions, skip the error code
|
|
||||||
and cast straight to T, and exceptions will be thrown automatically if an error happens. Use the
|
|
||||||
same API either way!
|
|
||||||
- Error chaining: We also worked to keep non-exception error-handling short and sweet. Instead of
|
|
||||||
having to check the error code after every single operation, now you can *chain* JSON navigation
|
|
||||||
calls like looking up an object field or array element, or casting to a string, so that you only
|
|
||||||
have to check the error code once at the very end.
|
|
||||||
@@ -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
+3
-161
@@ -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;
|
||||||
@@ -521,7 +499,7 @@ static void twitter_image_sizes(State& state) {
|
|||||||
set<tuple<uint64_t, uint64_t>> image_sizes;
|
set<tuple<uint64_t, uint64_t>> image_sizes;
|
||||||
for (dom::object tweet : doc["statuses"]) {
|
for (dom::object tweet : doc["statuses"]) {
|
||||||
dom::array media;
|
dom::array media;
|
||||||
if (not (error = tweet["entities"]["media"].get(media))) {
|
if (! (error = tweet["entities"]["media"].get(media))) {
|
||||||
for (dom::object image : media) {
|
for (dom::object image : media) {
|
||||||
for (auto size : image["sizes"].get_object()) {
|
for (auto size : image["sizes"].get_object()) {
|
||||||
image_sizes.emplace(size.value["w"], size.value["h"]);
|
image_sizes.emplace(size.value["w"], size.value["h"]);
|
||||||
@@ -564,7 +542,7 @@ static void error_code_twitter_default_profile(State& state) noexcept {
|
|||||||
for (dom::element tweet : tweets) {
|
for (dom::element tweet : tweets) {
|
||||||
dom::object user;
|
dom::object user;
|
||||||
if ((error = tweet["user"].get(user))) { return; }
|
if ((error = tweet["user"].get(user))) { return; }
|
||||||
bool default_profile;
|
bool default_profile{};
|
||||||
if ((error = user["default_profile"].get(default_profile))) { return; }
|
if ((error = user["default_profile"].get(default_profile))) { return; }
|
||||||
if (default_profile) {
|
if (default_profile) {
|
||||||
std::string_view screen_name;
|
std::string_view screen_name;
|
||||||
@@ -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;
|
||||||
@@ -638,7 +568,7 @@ static void error_code_twitter_image_sizes(State& state) noexcept {
|
|||||||
if ((error = doc["statuses"].get(statuses))) { return; }
|
if ((error = doc["statuses"].get(statuses))) { return; }
|
||||||
for (dom::element tweet : statuses) {
|
for (dom::element tweet : statuses) {
|
||||||
dom::array images;
|
dom::array images;
|
||||||
if (not (error = tweet["entities"]["media"].get(images))) {
|
if (! (error = tweet["entities"]["media"].get(images))) {
|
||||||
for (dom::element image : images) {
|
for (dom::element image : images) {
|
||||||
dom::object sizes;
|
dom::object sizes;
|
||||||
if ((error = image["sizes"].get(sizes))) { return; }
|
if ((error = image["sizes"].get(sizes))) { return; }
|
||||||
@@ -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;
|
||||||
|
|||||||
+14
-10
@@ -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,24 +503,28 @@ 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;
|
||||||
double freqall = (all_stages_without_allocation.best.cycles() / all_stages_without_allocation.best.elapsed_sec()) / 1000000000.0;
|
double freqall = (all_stages_without_allocation.best.cycles() / all_stages_without_allocation.best.elapsed_sec()) / 1000000000.0;
|
||||||
double freqmin = min(freq1, freq2);
|
double freqmin = min(freq1, freq2);
|
||||||
double freqmax = max(freq1, freq2);
|
double freqmax = max(freq1, freq2);
|
||||||
if((freqall < 0.95 * freqmin) or (freqall > 1.05 * freqmax)) {
|
if((freqall < 0.95 * freqmin) || (freqall > 1.05 * freqmax)) {
|
||||||
printf("\nWarning: The processor frequency fluctuates in an expected way!!!\n"
|
printf("\nWarning: The processor frequency fluctuates in an expected way!!!\n"
|
||||||
"Range for stage 1 and stage 2 : [%.3f GHz, %.3f GHz], overall: %.3f GHz.\n",
|
"Range for stage 1 and stage 2 : [%.3f GHz, %.3f GHz], overall: %.3f GHz.\n",
|
||||||
freqmin, freqmax, freqall);
|
freqmin, freqmax, freqall);
|
||||||
|
|||||||
@@ -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(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,
|
||||||
@@ -145,12 +149,21 @@ struct event_collector {
|
|||||||
PERF_COUNT_HW_CACHE_REFERENCES,
|
PERF_COUNT_HW_CACHE_REFERENCES,
|
||||||
PERF_COUNT_HW_CACHE_MISSES
|
PERF_COUNT_HW_CACHE_MISSES
|
||||||
#endif
|
#endif
|
||||||
}, quiet) {}
|
}) {}
|
||||||
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
|
||||||
@@ -15,7 +15,7 @@ struct simdjsondom2msgpack {
|
|||||||
* @param json JSON input
|
* @param json JSON input
|
||||||
* @param buf temporary buffer (must be large enough, with simdjson::SIMDJSON_PADDING bytes
|
* @param buf temporary buffer (must be large enough, with simdjson::SIMDJSON_PADDING bytes
|
||||||
* of padding)
|
* of padding)
|
||||||
* @return std::string_view msgpack output, writting to the temporary buffer
|
* @return std::string_view msgpack output, writing to the temporary buffer
|
||||||
*/
|
*/
|
||||||
inline std::string_view to_msgpack(const simdjson::padded_string &json,
|
inline std::string_view to_msgpack(const simdjson::padded_string &json,
|
||||||
uint8_t *buf);
|
uint8_t *buf);
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ struct simdjson2msgpack {
|
|||||||
* @param json JSON input
|
* @param json JSON input
|
||||||
* @param buf temporary buffer (must be large enough, with simdjson::SIMDJSON_PADDING bytes
|
* @param buf temporary buffer (must be large enough, with simdjson::SIMDJSON_PADDING bytes
|
||||||
* of padding)
|
* of padding)
|
||||||
* @return std::string_view msgpack output, writting to the temporary buffer
|
* @return std::string_view msgpack output, writing to the temporary buffer
|
||||||
*/
|
*/
|
||||||
inline std::string_view to_msgpack(const simdjson::padded_string &json,
|
inline std::string_view to_msgpack(const simdjson::padded_string &json,
|
||||||
uint8_t *buf);
|
uint8_t *buf);
|
||||||
@@ -51,6 +51,7 @@ private:
|
|||||||
simdjson_inline void
|
simdjson_inline void
|
||||||
write_raw_string(simdjson::ondemand::raw_json_string rjs);
|
write_raw_string(simdjson::ondemand::raw_json_string rjs);
|
||||||
inline void recursive_processor(simdjson::ondemand::value element);
|
inline void recursive_processor(simdjson::ondemand::value element);
|
||||||
|
inline void recursive_processor_ref(simdjson::ondemand::value& element);
|
||||||
|
|
||||||
simdjson::ondemand::parser parser;
|
simdjson::ondemand::parser parser;
|
||||||
uint8_t *buff{};
|
uint8_t *buff{};
|
||||||
@@ -74,17 +75,33 @@ simdjson2msgpack::to_msgpack(const simdjson::padded_string &json,
|
|||||||
write_byte(0xc2 + doc.get_bool());
|
write_byte(0xc2 + doc.get_bool());
|
||||||
break;
|
break;
|
||||||
case simdjson::ondemand::json_type::null:
|
case simdjson::ondemand::json_type::null:
|
||||||
write_byte(0xc0);
|
// We check that the value is indeed null
|
||||||
|
// otherwise: an error is thrown.
|
||||||
|
if(doc.is_null()) {
|
||||||
|
write_byte(0xc0);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case simdjson::ondemand::json_type::array:
|
case simdjson::ondemand::json_type::array:
|
||||||
case simdjson::ondemand::json_type::object:
|
case simdjson::ondemand::json_type::object:
|
||||||
default:
|
default:
|
||||||
// impossible
|
// impossible
|
||||||
break;
|
SIMDJSON_UNREACHABLE();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
simdjson::ondemand::value val = doc;
|
simdjson::ondemand::value val = doc;
|
||||||
|
#define SIMDJSON_GCC_COMPILER ((__GNUC__) && !(__clang__) && !(__INTEL_COMPILER))
|
||||||
|
#if SIMDJSON_GCC_COMPILER
|
||||||
|
// the GCC compiler does well with by-value passing.
|
||||||
|
// GCC has superior recursive inlining:
|
||||||
|
// https://stackoverflow.com/questions/29186186/why-does-gcc-generate-a-faster-program-than-clang-in-this-recursive-fibonacci-co
|
||||||
|
// https://godbolt.org/z/TeK4doE51
|
||||||
recursive_processor(val);
|
recursive_processor(val);
|
||||||
|
#else
|
||||||
|
recursive_processor_ref(val);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
if (!doc.at_end()) {
|
||||||
|
throw "There are unexpectedly tokens after the end of the json in the json2msgpack sample data";
|
||||||
}
|
}
|
||||||
return std::string_view(reinterpret_cast<char *>(buf), size_t(buff - buf));
|
return std::string_view(reinterpret_cast<char *>(buf), size_t(buff - buf));
|
||||||
}
|
}
|
||||||
@@ -156,7 +173,58 @@ void simdjson2msgpack::recursive_processor(simdjson::ondemand::value element) {
|
|||||||
write_byte(0xc2 + element.get_bool());
|
write_byte(0xc2 + element.get_bool());
|
||||||
break;
|
break;
|
||||||
case simdjson::ondemand::json_type::null:
|
case simdjson::ondemand::json_type::null:
|
||||||
write_byte(0xc0);
|
// We check that the value is indeed null
|
||||||
|
// otherwise: an error is thrown.
|
||||||
|
if(element.is_null()) {
|
||||||
|
write_byte(0xc0);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
SIMDJSON_UNREACHABLE();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void simdjson2msgpack::recursive_processor_ref(simdjson::ondemand::value& element) {
|
||||||
|
switch (element.type()) {
|
||||||
|
case simdjson::ondemand::json_type::array: {
|
||||||
|
uint32_t counter = 0;
|
||||||
|
write_byte(0xdd);
|
||||||
|
uint8_t *location = skip_uint32();
|
||||||
|
for (auto child : element.get_array()) {
|
||||||
|
counter++;
|
||||||
|
simdjson::ondemand::value v = child.value();
|
||||||
|
recursive_processor_ref(v);
|
||||||
|
}
|
||||||
|
write_uint32_at(counter, location);
|
||||||
|
} break;
|
||||||
|
case simdjson::ondemand::json_type::object: {
|
||||||
|
uint32_t counter = 0;
|
||||||
|
write_byte(0xdf);
|
||||||
|
uint8_t *location = skip_uint32();
|
||||||
|
for (auto field : element.get_object()) {
|
||||||
|
counter++;
|
||||||
|
write_raw_string(field.key());
|
||||||
|
simdjson::ondemand::value v = field.value();
|
||||||
|
recursive_processor_ref(v);
|
||||||
|
}
|
||||||
|
write_uint32_at(counter, location);
|
||||||
|
} break;
|
||||||
|
case simdjson::ondemand::json_type::number:
|
||||||
|
write_double(element.get_double());
|
||||||
|
break;
|
||||||
|
case simdjson::ondemand::json_type::string:
|
||||||
|
write_raw_string(element.get_raw_json_string());
|
||||||
|
break;
|
||||||
|
case simdjson::ondemand::json_type::boolean:
|
||||||
|
write_byte(0xc2 + element.get_bool());
|
||||||
|
break;
|
||||||
|
case simdjson::ondemand::json_type::null:
|
||||||
|
// We check that the value is indeed null
|
||||||
|
// otherwise: an error is thrown.
|
||||||
|
if(element.is_null()) {
|
||||||
|
write_byte(0xc0);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
SIMDJSON_UNREACHABLE();
|
SIMDJSON_UNREACHABLE();
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -1,22 +1,13 @@
|
|||||||
// https://github.com/WojciechMula/toys/blob/master/000helpers/linux-perf-events.h
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
#ifdef __has_include
|
|
||||||
#if __has_include(<asm/unistd.h>)
|
|
||||||
#include <asm/unistd.h> // for __NR_perf_event_open
|
#include <asm/unistd.h> // for __NR_perf_event_open
|
||||||
#else
|
|
||||||
#warning "Header asm/unistd.h cannot be found though it is a linux system. Are linux headers missing?"
|
|
||||||
#endif
|
|
||||||
#else // no __has_include
|
|
||||||
// Please insure that linux headers have been installed.
|
|
||||||
#include <asm/unistd.h> // for __NR_perf_event_open
|
|
||||||
#endif
|
|
||||||
#include <linux/perf_event.h> // for perf event constants
|
#include <linux/perf_event.h> // for perf event constants
|
||||||
#include <sys/ioctl.h> // for ioctl
|
#include <sys/ioctl.h> // for ioctl
|
||||||
#include <unistd.h> // for syscall
|
#include <unistd.h> // for syscall
|
||||||
|
|
||||||
#include <cerrno> // for errno
|
#include <cerrno> // for errno
|
||||||
#include <cstring> // for std::memset
|
#include <cstring> // for memset
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
@@ -28,13 +19,11 @@ template <int TYPE = PERF_TYPE_HARDWARE> class LinuxEvents {
|
|||||||
perf_event_attr attribs{};
|
perf_event_attr attribs{};
|
||||||
size_t num_events{};
|
size_t num_events{};
|
||||||
std::vector<uint64_t> temp_result_vec{};
|
std::vector<uint64_t> temp_result_vec{};
|
||||||
std::vector<uint64_t> result{};
|
std::vector<uint64_t> ids{};
|
||||||
std::vector<int> fds{};
|
|
||||||
bool quiet;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit LinuxEvents(std::vector<int> config_vec, bool _quiet=false) : fd(0), working(true), quiet{_quiet} {
|
explicit LinuxEvents(std::vector<int> config_vec) : fd(0), working(true) {
|
||||||
std::memset(&attribs, 0, sizeof(attribs));
|
memset(&attribs, 0, sizeof(attribs));
|
||||||
attribs.type = TYPE;
|
attribs.type = TYPE;
|
||||||
attribs.size = sizeof(attribs);
|
attribs.size = sizeof(attribs);
|
||||||
attribs.disabled = 1;
|
attribs.disabled = 1;
|
||||||
@@ -49,7 +38,7 @@ public:
|
|||||||
|
|
||||||
int group = -1; // no group
|
int group = -1; // no group
|
||||||
num_events = config_vec.size();
|
num_events = config_vec.size();
|
||||||
result.resize(config_vec.size());
|
ids.resize(config_vec.size());
|
||||||
uint32_t i = 0;
|
uint32_t i = 0;
|
||||||
for (auto config : config_vec) {
|
for (auto config : config_vec) {
|
||||||
attribs.config = config;
|
attribs.config = config;
|
||||||
@@ -57,22 +46,17 @@ public:
|
|||||||
if (_fd == -1) {
|
if (_fd == -1) {
|
||||||
report_error("perf_event_open");
|
report_error("perf_event_open");
|
||||||
}
|
}
|
||||||
fd = _fd; // fd tracks the last _fd value.
|
ioctl(_fd, PERF_EVENT_IOC_ID, &ids[i++]);
|
||||||
fds.push_back(fd);
|
|
||||||
ioctl(fd, PERF_EVENT_IOC_ID, &result[i++]);
|
|
||||||
if (group == -1) {
|
if (group == -1) {
|
||||||
group = fd;
|
group = _fd;
|
||||||
|
fd = _fd;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
temp_result_vec.resize(num_events * 2 + 1);
|
temp_result_vec.resize(num_events * 2 + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
~LinuxEvents() {
|
~LinuxEvents() { if (fd != -1) { close(fd); } }
|
||||||
for (auto tfd : fds) {
|
|
||||||
if (tfd != -1) { close(tfd); }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void start() {
|
inline void start() {
|
||||||
if (fd != -1) {
|
if (fd != -1) {
|
||||||
@@ -97,10 +81,16 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// our actual results are in slots 1,3,5, ... of this structure
|
// our actual results are in slots 1,3,5, ... of this structure
|
||||||
// we really should be checking our result obtained earlier to be safe
|
|
||||||
for (uint32_t i = 1; i < temp_result_vec.size(); i += 2) {
|
for (uint32_t i = 1; i < temp_result_vec.size(); i += 2) {
|
||||||
results[i / 2] = temp_result_vec[i];
|
results[i / 2] = temp_result_vec[i];
|
||||||
}
|
}
|
||||||
|
for (uint32_t i = 2; i < temp_result_vec.size(); i += 2) {
|
||||||
|
if(ids[i/2-1] != temp_result_vec[i]) {
|
||||||
|
report_error("event mismatch");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool is_working() {
|
bool is_working() {
|
||||||
@@ -108,13 +98,8 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void report_error(const std::string &context) {
|
void report_error(const std::string &) {
|
||||||
if (!quiet) {
|
|
||||||
if (working) {
|
|
||||||
std::cerr << (context + ": " + std::string(strerror(errno))) << std::endl;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
working = false;
|
working = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
@@ -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;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -50,6 +50,23 @@ undefined behavior.")
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
option(SIMDJSON_SANITIZE_MEMORY "Sanitize memory" OFF)
|
||||||
|
|
||||||
|
|
||||||
|
if(SIMDJSON_SANITIZE_MEMORY)
|
||||||
|
message(STATUS "Setting the memory sanitizer.")
|
||||||
|
add_compile_options(
|
||||||
|
-fsanitize=memory -fno-sanitize-recover=all
|
||||||
|
)
|
||||||
|
link_libraries(
|
||||||
|
-fsanitize=memory -fno-sanitize-recover=all
|
||||||
|
)
|
||||||
|
# Ubuntu bug for GCC 5.0+ (safe for all versions)
|
||||||
|
if(CMAKE_COMPILER_IS_GNUCC)
|
||||||
|
link_libraries(-fuse-ld=gold)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
if(SIMDJSON_SANITIZE_THREADS)
|
if(SIMDJSON_SANITIZE_THREADS)
|
||||||
message(STATUS "Setting both the thread sanitizer \
|
message(STATUS "Setting both the thread sanitizer \
|
||||||
and the undefined-behavior sanitizer.")
|
and the undefined-behavior sanitizer.")
|
||||||
@@ -73,6 +90,8 @@ if(NOT is_multi_config AND NOT CMAKE_BUILD_TYPE)
|
|||||||
if(SIMDJSON_SANITIZE OR SIMDJSON_SANITIZE_UNDEFINED)
|
if(SIMDJSON_SANITIZE OR SIMDJSON_SANITIZE_UNDEFINED)
|
||||||
message(STATUS "No build type selected and you have enabled the sanitizer, \
|
message(STATUS "No build type selected and you have enabled the sanitizer, \
|
||||||
default to Debug. Consider setting CMAKE_BUILD_TYPE.")
|
default to Debug. Consider setting CMAKE_BUILD_TYPE.")
|
||||||
|
message(STATUS "Setting debug optimization flag to -O1 to help sanitizer.")
|
||||||
|
set(CMAKE_CXX_FLAGS_DEBUG "-O1" CACHE STRING "" FORCE)
|
||||||
set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
|
set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
|
||||||
else()
|
else()
|
||||||
message(STATUS "No build type selected, default to Release")
|
message(STATUS "No build type selected, default to Release")
|
||||||
@@ -91,13 +110,18 @@ endif()
|
|||||||
|
|
||||||
# We compile tools, tests, etc. with C++ 17. Override yourself if you need on a
|
# We compile tools, tests, etc. with C++ 17. Override yourself if you need on a
|
||||||
# target.
|
# target.
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
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_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)
|
||||||
@@ -144,6 +168,11 @@ else()
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
option(SIMDJSON_GLIBCXX_ASSERTIONS "Set _GLIBCXX_ASSERTIONS" OFF)
|
||||||
|
if (SIMDJSON_GLIBCXX_ASSERTIONS)
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_ASSERTIONS")
|
||||||
|
endif()
|
||||||
|
|
||||||
#
|
#
|
||||||
# Other optional flags
|
# Other optional flags
|
||||||
#
|
#
|
||||||
@@ -187,6 +216,18 @@ else()
|
|||||||
message(STATUS "AVX-512 instructions are not allowed.")
|
message(STATUS "AVX-512 instructions are not allowed.")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
option(
|
||||||
|
SIMDJSON_SKIPUTF8VALIDATION
|
||||||
|
"SKIP UTF8 VALIDATION."
|
||||||
|
OFF
|
||||||
|
)
|
||||||
|
if(SIMDJSON_SKIPUTF8VALIDATION)
|
||||||
|
add_compile_definitions(SIMDJSON_UTF8VALIDATION=0)
|
||||||
|
message(STATUS "SKIP UTF8 VALIDATION")
|
||||||
|
else()
|
||||||
|
add_compile_definitions(SIMDJSON_UTF8VALIDATION=1)
|
||||||
|
endif()
|
||||||
|
|
||||||
include(CheckSymbolExists)
|
include(CheckSymbolExists)
|
||||||
check_symbol_exists(fork unistd.h HAVE_POSIX_FORK)
|
check_symbol_exists(fork unistd.h HAVE_POSIX_FORK)
|
||||||
check_symbol_exists(wait sys/wait.h HAVE_POSIX_WAIT)
|
check_symbol_exists(wait sys/wait.h HAVE_POSIX_WAIT)
|
||||||
|
|||||||
@@ -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
+19
-7
@@ -15,14 +15,14 @@ if(SIMDJSON_GOOGLE_BENCHMARKS)
|
|||||||
set_off(BENCHMARK_ENABLE_INSTALL)
|
set_off(BENCHMARK_ENABLE_INSTALL)
|
||||||
set_off(BENCHMARK_ENABLE_WERROR)
|
set_off(BENCHMARK_ENABLE_WERROR)
|
||||||
|
|
||||||
import_dependency(google_benchmarks google/benchmark f91b6b4)
|
import_dependency(google_benchmarks google/benchmark v1.7.1)
|
||||||
add_dependency(google_benchmarks)
|
add_dependency(google_benchmarks)
|
||||||
endif()
|
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)
|
||||||
@@ -94,9 +94,21 @@ int main() {}
|
|||||||
import_dependency(rapidjson Tencent/rapidjson f54b0e4)
|
import_dependency(rapidjson Tencent/rapidjson f54b0e4)
|
||||||
add_library(rapidjson INTERFACE)
|
add_library(rapidjson INTERFACE)
|
||||||
target_compile_definitions(rapidjson INTERFACE RAPIDJSON_HAS_STDSTRING)
|
target_compile_definitions(rapidjson INTERFACE RAPIDJSON_HAS_STDSTRING)
|
||||||
|
include (TestBigEndian)
|
||||||
|
TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
|
||||||
|
if(IS_BIG_ENDIAN)
|
||||||
|
target_compile_definitions(rapidjson INTERFACE RAPIDJSON_ENDIAN=1)
|
||||||
|
else()
|
||||||
|
target_compile_definitions(rapidjson INTERFACE RAPIDJSON_ENDIAN=0)
|
||||||
|
endif()
|
||||||
|
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)
|
||||||
@@ -122,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()
|
||||||
@@ -143,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()
|
||||||
|
|||||||
Vendored
+1
-1
@@ -40,7 +40,7 @@ macro(add_dependency NAME)
|
|||||||
message(FATAL_ERROR "Missing ${NAME}_SOURCE_DIR variable")
|
message(FATAL_ERROR "Missing ${NAME}_SOURCE_DIR variable")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_subdirectory("${${NAME}_SOURCE_DIR}" "${PROJECT_BINARY_DIR}/_deps/${NAME}")
|
add_subdirectory("${${NAME}_SOURCE_DIR}" "${PROJECT_BINARY_DIR}/_deps/${NAME}" EXCLUDE_FROM_ALL)
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
function(set_off NAME)
|
function(set_off NAME)
|
||||||
|
|||||||
+1505
-171
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
|||||||
We take our documentation seriously. Please start reading the documentation before you attempt to use simdjson. We hope you will enjoy reading us.
|
We take our documentation seriously. Please start reading the documentation before you attempt to use simdjson. We hope you will enjoy reading us.
|
||||||
|
|
||||||
* Basics: https://github.com/simdjson/simdjson/blob/master/doc/basics.md is an overview of how to use simdjson and its APIs.
|
* Basics: https://github.com/simdjson/simdjson/blob/master/doc/basics.md is an overview of how to use simdjson and its APIs.
|
||||||
* parse_many: https://github.com/simdjson/simdjson/blob/master/doc/parse_many.md describes an interface providing features to work with files or streams containing multiple small JSON documents. As fast and convenient as possible.
|
* iterate_many: https://github.com/simdjson/simdjson/blob/master/doc/iterate_many.md describes an interface providing features to work with files or streams containing multiple small JSON documents. As fast and convenient as possible.
|
||||||
* Performance: https://github.com/simdjson/simdjson/blob/master/doc/performance.md shows some more advanced scenarios and how to tune for them.
|
* Performance: https://github.com/simdjson/simdjson/blob/master/doc/performance.md shows some more advanced scenarios and how to tune for them.
|
||||||
|
|||||||
+48
-20
@@ -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)
|
||||||
@@ -16,8 +16,9 @@ An overview of what you need to know to use simdjson, with examples.
|
|||||||
* [Server Loops: Long-Running Processes and Memory Capacity](#server-loops-long-running-processes-and-memory-capacity)
|
* [Server Loops: Long-Running Processes and Memory Capacity](#server-loops-long-running-processes-and-memory-capacity)
|
||||||
* [Best Use of the DOM API](#best-use-of-the-dom-api)
|
* [Best Use of the DOM API](#best-use-of-the-dom-api)
|
||||||
* [Padding and Temporary Copies](#padding-and-temporary-copies)
|
* [Padding and Temporary Copies](#padding-and-temporary-copies)
|
||||||
|
* [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
|
||||||
@@ -44,10 +45,24 @@ dom::parser parser;
|
|||||||
dom::element doc = parser.parse("[1,2,3]"_padded); // parse a string, the _padded suffix creates a simdjson::padded_string instance
|
dom::element doc = parser.parse("[1,2,3]"_padded); // parse a string, the _padded suffix creates a simdjson::padded_string instance
|
||||||
```
|
```
|
||||||
|
|
||||||
|
You can copy your data directly on a `simdjson::padded_string` as follows:
|
||||||
|
|
||||||
|
```c++
|
||||||
|
const char * data = "my data"; // 7 bytes
|
||||||
|
simdjson::padded_string my_padded_data(data, 7); // copies to a padded buffer
|
||||||
|
```
|
||||||
|
|
||||||
|
Or as follows...
|
||||||
|
|
||||||
|
```c++
|
||||||
|
std::string data = "my data";
|
||||||
|
simdjson::padded_string my_padded_data(data); // copies to a padded buffer
|
||||||
|
```
|
||||||
|
|
||||||
The parsed document resulting from the `parser.load` and `parser.parse` calls depends on the `parser` instance. Thus the `parser` instance must remain in scope. Furthermore, you must have at most one parsed document in play per `parser` instance.
|
The parsed document resulting from the `parser.load` and `parser.parse` calls depends on the `parser` instance. Thus the `parser` instance must remain in scope. Furthermore, you must have at most one parsed document in play per `parser` instance.
|
||||||
You cannot copy a `parser` instance, you may only move it.
|
You cannot copy a `parser` instance, you may only move it.
|
||||||
|
|
||||||
If you need to keep a document around long term, you can keep or move the parser instance. Note that moving a parser instance, or keeping one in a movable data structure like vector or map, can cause any outstanding `element`, `object` or `array` instances to be invalidated. If you need to store a parser in a movable data structure, you should use a `std::unique_ptr` to avoid this invalidation(e.g., `std::unique_ptr<dom::parser> parser(new dom::parser{})`).
|
If you need to keep a document around long term, you can keep or move the parser instance. Note that moving a parser instance, or keeping one in a movable data structure like vector or map, can cause any outstanding `element`, `object` or `array` instances to be invalidated. The `element`, `object` or `array` instances are mere thin wrappers akin to an `std::vector<int>::iterator`: they are invalid when default constructed, they must be tied to a valid document instance. If you need to store a parser in a movable data structure, you should use a `std::unique_ptr` to avoid this invalidation(e.g., `std::unique_ptr<dom::parser> parser(new dom::parser{})`).
|
||||||
|
|
||||||
During the`load` or `parse` calls, neither the input file nor the input string are ever modified. After calling `load` or `parse`, the source (either a file or a string) can be safely discarded. All of the JSON data is stored in the `parser` instance. The parsed document is also immutable in simdjson: you do not modify it by accessing it.
|
During the`load` or `parse` calls, neither the input file nor the input string are ever modified. After calling `load` or `parse`, the source (either a file or a string) can be safely discarded. All of the JSON data is stored in the `parser` instance. The parsed document is also immutable in simdjson: you do not modify it by accessing it.
|
||||||
|
|
||||||
@@ -56,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
|
||||||
---------------------
|
---------------------
|
||||||
@@ -65,7 +86,7 @@ Once you have an element, you can navigate it with idiomatic C++ iterators, oper
|
|||||||
* **Extracting Values (with exceptions):** You can cast a JSON element to a native type: `double(element)` or
|
* **Extracting Values (with exceptions):** You can cast a JSON element to a native type: `double(element)` or
|
||||||
`double x = json_element`. This works for double, uint64_t, int64_t, bool,
|
`double x = json_element`. This works for double, uint64_t, int64_t, bool,
|
||||||
dom::object and dom::array. An exception (`simdjson::simdjson_error`) is thrown if the cast is not possible.
|
dom::object and dom::array. An exception (`simdjson::simdjson_error`) is thrown if the cast is not possible.
|
||||||
* **Extracting Values (without exceptions):** You can use a variant usage of `get()` with error codes to avoid exceptions. You first declare the variable of the appropriate type (`double`, `uint64_t`, `int64_t`, `bool`,
|
* **Extracting Values (without exceptions):** You can use a variant usage of `get()` with error codes to avoid exceptions. You first declare the variable of the appropriate type (`double`, `uint64_t`, `int64_t`, `bool`, `std::string_view`,
|
||||||
`dom::object` and `dom::array`) and pass it by reference to `get()` which gives you back an error code: e.g.,
|
`dom::object` and `dom::array`) and pass it by reference to `get()` which gives you back an error code: e.g.,
|
||||||
```c++
|
```c++
|
||||||
simdjson::error_code error;
|
simdjson::error_code error;
|
||||||
@@ -76,6 +97,7 @@ Once you have an element, you can navigate it with idiomatic C++ iterators, oper
|
|||||||
if (error) { std::cerr << error << std::endl; return EXIT_FAILURE; }
|
if (error) { std::cerr << error << std::endl; return EXIT_FAILURE; }
|
||||||
std::cout << "I parsed " << value << " from " << numberstring.data() << std::endl;
|
std::cout << "I parsed " << value << " from " << numberstring.data() << std::endl;
|
||||||
```
|
```
|
||||||
|
The strings contain unescaped valid UTF-8 strings: no unmatched surrogate is allowed.
|
||||||
* **Field Access:** To get the value of the "foo" field in an object, use `object["foo"]`.
|
* **Field Access:** To get the value of the "foo" field in an object, use `object["foo"]`.
|
||||||
* **Array Iteration:** To iterate through an array, use `for (auto value : array) { ... }`. If you
|
* **Array Iteration:** To iterate through an array, use `for (auto value : array) { ... }`. If you
|
||||||
know the type of the value, you can cast it right there, too! `for (double value : array) { ... }`
|
know the type of the value, you can cast it right there, too! `for (double value : array) { ... }`
|
||||||
@@ -88,8 +110,8 @@ Once you have an element, you can navigate it with idiomatic C++ iterators, oper
|
|||||||
* **Array and Object size** Given an array or an object, you can get its size (number of elements or keys)
|
* **Array and Object size** Given an array or an object, you can get its size (number of elements or keys)
|
||||||
with the `size()` method.
|
with the `size()` method.
|
||||||
* **Checking an Element Type:** You can check an element's type with `element.type()`. It
|
* **Checking an Element Type:** You can check an element's type with `element.type()`. It
|
||||||
returns an `element_type` with values such as `simdjson::dom::element_type::ARRAY`, `simdjson::dom::element_type::OBJECT`, `simdjson::dom::element_type::INT64`, `simdjson::dom::element_type::UINT64`,`simdjson::dom::element_type::DOUBLE`, `simdjson::dom::element_type::BOOL` or, `simdjson::dom::element_type::NULL_VALUE`.
|
returns an `element_type` with values such as `simdjson::dom::element_type::ARRAY`, `simdjson::dom::element_type::OBJECT`, `simdjson::dom::element_type::INT64`, `simdjson::dom::element_type::UINT64`,`simdjson::dom::element_type::DOUBLE`, `simdjson::dom::element_type::STRING`, `simdjson::dom::element_type::BOOL` or, `simdjson::dom::element_type::NULL_VALUE`.
|
||||||
* **Output to streams and strings:** Given a document or an element (or node) out of a JSON document, you can output a minified string version using the C++ stream idiom (`out << element`). You can also request the construction of a minified string version (`simdjson::minify(element)`). Numbers are serialized as 64-bit floating-point numbers (`double`).
|
* **Output to streams and strings:** Given a document or an element (or node) out of a JSON document, you can output a minified string version using the C++ stream idiom (`out << element`). You can also request the construction of a minified string version (`simdjson::minify(element)`) or a prettified string version (`simdjson::prettify(element)`). Numbers are serialized as 64-bit floating-point numbers (`double`).
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -167,7 +189,7 @@ While the simdjson library can be used in any project using C++ 11 and above, fi
|
|||||||
```c++
|
```c++
|
||||||
padded_string json = R"( { "foo": 1, "bar": 2 } )"_padded;
|
padded_string json = R"( { "foo": 1, "bar": 2 } )"_padded;
|
||||||
dom::parser parser;
|
dom::parser parser;
|
||||||
dom::object object;
|
dom::object object; // invalid until the get() succeeds
|
||||||
auto error = parser.parse(json).get(object);
|
auto error = parser.parse(json).get(object);
|
||||||
if (error) { cerr << error << endl; return; }
|
if (error) { cerr << error << endl; return; }
|
||||||
for (auto [key, value] : object) {
|
for (auto [key, value] : object) {
|
||||||
@@ -181,7 +203,7 @@ For comparison, here is the C++ 11 version of the same code:
|
|||||||
// C++ 11 version for comparison
|
// C++ 11 version for comparison
|
||||||
padded_string json = R"( { "foo": 1, "bar": 2 } )"_padded;
|
padded_string json = R"( { "foo": 1, "bar": 2 } )"_padded;
|
||||||
dom::parser parser;
|
dom::parser parser;
|
||||||
dom::object object;
|
dom::object object; // invalid until the get() succeeds
|
||||||
auto error = parser.parse(json).get(object);
|
auto error = parser.parse(json).get(object);
|
||||||
if (error) { cerr << error << endl; return; }
|
if (error) { cerr << error << endl; return; }
|
||||||
for (dom::key_value_pair field : object) {
|
for (dom::key_value_pair field : object) {
|
||||||
@@ -207,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:
|
||||||
|
|
||||||
@@ -227,7 +249,7 @@ dom::parser parser;
|
|||||||
dom::element cars = parser.parse(cars_json);
|
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
|
||||||
for (dom::element car_element : cars) {
|
for (dom::element car_element : cars) {
|
||||||
dom::object car;
|
dom::object car; // invalid until the get() succeeds
|
||||||
simdjson::error_code error;
|
simdjson::error_code error;
|
||||||
if ((error = car_element.get(car))) { std::cerr << error << std::endl; return; }
|
if ((error = car_element.get(car))) { std::cerr << error << std::endl; return; }
|
||||||
double x = car.at_pointer("/tire_pressure/1");
|
double x = car.at_pointer("/tire_pressure/1");
|
||||||
@@ -283,11 +305,11 @@ it selects the key "count" within that object.
|
|||||||
|
|
||||||
int main(void) {
|
int main(void) {
|
||||||
simdjson::dom::parser parser;
|
simdjson::dom::parser parser;
|
||||||
simdjson::dom::element tweets;
|
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; }
|
||||||
|
|
||||||
simdjson::dom::element res;
|
simdjson::dom::element res; // invalid until the get() succeeds
|
||||||
if ((error = tweets["search_metadata"]["count"].get(res))) {
|
if ((error = tweets["search_metadata"]["count"].get(res))) {
|
||||||
std::cerr << "could not access keys" << std::endl;
|
std::cerr << "could not access keys" << std::endl;
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
@@ -311,12 +333,12 @@ Observe how we use the `at` method when querying an index into an array, and not
|
|||||||
|
|
||||||
int main(void) {
|
int main(void) {
|
||||||
simdjson::dom::parser parser;
|
simdjson::dom::parser parser;
|
||||||
simdjson::dom::element tweets;
|
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;
|
||||||
}
|
}
|
||||||
@@ -336,7 +358,7 @@ auto cars_json = R"( [
|
|||||||
{ "make": "Toyota", "model": "Tercel", "year": 1999, "tire_pressure": [ 29.8, 30.0, 30.2, 30.5 ] }
|
{ "make": "Toyota", "model": "Tercel", "year": 1999, "tire_pressure": [ 29.8, 30.0, 30.2, 30.5 ] }
|
||||||
] )"_padded;
|
] )"_padded;
|
||||||
dom::parser parser;
|
dom::parser parser;
|
||||||
dom::array cars;
|
dom::array cars; // invalid until the get() succeeds
|
||||||
auto error = parser.parse(cars_json).get(cars);
|
auto error = parser.parse(cars_json).get(cars);
|
||||||
if (error) { cerr << error << endl; exit(1); }
|
if (error) { cerr << error << endl; exit(1); }
|
||||||
|
|
||||||
@@ -382,7 +404,7 @@ auto abstract_json = R"( [
|
|||||||
{ "12545" : {"a":11.44, "b":12.78, "c": 11111111} }
|
{ "12545" : {"a":11.44, "b":12.78, "c": 11111111} }
|
||||||
] )"_padded;
|
] )"_padded;
|
||||||
dom::parser parser;
|
dom::parser parser;
|
||||||
dom::array array;
|
dom::array array; // invalid until after the next line
|
||||||
auto error = parser.parse(abstract_json).get(array);
|
auto error = parser.parse(abstract_json).get(array);
|
||||||
if (error) { cerr << error << endl; exit(1); }
|
if (error) { cerr << error << endl; exit(1); }
|
||||||
// Iterate through an array of objects
|
// Iterate through an array of objects
|
||||||
@@ -436,7 +458,7 @@ bool parse_double(const char *j, double &d) {
|
|||||||
|
|
||||||
bool parse_string(const char *j, std::string &s) {
|
bool parse_string(const char *j, std::string &s) {
|
||||||
std::string_view answer;
|
std::string_view answer;
|
||||||
auto error = parser.parse(j,strlen(j))
|
auto error = parser.parse(j, strlen(j))
|
||||||
.at(0)
|
.at(0)
|
||||||
.get(answer, error);
|
.get(answer, error);
|
||||||
if (error) { return false; }
|
if (error) { return false; }
|
||||||
@@ -643,3 +665,9 @@ simdjson::dom::element element = parser.parse(padded_json_copy.get(), json_len,
|
|||||||
````
|
````
|
||||||
|
|
||||||
Setting the `realloc_if_needed` parameter `false` in this manner may lead to better performance since copies are avoided, but it requires that the user takes more responsibilities: the simdjson library cannot verify that the input buffer was padded with SIMDJSON_PADDING extra bytes.
|
Setting the `realloc_if_needed` parameter `false` in this manner may lead to better performance since copies are avoided, but it requires that the user takes more responsibilities: the simdjson library cannot verify that the input buffer was padded with SIMDJSON_PADDING extra bytes.
|
||||||
|
|
||||||
|
Performance Tips
|
||||||
|
---------------------
|
||||||
|
|
||||||
|
- For release builds, we recommend setting `NDEBUG` pre-processor directive when compiling the `simdjson` library. Importantly, using the optimization flags `-O2` or `-O3` under GCC and LLVM clang does not set the `NDEBUG` directrive, you must set it manually (e.g., `-DNDEBUG`).
|
||||||
|
- For long streams of JSON documents, consider [`iterate_many`](iterate_many.md) and [`parse_many`](parse_many.md) for better performance.
|
||||||
|
|||||||
@@ -11,26 +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.
|
* 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 3 implementations
|
compiles *all* the implementations into the executable. On Intel, it will include 4 implementations
|
||||||
(haswell, westmere and fallback), on ARM it will include 2 (arm64 and fallback), and on PPC it will include 2 (ppc64 and fallback).
|
(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).
|
||||||
|
|
||||||
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
|
||||||
@@ -51,7 +56,7 @@ Inspecting the Detected Implementation
|
|||||||
You can check what implementation is running with `active_implementation`:
|
You can check what implementation is running with `active_implementation`:
|
||||||
|
|
||||||
```c++
|
```c++
|
||||||
cout << "simdjson v" << SIMDJSON_STRINGIFY(SIMDJSON_VERSION) << endl;
|
cout << "simdjson v" << SIMDJSON_VERSION << endl;
|
||||||
cout << "Detected the best implementation for your machine: " << simdjson::get_active_implementation()->name();
|
cout << "Detected the best implementation for your machine: " << simdjson::get_active_implementation()->name();
|
||||||
cout << "(" << simdjson::get_active_implementation()->description() << ")" << endl;
|
cout << "(" << simdjson::get_active_implementation()->description() << ")" << endl;
|
||||||
```
|
```
|
||||||
@@ -74,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
|
||||||
@@ -100,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;
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -112,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+163
-3
@@ -17,11 +17,15 @@ 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)
|
||||||
- [Tracking your position](#tracking-your-position)
|
- [Tracking your position](#tracking-your-position)
|
||||||
- [Incomplete streams](#incomplete-streams)
|
- [Incomplete streams](#incomplete-streams)
|
||||||
|
- [C++20 features](#c20-features)
|
||||||
|
|
||||||
Motivation
|
Motivation
|
||||||
-----------
|
-----------
|
||||||
@@ -129,6 +133,18 @@ Some official formats **(non-exhaustive list)**:
|
|||||||
API
|
API
|
||||||
---
|
---
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
```c++
|
||||||
|
auto json = R"({ "foo": 1 } { "foo": 2 } { "foo": 3 } )"_padded;
|
||||||
|
ondemand::parser parser;
|
||||||
|
ondemand::document_stream docs = parser.iterate_many(json);
|
||||||
|
for (auto doc : docs) {
|
||||||
|
std::cout << doc["foo"] << std::endl;
|
||||||
|
}
|
||||||
|
// Prints 1 2 3
|
||||||
|
```
|
||||||
|
|
||||||
See [basics.md](basics.md#newline-delimited-json-ndjson-and-json-lines) for an overview of the API.
|
See [basics.md](basics.md#newline-delimited-json-ndjson-and-json-lines) for an overview of the API.
|
||||||
|
|
||||||
## Use cases
|
## Use cases
|
||||||
@@ -181,12 +197,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++;
|
||||||
@@ -222,7 +238,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;
|
||||||
}
|
}
|
||||||
@@ -237,3 +253,147 @@ This will print:
|
|||||||
```
|
```
|
||||||
|
|
||||||
Importantly, you should only call `truncated_bytes()` after iterating through all of the documents since the stream cannot tell whether there are truncated documents at the very end when it may not have accessed that part of the data yet.
|
Importantly, you should only call `truncated_bytes()` after iterating through all of the documents since the stream cannot tell whether there are truncated documents at the very end when it may not have accessed that part of the data yet.
|
||||||
|
|
||||||
|
Comma-separated documents
|
||||||
|
-----------
|
||||||
|
|
||||||
|
We also support comma-separated documents, but with some performance limitations. The `iterate_many` function takes in an option to allow parsing of comma separated documents (which defaults on false). In this mode, the entire buffer is processed in one batch. Therefore, the total size of the document should not exceed the maximal capacity of the parser (4 GB). This mode also effectively disallow multithreading. It is therefore mostly suitable for not "very large" inputs. In this mode, the batch_size parameter
|
||||||
|
is effectively ignored, as it is set to at least the document size.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
```C++
|
||||||
|
auto json = R"( 1, 2, 3, 4, "a", "b", "c", {"hello": "world"} , [1, 2, 3])"_padded;
|
||||||
|
ondemand::parser parser;
|
||||||
|
ondemand::document_stream doc_stream;
|
||||||
|
// We pass '32' as the batch size, but it is a bogus parameter because, since
|
||||||
|
// we pass 'true' to the allow_comma parameter, the batch size will be set to at least
|
||||||
|
// the document size.
|
||||||
|
auto error = parser.iterate_many(json, 32, true).get(doc_stream);
|
||||||
|
if (error) { std::cerr << error << std::endl; return; }
|
||||||
|
for (auto doc : doc_stream) {
|
||||||
|
std::cout << doc.type() << std::endl;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
This will print:
|
||||||
|
|
||||||
|
```
|
||||||
|
number
|
||||||
|
number
|
||||||
|
number
|
||||||
|
number
|
||||||
|
string
|
||||||
|
string
|
||||||
|
string
|
||||||
|
object
|
||||||
|
array
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
|
C++20 features
|
||||||
|
--------------------
|
||||||
|
|
||||||
|
In C++20, the standard introduced the notion of *customization point*.
|
||||||
|
A customization point is a function or function object that can be customized for different types. It allows library authors to provide default behavior while giving users the ability to override this behavior for specific types.
|
||||||
|
|
||||||
|
A tag_invoke function serves as a mechanism for customization points. It is not directly part of the C++ standard library but is often used in libraries that implement customization points.
|
||||||
|
The tag_invoke function is typically a generic function that takes a tag type and additional arguments.
|
||||||
|
The first argument is usually a tag type (often an empty struct) that uniquely identifies the customization point (e.g., deserialization of custom types in simdjson). Users or library providers can specialize tag_invoke for their types by defining it in the appropriate namespace, often inline namespace.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
You can deserialize you own data structures conveniently if your system supports C++20.
|
||||||
|
When it is the case, the macro `SIMDJSON_SUPPORTS_DESERIALIZATION` will be set to 1 by
|
||||||
|
the simdjson library.
|
||||||
|
|
||||||
|
Consider a custom class `Car`:
|
||||||
|
|
||||||
|
```C++
|
||||||
|
struct Car {
|
||||||
|
std::string make;
|
||||||
|
std::string model;
|
||||||
|
int year;
|
||||||
|
std::vector<float> tire_pressure;
|
||||||
|
};
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
|
You may support deserializing directly from a JSON value or document to your own `Car` instance
|
||||||
|
by defining a single `tag_invoke` function:
|
||||||
|
|
||||||
|
|
||||||
|
```C++
|
||||||
|
namespace simdjson {
|
||||||
|
// This tag_invoke MUST be inside simdjson namespace
|
||||||
|
template <typename simdjson_value>
|
||||||
|
auto tag_invoke(deserialize_tag, simdjson_value &val, Car& car) {
|
||||||
|
ondemand::object obj;
|
||||||
|
auto error = val.get_object().get(obj);
|
||||||
|
if (error) {
|
||||||
|
return error;
|
||||||
|
}
|
||||||
|
if ((error = obj["make"].get_string(car.make))) {
|
||||||
|
return error;
|
||||||
|
}
|
||||||
|
if ((error = obj["model"].get_string(car.model))) {
|
||||||
|
return error;
|
||||||
|
}
|
||||||
|
if ((error = obj["year"].get(car.year))) {
|
||||||
|
return error;
|
||||||
|
}
|
||||||
|
if ((error = obj["tire_pressure"].get<std::vector<float>>().get(
|
||||||
|
car.tire_pressure))) {
|
||||||
|
return error;
|
||||||
|
}
|
||||||
|
return simdjson::SUCCESS;
|
||||||
|
}
|
||||||
|
} // namespace simdjson
|
||||||
|
```
|
||||||
|
|
||||||
|
Importantly, the `tag_invoke` function must be inside the `simdjson` namespace.
|
||||||
|
Let us explain each argument of `tag_invoke` function.
|
||||||
|
|
||||||
|
- `simdjson::deserialize_tag`: it is the tag for Customization Point Object (CPO). You may often ignore this parameter. It is used to indicate that you mean to provide a deserialization function for simdjson.
|
||||||
|
- `var`: It receives automatically a `simdjson` value type (document, value, document_reference).
|
||||||
|
- The third parameter is an instance of the type that you want to support.
|
||||||
|
|
||||||
|
Please see our main documentation (`basics.md`) under
|
||||||
|
"Use `tag_invoke` for custom types (C++20)" for details about
|
||||||
|
tag_invoke functions.
|
||||||
|
|
||||||
|
Given a stream of JSON documents, you can add them to a data struture
|
||||||
|
such as a `std::vector<Car>` like so if you support exceptions:
|
||||||
|
|
||||||
|
```C++
|
||||||
|
padded_string json =
|
||||||
|
R"( { "make": "Toyota", "model": "Camry", "year": 2018,
|
||||||
|
"tire_pressure": [ 40.1, 39.9 ] }
|
||||||
|
{ "make": "Kia", "model": "Soul", "year": 2012,
|
||||||
|
"tire_pressure": [ 30.1, 31.0 ] }
|
||||||
|
{ "make": "Toyota", "model": "Tercel", "year": 1999,
|
||||||
|
"tire_pressure": [ 29.8, 30.0 ] }
|
||||||
|
)"_padded;
|
||||||
|
ondemand::parser parser;
|
||||||
|
ondemand::document_stream stream;
|
||||||
|
[[maybe_unused]] auto error = parser.iterate_many(json).get(stream);
|
||||||
|
std::vector<Car> cars;
|
||||||
|
for(auto doc : stream) {
|
||||||
|
cars.push_back((Car)doc); // an exception may be thrown
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Otherwise you may use this longer version for explicit handling of errors:
|
||||||
|
|
||||||
|
|
||||||
|
```C++
|
||||||
|
std::vector<Car> cars;
|
||||||
|
for(auto doc : stream) {
|
||||||
|
Car c;
|
||||||
|
if ((error = doc.get<Car>().get(c))) {
|
||||||
|
std::cerr << simdjson::error_message(error); << std::endl;
|
||||||
|
return EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
cars.push_back(c);
|
||||||
|
}
|
||||||
|
```
|
||||||
+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: `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;
|
||||||
}
|
}
|
||||||
|
|||||||
+128
-6
@@ -3,7 +3,10 @@ Performance Notes
|
|||||||
|
|
||||||
simdjson strives to be at its fastest *without tuning*, and generally achieves this. However, there
|
simdjson strives to be at its fastest *without tuning*, and generally achieves this. However, there
|
||||||
are still some scenarios where tuning can enhance performance.
|
are still some scenarios where tuning can enhance performance.
|
||||||
|
Once your code is tested, we
|
||||||
|
further encourage you to define `NDEBUG` in your Release builds to disable additional runtime
|
||||||
|
testing and get the best performance.
|
||||||
|
* [NDEBUG directive](#ndebug-directive)
|
||||||
* [Reusing the parser for maximum efficiency](#reusing-the-parser-for-maximum-efficiency)
|
* [Reusing the parser for maximum efficiency](#reusing-the-parser-for-maximum-efficiency)
|
||||||
* [Reusing string buffers](#reusing-string-buffers)
|
* [Reusing string buffers](#reusing-string-buffers)
|
||||||
* [Server Loops: Long-Running Processes and Memory Capacity](#server-loops-long-running-processes-and-memory-capacity)
|
* [Server Loops: Long-Running Processes and Memory Capacity](#server-loops-long-running-processes-and-memory-capacity)
|
||||||
@@ -11,6 +14,19 @@ are still some scenarios where tuning can enhance 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
|
||||||
|
-------------
|
||||||
|
|
||||||
|
In C/C++, the `NDEBUG` pre-processor directive is not set by default. When it is not set, the simdjson library does
|
||||||
|
many additional checks that may impact negatively the performance. We recommend that, once your code
|
||||||
|
is well tested, you define `NDEBUG` directive in your Release builds. The `NDEBUG` directive should be defined
|
||||||
|
prior to including the `simdjson.h` header.
|
||||||
|
|
||||||
|
The `NDEBUG` directive is generally independent from optimization flags. For example, setting `-O3` under
|
||||||
|
GCC does not set the `NDEBUG` directive.
|
||||||
|
|
||||||
Reusing the parser for maximum efficiency
|
Reusing the parser for maximum efficiency
|
||||||
-----------------------------------------
|
-----------------------------------------
|
||||||
@@ -59,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++
|
||||||
@@ -138,13 +154,13 @@ few hundred megabytes per second if your JSON documents are densely packed with
|
|||||||
Visual Studio
|
Visual Studio
|
||||||
--------------
|
--------------
|
||||||
|
|
||||||
On Intel and AMD Windows platforms, Microsoft Visual Studio enables programmers to build either 32-bit (x86) or 64-bit (x64) binaries. We urge you to always use 64-bit mode. Visual Studio 2019 should default on 64-bit builds when you have a 64-bit version of Windows, which we recommend.
|
On Intel and AMD Windows platforms, Microsoft Visual Studio enables programmers to build either 32-bit (x86) or 64-bit (x64 or ARM64) binaries. We urge you to always use 64-bit mode. Visual Studio 2019 should default on 64-bit builds when you have a 64-bit version of Windows, which we recommend.
|
||||||
|
|
||||||
When compiling with Visual Studio, we recommend the flags `/Ob2 /O2` or better. We do not recommend that you compile simdjson with architecture-specific flags such as `arch:AVX2`. The simdjson library automatically selects the best execution kernel at runtime.
|
When compiling with Visual Studio, we recommend the flags `/Ob2 /O2` or better. We do not recommend that you compile simdjson with architecture-specific flags such as `arch:AVX2`. The simdjson library automatically selects the best execution kernel at runtime.
|
||||||
|
|
||||||
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
|
||||||
@@ -160,8 +176,114 @@ You should not expect the simdjson library to cause *downclocking* of your recen
|
|||||||
- [Whenever 512-bit AVX-512 instructions are used](https://lemire.me/blog/2018/09/07/avx-512-when-and-how-to-use-these-new-instructions/).
|
- [Whenever 512-bit AVX-512 instructions are used](https://lemire.me/blog/2018/09/07/avx-512-when-and-how-to-use-these-new-instructions/).
|
||||||
- Whenever heavy 256-bit or wider instructions are used. Heavy instructions are those involving floating point operations or integer multiplications (since these execute on the floating point unit).
|
- Whenever heavy 256-bit or wider instructions are used. Heavy instructions are those involving floating point operations or integer multiplications (since these execute on the floating point unit).
|
||||||
|
|
||||||
The simdjson library does not make use of heavy 256-bit instructions. We do use vectorized multiplications, but only using 128-bit registers. Thus there should be no downclocking due to simdjson on recent processors, except when AVX-512 is allowed and
|
The simdjson library does not generally make use of heavy 256-bit instructions. On AVX2 kernels, we use vectorized multiplications, but only using 128-bit registers. On recent processors (Ice Lake/Tiger Lake or better, AMD Zen 4 or better) [no frequency throttling is found](https://travisdowns.github.io/blog/2020/08/19/icl-avx512-freq.html) due to SIMD instructions: we are thus more aggressive with SIMD on these machines. If you can still concerned, you can easily disable AVX-512 with the CMake option `SIMDJSON_AVX512_ALLOWED` set to `OFF` (e.g., `cmake -D SIMDJSON_AVX512_ALLOWED=OFF -B build && cmake --build build`) or by setting
|
||||||
detected. However, we only allow AVX-512 on recent processors (Ice Lake/Tiger Lake or better) where [little to no frequency throttling is expected](https://travisdowns.github.io/blog/2020/08/19/icl-avx512-freq.html). If you can still concerned, you can easily disable AVX-512 with the CMake option `SIMDJSON_AVX512_ALLOWED` set to `OFF` (e.g., `cmake -D SIMDJSON_AVX512_ALLOWED=OFF -B build && cmake --build build`) or by setting
|
|
||||||
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);
|
||||||
|
|||||||
+18
-3
@@ -34,8 +34,23 @@
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "simdjson/simdjson_version.h"
|
#include "simdjson/common_defs.h"
|
||||||
#include "simdjson/dom.h"
|
|
||||||
#include "simdjson/builtin.h"
|
|
||||||
|
|
||||||
|
// This provides the public API for simdjson.
|
||||||
|
// DOM and ondemand are amalgamated separately, in simdjson.h
|
||||||
|
#include "simdjson/simdjson_version.h"
|
||||||
|
|
||||||
|
#include "simdjson/base.h"
|
||||||
|
|
||||||
|
#include "simdjson/error.h"
|
||||||
|
#include "simdjson/error-inl.h"
|
||||||
|
#include "simdjson/implementation.h"
|
||||||
|
#include "simdjson/minify.h"
|
||||||
|
#include "simdjson/padded_string.h"
|
||||||
|
#include "simdjson/padded_string-inl.h"
|
||||||
|
#include "simdjson/padded_string_view.h"
|
||||||
|
#include "simdjson/padded_string_view-inl.h"
|
||||||
|
|
||||||
|
#include "simdjson/dom.h"
|
||||||
|
#include "simdjson/ondemand.h"
|
||||||
#endif // SIMDJSON_H
|
#endif // SIMDJSON_H
|
||||||
|
|||||||
@@ -1,34 +1,8 @@
|
|||||||
#ifndef SIMDJSON_ARM64_H
|
#ifndef SIMDJSON_ARM64_H
|
||||||
#define SIMDJSON_ARM64_H
|
#define SIMDJSON_ARM64_H
|
||||||
|
|
||||||
#include "simdjson/implementation-base.h"
|
|
||||||
|
|
||||||
#if SIMDJSON_IMPLEMENTATION_ARM64
|
|
||||||
|
|
||||||
namespace simdjson {
|
|
||||||
/**
|
|
||||||
* Implementation for NEON (ARMv8).
|
|
||||||
*/
|
|
||||||
namespace arm64 {
|
|
||||||
} // namespace arm64
|
|
||||||
} // namespace simdjson
|
|
||||||
|
|
||||||
#include "simdjson/arm64/implementation.h"
|
|
||||||
|
|
||||||
#include "simdjson/arm64/begin.h"
|
#include "simdjson/arm64/begin.h"
|
||||||
|
#include "simdjson/generic/amalgamated.h"
|
||||||
// Declarations
|
|
||||||
#include "simdjson/generic/dom_parser_implementation.h"
|
|
||||||
#include "simdjson/arm64/intrinsics.h"
|
|
||||||
#include "simdjson/arm64/bitmanipulation.h"
|
|
||||||
#include "simdjson/arm64/bitmask.h"
|
|
||||||
#include "simdjson/arm64/simd.h"
|
|
||||||
#include "simdjson/generic/jsoncharutils.h"
|
|
||||||
#include "simdjson/generic/atomparsing.h"
|
|
||||||
#include "simdjson/arm64/stringparsing.h"
|
|
||||||
#include "simdjson/arm64/numberparsing.h"
|
|
||||||
#include "simdjson/arm64/end.h"
|
#include "simdjson/arm64/end.h"
|
||||||
|
|
||||||
#endif // SIMDJSON_IMPLEMENTATION_ARM64
|
#endif // SIMDJSON_ARM64_H
|
||||||
|
|
||||||
#endif // SIMDJSON_ARM64_H
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user