Update feature detection

Author: onethumb

src/arch/mod.rs

@@ -54,18 +54,20 @@ pub(crate) unsafe fn update(state: u64, bytes: &[u8], params: CrcParams) -> u64
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 #[target_feature(enable = "sse2,sse4.1,pclmulqdq")]
 pub(crate) unsafe fn update(state: u64, bytes: &[u8], params: CrcParams) -> u64 {
-    let ops = X86Ops;
+    update_x86_sse(state, bytes, params)
+}
 
-    match params.width {
-        64 => algorithm::update::<X86Ops, Width64>(state, bytes, params, &ops),
-        32 => algorithm::update::<X86Ops, Width32>(state as u32, bytes, params, &ops) as u64,
-        _ => panic!("Unsupported CRC width: {}", params.width),
-    }
+#[rustversion::since(1.89)]
+#[inline]
+#[cfg(target_arch = "x86")]
+#[target_feature(enable = "sse2,sse4.1,pclmulqdq")]
+pub(crate) unsafe fn update(state: u64, bytes: &[u8], params: CrcParams) -> u64 {
+    update_x86_sse(state, bytes, params)
 }
 
 #[rustversion::since(1.89)]
 #[inline]
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+#[cfg(target_arch = "x86_64")]
 #[target_feature(enable = "sse2,sse4.1,pclmulqdq")]
 pub(crate) unsafe fn update(state: u64, bytes: &[u8], params: CrcParams) -> u64 {
     use std::arch::is_x86_feature_detected;
@@ -106,6 +108,19 @@ pub(crate) unsafe fn update(state: u64, bytes: &[u8], params: CrcParams) -> u64
     software::update(state, bytes, params)
 }
 
+#[inline]
+#[cfg(target_arch = "x86")]
+#[target_feature(enable = "sse2,sse4.1,pclmulqdq")]
+unsafe fn update_x86_sse(state: u64, bytes: &[u8], params: CrcParams) -> u64 {
+    let ops = X86Ops;
+
+    match params.width {
+        64 => algorithm::update::<X86Ops, Width64>(state, bytes, params, &ops),
+        32 => algorithm::update::<X86Ops, Width32>(state as u32, bytes, params, &ops) as u64,
+        _ => panic!("Unsupported CRC width: {}", params.width),
+    }
+}
+
 #[rustversion::before(1.89)]
 pub fn get_target() -> String {
     #[cfg(target_arch = "aarch64")]

src/crc32/fusion/x86.rs

@@ -29,7 +29,10 @@ pub fn crc32_iscsi(crc: u32, data: &[u8]) -> u32 {
 #[rustversion::since(1.89)]
 #[inline(always)]
 pub fn crc32_iscsi(crc: u32, data: &[u8]) -> u32 {
-    if is_x86_feature_detected!("vpclmulqdq") {
+    if is_x86_feature_detected!("vpclmulqdq")
+        && is_x86_feature_detected!("avx512f")
+        && is_x86_feature_detected!("avx512vl")
+    {
         unsafe {
             return crc32_iscsi_avx512_vpclmulqdq_v3x2(crc, data.as_ptr(), data.len());
         }