feat(arch): add support for wasm32 with simd128 feature

closes #217

Author: sam-kirby

.cargo/config

@@ -1,2 +1,8 @@
 [build]
 rustflags = ["-C", "target-cpu=native"]
+
+[target.wasm32-unknown-unknown]
+rustflags = ["-C", "target-feature=+simd128"]
+
+[target.wasm32-wasi]
+rustflags = ["-C", "target-feature=+simd128"]

Cargo.toml

@@ -14,8 +14,8 @@ rust-version = "1.49"
 [dependencies]
 beef = { version = "0.5", optional = true }
 halfbrown = "0.1"
-value-trait = { version = "0.2.1" }
-simdutf8 = { version = "0.1.3", features = ["public_imp", "aarch64_neon"] }
+value-trait = "0.2.10"
+simdutf8 = { version = "0.1.4", features = ["public_imp", "aarch64_neon"] }
 
 # serde compatibilty
 serde = { version = "1", features = ["derive"], optional = true}
@@ -35,6 +35,8 @@ criterion = { version = "0.3", optional = true }
 [dev-dependencies]
 float-cmp = "0.9"
 getopts = "0.2"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 proptest = "1.0"
 
 [lib]

Makefile

@@ -5,4 +5,9 @@ perf:
 	cargo +nightly run --example perf --features perf --release
 clippy:
 	touch src/lib.rs
-	cargo clippy
+	cargo clippy
+wasmtest:
+	cargo clean --target-dir target
+	cargo build --tests --target wasm32-wasi --target-dir target
+	wasmtime run --wasm-features=simd target/wasm32-wasi/debug/deps/simd_json*.wasm
+	wasmtime run --dir=. --wasm-features=simd target/wasm32-wasi/debug/deps/jsonchecker*.wasm

src/lib.rs

@@ -171,34 +171,42 @@ use crate::neon::stage1::{SimdInput, SIMDINPUT_LENGTH, SIMDJSON_PADDING};
 #[cfg(target_feature = "neon")]
 use simdutf8::basic::imp::aarch64::neon::ChunkedUtf8ValidatorImp;
 
+#[cfg(target_feature = "simd128")]
+mod simd128;
+#[cfg(target_feature = "simd128")]
+pub use crate::simd128::deser::*;
+#[cfg(target_feature = "simd128")]
+use crate::simd128::stage1::{SimdInput, SIMDINPUT_LENGTH, SIMDJSON_PADDING};
+#[cfg(target_feature = "simd128")]
+use simdutf8::basic::imp::wasm32::simd128::ChunkedUtf8ValidatorImp;
+
 // We import this as generics
 #[cfg(all(not(any(
     target_feature = "sse4.2",
     target_feature = "avx2",
-    target_feature = "neon"
+    target_feature = "neon",
+    target_feature = "simd128"
 ))))]
 mod sse42;
 #[cfg(all(not(any(
     target_feature = "sse4.2",
     target_feature = "avx2",
-    target_feature = "neon"
-))))]
-#[cfg(all(not(any(
-    target_feature = "sse4.2",
-    target_feature = "avx2",
-    target_feature = "neon"
+    target_feature = "neon",
+    target_feature = "simd128"
 ))))]
 pub use crate::sse42::deser::*;
 #[cfg(all(not(any(
     target_feature = "sse4.2",
     target_feature = "avx2",
-    target_feature = "neon"
+    target_feature = "neon",
+    target_feature = "simd128"
 ))))]
 use crate::sse42::stage1::{SimdInput, SIMDINPUT_LENGTH, SIMDJSON_PADDING};
 #[cfg(all(not(any(
     target_feature = "sse4.2",
     target_feature = "avx2",
-    target_feature = "neon"
+    target_feature = "neon",
+    target_feature = "simd128"
 ))))]
 use simdutf8::basic::imp::x86::sse42::ChunkedUtf8ValidatorImp;
 
@@ -207,7 +215,8 @@ use simdutf8::basic::imp::x86::sse42::ChunkedUtf8ValidatorImp;
     not(any(
         target_feature = "sse4.2",
         target_feature = "avx2",
-        target_feature = "neon"
+        target_feature = "neon",
+        target_feature = "simd128"
     ))
 ))]
 fn please_compile_with_a_simd_compatible_cpu_setting_read_the_simdjsonrs_readme() -> ! {}
