Skip to content

Commit 9a404bd

Browse files
authored
Reenabling the optimized kernels (main branch). (simdjson#1344)
* Reenabling the optimized kernels (main branch). * Defining SIMDJSON_CAN_ALWAYS_RUN_PPC64 and SIMDJSON_CAN_ALWAYS_RUN_ARM64 * Adding the bad UTF8 string from the fuzzer. * Taking into account John's comments. * Bumping the lib version. * Update CMakeLists.txt
1 parent 91b07ba commit 9a404bd

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ project(simdjson
77

88
set(PROJECT_VERSION_MAJOR 0)
99
set(PROJECT_VERSION_MINOR 7)
10-
set(PROJECT_VERSION_PATCH 0)
11-
set(SIMDJSON_SEMANTIC_VERSION "0.7.0" CACHE STRING "simdjson semantic version")
12-
set(SIMDJSON_LIB_VERSION "5.0.0" CACHE STRING "simdjson library version")
13-
set(SIMDJSON_LIB_SOVERSION "5" CACHE STRING "simdjson library soversion")
10+
set(PROJECT_VERSION_PATCH 1)
11+
set(SIMDJSON_SEMANTIC_VERSION "0.7.1" CACHE STRING "simdjson semantic version")
12+
set(SIMDJSON_LIB_VERSION "6.0.0" CACHE STRING "simdjson library version")
13+
set(SIMDJSON_LIB_SOVERSION "6" CACHE STRING "simdjson library soversion")
1414
set(SIMDJSON_GITHUB_REPOSITORY https://github.com/simdjson/simdjson)
1515

1616
include(GNUInstallDirs)

include/simdjson/arm64.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77

88
#include "simdjson/portability.h"
99

10+
#ifndef SIMDJSON_IMPLEMENTATION_ARM64
11+
#define SIMDJSON_IMPLEMENTATION_ARM64 (SIMDJSON_IS_ARM64)
12+
#endif
13+
#define SIMDJSON_CAN_ALWAYS_RUN_ARM64 SIMDJSON_IMPLEMENTATION_ARM64 && SIMDJSON_IS_ARM64
14+
15+
1016
#include "simdjson/internal/isadetection.h"
1117
#include "simdjson/internal/jsoncharutils_tables.h"
1218
#include "simdjson/internal/numberparsing_tables.h"

include/simdjson/ppc64.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77

88
#include "simdjson/portability.h"
99

10+
#ifndef SIMDJSON_IMPLEMENTATION_PPC64
11+
#define SIMDJSON_IMPLEMENTATION_PPC64 (SIMDJSON_IS_PPC64)
12+
#endif
13+
#define SIMDJSON_CAN_ALWAYS_RUN_PPC64 SIMDJSON_IMPLEMENTATION_PPC64 && SIMDJSON_IS_PPC64
14+
15+
1016
#include "simdjson/internal/isadetection.h"
1117
#include "simdjson/internal/jsoncharutils_tables.h"
1218
#include "simdjson/internal/numberparsing_tables.h"

tests/unicode_tests.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,8 @@ void test() {
222222
"\xef\xbf", // 6.14.7
223223
"\x80",
224224
"\x91\x85\x95\x9e",
225-
"\x6c\x02\x8e\x18"};
225+
"\x6c\x02\x8e\x18",
226+
"[[[[[[[[[[[[[[[\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x000\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"};
226227
for (size_t i = 0; i < 8; i++) {
227228
size_t len = std::strlen(goodsequences[i]);
228229
if (!simdjson::validate_utf8(goodsequences[i], len)) {

0 commit comments

Comments
 (0)