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

Crude first cut of "stage34", a unified code-based DFA with explicit stack for stages 3 and 4.

This commit is contained in:
Geoff Langdale 2018-09-24 10:42:30 +10:00
parent 2aa6b93a02
commit 053f04b15d
4 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -11,8 +11,8 @@ LIBFLAGS = -ldouble-conversion
EXECUTABLES=parse jsoncheck minifiercompetition parsingcompetition EXECUTABLES=parse jsoncheck minifiercompetition parsingcompetition
DOUBLEEXECUTABLES=parsedouble jsoncheckdouble parsingcompetitiondouble DOUBLEEXECUTABLES=parsedouble jsoncheckdouble parsingcompetitiondouble
HEADERS=include/jsonparser/jsonparser.h include/jsonparser/common_defs.h include/jsonparser/jsonioutil.h benchmark/benchmark.h benchmark/linux/linux-perf-events.h include/jsonparser/simdjson_internal.h include/jsonparser/stage1_find_marks.h include/jsonparser/stage2_flatten.h include/jsonparser/stage3_ape_machine.h include/jsonparser/stage4_shovel_machine.h HEADERS=include/jsonparser/jsonparser.h include/jsonparser/common_defs.h include/jsonparser/jsonioutil.h benchmark/benchmark.h benchmark/linux/linux-perf-events.h include/jsonparser/simdjson_internal.h include/jsonparser/stage1_find_marks.h include/jsonparser/stage2_flatten.h include/jsonparser/stage3_ape_machine.h include/jsonparser/stage4_shovel_machine.h include/jsonparser/stage34_unified.h
LIBFILES=src/jsonioutil.cpp src/jsonparser.cpp src/stage1_find_marks.cpp src/stage2_flatten.cpp src/stage3_ape_machine.cpp src/stage4_shovel_machine.cpp LIBFILES=src/jsonioutil.cpp src/jsonparser.cpp src/stage1_find_marks.cpp src/stage2_flatten.cpp src/stage3_ape_machine.cpp src/stage4_shovel_machine.cpp src/stage34_unified.cpp
MINIFIERHEADERS=include/jsonparser/jsonminifier.h include/jsonparser/simdprune_tables.h MINIFIERHEADERS=include/jsonparser/jsonminifier.h include/jsonparser/simdprune_tables.h
MINIFIERLIBFILES=src/jsonminifier.cpp MINIFIERLIBFILES=src/jsonminifier.cpp

36
benchmark/parse.cpp
View File

@ -22,6 +22,8 @@
#include <vector> #include <vector>
#include <x86intrin.h> #include <x86intrin.h>
//#define TEST_UNIFIED
/// Fixme: enable doube conv /// Fixme: enable doube conv
// #define DOUBLECONV // #define DOUBLECONV
#ifdef DOUBLECONV #ifdef DOUBLECONV
@ -39,6 +41,7 @@ using namespace double_conversion;
#include "jsonparser/stage2_flatten.h" #include "jsonparser/stage2_flatten.h"
#include "jsonparser/stage3_ape_machine.h" #include "jsonparser/stage3_ape_machine.h"
#include "jsonparser/stage4_shovel_machine.h" #include "jsonparser/stage4_shovel_machine.h"
#include "jsonparser/stage34_unified.h"
using namespace std; using namespace std;
// https://stackoverflow.com/questions/2616906/how-do-i-output-coloured-text-to-a-linux-terminal // https://stackoverflow.com/questions/2616906/how-do-i-output-coloured-text-to-a-linux-terminal
@ -170,8 +173,10 @@ int main(int argc, char *argv[]) {
unified.end(results); unified.end(results);
cy1 += results[0]; cy1 += results[0];
cl1 += results[1]; cl1 += results[1];
if (!isok) if (!isok) {
cout << "Here1\n";
break; break;
}
unified.start(); unified.start();
#endif #endif
isok = flatten_indexes(p.second, pj); isok = flatten_indexes(p.second, pj);
@ -179,17 +184,24 @@ int main(int argc, char *argv[]) {
unified.end(results); unified.end(results);
cy2 += results[0]; cy2 += results[0];
cl2 += results[1]; cl2 += results[1];
if (!isok) if (!isok) {
cout << "Here2\n";
break; break;
}
unified.start(); unified.start();
#endif #endif
#ifndef TEST_UNIFIED
isok = ape_machine(p.first, p.second, pj); isok = ape_machine(p.first, p.second, pj);
#ifndef SQUASH_COUNTERS #ifndef SQUASH_COUNTERS
unified.end(results); unified.end(results);
cy3 += results[0]; cy3 += results[0];
cl3 += results[1]; cl3 += results[1];
if (!isok) if (!isok) {
cout << "Here3\n";
break; break;
}
unified.start(); unified.start();
#endif #endif
isok = shovel_machine(p.first, p.second, pj); isok = shovel_machine(p.first, p.second, pj);
@ -198,8 +210,24 @@ int main(int argc, char *argv[]) {
cy4 += results[0]; cy4 += results[0];
cl4 += results[1]; cl4 += results[1];
#endif #endif
if (!isok) if (!isok) {
cout << "Here4\n";
break; break;
}
#else
isok = unified_machine(p.first, p.second, pj);
#ifndef SQUASH_COUNTERS
unified.end(results);
cy3 += results[0];
cl3 += results[1];
if (!isok) {
cout << "Here3\n";
break;
}
#endif
#endif
auto end = std::chrono::steady_clock::now(); auto end = std::chrono::steady_clock::now();
std::chrono::duration<double> secs = end - start; std::chrono::duration<double> secs = end - start;
res[i] = secs.count(); res[i] = secs.count();

7
include/jsonparser/stage34_unified.h Normal file
View File

@ -0,0 +1,7 @@
#pragma once
#include "common_defs.h"
#include "simdjson_internal.h"
void init_state_machine();
bool unified_machine(const u8 *buf, size_t len, ParsedJson &pj);

2
src/stage4_shovel_machine.cpp
View File

@ -644,8 +644,10 @@ bool shovel_machine(const u8 *buf, size_t len, ParsedJson &pj) {
} }
} }
} }
/*
if (error_sump) { if (error_sump) {
return false; return false;
} }
*/
return true; return true;
} }