Compare commits

...

2 Commits

Author SHA1 Message Date
Daniel Lemire 5541e78402 version bump 2023-12-01 13:56:12 -05:00
Daniel Lemire 9a9ed0e2da Fix Visual Studio 64-bit ARM regression (#2091)
* fix for ARM64 kernel under Visual Studio (bug introduced in release 3.6.1)

* revert comment

* updating amal.
2023-12-01 13:55:28 -05:00
6 changed files with 68 additions and 68 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14)
project( project(
simdjson simdjson
# The version number is modified by tools/release.py # The version number is modified by tools/release.py
VERSION 3.6.1 VERSION 3.6.2
DESCRIPTION "Parsing gigabytes of JSON per second" DESCRIPTION "Parsing gigabytes of JSON per second"
HOMEPAGE_URL "https://simdjson.org/" HOMEPAGE_URL "https://simdjson.org/"
LANGUAGES CXX C LANGUAGES CXX C
+1 -1
View File
@@ -38,7 +38,7 @@ PROJECT_NAME = simdjson
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = "3.6.1" PROJECT_NUMBER = "3.6.2"
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a # for a project that appears at the top of each page and should give viewer a
+12 -12
View File
@@ -21,7 +21,7 @@ namespace {
#define simdjson_make_uint8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \ #define simdjson_make_uint8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \
x13, x14, x15, x16) \ x13, x14, x15, x16) \
([=]() { \ ([=]() { \
static uint8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \ uint8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \
x9, x10, x11, x12, x13, x14, x15, x16}; \ x9, x10, x11, x12, x13, x14, x15, x16}; \
return vld1q_u8(array); \ return vld1q_u8(array); \
}()) }())
@@ -30,7 +30,7 @@ namespace {
#define simdjson_make_int8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \ #define simdjson_make_int8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \
x13, x14, x15, x16) \ x13, x14, x15, x16) \
([=]() { \ ([=]() { \
static int8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \ int8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \
x9, x10, x11, x12, x13, x14, x15, x16}; \ x9, x10, x11, x12, x13, x14, x15, x16}; \
return vld1q_s8(array); \ return vld1q_s8(array); \
}()) }())
@@ -38,29 +38,29 @@ namespace {
#ifndef simdjson_make_uint8x8_t #ifndef simdjson_make_uint8x8_t
#define simdjson_make_uint8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_uint8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static uint8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ uint8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1_u8(array); \ return vld1_u8(array); \
}()) }())
#endif #endif
#ifndef simdjson_make_int8x8_t #ifndef simdjson_make_int8x8_t
#define simdjson_make_int8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_int8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static int8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ int8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1_s8(array); \ return vld1_s8(array); \
}()) }())
#endif #endif
#ifndef simdjson_make_uint16x8_t #ifndef simdjson_make_uint16x8_t
#define simdjson_make_uint16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_uint16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static uint16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ uint16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1q_u16(array); \ return vld1q_u16(array); \
}()) }())
#endif #endif
#ifndef simdjson_make_int16x8_t #ifndef simdjson_make_int16x8_t
#define simdjson_make_int16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_int16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static int16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ int16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1q_s16(array); \ return vld1q_s16(array); \
}()) }())
#endif #endif
+2 -2
View File
@@ -4,7 +4,7 @@
#define SIMDJSON_SIMDJSON_VERSION_H #define SIMDJSON_SIMDJSON_VERSION_H
/** The version of simdjson being used (major.minor.revision) */ /** The version of simdjson being used (major.minor.revision) */
#define SIMDJSON_VERSION "3.6.1" #define SIMDJSON_VERSION "3.6.2"
namespace simdjson { namespace simdjson {
enum { enum {
@@ -19,7 +19,7 @@ enum {
/** /**
* The revision (major.minor.REVISION) of simdjson being used. * The revision (major.minor.REVISION) of simdjson being used.
*/ */
SIMDJSON_VERSION_REVISION = 1 SIMDJSON_VERSION_REVISION = 2
}; };
} // namespace simdjson } // namespace simdjson
+25 -25
View File
@@ -1,4 +1,4 @@
/* auto-generated on 2023-11-30 18:06:50 -0500. Do not edit! */ /* auto-generated on 2023-12-01 13:55:28 -0500. Do not edit! */
/* including simdjson.cpp: */ /* including simdjson.cpp: */
/* begin file simdjson.cpp */ /* begin file simdjson.cpp */
#define SIMDJSON_SRC_SIMDJSON_CPP #define SIMDJSON_SRC_SIMDJSON_CPP
@@ -7570,7 +7570,7 @@ namespace {
#define simdjson_make_uint8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \ #define simdjson_make_uint8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \
x13, x14, x15, x16) \ x13, x14, x15, x16) \
([=]() { \ ([=]() { \
static uint8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \ uint8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \
x9, x10, x11, x12, x13, x14, x15, x16}; \ x9, x10, x11, x12, x13, x14, x15, x16}; \
return vld1q_u8(array); \ return vld1q_u8(array); \
}()) }())
@@ -7579,7 +7579,7 @@ namespace {
#define simdjson_make_int8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \ #define simdjson_make_int8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \
x13, x14, x15, x16) \ x13, x14, x15, x16) \
([=]() { \ ([=]() { \
static int8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \ int8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \
x9, x10, x11, x12, x13, x14, x15, x16}; \ x9, x10, x11, x12, x13, x14, x15, x16}; \
return vld1q_s8(array); \ return vld1q_s8(array); \
}()) }())
@@ -7587,29 +7587,29 @@ namespace {
#ifndef simdjson_make_uint8x8_t #ifndef simdjson_make_uint8x8_t
#define simdjson_make_uint8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_uint8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static uint8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ uint8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1_u8(array); \ return vld1_u8(array); \
}()) }())
#endif #endif
#ifndef simdjson_make_int8x8_t #ifndef simdjson_make_int8x8_t
#define simdjson_make_int8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_int8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static int8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ int8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1_s8(array); \ return vld1_s8(array); \
}()) }())
#endif #endif
#ifndef simdjson_make_uint16x8_t #ifndef simdjson_make_uint16x8_t
#define simdjson_make_uint16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_uint16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static uint16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ uint16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1q_u16(array); \ return vld1q_u16(array); \
}()) }())
#endif #endif
#ifndef simdjson_make_int16x8_t #ifndef simdjson_make_int16x8_t
#define simdjson_make_int16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_int16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static int16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ int16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1q_s16(array); \ return vld1q_s16(array); \
}()) }())
#endif #endif
@@ -10275,7 +10275,7 @@ namespace {
#define simdjson_make_uint8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \ #define simdjson_make_uint8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \
x13, x14, x15, x16) \ x13, x14, x15, x16) \
([=]() { \ ([=]() { \
static uint8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \ uint8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \
x9, x10, x11, x12, x13, x14, x15, x16}; \ x9, x10, x11, x12, x13, x14, x15, x16}; \
return vld1q_u8(array); \ return vld1q_u8(array); \
}()) }())
@@ -10284,7 +10284,7 @@ namespace {
#define simdjson_make_int8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \ #define simdjson_make_int8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \
x13, x14, x15, x16) \ x13, x14, x15, x16) \
([=]() { \ ([=]() { \
static int8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \ int8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \
x9, x10, x11, x12, x13, x14, x15, x16}; \ x9, x10, x11, x12, x13, x14, x15, x16}; \
return vld1q_s8(array); \ return vld1q_s8(array); \
}()) }())
@@ -10292,29 +10292,29 @@ namespace {
#ifndef simdjson_make_uint8x8_t #ifndef simdjson_make_uint8x8_t
#define simdjson_make_uint8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_uint8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static uint8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ uint8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1_u8(array); \ return vld1_u8(array); \
}()) }())
#endif #endif
#ifndef simdjson_make_int8x8_t #ifndef simdjson_make_int8x8_t
#define simdjson_make_int8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_int8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static int8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ int8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1_s8(array); \ return vld1_s8(array); \
}()) }())
#endif #endif
#ifndef simdjson_make_uint16x8_t #ifndef simdjson_make_uint16x8_t
#define simdjson_make_uint16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_uint16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static uint16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ uint16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1q_u16(array); \ return vld1q_u16(array); \
}()) }())
#endif #endif
#ifndef simdjson_make_int16x8_t #ifndef simdjson_make_int16x8_t
#define simdjson_make_int16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_int16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static int16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ int16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1q_s16(array); \ return vld1q_s16(array); \
}()) }())
#endif #endif
+27 -27
View File
@@ -1,4 +1,4 @@
/* auto-generated on 2023-11-30 18:06:50 -0500. Do not edit! */ /* auto-generated on 2023-12-01 13:55:28 -0500. Do not edit! */
/* including simdjson.h: */ /* including simdjson.h: */
/* begin file simdjson.h */ /* begin file simdjson.h */
#ifndef SIMDJSON_H #ifndef SIMDJSON_H
@@ -2321,7 +2321,7 @@ namespace std {
#define SIMDJSON_SIMDJSON_VERSION_H #define SIMDJSON_SIMDJSON_VERSION_H
/** The version of simdjson being used (major.minor.revision) */ /** The version of simdjson being used (major.minor.revision) */
#define SIMDJSON_VERSION "3.6.1" #define SIMDJSON_VERSION "3.6.2"
namespace simdjson { namespace simdjson {
enum { enum {
@@ -2336,7 +2336,7 @@ enum {
/** /**
* The revision (major.minor.REVISION) of simdjson being used. * The revision (major.minor.REVISION) of simdjson being used.
*/ */
SIMDJSON_VERSION_REVISION = 1 SIMDJSON_VERSION_REVISION = 2
}; };
} // namespace simdjson } // namespace simdjson
@@ -10654,7 +10654,7 @@ namespace {
#define simdjson_make_uint8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \ #define simdjson_make_uint8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \
x13, x14, x15, x16) \ x13, x14, x15, x16) \
([=]() { \ ([=]() { \
static uint8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \ uint8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \
x9, x10, x11, x12, x13, x14, x15, x16}; \ x9, x10, x11, x12, x13, x14, x15, x16}; \
return vld1q_u8(array); \ return vld1q_u8(array); \
}()) }())
@@ -10663,7 +10663,7 @@ namespace {
#define simdjson_make_int8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \ #define simdjson_make_int8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \
x13, x14, x15, x16) \ x13, x14, x15, x16) \
([=]() { \ ([=]() { \
static int8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \ int8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \
x9, x10, x11, x12, x13, x14, x15, x16}; \ x9, x10, x11, x12, x13, x14, x15, x16}; \
return vld1q_s8(array); \ return vld1q_s8(array); \
}()) }())
@@ -10671,29 +10671,29 @@ namespace {
#ifndef simdjson_make_uint8x8_t #ifndef simdjson_make_uint8x8_t
#define simdjson_make_uint8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_uint8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static uint8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ uint8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1_u8(array); \ return vld1_u8(array); \
}()) }())
#endif #endif
#ifndef simdjson_make_int8x8_t #ifndef simdjson_make_int8x8_t
#define simdjson_make_int8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_int8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static int8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ int8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1_s8(array); \ return vld1_s8(array); \
}()) }())
#endif #endif
#ifndef simdjson_make_uint16x8_t #ifndef simdjson_make_uint16x8_t
#define simdjson_make_uint16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_uint16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static uint16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ uint16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1q_u16(array); \ return vld1q_u16(array); \
}()) }())
#endif #endif
#ifndef simdjson_make_int16x8_t #ifndef simdjson_make_int16x8_t
#define simdjson_make_int16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_int16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static int16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ int16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1q_s16(array); \ return vld1q_s16(array); \
}()) }())
#endif #endif
@@ -26146,7 +26146,7 @@ namespace {
#define simdjson_make_uint8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \ #define simdjson_make_uint8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \
x13, x14, x15, x16) \ x13, x14, x15, x16) \
([=]() { \ ([=]() { \
static uint8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \ uint8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \
x9, x10, x11, x12, x13, x14, x15, x16}; \ x9, x10, x11, x12, x13, x14, x15, x16}; \
return vld1q_u8(array); \ return vld1q_u8(array); \
}()) }())
@@ -26155,7 +26155,7 @@ namespace {
#define simdjson_make_int8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \ #define simdjson_make_int8x16_t(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, \
x13, x14, x15, x16) \ x13, x14, x15, x16) \
([=]() { \ ([=]() { \
static int8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \ int8_t array[16] = {x1, x2, x3, x4, x5, x6, x7, x8, \
x9, x10, x11, x12, x13, x14, x15, x16}; \ x9, x10, x11, x12, x13, x14, x15, x16}; \
return vld1q_s8(array); \ return vld1q_s8(array); \
}()) }())
@@ -26163,29 +26163,29 @@ namespace {
#ifndef simdjson_make_uint8x8_t #ifndef simdjson_make_uint8x8_t
#define simdjson_make_uint8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_uint8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static uint8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ uint8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1_u8(array); \ return vld1_u8(array); \
}()) }())
#endif #endif
#ifndef simdjson_make_int8x8_t #ifndef simdjson_make_int8x8_t
#define simdjson_make_int8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_int8x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static int8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ int8_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1_s8(array); \ return vld1_s8(array); \
}()) }())
#endif #endif
#ifndef simdjson_make_uint16x8_t #ifndef simdjson_make_uint16x8_t
#define simdjson_make_uint16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_uint16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static uint16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ uint16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1q_u16(array); \ return vld1q_u16(array); \
}()) }())
#endif #endif
#ifndef simdjson_make_int16x8_t #ifndef simdjson_make_int16x8_t
#define simdjson_make_int16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \ #define simdjson_make_int16x8_t(x1, x2, x3, x4, x5, x6, x7, x8) \
([=]() { \ ([=]() { \
static int16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \ int16_t array[8] = {x1, x2, x3, x4, x5, x6, x7, x8}; \
return vld1q_s16(array); \ return vld1q_s16(array); \
}()) }())
#endif #endif