Merge pull request rust-lang#1911 from nikic/remove-hack

Remove some llvm workarounds

Author: folkertdev

crates/core_arch/src/x86/avx512f.rs

@@ -49621,9 +49621,7 @@ mod tests {
         assert_eq_m512i(r, e);
     }
 
-    // FIXME(llvm): https://github.com/llvm/llvm-project/issues/154492
-    //#[simd_test(enable = "avx512f")]
-    #[simd_test(enable = "avx512f,avx512vl")]
+    #[simd_test(enable = "avx512f")]
     unsafe fn test_mm512_mask_cvttps_epu32() {
         let a = _mm512_setr_ps(
             0., -1.5, 2., -3.5, 4., -5.5, 6., -7.5, 8., 9.5, 10., 11.5, 12., 13.5, 14., 15.5,
@@ -49636,9 +49634,7 @@ mod tests {
         assert_eq_m512i(r, e);
     }
 
-    // FIXME(llvm): https://github.com/llvm/llvm-project/issues/154492
-    //#[simd_test(enable = "avx512f")]
-    #[simd_test(enable = "avx512f,avx512vl")]
+    #[simd_test(enable = "avx512f")]
     unsafe fn test_mm512_maskz_cvttps_epu32() {
         let a = _mm512_setr_ps(
             0., -1.5, 2., -3.5, 4., -5.5, 6., -7.5, 8., 9.5, 10., 11.5, 12., 13.5, 14., 15.5,

crates/core_arch/src/x86_64/avx512f.rs

@@ -5311,9 +5311,7 @@ mod tests {
         assert_eq_m256i(r, e);
     }
 
-    // FIXME(llvm): https://github.com/llvm/llvm-project/issues/154492
-    //#[simd_test(enable = "avx512f")]
-    #[simd_test(enable = "avx512f,avx512vl")]
+    #[simd_test(enable = "avx512f")]
     unsafe fn test_mm512_mask_cvttpd_epu32() {
         let a = _mm512_setr_pd(0., -1.5, 2., -3.5, 4., -5.5, 6., -7.5);
         let src = _mm256_set1_epi32(0);
@@ -5324,9 +5322,7 @@ mod tests {
         assert_eq_m256i(r, e);
     }
 
-    // FIXME(llvm): https://github.com/llvm/llvm-project/issues/154492
-    //#[simd_test(enable = "avx512f")]
-    #[simd_test(enable = "avx512f,avx512vl")]
+    #[simd_test(enable = "avx512f")]
     unsafe fn test_mm512_maskz_cvttpd_epu32() {
         let a = _mm512_setr_pd(0., -1.5, 2., -3.5, 4., -5.5, 6., -7.5);
         let r = _mm512_maskz_cvttpd_epu32(0, a);