Skip to content

Commit c1d0e48

Browse files
RalfJungRalfJung
committed
fix use of platform_intrinsics in tests
1 parent cc3df0a commit c1d0e48

File tree

90 files changed

+236
-277
lines changed

Some content is hidden

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

90 files changed

+236
-277
lines changed

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

+2-5
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

+2-4
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::simd_div;
64

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

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

+2-4
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::simd_div;
64

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

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

+2-4
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::simd_reduce_any;
64

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

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

+2-4
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::simd_rem;
64

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

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

+2-4
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::simd_select_bitmask;
64

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

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

+2-4
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::simd_select;
64

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

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

+2-4
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::simd_shl;
64

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

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

+2-4
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_shr<T>(x: T, y: T) -> T;
5-
}
3+
use std::intrinsics::simd::simd_shr;
64

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

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

+1-7
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

+1-1
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

+2-8
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]));
@@ -497,9 +494,6 @@ fn simd_round() {
497494

498495
fn simd_intrinsics() {
499496
use intrinsics::*;
500-
extern "platform-intrinsic" {
501-
fn simd_shuffle_generic<T, U, const IDX: &'static [u32]>(x: T, y: T) -> U;
502-
}
503497

504498
unsafe {
505499
// Make sure simd_eq returns all-1 for `true`

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

+1-1
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/codegen/issues/issue-84268.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ compile-flags: -O --crate-type=rlib
2-
#![feature(platform_intrinsics, repr_simd)]
2+
#![feature(intrinsics, repr_simd)]
33

4-
extern "platform-intrinsic" {
4+
extern "rust-intrinsic" {
55
fn simd_fabs<T>(x: T) -> T;
66
fn simd_eq<T, U>(x: T, y: T) -> U;
77
}

‎tests/codegen/simd-intrinsic/simd-intrinsic-float-abs.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![crate_type = "lib"]
44

5-
#![feature(repr_simd, platform_intrinsics)]
5+
#![feature(repr_simd, intrinsics)]
66
#![allow(non_camel_case_types)]
77

88
#[repr(simd)]
@@ -25,7 +25,7 @@ pub struct f32x16(pub f32, pub f32, pub f32, pub f32,
2525
pub f32, pub f32, pub f32, pub f32,
2626
pub f32, pub f32, pub f32, pub f32);
2727

28-
extern "platform-intrinsic" {
28+
extern "rust-intrinsic" {
2929
fn simd_fabs<T>(x: T) -> T;
3030
}
3131

‎tests/codegen/simd-intrinsic/simd-intrinsic-float-ceil.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![crate_type = "lib"]
44

5-
#![feature(repr_simd, platform_intrinsics)]
5+
#![feature(repr_simd, intrinsics)]
66
#![allow(non_camel_case_types)]
77

88
#[repr(simd)]
@@ -25,7 +25,7 @@ pub struct f32x16(pub f32, pub f32, pub f32, pub f32,
2525
pub f32, pub f32, pub f32, pub f32,
2626
pub f32, pub f32, pub f32, pub f32);
2727

28-
extern "platform-intrinsic" {
28+
extern "rust-intrinsic" {
2929
fn simd_ceil<T>(x: T) -> T;
3030
}
3131

‎tests/codegen/simd-intrinsic/simd-intrinsic-float-cos.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![crate_type = "lib"]
44

5-
#![feature(repr_simd, platform_intrinsics)]
5+
#![feature(repr_simd, intrinsics)]
66
#![allow(non_camel_case_types)]
77

88
#[repr(simd)]
@@ -25,7 +25,7 @@ pub struct f32x16(pub f32, pub f32, pub f32, pub f32,
2525
pub f32, pub f32, pub f32, pub f32,
2626
pub f32, pub f32, pub f32, pub f32);
2727

28-
extern "platform-intrinsic" {
28+
extern "rust-intrinsic" {
2929
fn simd_fcos<T>(x: T) -> T;
3030
}
3131

‎tests/codegen/simd-intrinsic/simd-intrinsic-float-exp.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![crate_type = "lib"]
44

5-
#![feature(repr_simd, platform_intrinsics)]
5+
#![feature(repr_simd, intrinsics)]
66
#![allow(non_camel_case_types)]
77

88
#[repr(simd)]
@@ -25,7 +25,7 @@ pub struct f32x16(pub f32, pub f32, pub f32, pub f32,
2525
pub f32, pub f32, pub f32, pub f32,
2626
pub f32, pub f32, pub f32, pub f32);
2727

28-
extern "platform-intrinsic" {
28+
extern "rust-intrinsic" {
2929
fn simd_fexp<T>(x: T) -> T;
3030
}
3131

‎tests/codegen/simd-intrinsic/simd-intrinsic-float-exp2.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![crate_type = "lib"]
44

5-
#![feature(repr_simd, platform_intrinsics)]
5+
#![feature(repr_simd, intrinsics)]
66
#![allow(non_camel_case_types)]
77

88
#[repr(simd)]
@@ -25,7 +25,7 @@ pub struct f32x16(pub f32, pub f32, pub f32, pub f32,
2525
pub f32, pub f32, pub f32, pub f32,
2626
pub f32, pub f32, pub f32, pub f32);
2727

28-
extern "platform-intrinsic" {
28+
extern "rust-intrinsic" {
2929
fn simd_fexp2<T>(x: T) -> T;
3030
}
3131

‎tests/codegen/simd-intrinsic/simd-intrinsic-float-floor.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![crate_type = "lib"]
44

5-
#![feature(repr_simd, platform_intrinsics)]
5+
#![feature(repr_simd, intrinsics)]
66
#![allow(non_camel_case_types)]
77

88
#[repr(simd)]
@@ -25,7 +25,7 @@ pub struct f32x16(pub f32, pub f32, pub f32, pub f32,
2525
pub f32, pub f32, pub f32, pub f32,
2626
pub f32, pub f32, pub f32, pub f32);
2727

28-
extern "platform-intrinsic" {
28+
extern "rust-intrinsic" {
2929
fn simd_floor<T>(x: T) -> T;
3030
}
3131

‎tests/codegen/simd-intrinsic/simd-intrinsic-float-fma.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![crate_type = "lib"]
44

5-
#![feature(repr_simd, platform_intrinsics)]
5+
#![feature(repr_simd, intrinsics)]
66
#![allow(non_camel_case_types)]
77

88
#[repr(simd)]
@@ -25,7 +25,7 @@ pub struct f32x16(pub f32, pub f32, pub f32, pub f32,
2525
pub f32, pub f32, pub f32, pub f32,
2626
pub f32, pub f32, pub f32, pub f32);
2727

28-
extern "platform-intrinsic" {
28+
extern "rust-intrinsic" {
2929
fn simd_fma<T>(x: T, b: T, c: T) -> T;
3030
}
3131

‎tests/codegen/simd-intrinsic/simd-intrinsic-float-fsqrt.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![crate_type = "lib"]
44

5-
#![feature(repr_simd, platform_intrinsics)]
5+
#![feature(repr_simd, intrinsics)]
66
#![allow(non_camel_case_types)]
77

88
#[repr(simd)]
@@ -25,7 +25,7 @@ pub struct f32x16(pub f32, pub f32, pub f32, pub f32,
2525
pub f32, pub f32, pub f32, pub f32,
2626
pub f32, pub f32, pub f32, pub f32);
2727

28-
extern "platform-intrinsic" {
28+
extern "rust-intrinsic" {
2929
fn simd_fsqrt<T>(x: T) -> T;
3030
}
3131

‎tests/codegen/simd-intrinsic/simd-intrinsic-float-log.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![crate_type = "lib"]
44

5-
#![feature(repr_simd, platform_intrinsics)]
5+
#![feature(repr_simd, intrinsics)]
66
#![allow(non_camel_case_types)]
77

88
#[repr(simd)]
@@ -25,7 +25,7 @@ pub struct f32x16(pub f32, pub f32, pub f32, pub f32,
2525
pub f32, pub f32, pub f32, pub f32,
2626
pub f32, pub f32, pub f32, pub f32);
2727

28-
extern "platform-intrinsic" {
28+
extern "rust-intrinsic" {
2929
fn simd_flog<T>(x: T) -> T;
3030
}
3131

‎tests/codegen/simd-intrinsic/simd-intrinsic-float-log10.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![crate_type = "lib"]
44

5-
#![feature(repr_simd, platform_intrinsics)]
5+
#![feature(repr_simd, intrinsics)]
66
#![allow(non_camel_case_types)]
77

88
#[repr(simd)]
@@ -25,7 +25,7 @@ pub struct f32x16(pub f32, pub f32, pub f32, pub f32,
2525
pub f32, pub f32, pub f32, pub f32,
2626
pub f32, pub f32, pub f32, pub f32);
2727

28-
extern "platform-intrinsic" {
28+
extern "rust-intrinsic" {
2929
fn simd_flog10<T>(x: T) -> T;
3030
}
3131

‎tests/codegen/simd-intrinsic/simd-intrinsic-float-log2.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![crate_type = "lib"]
44

5-
#![feature(repr_simd, platform_intrinsics)]
5+
#![feature(repr_simd, intrinsics)]
66
#![allow(non_camel_case_types)]
77

88
#[repr(simd)]
@@ -25,7 +25,7 @@ pub struct f32x16(pub f32, pub f32, pub f32, pub f32,
2525
pub f32, pub f32, pub f32, pub f32,
2626
pub f32, pub f32, pub f32, pub f32);
2727

28-
extern "platform-intrinsic" {
28+
extern "rust-intrinsic" {
2929
fn simd_flog2<T>(x: T) -> T;
3030
}
3131

‎tests/codegen/simd-intrinsic/simd-intrinsic-float-minmax.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
#![crate_type = "lib"]
44

5-
#![feature(repr_simd, platform_intrinsics)]
5+
#![feature(repr_simd, intrinsics)]
66
#![allow(non_camel_case_types)]
77

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

12-
extern "platform-intrinsic" {
12+
extern "rust-intrinsic" {
1313
fn simd_fmin<T>(x: T, y: T) -> T;
1414
fn simd_fmax<T>(x: T, y: T) -> T;
1515
}

0 commit comments

Comments
 (0)