release candidate

Reduce errors in vscode

.clangd

@@ -45,11 +45,3 @@ Diagnostics:
     Suppress:
         - pragma_attribute_no_pop_eof
         - pragma_attribute_stack_mismatch
----
-# clang 18
-If:
-    PathMatch:
-        - dependencies/.cache/json11/json11.cpp
-CompileFlags:
-    Add:
-        - -Wno-unqualified-std-cast-call

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14)
 project(
     simdjson
     # The version number is modified by tools/release.py
-    VERSION 3.10.0
+    VERSION 3.10.1
     DESCRIPTION "Parsing gigabytes of JSON per second"
     HOMEPAGE_URL "https://simdjson.org/"
     LANGUAGES CXX C
@@ -23,7 +23,11 @@ string(
 set(SIMDJSON_LIB_VERSION "23.0.0" CACHE STRING "simdjson library version")
 set(SIMDJSON_LIB_SOVERSION "23" CACHE STRING "simdjson library soversion")
 
-option(SIMDJSON_BUILD_STATIC_LIB "Build simdjson_static library along with simdjson" OFF)
+option(SIMDJSON_BUILD_STATIC_LIB "Build simdjson_static library along with simdjson (only makes sense if BUILD_SHARED_LIBS=ON)" OFF)
+if(SIMDJSON_BUILD_STATIC_LIB AND NOT BUILD_SHARED_LIBS)
+  message(WARNING "SIMDJSON_BUILD_STATIC_LIB only makes sense if BUILD_SHARED_LIBS is set to ON")
+  message(WARNING "You might be building and installing a two identical static libraries.")
+endif()
 
 option(SIMDJSON_ENABLE_THREADS "Link with thread support" ON)
 
@@ -206,6 +210,7 @@ if(SIMDJSON_BUILD_STATIC_LIB)
       TARGETS simdjson_static
       EXPORT simdjson_staticTargets
       ARCHIVE COMPONENT simdjson_Development
+      INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
   )
   install(
       EXPORT simdjson_staticTargets

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = simdjson
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "3.10.0"
+PROJECT_NUMBER         = "3.10.1"
 
 # 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

include/simdjson/arm64/simd.h

@@ -412,66 +412,6 @@ namespace {
     }
   };
 
-#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
-      static const uint8x16_t BITMASK64_BUILDER_MASK = simdjson_make_uint8x16_t(
-        0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80,
-        0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80
-      );
-#else
-      static const uint8x16_t BITMASK64_BUILDER_MASK = {
-        0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80,
-        0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80
-      };
-#endif
-
-  template <int N = 0>
-  struct simd_bitmask64_builder;
-
-  template<>
-  struct simd_bitmask64_builder<4> {
-    const uint64_t mask;
-    operator uint64_t() && { return mask; }
-  }; // struct simd_bitmask64_builder<4>
-
-  template<>
-  struct simd_bitmask64_builder<3> {
-    const uint8x16_t sum01;
-    const simd8<bool> val2;
-    simdjson_inline simd_bitmask64_builder<4> next(simd8<bool> val3) {
-      // Add each of the elements next to each other, successively, to stuff each 8 byte mask into one.
-      uint8x16_t sum23 = vpaddq_u8(val2 & BITMASK64_BUILDER_MASK, val3 & BITMASK64_BUILDER_MASK);
-      uint8x16_t sum0123 = vpaddq_u8(sum01, sum23);
-
-      // This algorithm is actually designed to create a 128-bit mask from 8 16-byte simd masks,
-      // but since we only want 64 bits, we add the mask to itself (creating the final mask twice).
-      uint8x16_t sum01230123 = vpaddq_u8(sum0123, sum0123);
-      return { vgetq_lane_u64(vreinterpretq_u64_u8(sum01230123), 0) };
-    }
-  }; // struct simd_bitmask64_builder<3>
-
-  template<>
-  struct simd_bitmask64_builder<2> {
-    const uint8x16_t sum01;
-    simdjson_inline simd_bitmask64_builder<3> next(simd8<bool> val2) {
-      return { sum01, val2 };
-    }
-  }; // struct simd_bitmask64_builder<2>
-
-  template<>
-  struct simd_bitmask64_builder<1> {
-    const simd8<bool> val0;
-    simdjson_inline simd_bitmask64_builder<2> next(simd8<bool> val1) {
-      return { vpaddq_u8(val0 & BITMASK64_BUILDER_MASK, val1 & BITMASK64_BUILDER_MASK) };
-    }
-  }; // struct simd_bitmask64_builder<1>
-
-  template<>
-  struct simd_bitmask64_builder<0> {
-    simdjson_inline simd_bitmask64_builder<1> next(simd8<bool> val) {
-      return { val };
-    }
-  }; // struct simd_bitmask64_builder<0>
-
   template<typename T>
   struct simd8x64 {
     static constexpr int NUM_CHUNKS = 64 / sizeof(simd8<T>);
@@ -509,11 +449,23 @@ namespace {
     }
 
     simdjson_inline uint64_t to_bitmask() const {
-      return simd_bitmask64_builder<0>()
-        .next(this->chunks[0])
-        .next(this->chunks[1])
-        .next(this->chunks[2])
-        .next(this->chunks[3]);
+#ifdef SIMDJSON_REGULAR_VISUAL_STUDIO
+      const uint8x16_t bit_mask = simdjson_make_uint8x16_t(
+        0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80,
+        0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80
+      );
+#else
+      const uint8x16_t bit_mask = {
+        0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80,
+        0x01, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80
+      };
+#endif
+      // Add each of the elements next to each other, successively, to stuff each 8 byte mask into one.
+      uint8x16_t sum0 = vpaddq_u8(this->chunks[0] & bit_mask, this->chunks[1] & bit_mask);
+      uint8x16_t sum1 = vpaddq_u8(this->chunks[2] & bit_mask, this->chunks[3] & bit_mask);
+      sum0 = vpaddq_u8(sum0, sum1);
+      sum0 = vpaddq_u8(sum0, sum0);
+      return vgetq_lane_u64(vreinterpretq_u64_u8(sum0), 0);
     }
 
     simdjson_inline uint64_t eq(const T m) const {

include/simdjson/haswell/simd.h

@@ -295,30 +295,6 @@ namespace simd {
     simdjson_inline int get_bit() const { return _mm256_movemask_epi8(_mm256_slli_epi16(*this, 7-N)); }
   };
 
-  template <int N = 0>
-  struct simd_bitmask64_builder;
-
-  template<>
-  struct simd_bitmask64_builder<2> {
-    const uint64_t bitmask;
-    operator uint64_t() && { return bitmask; }
-  }; // struct simd_bitmask64_builder<2>
-
-  template<>
-  struct simd_bitmask64_builder<1> {
-    const int bitmask;
-    simdjson_inline simd_bitmask64_builder<2> next(simd8<bool> val) {
-      uint64_t r_lo = uint32_t(bitmask);
-      uint64_t r_hi = val.to_bitmask();
-      return { r_lo | (r_hi << 32) };
-    }
-  }; // struct simd_bitmask64_builder<1>
-
-  template<>
-  struct simd_bitmask64_builder<0> {
-    simdjson_inline simd_bitmask64_builder<1> next(simd8<bool> val) { return { val.to_bitmask() }; }
-  }; // struct simd_bitmask64_builder<0>
-
   template<typename T>
   struct simd8x64 {
     static constexpr int NUM_CHUNKS = 64 / sizeof(simd8<T>);
@@ -346,9 +322,9 @@ namespace simd {
     }
 
     simdjson_inline uint64_t to_bitmask() const {
-      return simd_bitmask64_builder<0>()
-        .next(this->chunks[0])
-        .next(this->chunks[1]);
+      uint64_t r_lo = uint32_t(this->chunks[0].to_bitmask());
+      uint64_t r_hi =                       this->chunks[1].to_bitmask();
+      return r_lo | (r_hi << 32);
     }
 
     simdjson_inline simd8<T> reduce_or() const {

include/simdjson/icelake/simd.h

@@ -314,20 +314,6 @@ namespace simd {
     simdjson_inline uint64_t get_bit() const { return _mm512_movepi8_mask(_mm512_slli_epi16(*this, 7-N)); }
   };
 
-  template <int N = 0>
-  struct simd_bitmask64_builder;
-
-  template<>
-  struct simd_bitmask64_builder<1> {
-    const __mmask64 bitmask;
-    operator __mmask64() && { return bitmask; }
-  }; // struct simd_bitmask64_builder<2>
-
-  template<>
-  struct simd_bitmask64_builder<0> {
-    simdjson_inline simd_bitmask64_builder<1> next(simd8<bool> val) { return { _mm512_movepi8_mask(val) }; }
-  }; // struct simd_bitmask64_builder<0>
-
   template<typename T>
   struct simd8x64 {
     static constexpr int NUM_CHUNKS = 64 / sizeof(simd8<T>);

include/simdjson/lasx/simd.h

@@ -298,35 +298,6 @@ namespace simd {
     simdjson_inline simd8<uint8_t> shl() const { return simd8<uint8_t>(__lasx_xvslli_b(*this, N)); }
   };
 
-  template <int N = 0>
-  struct simd_bitmask64_builder;
-
-  template<>
-  struct simd_bitmask64_builder<2> {
-    const unsigned long int mask01;
-    operator uint64_t() { return mask01; }
-  }; // struct simd_bitmask64_builder<2>
-
-  template<>
-  struct simd_bitmask64_builder<1> {
-    const __m256i mask0;
-    simdjson_inline simd_bitmask64_builder<2> next(simd8<bool> val1) {
-      __m256i mask1 = __lasx_xvmskltz_b(val1);
-      __m256i mask_tmp = __lasx_xvpickve_w(mask0, 4);
-      __m256i tmp = __lasx_xvpickve_w(mask1, 4);
-      __m256i mask01 = __lasx_xvinsve0_w(mask0, mask1, 1);
-      __m256i mask01_tmp = __lasx_xvinsve0_w(mask_tmp, tmp, 1);
-      return { __lasx_xvpickve2gr_du(__lasx_xvpackev_h(mask01_tmp, mask01), 0) };
-    }
-  }; // struct simd_bitmask64_builder<1>
-
-  template<>
-  struct simd_bitmask64_builder<0> {
-    simdjson_inline simd_bitmask64_builder<1> next(simd8<bool> val) {
-      return { __lasx_xvmskltz_b(val0) };
-    }
-  }; // struct simd_bitmask64_builder<0>
-
   template<typename T>
   struct simd8x64 {
     static constexpr int NUM_CHUNKS = 64 / sizeof(simd8<T>);
@@ -360,9 +331,13 @@ namespace simd {
     }
 
     simdjson_inline uint64_t to_bitmask() const {
-      return simd_bitmask64_builder<0>()
-        .next(this->chunks[0])
-        .next(this->chunks[1]);
+      __m256i mask0 = __lasx_xvmskltz_b(this->chunks[0]);
+      __m256i mask1 = __lasx_xvmskltz_b(this->chunks[1]);
+      __m256i mask_tmp = __lasx_xvpickve_w(mask0, 4);
+      __m256i tmp = __lasx_xvpickve_w(mask1, 4);
+      mask0 = __lasx_xvinsve0_w(mask0, mask1, 1);
+      mask_tmp = __lasx_xvinsve0_w(mask_tmp, tmp, 1);
+      return __lasx_xvpickve2gr_du(__lasx_xvpackev_h(mask_tmp, mask0), 0);
     }
 
     simdjson_inline simd8<T> reduce_or() const {

include/simdjson/lsx/simd.h

@@ -255,50 +255,6 @@ namespace simd {
     simdjson_inline simd8<uint8_t> shl() const { return simd8<uint8_t>(__lsx_vslli_b(*this, N)); }
   };
 
-  template <int N = 0>
-  struct simd_bitmask64_builder;
-
-  template<>
-  struct simd_bitmask64_builder<4> {
-    const unsigned long int result;
-    operator uint64_t() { return result; }
-  }; // struct simd_bitmask64_builder<4>
-
-  template<>
-  struct simd_bitmask64_builder<3> {
-    const __m128i mask01;
-    const __m128i mask2;
-    simdjson_inline simd_bitmask64_builder<4> next(simd8<bool> val3) {
-      __m128i mask3 = __lsx_vmskltz_b(val3);
-      __m128i mask23 = __lsx_vilvl_h(mask3, mask2);
-      return { __lsx_vpickve2gr_du(__lsx_vilvl_w(mask23, mask01), 0) };
-    }
-  }; // struct simd_bitmask64_builder<3>
-
-  template<>
-  struct simd_bitmask64_builder<2> {
-    const __m128i mask01;
-    simdjson_inline simd_bitmask64_builder<3> next(simd8<bool> val2) {
-      return { mask01, __lsx_vmskltz_b(val2) };
-    }
-  }; // struct simd_bitmask64_builder<2>
-
-  template<>
-  struct simd_bitmask64_builder<1> {
-    const __m128i mask0;
-    simdjson_inline simd_bitmask64_builder<2> next(simd8<bool> val1) {
-      __m128i mask1 = __lsx_vmskltz_b(val1);
-      return { __lsx_vilvl_h(mask1, mask0) };
-    }
-  }; // struct simd_bitmask64_builder<1>
-
-  template<>
-  struct simd_bitmask64_builder<0> {
-    simdjson_inline simd_bitmask64_builder<1> next(simd8<bool> val0) {
-      return { __lsx_vmskltz_b(val0) };
-    }
-  }; // struct simd_bitmask64_builder<0>
-
   template<typename T>
   struct simd8x64 {
     static constexpr int NUM_CHUNKS = 64 / sizeof(simd8<T>);
@@ -347,11 +303,13 @@ namespace simd {
     }
 
     simdjson_inline uint64_t to_bitmask() const {
-      return simd_bitmask64_builder<0>()
-        .next(this->chunks[0])
-        .next(this->chunks[1])
-        .next(this->chunks[2])
-        .next(this->chunks[3]);
+      __m128i mask1 = __lsx_vmskltz_b(this->chunks[0]);
+      __m128i mask2 = __lsx_vmskltz_b(this->chunks[1]);
+      __m128i mask3 = __lsx_vmskltz_b(this->chunks[2]);
+      __m128i mask4 = __lsx_vmskltz_b(this->chunks[3]);
+      mask1 = __lsx_vilvl_h(mask2, mask1);
+      mask2 = __lsx_vilvl_h(mask4, mask3);
+      return __lsx_vpickve2gr_du(__lsx_vilvl_w(mask2, mask1), 0);
     }
 
     simdjson_inline simd8<T> reduce_or() const {

include/simdjson/ppc64/simd.h

@@ -392,51 +392,6 @@ template <> struct simd8<uint8_t> : base8_numeric<uint8_t> {
   }
 };
 
-template <int N = 0>
-struct simd_bitmask64_builder;
-
-template<>
-struct simd_bitmask64_builder<4> {
-  const uint64_t bitmask;
-  simdjson_inline operator uint64_t() && { return bitmask; }
-}; // struct simd_bitmask64_builder<4>
-
-template<>
-struct simd_bitmask64_builder<3> {
-  const int bitmask01;
-  const int bitmask2;
-  simdjson_inline simd_bitmask64_builder<4> next(simd8<bool> val) {
-    return {
-      uint64_t(this->bitmask01) |
-      (uint64_t(this->bitmask2) << 32) |
-      (uint64_t(val.to_bitmask()) << 48)
-    };
-  }
-}; // struct simd_bitmask64_builder<3>
-
-template<>
-struct simd_bitmask64_builder<2> {
-  const int bitmask01;
-  simdjson_inline simd_bitmask64_builder<3> next(simd8<bool> val) {
-    return { bitmask01, val.to_bitmask() };
-  }
-}; // struct simd_bitmask64_builder<2>
-
-template<>
-struct simd_bitmask64_builder<1> {
-  const int bitmask0;
-  simdjson_inline simd_bitmask64_builder<2> next(simd8<bool> val) {
-    return { bitmask0 | (val.to_bitmask() << 16) };
-  }
-}; // struct simd_bitmask64_builder<1>
-
-template<>
-struct simd_bitmask64_builder<0> {
-  simdjson_inline simd_bitmask64_builder<1> next(simd8<bool> val) {
-    return { val.to_bitmask() };
-  }
-}; // struct simd_bitmask64_builder<0>
-
 template <typename T> struct simd8x64 {
   static constexpr int NUM_CHUNKS = 64 / sizeof(simd8<T>);
   static_assert(NUM_CHUNKS == 4,
@@ -479,11 +434,11 @@ template <typename T> struct simd8x64 {
   }
 
   simdjson_inline uint64_t to_bitmask() const {
-      return simd_bitmask64_builder<0>()
-        .next(this->chunks[0])
-        .next(this->chunks[1])
-        .next(this->chunks[2])
-        .next(this->chunks[3]);
+    uint64_t r0 = uint32_t(this->chunks[0].to_bitmask());
+    uint64_t r1 = this->chunks[1].to_bitmask();
+    uint64_t r2 = this->chunks[2].to_bitmask();
+    uint64_t r3 = this->chunks[3].to_bitmask();
+    return r0 | (r1 << 16) | (r2 << 32) | (r3 << 48);
   }
 
   simdjson_inline uint64_t eq(const T m) const {

include/simdjson/simdjson_version.h

@@ -4,7 +4,7 @@
 #define SIMDJSON_SIMDJSON_VERSION_H
 
 /** The version of simdjson being used (major.minor.revision) */
-#define SIMDJSON_VERSION "3.10.0"
+#define SIMDJSON_VERSION "3.10.1"
 
 namespace simdjson {
 enum {
@@ -19,7 +19,7 @@ enum {
   /**
    * The revision (major.minor.REVISION) of simdjson being used.
    */
-  SIMDJSON_VERSION_REVISION = 0
+  SIMDJSON_VERSION_REVISION = 1
 };
 } // namespace simdjson
 

include/simdjson/westmere/simd.h

@@ -260,51 +260,6 @@ namespace simd {
     simdjson_inline int get_bit() const { return _mm_movemask_epi8(_mm_slli_epi16(*this, 7-N)); }
   };
 
-  template <int N = 0>
-  struct simd_bitmask64_builder;
-
-  template<>
-  struct simd_bitmask64_builder<4> {
-    const uint64_t bitmask;
-    operator uint64_t() && { return bitmask; }
-  }; // struct simd_bitmask64_builder<4>
-
-  template<>
-  struct simd_bitmask64_builder<3> {
-    uint32_t bitmask01;
-    const int bitmask2;
-    simdjson_inline simd_bitmask64_builder<4> next(simd8<bool> val3) {
-      return {
-        uint64_t(this->bitmask01) |
-        (uint64_t(this->bitmask2) << 32) |
-        (uint64_t(val3.to_bitmask()) << 48)
-      };
-    }
-  }; // struct simd_bitmask64_builder<3>
-
-  template<>
-  struct simd_bitmask64_builder<2> {
-    uint32_t bitmask01;
-    simdjson_inline simd_bitmask64_builder<3> next(simd8<bool> val2) {
-      return { bitmask01, val2.to_bitmask() };
-    }
-  }; // struct simd_bitmask64_builder<2>
-
-  template<>
-  struct simd_bitmask64_builder<1> {
-    const int bitmask0;
-    simdjson_inline simd_bitmask64_builder<2> next(simd8<bool> val1) {
-      return { uint32_t(bitmask0) | (uint32_t(val1.to_bitmask()) << 16) };
-    }
-  }; // struct simd_bitmask64_builder<1>
-
-  template<>
-  struct simd_bitmask64_builder<0> {
-    simdjson_inline simd_bitmask64_builder<1> next(simd8<bool> val0) {
-      return { val0.to_bitmask() };
-    }
-  }; // struct simd_bitmask64_builder<0>
-
   template<typename T>
   struct simd8x64 {
     static constexpr int NUM_CHUNKS = 64 / sizeof(simd8<T>);
@@ -338,11 +293,11 @@ namespace simd {
     }
 
     simdjson_inline uint64_t to_bitmask() const {
-      return simd_bitmask64_builder<0>()
-        .next(this->chunks[0])
-        .next(this->chunks[1])
-        .next(this->chunks[2])
-        .next(this->chunks[3]);
+      uint64_t r0 = uint32_t(this->chunks[0].to_bitmask() );
+      uint64_t r1 =          this->chunks[1].to_bitmask() ;
+      uint64_t r2 =          this->chunks[2].to_bitmask() ;
+      uint64_t r3 =          this->chunks[3].to_bitmask() ;
+      return r0 | (r1 << 16) | (r2 << 32) | (r3 << 48);
     }
 
     simdjson_inline uint64_t eq(const T m) const {

singleheader/simdjson.cpp

@@ -1,4 +1,4 @@
-/* auto-generated on 2024-08-01 09:31:50 -0400. Do not edit! */
+/* auto-generated on 2024-08-26 09:37:03 -0400. Do not edit! */
 /* including simdjson.cpp:  */
 /* begin file simdjson.cpp */
 #define SIMDJSON_SRC_SIMDJSON_CPP
@@ -332,6 +332,8 @@ double from_chars(const char *first, const char* end) noexcept;
 #define SIMDJSON_ISALIGNED_N(ptr, n) (((uintptr_t)(ptr) & ((n)-1)) == 0)
 
 #if SIMDJSON_REGULAR_VISUAL_STUDIO
+  // We could use [[deprecated]] but it requires C++14
+  #define simdjson_deprecated __declspec(deprecated)
 
   #define simdjson_really_inline __forceinline
   #define simdjson_never_inline __declspec(noinline)
@@ -370,6 +372,8 @@ double from_chars(const char *first, const char* end) noexcept;
   #define SIMDJSON_POP_DISABLE_UNUSED_WARNINGS
 
 #else // SIMDJSON_REGULAR_VISUAL_STUDIO
+  // We could use [[deprecated]] but it requires C++14
+  #define simdjson_deprecated __attribute__((deprecated))
 
   #define simdjson_really_inline inline __attribute__((always_inline))
   #define simdjson_never_inline inline __attribute__((noinline))