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

Mostly fixed performance regression.

This commit is contained in:
Daniel Lemire 2018-12-10 15:35:42 -05:00
parent 8615760331
commit 7fda77d51a
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/simdjson/jsoncharutils.h
View File

@ -33,6 +33,23 @@ really_inline u32 is_not_structural_or_whitespace(u8 c) {
return structural_or_whitespace_negated[c]; return structural_or_whitespace_negated[c];
} }
const u32 structural_or_whitespace[256] = {
1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
really_inline u32 is_structural_or_whitespace(u8 c) {
return structural_or_whitespace[c];
}
const char digittoval[256] = { const char digittoval[256] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

9
include/simdjson/numberparsing.h
View File

@ -250,7 +250,7 @@ parse_float(const u8 *const buf,
#ifdef JSON_TEST_NUMBERS // for unit testing #ifdef JSON_TEST_NUMBERS // for unit testing
foundFloat(d, buf + offset); foundFloat(d, buf + offset);
#endif #endif
return true; return is_structural_or_whitespace(*p);
} }
// called by parse_number when we know that the output is an integer, // called by parse_number when we know that the output is an integer,
@ -321,7 +321,7 @@ static never_inline bool parse_large_integer(const u8 *const buf,
#ifdef JSON_TEST_NUMBERS // for unit testing #ifdef JSON_TEST_NUMBERS // for unit testing
foundInteger(signed_answer, buf + offset); foundInteger(signed_answer, buf + offset);
#endif #endif
return true; return is_structural_or_whitespace(*p);
} }
#ifndef likely #ifndef likely
@ -450,9 +450,6 @@ static really_inline bool parse_number(const u8 *const buf,
} }
exponent += (negexp ? -expnumber : expnumber); exponent += (negexp ? -expnumber : expnumber);
} }
if(is_not_structural_or_whitespace(*p)) {
return false;
}
i = negative ? -i : i; i = negative ? -i : i;
if ((exponent != 0) || (expnumber != 0)) { if ((exponent != 0) || (expnumber != 0)) {
if (unlikely(digitcount >= 19)) { // this is uncommon!!! if (unlikely(digitcount >= 19)) { // this is uncommon!!!
@ -495,5 +492,5 @@ static really_inline bool parse_number(const u8 *const buf,
foundInteger(i, buf + offset); foundInteger(i, buf + offset);
#endif #endif
} }
return true; return is_structural_or_whitespace(*p);
} }