Skip to content

Commit 56087ea

Browse files
RalfJungAmanieu
RalfJung
authored and
Amanieu
committed
use remaining SIMD intrinsics via libcore
1 parent 2ca0972 commit 56087ea

33 files changed

+53
-66
lines changed

‎crates/core_arch/src/aarch64/neon/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ pub use self::generated::*;
1111
// FIXME: replace neon with asimd
1212

1313
use crate::{
14-
core_arch::{arm_shared::*, simd::*, simd_llvm::*},
14+
core_arch::{arm_shared::*, simd::*},
1515
hint::unreachable_unchecked,
16+
intrinsics::simd::*,
1617
mem::{transmute, zeroed},
1718
ptr::{read_unaligned, write_unaligned},
1819
};

‎crates/core_arch/src/arm_shared/neon/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ mod generated;
77
#[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
88
pub use self::generated::*;
99

10-
use crate::{
11-
core_arch::simd::*, core_arch::simd_llvm::*, hint::unreachable_unchecked, mem::transmute,
12-
};
10+
use crate::{core_arch::simd::*, hint::unreachable_unchecked, intrinsics::simd::*, mem::transmute};
1311
#[cfg(test)]
1412
use stdarch_test::assert_instr;
1513

‎crates/core_arch/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#![feature(
88
custom_inner_attributes,
99
link_llvm_intrinsics,
10-
platform_intrinsics,
1110
repr_simd,
1211
simd_ffi,
1312
proc_macro_hygiene,

‎crates/core_arch/src/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,6 @@ pub mod arch {
265265
}
266266
}
267267

268-
mod simd_llvm;
269-
270268
#[cfg(any(target_arch = "x86", target_arch = "x86_64", doc))]
271269
#[doc(cfg(any(target_arch = "x86", target_arch = "x86_64")))]
272270
mod x86;

‎crates/core_arch/src/powerpc/altivec.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
1414
#![allow(non_camel_case_types)]
1515

16-
use crate::{
17-
core_arch::{simd::*, simd_llvm::*},
18-
mem,
19-
mem::transmute,
20-
};
16+
use crate::{core_arch::simd::*, intrinsics::simd::*, mem, mem::transmute};
2117

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

‎crates/core_arch/src/powerpc/vsx.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
99
#![allow(non_camel_case_types)]
1010

11-
use crate::core_arch::simd_llvm::*;
11+
use crate::intrinsics::simd::*;
1212

1313
#[cfg(test)]
1414
use stdarch_test::assert_instr;

‎crates/core_arch/src/simd_llvm.rs

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎crates/core_arch/src/v64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::prelude::v1::*;
44

5-
use crate::core_arch::simd_llvm::*;
5+
use crate::intrinsics::simd::*;
66