@@ -750,10 +759,15 @@ impl DerefMut for AlignedBuf {
 mod tests {
 
     #![allow(clippy::unnecessary_operation, clippy::non_ascii_literal)]
-    use super::{owned::Value, to_borrowed_value, to_owned_value, Deserializer};
+    #[cfg(not(target_arch = "wasm32"))]
+    use super::to_borrowed_value;
+    use super::{owned::Value, to_owned_value, Deserializer};
     use crate::tape::Node;
+    #[cfg(not(target_arch = "wasm32"))]
     use proptest::prelude::*;
-    use value_trait::{StaticNode, Writable};
+    #[cfg(not(target_arch = "wasm32"))]
+    use value_trait::StaticNode;
+    use value_trait::Writable;
 
     #[test]
     fn test_send_sync() {
@@ -865,6 +879,7 @@ mod tests {
         assert_eq!(v, parsed);
     }
     #[cfg(not(feature = "128bit"))]
+    #[cfg(not(target_arch = "wasm32"))]
     fn arb_json_value() -> BoxedStrategy<Value> {
         let leaf = prop_oneof![
             Just(Value::Static(StaticNode::Null)),
@@ -890,6 +905,7 @@ mod tests {
     }
 
     #[cfg(feature = "128bit")]
+    #[cfg(not(target_arch = "wasm32"))]
     fn arb_json_value() -> BoxedStrategy<Value> {
         let leaf = prop_oneof![
             Just(Value::Static(StaticNode::Null)),
@@ -916,6 +932,7 @@ mod tests {
         .boxed()
     }
 
+    #[cfg(not(target_arch = "wasm32"))]
     proptest! {
         #![proptest_config(ProptestConfig {
             // Setting both fork and timeout is redundant since timeout implies
@@ -958,6 +975,7 @@ mod tests_serde {
     use super::serde::from_slice;
     use super::{owned::to_value, owned::Object, owned::Value, to_borrowed_value, to_owned_value};
     use halfbrown::HashMap;
+    #[cfg(not(target_arch = "wasm32"))]
     use proptest::prelude::*;
     use serde::Deserialize;
 
@@ -1721,6 +1739,7 @@ mod tests_serde {
     }
 
     //6.576692109929364e305
+    #[cfg(not(target_arch = "wasm32"))]
     fn arb_json() -> BoxedStrategy<String> {
         let leaf = prop_oneof![
             Just(Value::Static(StaticNode::Null)),
@@ -1747,6 +1766,7 @@ mod tests_serde {
         .boxed()
     }
 
+    #[cfg(not(target_arch = "wasm32"))]
     proptest! {
         #![proptest_config(ProptestConfig {
             // Setting both fork and timeout is redundant since timeout implies
@@ -1782,9 +1802,11 @@ mod tests_serde {
 
     }
 
+    #[cfg(not(target_arch = "wasm32"))]
     fn arb_junk() -> BoxedStrategy<Vec<u8>> {
         prop::collection::vec(any::<u8>(), 0..(1024 * 8)).boxed()
     }
+    #[cfg(not(target_arch = "wasm32"))]
     proptest! {
         #![proptest_config(ProptestConfig {
             // Setting both fork and timeout is redundant since timeout implies
@@ -1807,6 +1829,7 @@ mod tests_serde {
         }
     }
 
+    #[cfg(not(target_arch = "wasm32"))]
     proptest! {
         #![proptest_config(ProptestConfig {
             // Setting both fork and timeout is redundant since timeout implies

src/neon/stage1.rs

@@ -11,15 +11,6 @@ pub(crate) unsafe fn bit_mask() -> uint8x16_t {
     ])
 }
 
-// FIXME this needs to be upstream
-//
-// vtstq_u8
-// vmovq_n_s8
-
-pub unsafe fn vtstq_u8(a: uint8x16_t, b: uint8x16_t) -> uint8x16_t {
-    vcgtq_u8(vandq_u8(a, b), vdupq_n_u8(0))
-}
-
 #[cfg_attr(not(feature = "no-inline"), inline(always))]
 pub unsafe fn neon_movemask_bulk(
     p0: uint8x16_t,

src/numberparse.rs

@@ -160,7 +160,7 @@ fn parse_eight_digits_unrolled(chars: &[u8]) -> u32 {
 }
 
 #[cfg_attr(not(feature = "no-inline"), inline)]
-#[cfg(target_feature = "neon")]
+#[cfg(any(target_feature = "neon", target_feature = "simd128"))]
 fn parse_eight_digits_unrolled(chars: &[u8]) -> u32 {
     let val: u64 = unsafe { *(chars.as_ptr() as *const u64) };
     //    memcpy(&val, chars, sizeof(u64));

src/serde/se.rs

@@ -820,7 +820,9 @@ where
 
 #[cfg(test)]
 mod test {
+    #[cfg(not(target_arch = "wasm32"))]
     use crate::{OwnedValue as Value, StaticNode};
+    #[cfg(not(target_arch = "wasm32"))]
     use proptest::prelude::*;
 
     #[test]
@@ -871,6 +873,7 @@ mod test {
     }
 
     #[cfg(not(feature = "128bit"))]
+    #[cfg(not(target_arch = "wasm32"))]
     fn arb_json_value() -> BoxedStrategy<Value> {
         let leaf = prop_oneof![
             Just(Value::Static(StaticNode::Null)),
@@ -902,6 +905,7 @@ mod test {
     }
 
     #[cfg(feature = "128bit")]
+    #[cfg(not(target_arch = "wasm32"))]
     fn arb_json_value() -> BoxedStrategy<Value> {
         let leaf = prop_oneof![
             Just(Value::Static(StaticNode::Null)),
@@ -934,6 +938,7 @@ mod test {
         .boxed()
     }
 
+    #[cfg(not(target_arch = "wasm32"))]
     proptest! {
         #![proptest_config(ProptestConfig {
             // Setting both fork and timeout is redundant since timeout implies

src/serde/se/pp.rs

@@ -651,10 +651,13 @@ where
 
 #[cfg(test)]
 mod test {
+    #[cfg(not(target_arch = "wasm32"))]
     use crate::{OwnedValue as Value, StaticNode};
+    #[cfg(not(target_arch = "wasm32"))]
     use proptest::prelude::*;
 
     #[cfg(not(feature = "128bit"))]
+    #[cfg(not(target_arch = "wasm32"))]
     fn arb_json_value() -> BoxedStrategy<Value> {
         let leaf = prop_oneof![
             Just(Value::Static(StaticNode::Null)),
@@ -686,6 +689,7 @@ mod test {
     }
 
     #[cfg(feature = "128bit")]
+    #[cfg(not(target_arch = "wasm32"))]
     fn arb_json_value() -> BoxedStrategy<Value> {
         let leaf = prop_oneof![
             Just(Value::Static(StaticNode::Null)),
@@ -718,6 +722,7 @@ mod test {
         .boxed()
     }
 
+    #[cfg(not(target_arch = "wasm32"))]
     proptest! {
         #![proptest_config(ProptestConfig {
             // Setting both fork and timeout is redundant since timeout implies

src/serde/value/borrowed/se.rs

@@ -793,7 +793,9 @@ mod test {
         assert_eq!(vec, vec3);
     }
 
+    #[cfg(not(target_arch = "wasm32"))]
     use proptest::prelude::*;
+    #[cfg(not(target_arch = "wasm32"))]
     prop_compose! {
       fn obj_case()(
         v_i128 in any::<i64>().prop_map(i128::from),
@@ -831,6 +833,7 @@ mod test {
       }
     }
 
+    #[cfg(not(target_arch = "wasm32"))]
     proptest! {
         #![proptest_config(ProptestConfig {
             .. ProptestConfig::default()

src/serde/value/owned/se.rs

@@ -642,7 +642,9 @@ impl serde::ser::SerializeStructVariant for SerializeStructVariant {
 
 #[cfg(test)]
 mod test {
-    use crate::serde::{from_slice, from_str, to_string};
+    use crate::serde::from_slice;
+    #[cfg(not(target_arch = "wasm32"))]
+    use crate::serde::{from_str, to_string};
     /*
     use crate::{
         owned::to_value, owned::Object, owned::Value, to_borrowed_value, to_owned_value,
@@ -729,7 +731,9 @@ mod test {
         assert_eq!(vec, vec3);
     }
 
+    #[cfg(not(target_arch = "wasm32"))]
     use proptest::prelude::*;
+    #[cfg(not(target_arch = "wasm32"))]
     prop_compose! {
       fn obj_case()(
         v_i128 in any::<i64>().prop_map(i128::from),
@@ -775,6 +779,7 @@ mod test {
       }
     }
 
+    #[cfg(not(target_arch = "wasm32"))]
     proptest! {
         #![proptest_config(ProptestConfig {
             .. ProptestConfig::default()