Skip to content

Commit 895251c

Browse files
sayantnsayantn
committed
Tidy up the as_* functions in x86
1 parent 4e47b16 commit 895251c

28 files changed

+99
-517
lines changed

Diff for: ‎crates/core_arch/src/x86/avx.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
//! [amd64_ref]: http://support.amd.com/TechDocs/24594.pdf
1414
//! [wiki]: https://en.wikipedia.org/wiki/Advanced_Vector_Extensions
1515
16-
use crate::{
17-
core_arch::{simd::*, x86::*},
18-
intrinsics::simd::*,
19-
mem, ptr,
20-
};
16+
use crate::{core_arch::x86::*, intrinsics::simd::*, mem, ptr};
2117

2218
#[cfg(test)]
2319
use stdarch_test::assert_instr;

Diff for: ‎crates/core_arch/src/x86/avx2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
2121
use core::hint::unreachable_unchecked;
2222

23-
use crate::core_arch::{simd::*, x86::*};
23+
use crate::core_arch::x86::*;
2424
use crate::intrinsics::simd::*;
2525

2626
#[cfg(test)]

Diff for: ‎crates/core_arch/src/x86/avx512bf16.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//! [AVX512BF16 intrinsics]: https://software.intel.com/sites/landingpage/IntrinsicsGuide/#expand=1769&avx512techs=AVX512_BF16
44
55
use crate::arch::asm;
6-
use crate::core_arch::{simd::*, x86::*};
6+
use crate::core_arch::x86::*;
77
use crate::intrinsics::simd::*;
88

