Force miri to use the fallback algorithm.

tkaitchuck · May 6, 2020 · ca2f390 · jonhoo · May 6, 2020 · tkaitchuck
1 parent 7681a46
commit ca2f390
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/aes_hash.rs b/src/aes_hash.rs
@@ -180,7 +180,7 @@ impl Hasher for AHasher {
     }
 }
 
-#[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "sse2"))]
+#[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "sse2", not(miri)))]
 #[inline(always)]
 fn add_by_64s(a: u128, b: u128) -> u128 {
     use core::mem::transmute;
@@ -193,7 +193,7 @@ fn add_by_64s(a: u128, b: u128) -> u128 {
     }
 }
 
-#[cfg(not(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "sse2")))]
+#[cfg(not(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "sse2", not(miri))))]
 #[inline(always)]
 fn add_by_64s(a: u128, b: u128) -> u128 {
     let a: [u64; 2] = a.convert();
@@ -202,7 +202,7 @@ fn add_by_64s(a: u128, b: u128) -> u128 {
     c.convert()
 }
 
-#[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes"))]
+#[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri)))]
 #[inline(always)]
 fn aeshash(value: u128, xor: u128) -> u128 {
     #[cfg(target_arch = "x86")]
@@ -215,7 +215,7 @@ fn aeshash(value: u128, xor: u128) -> u128 {
         transmute(_mm_aesdec_si128(value, transmute(xor)))
     }
 }
-#[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes"))]
+#[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri)))]
 #[inline(always)]
 fn aeshashx2(value: u128, k1: u128, k2: u128) -> u128 {
     #[cfg(target_arch = "x86")]

diff --git a/src/hash_quality_test.rs b/src/hash_quality_test.rs
@@ -50,10 +50,10 @@ fn count_same_bytes_and_nibbles(a: u64, b: u64) -> (i32, i32) {
 }
 
 fn test_keys_change_output<T: Hasher>(constructor: impl Fn(u64, u64) -> T) {
-    let mut a = constructor(0, 0);
-    let mut b = constructor(0, 1);
-    let mut c = constructor(1, 0);
-    let mut d = constructor(1, 1);
+    let mut a = constructor(1, 1);
+    let mut b = constructor(1, 2);
+    let mut c = constructor(2, 1);
+    let mut d = constructor(2, 2);
     "test".hash(&mut a);
     "test".hash(&mut b);
     "test".hash(&mut c);
@@ -263,7 +263,7 @@ mod fallback_tests {
 }
 
 ///Basic sanity tests of the cypto properties of aHash.
-#[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes"))]
+#[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri)))]
 #[cfg(test)]
 mod aes_tests {
     use crate::aes_hash::*;

diff --git a/src/lib.rs b/src/lib.rs
@@ -17,7 +17,7 @@
 #[macro_use]
 mod convert;
 
-#[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes"))]
+#[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri)))]
 mod aes_hash;
 mod fallback_hash;
 #[cfg(test)]
@@ -33,10 +33,10 @@ mod random_state;
 #[cfg(feature = "compile-time-rng")]
 use const_random::const_random;
 
-#[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes"))]
+#[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri)))]
 pub use crate::aes_hash::AHasher;
 
-#[cfg(not(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes")))]
+#[cfg(not(all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri))))]
 pub use crate::fallback_hash::AHasher;
 pub use crate::random_state::RandomState;