jasder
/
simdjson
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Adding haswell amal. tests (#447) 

* Adding an extra test.

* Disabling the AVX-accelerated minifier.

* Updating amalgamation.
This commit is contained in:
Daniel Lemire 2020-01-15 19:49:11 -05:00 committed by GitHub
parent f87e64f988
commit ab6d4871d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.circleci/config.yml
View File

@ -24,8 +24,11 @@ commands:
- checkout - checkout
- run: make - run: make
- run: make amalgamate - run: make amalgamate
- run: ARCHFLAGS=-march=haswell make amalgamate # some users do this: https://github.com/lemire/simdjson/issues/444
- run: make test - run: make test
- run: make checkperf - run: make checkperf
- run: make clean
- run: ARCHFLAGS=-march=haswell make test # this breaks runtime dispatch, but see https://github.com/lemire/simdjson/issues/444... this is a code robustness test
cmake_test: cmake_test:
steps: steps:
- run: apt-get update -qq - run: apt-get update -qq

2
singleheader/amalgamation_demo.cpp
View File

@ -1,4 +1,4 @@
/* auto-generated on Wed Jan 15 13:09:01 EST 2020. Do not edit! */ /* auto-generated on Wed Jan 15 15:50:50 EST 2020. Do not edit! */
#include <iostream> #include <iostream>
#include "simdjson.h" #include "simdjson.h"

6
singleheader/simdjson.cpp
View File

@ -1,4 +1,4 @@
/* auto-generated on Wed Jan 15 13:09:01 EST 2020. Do not edit! */ /* auto-generated on Wed Jan 15 15:50:50 EST 2020. Do not edit! */
#include "simdjson.h" #include "simdjson.h"
/* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */ /* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */
@ -582,7 +582,7 @@ padded_string get_corpus(const std::string &filename) {
/* begin file src/jsonminifier.cpp */ /* begin file src/jsonminifier.cpp */
#include <cstdint> #include <cstdint>
#ifndef __AVX2__ #ifndef SIMDJSON_ISSUE384RESOLVED // to avoid tripping users
namespace simdjson { namespace simdjson {
static uint8_t jump_table[256 * 3] = { static uint8_t jump_table[256 * 3] = {
@ -642,7 +642,7 @@ size_t json_minify(const unsigned char *bytes, size_t how_many,
#else #else
// //
// This fast code is disabled in the context of runtime dispatching. // This fast code is disabled.
// See issue https://github.com/lemire/simdjson/issues/384 // See issue https://github.com/lemire/simdjson/issues/384
// //
#include <cstring> #include <cstring>

7
singleheader/simdjson.h
View File

@ -1,4 +1,4 @@
/* auto-generated on Wed Jan 15 13:09:01 EST 2020. Do not edit! */ /* auto-generated on Wed Jan 15 15:50:50 EST 2020. Do not edit! */
/* begin file include/simdjson/simdjson_version.h */ /* begin file include/simdjson/simdjson_version.h */
// /include/simdjson/simdjson_version.h automatically generated by release.py, // /include/simdjson/simdjson_version.h automatically generated by release.py,
// do not change by hand // do not change by hand
@ -570,13 +570,10 @@ const std::string &error_message(const int);
#define SIMDJSON_MAXSIZE_BYTES 0xFFFFFFFF #define SIMDJSON_MAXSIZE_BYTES 0xFFFFFFFF
// the input buf should be readable up to buf + SIMDJSON_PADDING // the input buf should be readable up to buf + SIMDJSON_PADDING
#ifdef __AVX2__
#define SIMDJSON_PADDING sizeof(__m256i)
#else
// this is a stopgap; there should be a better description of the // this is a stopgap; there should be a better description of the
// main loop and its behavior that abstracts over this // main loop and its behavior that abstracts over this
// See https://github.com/lemire/simdjson/issues/174
#define SIMDJSON_PADDING 32 #define SIMDJSON_PADDING 32
#endif
#if defined(__GNUC__) #if defined(__GNUC__)
// Marks a block with a name so that MCA analysis can see it. // Marks a block with a name so that MCA analysis can see it.

4
src/jsonminifier.cpp
View File

@ -1,7 +1,7 @@
#include "simdjson/portability.h" #include "simdjson/portability.h"
#include <cstdint> #include <cstdint>
#ifndef __AVX2__ #ifndef SIMDJSON_ISSUE384RESOLVED // to avoid tripping users
namespace simdjson { namespace simdjson {
static uint8_t jump_table[256 * 3] = { static uint8_t jump_table[256 * 3] = {
@ -61,7 +61,7 @@ size_t json_minify(const unsigned char *bytes, size_t how_many,
#else #else
// //
// This fast code is disabled in the context of runtime dispatching. // This fast code is disabled.
// See issue https://github.com/lemire/simdjson/issues/384 // See issue https://github.com/lemire/simdjson/issues/384
// //
#include "simdprune_tables.h" #include "simdprune_tables.h"