Use simd-lite (#39)

* Use simd-lite
* Update badge
* Update badge
* Get rid of transmutes
* Use NeonInit trait
* vqsubq_u8 fix
* vqsubq_u8 fix pt. 2
* use reexprted values from simd-lite

Author: Licenser

.drone.yml

@@ -60,5 +60,5 @@ steps:
   commands:
   - rustup default nightly
   - rustup update
-  - cargo clean && cargo +nightly build --verbose --all
-  - cargo +nightly test --verbose --all
+  - cargo clean && cargo +nightly build --verbose --all --features neon
+  - cargo +nightly test --verbose --all --features neon

Cargo.toml

@@ -24,6 +24,7 @@ jemallocator = { version = "0.3", optional = true }
 perfcnt = { version = "0.4", optional = true }
 getopts = { version = "0.2", optional = true }
 colored = { version = "1.7", optional = true }
+simd-lite = { git = "https://github.com/simd-lite/simd-lite", optional = true, branch = "reexport" }
 
 
 
@@ -45,6 +46,8 @@ harness = false
 
 [features]
 default = ["swar-number-parsing", "serde_impl"]
+# Support for ARM NEON SIMD
+neon = ["simd-lite"]
 # use 8 number at once parsing strategy
 swar-number-parsing = []
 # serde compatibility

README.md

@@ -1,8 +1,9 @@
 # SIMD Json for Rust   [![Build Status]][drone.io] [![Windows Build Status]][appveyor.com] [![Latest Version]][crates.io]
 
-[Build Status]: https://cloud.drone.io/api/badges/Licenser/simdjson-rs/status.svg
-[drone.io]: https://cloud.drone.io/Licenser/simdjson-rs
-[Windows Build Status]: https://ci.appveyor.com/api/projects/status/0kf0v6hj5v2gite9?svg=true
+
+[Build Status]: https://cloud.drone.io/api/badges/simd-lite/simdjson-rs/status.svg
+[drone.io]: https://cloud.drone.io/simd-lite/simdjson-rs
+[Windows Build Status]: https://ci.appveyor.com/api/projects/status/ffi2ese7dxse6pb8?svg=true
 [appveyor.com]: https://ci.appveyor.com/project/Licenser/simdjson-rs
 [Latest Version]: https://img.shields.io/crates/v/simd-json.svg
 [crates.io]: https://crates.io/crates/simd-json

src/lib.rs

@@ -10,7 +10,7 @@
     stmt_expr_attributes,
     simd_ffi,
     link_llvm_intrinsics,
-    rustc_attrs
+    rustc_attrs,
     )
 )]
 
@@ -111,11 +111,11 @@ pub use crate::sse42::deser::*;
 #[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), not(target_feature = "avx2")))]
 use crate::sse42::stage1::SIMDJSON_PADDING;
 
-#[cfg(target_feature = "neon")]
+#[cfg(all(target_feature = "neon", feature = "neon"))]
 mod neon;
-#[cfg(target_feature = "neon")]
+#[cfg(all(target_feature = "neon", feature = "neon"))]
 pub use crate::neon::deser::*;
-#[cfg(target_feature = "neon")]
+#[cfg(all(target_feature = "neon", feature = "neon"))]
 use crate::neon::stage1::SIMDJSON_PADDING;
 
 mod stage2;

src/neon/deser.rs

@@ -1,11 +1,10 @@
 
-pub use crate::error::{Error, ErrorType};
-pub use crate::Deserializer;
-pub use crate::Result;
-pub use crate::neon::stage1::*;
-pub use crate::neon::utf8check::*;
-pub use crate::neon::intrinsics::*;
-pub use crate::stringparse::*;
+use crate::error::{ErrorType};
+use crate::Deserializer;
+use crate::Result;
+use crate::stringparse::*;
+use simd_lite::aarch64::*;
+use crate::neon::stage1::*;
 
 impl<'de> Deserializer<'de> {
     #[cfg_attr(not(feature = "no-inline"), inline(always))]
@@ -196,4 +195,4 @@ impl<'de> Deserializer<'de> {
             }
         }
     }
-}
+}

src/neon/generator.rs

@@ -1,7 +1,7 @@
 use crate::value::generator::ESCAPED;
 use std::io;
-use crate::neon::intrinsics::*;
 use crate::neon::stage1::neon_movemask;
+use simd_lite::aarch64::*;
 
 #[inline(always)]
 pub unsafe fn write_str_simd<W>(writer: &mut W, string: &mut &[u8], len: &mut usize, idx: &mut usize) -> io::Result<()> where W: std::io::Write {
@@ -23,7 +23,7 @@ pub unsafe fn write_str_simd<W>(writer: &mut W, string: &mut &[u8], len: &mut us
         // then test of the data is unchanged. aka: xor it with the
         // Any field that was inside the quote range it will be zero
         // now.
-        let is_unchanged = vxorrq_u8(data, in_quote_range);
+        let is_unchanged = veorq_u8(data, in_quote_range);
         let in_range = vceqq_u8(is_unchanged, zero);
         let quote_bits = neon_movemask(vorrq_u8(bs_or_quote, in_range));
         if quote_bits != 0 {