pclmul -> pclmulqdq

Author: newpavlov

coresimd/src/runtime/x86.rs

@@ -32,9 +32,9 @@ macro_rules! __unstable_detect_feature {
     ("aes", $unstable_detect_feature:path) => {
         $unstable_detect_feature(
             $crate::__vendor_runtime::__Feature::aes{})  };
-    ("pclmul", $unstable_detect_feature:path) => {
+    ("pclmulqdq", $unstable_detect_feature:path) => {
         $unstable_detect_feature(
-            $crate::__vendor_runtime::__Feature::pclmul{})  };
+            $crate::__vendor_runtime::__Feature::pclmulqdq{})  };
     ("tsc", $unstable_detect_feature:path) => {
         $unstable_detect_feature(
             $crate::__vendor_runtime::__Feature::tsc{})  };
@@ -180,7 +180,7 @@ pub enum __Feature {
     /// AES (Advanced Encryption Standard New Instructions AES-NI)
     aes,
     /// CLMUL (Carry-less Multiplication)
-    pclmul,
+    pclmulqdq,
     /// TSC (Time Stamp Counter)
     tsc,
     /// MMX
@@ -356,7 +356,7 @@ pub fn detect_features() -> cache::Initializer {
         enable(proc_info_ecx, 20, __Feature::sse4_2);
         enable(proc_info_ecx, 23, __Feature::popcnt);
         enable(proc_info_ecx, 25, __Feature::aes);
-        enable(proc_info_ecx, 1, __Feature::pclmul);
+        enable(proc_info_ecx, 1, __Feature::pclmulqdq);
         enable(proc_info_edx, 4, __Feature::tsc);
         enable(proc_info_edx, 23, __Feature::mmx);
         enable(proc_info_edx, 24, __Feature::fxsr);
@@ -469,7 +469,7 @@ mod tests {
     #[test]
     fn dump() {
         println!("aes: {:?}", cfg_feature_enabled!("aes"));
-        println!("pclmul: {:?}", cfg_feature_enabled!("pclmul"));
+        println!("pclmulqdq: {:?}", cfg_feature_enabled!("pclmulqdq"));
         println!("tsc: {:?}", cfg_feature_enabled!("tsc"));
         println!("sse: {:?}", cfg_feature_enabled!("sse"));
         println!("sse2: {:?}", cfg_feature_enabled!("sse2"));
@@ -511,7 +511,7 @@ mod tests {
     fn compare_with_cupid() {
         let information = cupid::master().unwrap();
         assert_eq!(cfg_feature_enabled!("aes"), information.aesni());
-        assert_eq!(cfg_feature_enabled!("pclmul"), information.pclmulqdq());
+        assert_eq!(cfg_feature_enabled!("pclmulqdq"), information.pclmulqdq());
         assert_eq!(cfg_feature_enabled!("tsc"), information.tsc());
         assert_eq!(cfg_feature_enabled!("sse"), information.sse());
         assert_eq!(cfg_feature_enabled!("sse2"), information.sse2());

coresimd/src/x86/i686/mod.rs

@@ -3,12 +3,12 @@
 mod aes;
 pub use self::aes::*;
 
-mod clmul;
-pub use self::clmul::*;
-
 mod mmx;
 pub use self::mmx::*;
 
+mod pclmulqdq;
+pub use self::pclmulqdq::*;
+
 mod sse;
 pub use self::sse::*;
 

coresimd/src/x86/i686/clmul.rs renamed to coresimd/src/x86/i686/pclmulqdq.rs

@@ -21,7 +21,7 @@ extern "C" {
 /// The immediate byte is used for determining which halves of `a` and `b`
 /// should be used. Immediate bits other than 0 and 4 are ignored.
 #[inline]
-#[target_feature(enable = "pclmul")]
+#[target_feature(enable = "pclmulqdq")]
 #[cfg_attr(test, assert_instr(pclmulqdq, imm8 = 0))]
 pub unsafe fn _mm_clmulepi64_si128(a: __m128i, b: __m128i, imm8: u8) -> __m128i {
     macro_rules! call {
@@ -42,7 +42,7 @@ mod tests {
 
     use x86::*;
 
-    #[simd_test = "pclmul"]
+    #[simd_test = "pclmulqdq"]
     unsafe fn test_mm_clmulepi64_si128() {
         // Constants taken from https://software.intel.com/sites/default/files/managed/72/cc/clmul-wp-rev-2.02-2014-04-20.pdf
         let a = _mm_set_epi64x(0x7b5b546573745665, 0x63746f725d53475d);