fix(cksum): add x86 (32-bit) CPU feature detection support

naoNao89 · naoNao89 · commit ca5e8ad22204 · 2025-11-02T18:38:55.000+07:00
The cpufeatures dependency was included for x86 architecture in Cargo.toml,
but the hardware.rs file only had CPU feature detection functions for x86_64.
This caused the x86 Android emulator test to fail because the CPU feature
detection functions were missing.

Added CPU feature detection functions for x86 (32-bit) architecture:
- has_avx512() for x86
- has_avx2() for x86
- has_pclmul() for x86

Updated cfg attributes to include both x86_64 and x86 architectures.
Updated test to cover both x86 and x86_64 architectures.
diff --git a/src/uu/cksum/src/hardware.rs b/src/uu/cksum/src/hardware.rs
@@ -67,35 +67,53 @@ impl CpuFeatures {
 // CPU feature detection functions
 // These use cpufeatures crate for cross-platform detection
 
-#[cfg(all(target_arch = "x86_64", not(target_os = "android")))]
+#[cfg(all(
+    any(target_arch = "x86_64", target_arch = "x86"),
+    not(target_os = "android")
+))]
 fn has_avx512() -> bool {
     cpufeatures::new!(cpuid_avx512, "avx512f", "avx512bw");
     cpuid_avx512::get()
 }
 
-#[cfg(not(all(target_arch = "x86_64", not(target_os = "android"))))]
+#[cfg(not(all(
+    any(target_arch = "x86_64", target_arch = "x86"),
+    not(target_os = "android")
+)))]
 fn has_avx512() -> bool {
     false
 }
 
-#[cfg(all(target_arch = "x86_64", not(target_os = "android")))]
+#[cfg(all(
+    any(target_arch = "x86_64", target_arch = "x86"),
+    not(target_os = "android")
+))]
 fn has_avx2() -> bool {
     cpufeatures::new!(cpuid_avx2, "avx2");
     cpuid_avx2::get()
 }
 
-#[cfg(not(all(target_arch = "x86_64", not(target_os = "android"))))]
+#[cfg(not(all(
+    any(target_arch = "x86_64", target_arch = "x86"),
+    not(target_os = "android")
+)))]
 fn has_avx2() -> bool {
     false
 }
 
-#[cfg(all(target_arch = "x86_64", not(target_os = "android")))]
+#[cfg(all(
+    any(target_arch = "x86_64", target_arch = "x86"),
+    not(target_os = "android")
+))]
 fn has_pclmul() -> bool {
     cpufeatures::new!(cpuid_pclmul, "pclmulqdq");
     cpuid_pclmul::get()
 }
 
-#[cfg(not(all(target_arch = "x86_64", not(target_os = "android"))))]
+#[cfg(not(all(
+    any(target_arch = "x86_64", target_arch = "x86"),
+    not(target_os = "android")
+)))]
 fn has_pclmul() -> bool {
     false
 }
@@ -141,10 +159,13 @@ mod tests {
     }
 
     #[test]
-    #[cfg(all(target_arch = "x86_64", not(target_os = "android")))]
-    fn test_cpu_features_on_x86_64() {
+    #[cfg(all(
+        any(target_arch = "x86_64", target_arch = "x86"),
+        not(target_os = "android")
+    ))]
+    fn test_cpu_features_on_x86() {
         let features = CpuFeatures::detect();
-        // On x86_64, at least one feature should be detected or all false
+        // On x86/x86_64, at least one feature should be detected or all false
         // (depending on CPU capabilities)
         let _ = features;
     }
