chore: polish wasm simd resolution

Author: V0ldek

.cargo/config.toml

@@ -1,6 +1,8 @@
+[build]
+rustflags = ["-C", "link-arg=-fuse-ld=lld"]
+
 [alias]
 rsontest = "hack test -q --feature-powerset --skip default -F arbitrary -F serde --ignore-unknown-features"
-build-website = "build -p rsonpath-website --target wasm32-unknown-unknown"
 
 [env]
 RUST_BACKTRACE = "1"

Cargo.lock

@@ -5,6 +5,7 @@ members = [
     "crates/rsonpath-lib",
     "crates/rsonpath-syntax",
     "crates/rsonpath-syntax-proptest",
+    "crates/rsonpath-test"
 ]
 
 exclude = ["crates/rsonpath-benchmarks", "crates/rsonpath-test-codegen", "web/rsonpath-website"]

Cargo.toml

@@ -1,7 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

crates/rsonpath-benchmarks/src/implementations/jsurferShim/gradle/wrapper/gradle-wrapper.properties

@@ -48,11 +48,6 @@ rsonpath-syntax-proptest = { workspace = true }
 serde_json = { workspace = true }
 test-case = { workspace = true }
 
-[patch.crates-io]
-getrandom_v03 = { package = "getrandom", version = "0.3.3", features = ["wasm_js"] }
-getrandom_v02 = { package = "getrandom", version = "0.2.12", features = ["wasm_js"] }
-getrandom_v01 = { package = "getrandom", version = "0.1.16", features = ["wasm_js"] }
-
 [features]
 default = ["simd"]
 serde = ["dep:serde", "smallvec/serde", "rsonpath-syntax/serde"]

crates/rsonpath-benchmarks/src/implementations/jsurferShim/gradlew

@@ -29,8 +29,8 @@ pub(crate) struct DepthVector32<'a, B: InputBlock<'a, SIZE>> {
 impl<'a, B: InputBlock<'a, SIZE>> DepthBlock<'a> for DepthVector32<'a, B> {
     #[inline(always)]
     fn advance_to_next_depth_decrease(&mut self) -> bool {
-        #[cfg(target_arch = "x86")]
-        debug_assert!(is_x86_feature_detected!("popcnt"));
+        #[cfg(target_arch = "x86")] // On wasm32 popcnt is built-in.
+        debug_assert!(!is_x86_feature_detected!("popcnt"));
         let next_closing = self.closing_mask.trailing_zeros() as usize;
 
         if next_closing == SIZE {
@@ -69,7 +69,7 @@ impl<'a, B: InputBlock<'a, SIZE>> DepthBlock<'a> for DepthVector32<'a, B> {
 
     #[inline(always)]
     fn depth_at_end(&self) -> isize {
-        #[cfg(target_arch = "x86")]
+        #[cfg(target_arch = "x86")] // On wasm32 popcnt is built-in.
         debug_assert!(is_x86_feature_detected!("popcnt"));
         (((self.opening_count as i32) - self.closing_mask.count_ones() as i32) + self.depth) as isize
     }
@@ -81,7 +81,7 @@ impl<'a, B: InputBlock<'a, SIZE>> DepthBlock<'a> for DepthVector32<'a, B> {
 
     #[inline(always)]
     fn estimate_lowest_possible_depth(&self) -> isize {
-        #[cfg(target_arch = "x86")]
+        #[cfg(target_arch = "x86")] // On wasm32 popcnt is built-in.
         debug_assert!(is_x86_feature_detected!("popcnt"));
         (self.depth - self.closing_mask.count_ones() as i32) as isize
     }

crates/rsonpath-benchmarks/src/implementations/jsurferShim/gradlew.bat

@@ -458,8 +458,8 @@ pub(crate) enum SimdTag {
     Ssse3,
     /// AVX2 detected.
     Avx2,
-    ///WASM32 detected
-    Wasm32,
+    /// WasmSimd128 detected
+    WasmSimd128,
 }
 
 /// Runtime-detected SIMD configuration guiding how to construct a [`Simd`] implementation for the engine.
@@ -502,6 +502,7 @@ impl SimdConfiguration {
             "sse2" => Some(SimdTag::Sse2),
             "ssse3" => Some(SimdTag::Ssse3),
             "avx2" => Some(SimdTag::Avx2),
+            "wasmsimd128" => Some(SimdTag::WasmSimd128),
             _ => None,
         };
         let quotes = match quotes_str.to_ascii_lowercase().as_ref() {
@@ -564,11 +565,14 @@ pub(crate) fn configure() -> SimdConfiguration {
             let fast_quotes = is_x86_feature_detected!("pclmulqdq");
             let fast_popcnt = is_x86_feature_detected!("popcnt");
         }
-        else if #[cfg(target_arch = "wasm32")]
+        // Wasm lacks dynamic feature detection (see https://doc.rust-lang.org/stable/core/arch/wasm32/index.html)
+        // Since SIMD is technically a proposal, to keep rsonpath usable as a library from Wasm contexts
+        // without simd128 we require the target_feature on compile-time to enable SIMD.
+        else if #[cfg(all(target_arch = "wasm32", target_feature = "simd128"))]
         {
-            let highest_simd = SimdTag::Wasm32;
+            let highest_simd = SimdTag::SimdWasm32;
             let fast_quotes = false;
-            let fast_popcnt = false;
+            let fast_popcnt = true; // popcnt is built-in on Wasm32
         }
         else
         {
@@ -593,7 +597,7 @@ impl Display for SimdConfiguration {
             SimdTag::Sse2 => "sse2",
             SimdTag::Ssse3 => "ssse3",
             SimdTag::Avx2 => "avx2",
-            SimdTag::Wasm32 => "wasm32",
+            SimdTag::WasmSimd128 => "wasmsimd128",
         };
         let quote_desc = if self.fast_quotes { "fast_quotes" } else { "slow_quotes" };
         let popcnt_desc = if self.fast_popcnt { "fast_popcnt" } else { "slow_popcnt" };
@@ -821,16 +825,8 @@ cfg_if! {
                             >::new();
                             $b
                         }
-                        $crate::classification::simd::SimdTag::Wasm32 => {
-                            let $simd = $crate::classification::simd::ResolvedSimd::<
-                                $crate::classification::quotes::nosimd::Constructor,
-                                $crate::classification::structural::nosimd::Constructor,
-                                $crate::classification::depth::nosimd::Constructor,
-                                $crate::classification::memmem::nosimd::Constructor,
-                                {$crate::classification::simd::NOSIMD}
-                            >::new();
-                            $b
-                        }
+                        $crate::classification::simd::SimdTag::WasmSimd128 =>
+                            unreachable!("WasmSimd128 tag on x86_64 arch; this is an error in SIMD configuration")
                     }
                 }
             };
@@ -958,16 +954,8 @@ cfg_if! {
                             >::new();
                             $b
                         }
-                        $crate::classification::simd::SimdTag::Wasm32 => {
-                            let $simd = $crate::classification::simd::ResolvedSimd::<
-                                $crate::classification::quotes::nosimd::Constructor,
-                                $crate::classification::structural::nosimd::Constructor,
-                                $crate::classification::depth::nosimd::Constructor,
-                                $crate::classification::memmem::nosimd::Constructor,
-                                {$crate::classification::simd::NOSIMD}
-                            >::new();
-                            $b
-                        }
+                        $crate::classification::simd::SimdTag::WasmSimd128 =>
+                            unreachable!("WasmSimd128 tag on x86_64 arch; this is an error in SIMD configuration")
                     }
                 }
             };