Fix avx512 poseidon2 compilation config

matter-labs · Aug 1, 2024 · f0b329c · f0b329c
1 parent 981490c
commit f0b329c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/implementations/poseidon2/mod.rs b/src/implementations/poseidon2/mod.rs
@@ -4,11 +4,9 @@ use crate::field::goldilocks::GoldilocksField;
 pub mod params;
 
 pub mod state_generic_impl;
-#[cfg(not(all(
+#[cfg(not(any(
     feature = "include_packed_simd",
-    any(
-        target_feature = "neon",
-        target_feature = "avx2",
+    all(
         target_feature = "avx512bw",
         target_feature = "avx512cd",
         target_feature = "avx512dq",
@@ -48,7 +46,6 @@ pub mod state_vectorized_double;
 pub use state_vectorized_double::*;
 
 #[cfg(all(
-    feature = "include_packed_simd",
     target_feature = "avx512bw",
     target_feature = "avx512cd",
     target_feature = "avx512dq",
@@ -58,7 +55,6 @@ pub use state_vectorized_double::*;
 pub mod state_avx512;
 
 #[cfg(all(
-    feature = "include_packed_simd",
     target_feature = "avx512bw",
     target_feature = "avx512cd",
     target_feature = "avx512dq",

diff --git a/src/implementations/poseidon2/state_avx512.rs b/src/implementations/poseidon2/state_avx512.rs
@@ -24,11 +24,6 @@ impl Aligned {
     }
 }
 
-// we also need holder for SIMD targets, because u64x4 has smaller alignment than u64x8
-#[derive(Clone, Copy)]
-#[repr(C, align(64))]
-struct U128x4Holder([packed_simd::u128x4; 3]);
-
 impl std::fmt::Debug for State {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{:?}", self.0)