Skip to content

Commit 97645e9

Browse files
RalfJungRalfJung
committed
fix use of platform_intrinsics in tests
1 parent 63815bd commit 97645e9

File tree

65 files changed

+142
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+142
-173
lines changed

‎compiler/rustc_codegen_cranelift/example/float-minmax-pass.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@
44

55
// Test that the simd_f{min,max} intrinsics produce the correct results.
66

7-
#![feature(repr_simd, intrinsics)]
7+
#![feature(repr_simd, core_intrinsics)]
88
#![allow(non_camel_case_types)]
99

1010
#[repr(simd)]
1111
#[derive(Copy, Clone, PartialEq, Debug)]
1212
struct f32x4(pub f32, pub f32, pub f32, pub f32);
1313

14-
extern "intrinsic" {
15-
fn simd_fmin<T>(x: T, y: T) -> T;
16-
fn simd_fmax<T>(x: T, y: T) -> T;
17-
}
14+
use std::intrinsics::simd::*;
1815

1916
fn main() {
2017
let x = f32x4(1.0, 2.0, 3.0, 4.0);

‎src/tools/miri/tests/fail/intrinsics/simd-div-by-zero.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
#![feature(platform_intrinsics, repr_simd)]
1+
#![feature(core_intrinsics, repr_simd)]
22

3-
extern "platform-intrinsic" {
4-
pub(crate) fn simd_div<T>(x: T, y: T) -> T;
5-
}
3+
use std::intrinsics::simd_div;
64

75
#[repr(simd)]
86
#[allow(non_camel_case_types)]

‎src/tools/miri/tests/fail/intrinsics/simd-div-overflow.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
#![feature(platform_intrinsics, repr_simd)]
1+
#![feature(core_intrinsics, repr_simd)]
22

3-
extern "platform-intrinsic" {
4-
pub(crate) fn simd_div<T>(x: T, y: T) -> T;
5-
}
3+
use std::intrinsics::simd_div;
64

75
#[repr(simd)]
86
#[allow(non_camel_case_types)]

‎src/tools/miri/tests/fail/intrinsics/simd-reduce-invalid-bool.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
#![feature(platform_intrinsics, repr_simd)]
1+
#![feature(core_intrinsics, repr_simd)]
22

3-
extern "platform-intrinsic" {
4-
pub(crate) fn simd_reduce_any<T>(x: T) -> bool;
5-
}
3+
use std::intrinsics::simd_reduce_any;
64

75
#[repr(simd)]
86
#[allow(non_camel_case_types)]

‎src/tools/miri/tests/fail/intrinsics/simd-rem-by-zero.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
#![feature(platform_intrinsics, repr_simd)]
1+
#![feature(core_intrinsics, repr_simd)]
22

3-
extern "platform-intrinsic" {
4-
pub(crate) fn simd_rem<T>(x: T, y: T) -> T;
5-
}
3+
use std::intrinsics::simd_rem;
64

75
#[repr(simd)]
86
#[allow(non_camel_case_types)]

‎src/tools/miri/tests/fail/intrinsics/simd-select-bitmask-invalid.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
#![feature(platform_intrinsics, repr_simd)]
1+
#![feature(core_intrinsics, repr_simd)]
22

3-
extern "platform-intrinsic" {
4-
fn simd_select_bitmask<M, T>(m: M, yes: T, no: T) -> T;
5-
}
3+
use std::intrinsics::simd_select_bitmask;
64

75
#[repr(simd)]
86
#[allow(non_camel_case_types)]

‎src/tools/miri/tests/fail/intrinsics/simd-select-invalid-bool.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
#![feature(platform_intrinsics, repr_simd)]
1+
#![feature(core_intrinsics, repr_simd)]
22

3-
extern "platform-intrinsic" {
4-
fn simd_select<M, T>(m: M, yes: T, no: T) -> T;
5-
}
3+
use std::intrinsics::simd_select;
64

75
#[repr(simd)]
86
#[allow(non_camel_case_types)]

‎src/tools/miri/tests/fail/intrinsics/simd-shl-too-far.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
#![feature(platform_intrinsics, repr_simd)]
1+
#![feature(core_intrinsics, repr_simd)]
22

3-
extern "platform-intrinsic" {
4-
pub(crate) fn simd_shl<T>(x: T, y: T) -> T;
5-
}
3+
use std::intrinsics::simd_shl;
64

75
#[repr(simd)]
86
#[allow(non_camel_case_types)]

‎src/tools/miri/tests/fail/intrinsics/simd-shr-too-far.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
#![feature(platform_intrinsics, repr_simd)]
1+
#![feature(core_intrinsics, repr_simd)]
22

3-
extern "platform-intrinsic" {
4-
pub(crate) fn simd_shr<T>(x: T, y: T) -> T;
3+
use std::intrinsics::simd_shr;
54
}
65

76
#[repr(simd)]

‎src/tools/miri/tests/pass/float_nan.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(float_gamma, portable_simd, core_intrinsics, platform_intrinsics)]
1+
#![feature(float_gamma, portable_simd, core_intrinsics)]
22
use std::collections::HashSet;
33
use std::fmt;
44
use std::hash::Hash;
@@ -525,12 +525,6 @@ fn test_simd() {
525525
use std::intrinsics::simd::*;
526526
use std::simd::*;
527527

528-
extern "platform-intrinsic" {
529-
fn simd_fsqrt<T>(x: T) -> T;
530-
fn simd_ceil<T>(x: T) -> T;
531-
fn simd_fma<T>(x: T, y: T, z: T) -> T;
532-
}
533-
534528
let nan = F32::nan(Neg, Quiet, 0).as_f32();
535529
check_all_outcomes(
536530
HashSet::from_iter([F32::nan(Pos, Quiet, 0), F32::nan(Neg, Quiet, 0)]),

‎src/tools/miri/tests/pass/portable-simd-ptrs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Separate test without strict provenance
22
//@compile-flags: -Zmiri-permissive-provenance
3-
#![feature(portable_simd, platform_intrinsics)]
3+
#![feature(portable_simd)]
44
use std::ptr;
55
use std::simd::prelude::*;
66

‎src/tools/miri/tests/pass/portable-simd.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//@compile-flags: -Zmiri-strict-provenance
2-
#![feature(portable_simd, platform_intrinsics, adt_const_params, inline_const, core_intrinsics)]
2+
#![feature(portable_simd, adt_const_params, inline_const, core_intrinsics)]
33
#![allow(incomplete_features, internal_features)]
44
use std::intrinsics::simd as intrinsics;
55
use std::ptr;
@@ -216,10 +216,7 @@ fn simd_ops_i32() {
216216
}
217217

218218
fn simd_mask() {
219-
extern "platform-intrinsic" {
220-
pub(crate) fn simd_bitmask<T, U>(x: T) -> U;
221-
pub(crate) fn simd_select_bitmask<M, T>(m: M, yes: T, no: T) -> T;
222-
}
219+
use std::intrinsics::simd::*;
223220

224221
let intmask = Mask::from_int(i32x4::from_array([0, -1, 0, 0]));
225222
assert_eq!(intmask, Mask::from_array([false, true, false, false]));

‎src/tools/miri/tests/pass/simd-intrinsic-generic-elements.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(repr_simd, platform_intrinsics)]
1+
#![feature(repr_simd)]
22

33
#[repr(simd)]
44
#[derive(Copy, Clone, Debug, PartialEq)]

‎tests/ui/consts/const-eval/simd/insert_extract.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ run-pass
22
#![feature(repr_simd)]
3-
#![feature(platform_intrinsics)]
3+
#![feature(intrinsics)]
44
#![feature(staged_api)]
55
#![stable(feature = "foo", since = "1.3.37")]
66
#![allow(non_camel_case_types)]
@@ -11,7 +11,7 @@
1111
#[repr(simd)] struct i8x1_arr([i8; 1]);
1212
#[repr(simd)] struct f32x4([f32; 4]);
1313

14-
extern "platform-intrinsic" {
14+
extern "rust-intrinsic" {
1515
#[rustc_const_stable(feature = "foo", since = "1.3.37")]
1616
fn simd_insert<T, U>(x: T, idx: u32, val: U) -> T;
1717
#[rustc_const_stable(feature = "foo", since = "1.3.37")]

‎tests/ui/error-codes/E0511.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//@ build-fail
22

3-
#![feature(platform_intrinsics)]
3+
#![feature(intrinsics)]
44

5-
extern "platform-intrinsic" {
5+
extern "rust-intrinsic" {
66
fn simd_add<T>(a: T, b: T) -> T;
77
}
88

‎tests/ui/feature-gates/feature-gate-abi.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// gate-test-intrinsics
2-
// gate-test-platform_intrinsics
32
//@ compile-flags: --crate-type=rlib
43

54
#![feature(no_core, lang_items)]
@@ -15,7 +14,7 @@ trait Tuple { }
1514
extern "rust-intrinsic" fn f1() {} //~ ERROR intrinsics are subject to change
1615
//~^ ERROR intrinsic must be in
1716
//~| ERROR unrecognized intrinsic function: `f1`
18-
extern "platform-intrinsic" fn f2() {} //~ ERROR platform intrinsics are experimental
17+
extern "rust-intrinsic" fn f2() {} //~ ERROR platform intrinsics are experimental
1918
//~^ ERROR intrinsic must be in
2019
//~| ERROR unrecognized intrinsic function: `f2`
2120
extern "rust-call" fn f4(_: ()) {} //~ ERROR rust-call ABI is subject to change
@@ -24,7 +23,7 @@ extern "rust-call" fn f4(_: ()) {} //~ ERROR rust-call ABI is subject to change
2423
trait Tr {
2524
extern "rust-intrinsic" fn m1(); //~ ERROR intrinsics are subject to change
2625
//~^ ERROR intrinsic must be in
27-
extern "platform-intrinsic" fn m2(); //~ ERROR platform intrinsics are experimental
26+
extern "rust-intrinsic" fn m2(); //~ ERROR platform intrinsics are experimental
2827
//~^ ERROR intrinsic must be in
2928
extern "rust-call" fn m4(_: ()); //~ ERROR rust-call ABI is subject to change
3029

@@ -37,7 +36,7 @@ struct S;
3736
impl Tr for S {
3837
extern "rust-intrinsic" fn m1() {} //~ ERROR intrinsics are subject to change
3938
//~^ ERROR intrinsic must be in
40-
extern "platform-intrinsic" fn m2() {} //~ ERROR platform intrinsics are experimental
39+
extern "rust-intrinsic" fn m2() {} //~ ERROR platform intrinsics are experimental
4140
//~^ ERROR intrinsic must be in
4241
extern "rust-call" fn m4(_: ()) {} //~ ERROR rust-call ABI is subject to change
4342
}
@@ -46,17 +45,17 @@ impl Tr for S {
4645
impl S {
4746
extern "rust-intrinsic" fn im1() {} //~ ERROR intrinsics are subject to change
4847
//~^ ERROR intrinsic must be in
49-
extern "platform-intrinsic" fn im2() {} //~ ERROR platform intrinsics are experimental
48+
extern "rust-intrinsic" fn im2() {} //~ ERROR platform intrinsics are experimental
5049
//~^ ERROR intrinsic must be in
5150
extern "rust-call" fn im4(_: ()) {} //~ ERROR rust-call ABI is subject to change
5251
}
5352

5453
// Function pointer types
5554
type A1 = extern "rust-intrinsic" fn(); //~ ERROR intrinsics are subject to change
56-
type A2 = extern "platform-intrinsic" fn(); //~ ERROR platform intrinsics are experimental
55+
type A2 = extern "rust-intrinsic" fn(); //~ ERROR platform intrinsics are experimental
5756
type A4 = extern "rust-call" fn(_: ()); //~ ERROR rust-call ABI is subject to change
5857

5958
// Foreign modules
6059
extern "rust-intrinsic" {} //~ ERROR intrinsics are subject to change
61-
extern "platform-intrinsic" {} //~ ERROR platform intrinsics are experimental
60+
extern "rust-intrinsic" {} //~ ERROR platform intrinsics are experimental
6261
extern "rust-call" {} //~ ERROR rust-call ABI is subject to change

‎tests/ui/feature-gates/feature-gate-abi.stderr

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ LL | extern "rust-intrinsic" fn f1() {}
1010
error[E0658]: platform intrinsics are experimental and possibly buggy
1111
--> $DIR/feature-gate-abi.rs:18:8
1212
|
13-
LL | extern "platform-intrinsic" fn f2() {}
13+
LL | extern "rust-intrinsic" fn f2() {}
1414
| ^^^^^^^^^^^^^^^^^^^^
1515
|
1616
= note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
17-
= help: add `#![feature(platform_intrinsics)]` to the crate attributes to enable
17+
= help: add `#![feature(intrinsics)]` to the crate attributes to enable
1818
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
1919

2020
error[E0658]: rust-call ABI is subject to change
@@ -39,11 +39,11 @@ LL | extern "rust-intrinsic" fn m1();
3939
error[E0658]: platform intrinsics are experimental and possibly buggy
4040
--> $DIR/feature-gate-abi.rs:27:12
4141
|
42-
LL | extern "platform-intrinsic" fn m2();
42+
LL | extern "rust-intrinsic" fn m2();
4343
| ^^^^^^^^^^^^^^^^^^^^
4444
|
4545
= note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
46-
= help: add `#![feature(platform_intrinsics)]` to the crate attributes to enable
46+
= help: add `#![feature(intrinsics)]` to the crate attributes to enable
4747
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
4848

4949
error[E0658]: rust-call ABI is subject to change
@@ -78,11 +78,11 @@ LL | extern "rust-intrinsic" fn m1() {}
7878
error[E0658]: platform intrinsics are experimental and possibly buggy
7979
--> $DIR/feature-gate-abi.rs:40:12
8080
|
81-
LL | extern "platform-intrinsic" fn m2() {}
81+
LL | extern "rust-intrinsic" fn m2() {}
8282
| ^^^^^^^^^^^^^^^^^^^^
8383
|
8484
= note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
85-
= help: add `#![feature(platform_intrinsics)]` to the crate attributes to enable
85+
= help: add `#![feature(intrinsics)]` to the crate attributes to enable
8686
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
8787

8888
error[E0658]: rust-call ABI is subject to change
@@ -107,11 +107,11 @@ LL | extern "rust-intrinsic" fn im1() {}
107107
error[E0658]: platform intrinsics are experimental and possibly buggy
108108
--> $DIR/feature-gate-abi.rs:49:12
109109
|
110-
LL | extern "platform-intrinsic" fn im2() {}
110+
LL | extern "rust-intrinsic" fn im2() {}
111111
| ^^^^^^^^^^^^^^^^^^^^
112112
|
113113
= note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
114-
= help: add `#![feature(platform_intrinsics)]` to the crate attributes to enable
114+
= help: add `#![feature(intrinsics)]` to the crate attributes to enable
115115
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
116116

117117
error[E0658]: rust-call ABI is subject to change
@@ -136,11 +136,11 @@ LL | type A1 = extern "rust-intrinsic" fn();
136136
error[E0658]: platform intrinsics are experimental and possibly buggy
137137
--> $DIR/feature-gate-abi.rs:56:18
138138
|
139-
LL | type A2 = extern "platform-intrinsic" fn();
139+
LL | type A2 = extern "rust-intrinsic" fn();
140140
| ^^^^^^^^^^^^^^^^^^^^
141141
|
142142
= note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
143-
= help: add `#![feature(platform_intrinsics)]` to the crate attributes to enable
143+
= help: add `#![feature(intrinsics)]` to the crate attributes to enable
144144
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
145145

146146
error[E0658]: rust-call ABI is subject to change
@@ -165,11 +165,11 @@ LL | extern "rust-intrinsic" {}
165165
error[E0658]: platform intrinsics are experimental and possibly buggy
166166
--> $DIR/feature-gate-abi.rs:61:8
167167
|
168-
LL | extern "platform-intrinsic" {}
168+
LL | extern "rust-intrinsic" {}
169169
| ^^^^^^^^^^^^^^^^^^^^
170170
|
171171
= note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
172-
= help: add `#![feature(platform_intrinsics)]` to the crate attributes to enable
172+
= help: add `#![feature(intrinsics)]` to the crate attributes to enable
173173
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
174174

175175
error[E0658]: rust-call ABI is subject to change
@@ -193,7 +193,7 @@ LL | extern "rust-intrinsic" fn f1() {}
193193
error[E0093]: unrecognized intrinsic function: `f2`
194194
--> $DIR/feature-gate-abi.rs:18:32
195195
|
196-
LL | extern "platform-intrinsic" fn f2() {}
196+
LL | extern "rust-intrinsic" fn f2() {}
197197
| ^^ unrecognized intrinsic
198198
|
199199
= help: if you're adding an intrinsic, be sure to update `check_intrinsic_type`
@@ -207,7 +207,7 @@ LL | extern "rust-intrinsic" fn m1();
207207
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
208208
--> $DIR/feature-gate-abi.rs:27:36
209209
|
210-
LL | extern "platform-intrinsic" fn m2();
210+
LL | extern "rust-intrinsic" fn m2();
211211
| ^^
212212

213213
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
@@ -219,7 +219,7 @@ LL | extern "rust-intrinsic" fn f1() {}
219219
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
220220
--> $DIR/feature-gate-abi.rs:18:37
221221
|
222-
LL | extern "platform-intrinsic" fn f2() {}
222+
LL | extern "rust-intrinsic" fn f2() {}
223223
| ^^
224224

225225
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
@@ -231,7 +231,7 @@ LL | extern "rust-intrinsic" fn m1() {}
231231
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
232232
--> $DIR/feature-gate-abi.rs:40:41
233233
|
234-
LL | extern "platform-intrinsic" fn m2() {}
234+
LL | extern "rust-intrinsic" fn m2() {}
235235
| ^^
236236

237237
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
@@ -243,7 +243,7 @@ LL | extern "rust-intrinsic" fn im1() {}
243243
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
244244
--> $DIR/feature-gate-abi.rs:49:42
245245
|
246-
LL | extern "platform-intrinsic" fn im2() {}
246+
LL | extern "rust-intrinsic" fn im2() {}
247247
| ^^
248248

249249
error: aborting due to 29 previous errors

‎tests/ui/inline-const/instance-doesnt-depend-on-type.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
fn main() {
77
const { core::mem::transmute::<u8, u8> };
88
// Don't resolve the instance of this inline constant to be an intrinsic,
9-
// even if the type of the constant is `extern "intrinsic" fn(u8) -> u8`.
9+
// even if the type of the constant is `extern "rust-intrinsic" fn(u8) -> u8`.
1010
}

‎tests/ui/intrinsics/bad-intrinsic-monomorphization.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//@ build-fail
22

3-
#![feature(repr_simd, platform_intrinsics, core_intrinsics)]
3+
#![feature(repr_simd, intrinsics, core_intrinsics)]
44
#![allow(warnings)]
55
#![crate_type = "rlib"]
66

77
// Bad monomorphizations could previously cause LLVM asserts even though the
88
// error was caught in the compiler.
99

10-
extern "platform-intrinsic" {
10+
extern "rust-intrinsic" {
1111
fn simd_add<T>(x: T, y: T) -> T;
1212
}
1313

0 commit comments

Comments
 (0)