99
#[cfg(test)]
@@ -556,7 +556,6 @@ pub unsafe fn _mm_cvtness_sbh(a: f32) -> bf16 {
556556

557557
#[cfg(test)]
558558
mod tests {
559-
use crate::core_arch::simd::u16x4;
560559
use crate::{
561560
core_arch::x86::*,
562561
mem::{transmute, transmute_copy},

Diff for: ‎crates/core_arch/src/x86/avx512bitalg.rs

+1-16
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,7 @@
77
//!
88
//! [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
99
10-
use crate::core_arch::simd::i16x16;
11-
use crate::core_arch::simd::i16x32;
12-
use crate::core_arch::simd::i16x8;
13-
use crate::core_arch::simd::i8x16;
14-
use crate::core_arch::simd::i8x32;
15-
use crate::core_arch::simd::i8x64;
16-
use crate::core_arch::x86::__m128i;
17-
use crate::core_arch::x86::__m256i;
18-
use crate::core_arch::x86::__m512i;
19-
use crate::core_arch::x86::__mmask16;
20-
use crate::core_arch::x86::__mmask32;
21-
use crate::core_arch::x86::__mmask64;
22-
use crate::core_arch::x86::__mmask8;
23-
use crate::core_arch::x86::m128iExt;
24-
use crate::core_arch::x86::m256iExt;
25-
use crate::core_arch::x86::m512iExt;
10+
use crate::core_arch::x86::*;
2611
use crate::intrinsics::simd::{simd_ctpop, simd_select_bitmask};
2712
use crate::mem::transmute;
2813

Diff for: ‎crates/core_arch/src/x86/avx512bw.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
use crate::{
2-
core_arch::{simd::*, x86::*},
3-
intrinsics::simd::*,
4-
ptr,
5-
};
1+
use crate::{core_arch::x86::*, intrinsics::simd::*, ptr};
62

73
use core::hint::unreachable_unchecked;
84

@@ -20742,7 +20738,7 @@ mod tests {
2074220738
let e = _mm_set_epi8(
2074320739
0, 0, 0, 0,
2074420740
0, 0, 0, 0,
20745-
u8::MAX as i8, u8::MAX as i8, u8::MAX as i8, u8::MAX as i8,
20741+
u8::MAX as i8, u8::MAX as i8, u8::MAX as i8, u8::MAX as i8,
2074620742
u8::MAX as i8, u8::MAX as i8, u8::MAX as i8, u8::MAX as i8,
2074720743
);
2074820744
assert_eq_m128i(r, e);

Diff for: ‎crates/core_arch/src/x86/avx512cd.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::core_arch::{simd::*, x86::*};
1+
use crate::core_arch::x86::*;
22
use crate::intrinsics::simd::*;
33

44
#[cfg(test)]

Diff for: ‎crates/core_arch/src/x86/avx512dq.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
use crate::{
2-
core_arch::{simd::*, x86::*},
3-
intrinsics::simd::*,
4-
mem::transmute,
5-
};
1+
use crate::{core_arch::x86::*, intrinsics::simd::*, mem::transmute};
62

73
// And //
84

Diff for: ‎crates/core_arch/src/x86/avx512f.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{
22
arch::asm,
3-
core_arch::{simd::*, x86::*},
3+
core_arch::x86::*,
44
intrinsics::simd::*,
55
intrinsics::{fmaf32, fmaf64},
66
mem, ptr,
@@ -41143,13 +41143,9 @@ extern "C" {
4114341143

4114441144
#[link_name = "llvm.x86.avx512.cvtsi2ss32"]
4114541145
fn vcvtsi2ss(a: f32x4, b: i32, rounding: i32) -> f32x4;
41146-
#[link_name = "llvm.x86.avx512.cvtsi2sd64"]
41147-
fn vcvtsi2sd(a: f64x2, b: i64, rounding: i32) -> f64x2;
4114841146

4114941147
#[link_name = "llvm.x86.avx512.cvtusi2ss"]
4115041148
fn vcvtusi2ss(a: f32x4, b: u32, rounding: i32) -> f32x4;
41151-
#[link_name = "llvm.x86.avx512.cvtusi642sd"]
41152-
fn vcvtusi2sd(a: f64x2, b: u64, rounding: i32) -> f64x2;
4115341149

4115441150
#[link_name = "llvm.x86.avx512.cvttss2si"]
4115541151
fn vcvttss2si(a: f32x4, rounding: i32) -> i32;

Diff for: ‎crates/core_arch/src/x86/avx512fp16.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::arch::asm;
2-
use crate::core_arch::{simd::*, x86::*};
2+
use crate::core_arch::x86::*;
33
use crate::intrinsics::{fmaf16, simd::*};
44
use crate::ptr;
55

Diff for: ‎crates/core_arch/src/x86/avx512vbmi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::core_arch::{simd::*, x86::*};
1+
use crate::core_arch::x86::*;
22
use crate::intrinsics::simd::*;
33

44
#[cfg(test)]

Diff for: ‎crates/core_arch/src/x86/avx512vbmi2.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
use crate::{
2-
core_arch::{simd::*, x86::*},
3-
intrinsics::simd::*,
4-
};
1+
use crate::{core_arch::x86::*, intrinsics::simd::*};
52

63
#[cfg(test)]
74
use stdarch_test::assert_instr;

Diff for: ‎crates/core_arch/src/x86/avx512vnni.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::core_arch::{simd::*, x86::*};
1+
use crate::core_arch::x86::*;
22
use crate::intrinsics::simd::*;
33

44
#[cfg(test)]

Diff for: ‎crates/core_arch/src/x86/avx512vpopcntdq.rs

+1-9
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,7 @@
77
//!
88
//! [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
99
10-
use crate::core_arch::simd::*;
11-
use crate::core_arch::x86::__m128i;
12-
use crate::core_arch::x86::__m256i;
13-
use crate::core_arch::x86::__m512i;
14-
use crate::core_arch::x86::__mmask16;
15-
use crate::core_arch::x86::__mmask8;
16-
use crate::core_arch::x86::m128iExt;
17-
use crate::core_arch::x86::m256iExt;
18-
use crate::core_arch::x86::m512iExt;
10+
use crate::core_arch::x86::*;
1911
use crate::intrinsics::simd::{simd_ctpop, simd_select_bitmask};
2012
use crate::mem::transmute;
2113

Diff for: ‎crates/core_arch/src/x86/avxneconvert.rs

-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ extern "C" {
264264

265265
#[cfg(test)]
266266
mod tests {
267-
use crate::core_arch::simd::{u16x4, u16x8};
268267
use crate::core_arch::x86::*;
269268
use crate::mem::transmute_copy;
270269
use std::ptr::addr_of;

Diff for: ‎crates/core_arch/src/x86/bmi2.rs

-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
//! [wikipedia_bmi]:
1111
//! https://en.wikipedia.org/wiki/Bit_Manipulation_Instruction_Sets#ABM_.28Advanced_Bit_Manipulation.29
1212
13-
#[cfg(test)]
14-
use stdarch_test::assert_instr;
15-
1613
/// Unsigned multiply without affecting flags.
1714
///
1815
/// Unsigned multiplication of `a` with `b` returning a pair `(lo, hi)` with
@@ -77,7 +74,6 @@ extern "C" {
7774

7875
#[cfg(test)]
7976
mod tests {
80-
use stdarch_test::simd_test;
8177

8278
use crate::core_arch::x86::*;
8379

Diff for: ‎crates/core_arch/src/x86/bt.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
use crate::arch::asm;
2-
#[cfg(test)]
3-
use stdarch_test::assert_instr;
42

53
// x32 wants to use a 32-bit address size, but asm! defaults to using the full
64
// register name (e.g. rax). We have to explicitly override the placeholder to

Diff for: ‎crates/core_arch/src/x86/f16c.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//!
33
//! [F16C intrinsics]: https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=fp16&expand=1769
44
5-
use crate::core_arch::{simd::*, x86::*};
5+
use crate::core_arch::x86::*;
66

77
#[cfg(test)]
88
use stdarch_test::assert_instr;

Diff for: ‎crates/core_arch/src/x86/gfni.rs

+1-12
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,7 @@
77
//!
88
//! [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
99
10-
use crate::core_arch::simd::i8x16;
11-
use crate::core_arch::simd::i8x32;
12-
use crate::core_arch::simd::i8x64;
13-
use crate::core_arch::x86::__m128i;
14-
use crate::core_arch::x86::__m256i;
15-
use crate::core_arch::x86::__m512i;
16-
use crate::core_arch::x86::__mmask16;
17-
use crate::core_arch::x86::__mmask32;
18-
use crate::core_arch::x86::__mmask64;
19-
use crate::core_arch::x86::m128iExt;
20-
use crate::core_arch::x86::m256iExt;
21-
use crate::core_arch::x86::m512iExt;
10+
use crate::core_arch::x86::*;
2211
use crate::intrinsics::simd::simd_select_bitmask;
2312
use crate::mem::transmute;
2413

0 commit comments

Comments
 (0)