wip

Author: hkratz

portable/Cargo.toml

@@ -12,6 +12,3 @@ std = [] # fixme: needed?
 
 # expose SIMD implementations in basic::imp::* and compat::imp::*
 public_imp = []
-
-# use 256-bit vectors
-simd256 = []

portable/src/basic.rs

@@ -195,7 +195,11 @@ pub mod imp {
     }
 
     /// Best for current target
-    pub use v128 as auto;
+    pub mod auto {
+        pub use crate::implementation::simd::auto::validate_utf8_basic as validate_utf8;
+        pub use crate::implementation::simd::auto::ChunkedUtf8ValidatorImp;
+        pub use crate::implementation::simd::auto::Utf8ValidatorImp;
+    }
 
     /// Includes the validation implementation using 128-bit portable SIMD.
     pub mod v128 {

portable/src/implementation/mod.rs

@@ -16,10 +16,7 @@ pub(crate) fn validate_utf8_basic(input: &[u8]) -> Result<(), crate::basic::Utf8
 
 #[inline(never)]
 fn validate_utf8_basic_simd(input: &[u8]) -> Result<(), crate::basic::Utf8Error> {
-    #[cfg(not(feature = "simd256"))]
-    return simd::v128::validate_utf8_basic(input);
-    #[cfg(feature = "simd256")]
-    return simd::v256::validate_utf8_basic(input);
+    simd::auto::validate_utf8_basic(input)
 }
 
 #[inline]
@@ -32,10 +29,7 @@ pub(crate) fn validate_utf8_compat(input: &[u8]) -> Result<(), crate::compat::Ut
 }
 
 fn validate_utf8_compat_simd(input: &[u8]) -> Result<(), crate::compat::Utf8Error> {
-    #[cfg(not(feature = "simd256"))]
-    return simd::v128::validate_utf8_compat(input);
-    #[cfg(feature = "simd256")]
-    return simd::v256::validate_utf8_compat(input);
+    simd::auto::validate_utf8_compat(input)
 }
 
 // fallback method implementations

portable/src/implementation/simd.rs

@@ -819,6 +819,8 @@ impl basic::imp::ChunkedUtf8Validator for ChunkedUtf8ValidatorImp {
     }
 }
 
+pub(crate) use v128 as auto; // FIXME: select based on target feature
+
 pub(crate) mod v128 {
     pub use super::validate_utf8_basic;
     pub use super::validate_utf8_compat;