77
define_ty_doc! {
88
f32x2, f32, f32 |

‎crates/core_arch/src/wasm32/simd128.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
#![allow(non_camel_case_types)]
77
#![allow(unused_imports)]
88

9-
use crate::{
10-
core_arch::{simd, simd_llvm::*},
11-
marker::Sized,
12-
mem, ptr,
13-
};
9+
use crate::{core_arch::simd, intrinsics::simd::*, marker::Sized, mem, ptr};
1410

1511
#[cfg(test)]
1612
use stdarch_test::assert_instr;

‎crates/core_arch/src/x86/avx.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
//! [wiki]: https://en.wikipedia.org/wiki/Advanced_Vector_Extensions
1515
1616
use crate::{
17-
core_arch::{simd::*, simd_llvm::*, x86::*},
17+
core_arch::{simd::*, x86::*},
18+
intrinsics::simd::*,
1819
mem, ptr,
1920
};
2021

‎crates/core_arch/src/x86/avx2.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
//! [wiki_avx]: https://en.wikipedia.org/wiki/Advanced_Vector_Extensions
1919
//! [wiki_fma]: https://en.wikipedia.org/wiki/Fused_multiply-accumulate
2020
21-
use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
21+
use crate::core_arch::{simd::*, x86::*};
22+
use crate::intrinsics::simd::*;
2223

2324
#[cfg(test)]
2425
use stdarch_test::assert_instr;

‎crates/core_arch/src/x86/avx512bf16.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
//!
33
//! [AVX512BF16 intrinsics]: https://software.intel.com/sites/landingpage/IntrinsicsGuide/#expand=1769&avx512techs=AVX512_BF16
44
5-
use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
5+
use crate::core_arch::{simd::*, x86::*};
6+
use crate::intrinsics::simd::*;
67

78
#[cfg(test)]
89
use stdarch_test::assert_instr;

‎crates/core_arch/src/x86/avx512bitalg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use crate::core_arch::simd::i16x8;
1313
use crate::core_arch::simd::i8x16;
1414
use crate::core_arch::simd::i8x32;
1515
use crate::core_arch::simd::i8x64;
16-
use crate::core_arch::simd_llvm::simd_select_bitmask;
1716
use crate::core_arch::x86::__m128i;
1817
use crate::core_arch::x86::__m256i;
1918
use crate::core_arch::x86::__m512i;
@@ -27,6 +26,7 @@ use crate::core_arch::x86::_mm_setzero_si128;
2726
use crate::core_arch::x86::m128iExt;
2827
use crate::core_arch::x86::m256iExt;
2928
use crate::core_arch::x86::m512iExt;
29+
use crate::intrinsics::simd::simd_select_bitmask;
3030
use crate::mem::transmute;
3131

3232
#[cfg(test)]

‎crates/core_arch/src/x86/avx512bw.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::{
22
arch::asm,
3-
core_arch::{simd::*, simd_llvm::*, x86::*},
3+
core_arch::{simd::*, x86::*},
4+
intrinsics::simd::*,
45
mem, ptr,
56
};
67

‎crates/core_arch/src/x86/avx512cd.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
1+
use crate::core_arch::{simd::*, x86::*};
2+
use crate::intrinsics::simd::*;
23

34
#[cfg(test)]
45
use stdarch_test::assert_instr;

‎crates/core_arch/src/x86/avx512f.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::{
22
arch::asm,
3-
core_arch::{simd::*, simd_llvm::*, x86::*},
3+
core_arch::{simd::*, x86::*},
4+
intrinsics::simd::*,
45
mem, ptr,
56
};
67

‎crates/core_arch/src/x86/avx512vbmi.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
1+
use crate::core_arch::{simd::*, x86::*};
2+
use crate::intrinsics::simd::*;
23

34
#[cfg(test)]
45
use stdarch_test::assert_instr;

‎crates/core_arch/src/x86/avx512vbmi2.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::{
22
arch::asm,
3-
core_arch::{simd::*, simd_llvm::*, x86::*},
3+
core_arch::{simd::*, x86::*},
4+
intrinsics::simd::*,
45
};
56

67
#[cfg(test)]

‎crates/core_arch/src/x86/avx512vnni.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
1+
use crate::core_arch::{simd::*, x86::*};
2+
use crate::intrinsics::simd::*;
23

34
#[cfg(test)]
45
use stdarch_test::assert_instr;

‎crates/core_arch/src/x86/avx512vpopcntdq.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use crate::core_arch::simd::i32x8;
1313
use crate::core_arch::simd::i64x2;
1414
use crate::core_arch::simd::i64x4;
1515
use crate::core_arch::simd::i64x8;
16-
use crate::core_arch::simd_llvm::simd_select_bitmask;
1716
use crate::core_arch::x86::__m128i;
1817
use crate::core_arch::x86::__m256i;
1918
use crate::core_arch::x86::__m512i;
@@ -25,6 +24,7 @@ use crate::core_arch::x86::_mm_setzero_si128;
2524
use crate::core_arch::x86::m128iExt;
2625
use crate::core_arch::x86::m256iExt;
2726
use crate::core_arch::x86::m512iExt;
27+
use crate::intrinsics::simd::simd_select_bitmask;
2828
use crate::mem::transmute;
2929

3030
#[cfg(test)]

‎crates/core_arch/src/x86/fma.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
//! [amd64_ref]: http://support.amd.com/TechDocs/24594.pdf
1919
//! [wiki_fma]: https://en.wikipedia.org/wiki/Fused_multiply-accumulate
2020
21-
use crate::core_arch::simd_llvm::simd_fma;
2221
use crate::core_arch::x86::*;
22+
use crate::intrinsics::simd::simd_fma;
2323

2424
#[cfg(test)]
2525
use stdarch_test::assert_instr;

‎crates/core_arch/src/x86/gfni.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use crate::core_arch::simd::i8x16;
1111
use crate::core_arch::simd::i8x32;
1212
use crate::core_arch::simd::i8x64;
13-
use crate::core_arch::simd_llvm::simd_select_bitmask;
1413
use crate::core_arch::x86::__m128i;
1514
use crate::core_arch::x86::__m256i;
1615
use crate::core_arch::x86::__m512i;
@@ -23,6 +22,7 @@ use crate::core_arch::x86::_mm_setzero_si128;
2322
use crate::core_arch::x86::m128iExt;
2423
use crate::core_arch::x86::m256iExt;
2524
use crate::core_arch::x86::m512iExt;
25+
use crate::intrinsics::simd::simd_select_bitmask;
2626
use crate::mem::transmute;
2727

2828
#[cfg(test)]

‎crates/core_arch/src/x86/sse.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
//! Streaming SIMD Extensions (SSE)
22

33
use crate::{
4-
core_arch::{simd::*, simd_llvm::*, x86::*},
4+
core_arch::{simd::*, x86::*},
5+
intrinsics::simd::*,
56
mem, ptr,
67
};
78

‎crates/core_arch/src/x86/sse2.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
use stdarch_test::assert_instr;
55

66
use crate::{
7-
core_arch::{simd::*, simd_llvm::*, x86::*},
7+
core_arch::{simd::*, x86::*},
8+
intrinsics::simd::*,
89
mem, ptr,
910
};
1011

‎crates/core_arch/src/x86/sse3.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//! Streaming SIMD Extensions 3 (SSE3)
22

3-
use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
3+
use crate::core_arch::{simd::*, x86::*};
4+
use crate::intrinsics::simd::*;
45

56
#[cfg(test)]
67
use stdarch_test::assert_instr;

‎crates/core_arch/src/x86/sse41.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//! Streaming SIMD Extensions 4.1 (SSE4.1)
22

3-
use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
3+
use crate::core_arch::{simd::*, x86::*};
4+
use crate::intrinsics::simd::*;
45

56
#[cfg(test)]
67
use stdarch_test::assert_instr;

‎crates/core_arch/src/x86/sse42.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
#[cfg(test)]
66
use stdarch_test::assert_instr;
77

8-
use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
8+
use crate::{
9+
core_arch::{simd::*, x86::*},
10+
intrinsics::simd::*,
11+
};
912

1013
/// String contains unsigned 8-bit characters *(Default)*
1114
#[stable(feature = "simd_x86", since = "1.27.0")]

‎crates/core_arch/src/x86/ssse3.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
//! Supplemental Streaming SIMD Extensions 3 (SSSE3)
22

3-
use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
3+
use crate::{
4+
core_arch::{simd::*, x86::*},
5+
intrinsics::simd::*,
6+
};
47

58
#[cfg(test)]
69
use stdarch_test::assert_instr;

‎crates/core_arch/src/x86_64/avx.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +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_llvm::*, x86::*},
18-
mem::transmute,
19-
};
16+
use crate::{core_arch::x86::*, intrinsics::simd::*, mem::transmute};
2017

