Tidy up the as_* functions in x86

Author: sayantn

crates/core_arch/src/x86/avx.rs

@@ -13,11 +13,7 @@
 //! [amd64_ref]: http://support.amd.com/TechDocs/24594.pdf
 //! [wiki]: https://en.wikipedia.org/wiki/Advanced_Vector_Extensions
 
-use crate::{
-    core_arch::{simd::*, x86::*},
-    intrinsics::simd::*,
-    mem, ptr,
-};
+use crate::{core_arch::x86::*, intrinsics::simd::*, mem, ptr};
 
 #[cfg(test)]
 use stdarch_test::assert_instr;

crates/core_arch/src/x86/avx2.rs

@@ -20,7 +20,7 @@
 
 use core::hint::unreachable_unchecked;
 
-use crate::core_arch::{simd::*, x86::*};
+use crate::core_arch::x86::*;
 use crate::intrinsics::simd::*;
 
 #[cfg(test)]

crates/core_arch/src/x86/avx512bf16.rs

@@ -3,7 +3,7 @@
 //! [AVX512BF16 intrinsics]: https://software.intel.com/sites/landingpage/IntrinsicsGuide/#expand=1769&avx512techs=AVX512_BF16
 
 use crate::arch::asm;
-use crate::core_arch::{simd::*, x86::*};
+use crate::core_arch::x86::*;
 use crate::intrinsics::simd::*;
 
 #[cfg(test)]
@@ -556,7 +556,6 @@ pub unsafe fn _mm_cvtness_sbh(a: f32) -> bf16 {
 
 #[cfg(test)]
 mod tests {
-    use crate::core_arch::simd::u16x4;
     use crate::{
         core_arch::x86::*,
         mem::{transmute, transmute_copy},

crates/core_arch/src/x86/avx512bitalg.rs

@@ -7,22 +7,7 @@
 //!
 //! [intel64_ref]: http://www.intel.de/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf
 
-use crate::core_arch::simd::i16x16;
-use crate::core_arch::simd::i16x32;
-use crate::core_arch::simd::i16x8;
-use crate::core_arch::simd::i8x16;
-use crate::core_arch::simd::i8x32;
-use crate::core_arch::simd::i8x64;
-use crate::core_arch::x86::__m128i;
-use crate::core_arch::x86::__m256i;
-use crate::core_arch::x86::__m512i;
-use crate::core_arch::x86::__mmask16;
-use crate::core_arch::x86::__mmask32;
-use crate::core_arch::x86::__mmask64;
-use crate::core_arch::x86::__mmask8;
-use crate::core_arch::x86::m128iExt;
-use crate::core_arch::x86::m256iExt;
-use crate::core_arch::x86::m512iExt;
+use crate::core_arch::x86::*;
 use crate::intrinsics::simd::{simd_ctpop, simd_select_bitmask};
 use crate::mem::transmute;
 

crates/core_arch/src/x86/avx512bw.rs

@@ -1,8 +1,4 @@
-use crate::{
-    core_arch::{simd::*, x86::*},
-    intrinsics::simd::*,
-    ptr,
-};
+use crate::{core_arch::x86::*, intrinsics::simd::*, ptr};
 
 use core::hint::unreachable_unchecked;
 
@@ -20742,7 +20738,7 @@ mod tests {
         let e = _mm_set_epi8(
             0, 0, 0, 0,
             0, 0, 0, 0,
-            u8::MAX as i8, u8::MAX as i8, u8::MAX as i8, u8::MAX as i8, 
+            u8::MAX as i8, u8::MAX as i8, u8::MAX as i8, u8::MAX as i8,
             u8::MAX as i8, u8::MAX as i8, u8::MAX as i8, u8::MAX as i8,
         );
         assert_eq_m128i(r, e);

crates/core_arch/src/x86/avx512cd.rs

@@ -1,4 +1,4 @@
-use crate::core_arch::{simd::*, x86::*};
+use crate::core_arch::x86::*;
 use crate::intrinsics::simd::*;
 
 #[cfg(test)]

crates/core_arch/src/x86/avx512dq.rs

@@ -1,8 +1,4 @@
-use crate::{
-    core_arch::{simd::*, x86::*},
-    intrinsics::simd::*,
-    mem::transmute,
-};
+use crate::{core_arch::x86::*, intrinsics::simd::*, mem::transmute};
 
 // And //
 

crates/core_arch/src/x86/avx512f.rs

@@ -1,6 +1,6 @@
 use crate::{
     arch::asm,
-    core_arch::{simd::*, x86::*},
+    core_arch::x86::*,
     intrinsics::simd::*,
     intrinsics::{fmaf32, fmaf64},
     mem, ptr,
@@ -41143,13 +41143,9 @@ extern "C" {
 
     #[link_name = "llvm.x86.avx512.cvtsi2ss32"]
     fn vcvtsi2ss(a: f32x4, b: i32, rounding: i32) -> f32x4;
-    #[link_name = "llvm.x86.avx512.cvtsi2sd64"]
-    fn vcvtsi2sd(a: f64x2, b: i64, rounding: i32) -> f64x2;
 
     #[link_name = "llvm.x86.avx512.cvtusi2ss"]
     fn vcvtusi2ss(a: f32x4, b: u32, rounding: i32) -> f32x4;
-    #[link_name = "llvm.x86.avx512.cvtusi642sd"]
-    fn vcvtusi2sd(a: f64x2, b: u64, rounding: i32) -> f64x2;
 
     #[link_name = "llvm.x86.avx512.cvttss2si"]
     fn vcvttss2si(a: f32x4, rounding: i32) -> i32;

crates/core_arch/src/x86/avx512fp16.rs

@@ -1,5 +1,5 @@
 use crate::arch::asm;
-use crate::core_arch::{simd::*, x86::*};
+use crate::core_arch::x86::*;
 use crate::intrinsics::{fmaf16, simd::*};
 use crate::ptr;
 

crates/core_arch/src/x86/avx512vbmi.rs

@@ -1,4 +1,4 @@
-use crate::core_arch::{simd::*, x86::*};
+use crate::core_arch::x86::*;
 use crate::intrinsics::simd::*;
 
 #[cfg(test)]