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

Cleaning out function names.

This commit is contained in:
Daniel Lemire 2018-12-30 20:57:53 -05:00
parent c6df7cb5f4
commit ebfb86222f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/jsonminifier.cpp
View File

@ -146,10 +146,10 @@ size_t jsonminify(const uint8_t *buf, size_t len, uint8_t *out) {
int mask2 = (whitespace >> 16) & 0xFFFF;
int mask3 = (whitespace >> 32) & 0xFFFF;
int mask4 = (whitespace >> 48) & 0xFFFF;
int pop1 = _mm_popcnt_u64((~whitespace) & 0xFFFF);
int pop2 = _mm_popcnt_u64((~whitespace) & UINT64_C(0xFFFFFFFF));
int pop3 = _mm_popcnt_u64((~whitespace) & UINT64_C(0xFFFFFFFFFFFF));
int pop4 = _mm_popcnt_u64((~whitespace));
int pop1 = hamming((~whitespace) & 0xFFFF);
int pop2 = hamming((~whitespace) & UINT64_C(0xFFFFFFFF));
int pop3 = hamming((~whitespace) & UINT64_C(0xFFFFFFFFFFFF));
int pop4 = hamming((~whitespace));
__m256i vmask1 =
_mm256_loadu2_m128i((const __m128i *)mask128_epi8 + (mask2 & 0x7FFF),
(const __m128i *)mask128_epi8 + (mask1 & 0x7FFF));
@ -225,10 +225,10 @@ size_t jsonminify(const uint8_t *buf, size_t len, uint8_t *out) {
int mask2 = (whitespace >> 16) & 0xFFFF;
int mask3 = (whitespace >> 32) & 0xFFFF;
int mask4 = (whitespace >> 48) & 0xFFFF;
int pop1 = _mm_popcnt_u64((~whitespace) & 0xFFFF);
int pop2 = _mm_popcnt_u64((~whitespace) & UINT64_C(0xFFFFFFFF));
int pop3 = _mm_popcnt_u64((~whitespace) & UINT64_C(0xFFFFFFFFFFFF));
int pop4 = _mm_popcnt_u64((~whitespace));
int pop1 = hamming((~whitespace) & 0xFFFF);
int pop2 = hamming((~whitespace) & UINT64_C(0xFFFFFFFF));
int pop3 = hamming((~whitespace) & UINT64_C(0xFFFFFFFFFFFF));
int pop4 = hamming((~whitespace));
__m256i vmask1 =
_mm256_loadu2_m128i((const __m128i *)mask128_epi8 + (mask2 & 0x7FFF),
(const __m128i *)mask128_epi8 + (mask1 & 0x7FFF));

2
src/stage2_flatten.cpp
View File

@ -72,7 +72,7 @@ bool flatten_indexes(size_t len, ParsedJson &pj) {
s &= s - 1ULL;
}
#elif defined(NO_PDEP_PLEASE)
uint32_t cnt = _mm_popcnt_u64(s);
uint32_t cnt = hamming(s);
uint32_t next_base = base + cnt;
while (s) {
CALL(SET_BITLOOPN, NO_PDEP_WIDTH)