2118
/// Copies `a` to result, and insert the 64-bit integer `i` into result
2219
/// at the location specified by `index`.

‎crates/core_arch/src/x86_64/avx2.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
//! [wiki_avx]: https://en.wikipedia.org/wiki/Advanced_Vector_Extensions
1919
//! [wiki_fma]: https://en.wikipedia.org/wiki/Fused_multiply-accumulate
2020

21-
use crate::core_arch::{simd_llvm::*, x86::*};
21+
use crate::core_arch::x86::*;
22+
use crate::intrinsics::simd::*;
2223

2324
/// Extracts a 64-bit integer from `a`, selected with `INDEX`.
2425
///

‎crates/core_arch/src/x86_64/avx512f.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::{
2-
core_arch::{simd::*, simd_llvm::*, x86::*, x86_64::*},
2+
core_arch::{simd::*, x86::*, x86_64::*},
3+
intrinsics::simd::*,
34
mem::transmute,
45
};
56

‎crates/core_arch/src/x86_64/sse2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//! `x86_64`'s Streaming SIMD Extensions 2 (SSE2)
22

33
use crate::{
4-
core_arch::{simd_llvm::*, x86::*},
5-
intrinsics,
4+
core_arch::x86::*,
5+
intrinsics::{self, simd::*},
66
};
77

88
#[cfg(test)]

‎crates/core_arch/src/x86_64/sse41.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
//! `i686`'s Streaming SIMD Extensions 4.1 (SSE4.1)
22

3-
use crate::{
4-
core_arch::{simd_llvm::*, x86::*},
5-
mem::transmute,
6-
};
3+
use crate::{core_arch::x86::*, intrinsics::simd::*, mem::transmute};
74

85
#[cfg(test)]
96
use stdarch_test::assert_instr;

0 commit comments

Comments
 (0)