bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Add #[rustc_args_required_const] to simd_shuffle tests

Browse source
This commit is contained in:
Dylan MacKenzie 2020-02-18 23:17:21 -08:00
parent f581b559a3
commit b43dc806ae
7 changed files with 32 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/test/incremental/issue-61530.rs
View file

@ -1,4 +1,4 @@
#![feature(repr_simd, platform_intrinsics)] #![feature(repr_simd, platform_intrinsics, rustc_attrs)]
// revisions:rpass1 rpass2 // revisions:rpass1 rpass2
@ -6,6 +6,7 @@
struct I32x2(i32, i32); struct I32x2(i32, i32);
extern "platform-intrinsic" { extern "platform-intrinsic" {
#[rustc_args_required_const(2)]
fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U; fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
} }

3
src/test/ui/issues/issue-38074.rs
View file

@ -1,9 +1,10 @@
// run-pass // run-pass
// ignore-emscripten FIXME(#45351) // ignore-emscripten FIXME(#45351)
#![feature(platform_intrinsics, repr_simd)] #![feature(platform_intrinsics, repr_simd, rustc_attrs)]
extern "platform-intrinsic" { extern "platform-intrinsic" {
#[rustc_args_required_const(2)]
fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U; fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
} }

4
src/test/ui/simd-intrinsic/simd-intrinsic-generic-elements.rs
View file

@ -42,9 +42,13 @@ extern "platform-intrinsic" {
fn simd_insert<T, E>(x: T, idx: u32, y: E) -> T; fn simd_insert<T, E>(x: T, idx: u32, y: E) -> T;
fn simd_extract<T, E>(x: T, idx: u32) -> E; fn simd_extract<T, E>(x: T, idx: u32) -> E;
#[rustc_args_required_const(2)]
fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U; fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
#[rustc_args_required_const(2)]
fn simd_shuffle3<T, U>(x: T, y: T, idx: [u32; 3]) -> U; fn simd_shuffle3<T, U>(x: T, y: T, idx: [u32; 3]) -> U;
#[rustc_args_required_const(2)]
fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U; fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
#[rustc_args_required_const(2)]
fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U; fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
} }

30
src/test/ui/simd-intrinsic/simd-intrinsic-generic-elements.stderr
View file

@ -1,89 +1,89 @@
error[E0511]: invalid monomorphization of `simd_insert` intrinsic: expected SIMD input type, found non-SIMD `i32` error[E0511]: invalid monomorphization of `simd_insert` intrinsic: expected SIMD input type, found non-SIMD `i32`
--> $DIR/simd-intrinsic-generic-elements.rs:55:9 --> $DIR/simd-intrinsic-generic-elements.rs:59:9
| |
LL | simd_insert(0, 0, 0); LL | simd_insert(0, 0, 0);
| ^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^
error[E0511]: invalid monomorphization of `simd_insert` intrinsic: expected inserted type `i32` (element of input `i32x4`), found `f64` error[E0511]: invalid monomorphization of `simd_insert` intrinsic: expected inserted type `i32` (element of input `i32x4`), found `f64`
--> $DIR/simd-intrinsic-generic-elements.rs:57:9 --> $DIR/simd-intrinsic-generic-elements.rs:61:9
| |
LL | simd_insert(x, 0, 1.0); LL | simd_insert(x, 0, 1.0);
| ^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^
error[E0511]: invalid monomorphization of `simd_extract` intrinsic: expected return type `i32` (element of input `i32x4`), found `f32` error[E0511]: invalid monomorphization of `simd_extract` intrinsic: expected return type `i32` (element of input `i32x4`), found `f32`
--> $DIR/simd-intrinsic-generic-elements.rs:59:9 --> $DIR/simd-intrinsic-generic-elements.rs:63:9
| |
LL | simd_extract::<_, f32>(x, 0); LL | simd_extract::<_, f32>(x, 0);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0511]: invalid monomorphization of `simd_shuffle2` intrinsic: expected SIMD input type, found non-SIMD `i32` error[E0511]: invalid monomorphization of `simd_shuffle2` intrinsic: expected SIMD input type, found non-SIMD `i32`
--> $DIR/simd-intrinsic-generic-elements.rs:62:9 --> $DIR/simd-intrinsic-generic-elements.rs:66:9
| |
LL | simd_shuffle2::<i32, i32>(0, 0, [0; 2]); LL | simd_shuffle2::<i32, i32>(0, 0, [0; 2]);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0511]: invalid monomorphization of `simd_shuffle3` intrinsic: expected SIMD input type, found non-SIMD `i32` error[E0511]: invalid monomorphization of `simd_shuffle3` intrinsic: expected SIMD input type, found non-SIMD `i32`
--> $DIR/simd-intrinsic-generic-elements.rs:64:9 --> $DIR/simd-intrinsic-generic-elements.rs:68:9
| |
LL | simd_shuffle3::<i32, i32>(0, 0, [0; 3]); LL | simd_shuffle3::<i32, i32>(0, 0, [0; 3]);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0511]: invalid monomorphization of `simd_shuffle4` intrinsic: expected SIMD input type, found non-SIMD `i32` error[E0511]: invalid monomorphization of `simd_shuffle4` intrinsic: expected SIMD input type, found non-SIMD `i32`
--> $DIR/simd-intrinsic-generic-elements.rs:66:9 --> $DIR/simd-intrinsic-generic-elements.rs:70:9
| |
LL | simd_shuffle4::<i32, i32>(0, 0, [0; 4]); LL | simd_shuffle4::<i32, i32>(0, 0, [0; 4]);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0511]: invalid monomorphization of `simd_shuffle8` intrinsic: expected SIMD input type, found non-SIMD `i32` error[E0511]: invalid monomorphization of `simd_shuffle8` intrinsic: expected SIMD input type, found non-SIMD `i32`
--> $DIR/simd-intrinsic-generic-elements.rs:68:9 --> $DIR/simd-intrinsic-generic-elements.rs:72:9
| |
LL | simd_shuffle8::<i32, i32>(0, 0, [0; 8]); LL | simd_shuffle8::<i32, i32>(0, 0, [0; 8]);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0511]: invalid monomorphization of `simd_shuffle2` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x2` with element type `f32` error[E0511]: invalid monomorphization of `simd_shuffle2` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x2` with element type `f32`
--> $DIR/simd-intrinsic-generic-elements.rs:71:9 --> $DIR/simd-intrinsic-generic-elements.rs:75:9
| |
LL | simd_shuffle2::<_, f32x2>(x, x, [0; 2]); LL | simd_shuffle2::<_, f32x2>(x, x, [0; 2]);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0511]: invalid monomorphization of `simd_shuffle3` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x3` with element type `f32` error[E0511]: invalid monomorphization of `simd_shuffle3` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x3` with element type `f32`
--> $DIR/simd-intrinsic-generic-elements.rs:73:9 --> $DIR/simd-intrinsic-generic-elements.rs:77:9
| |
LL | simd_shuffle3::<_, f32x3>(x, x, [0; 3]); LL | simd_shuffle3::<_, f32x3>(x, x, [0; 3]);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0511]: invalid monomorphization of `simd_shuffle4` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x4` with element type `f32` error[E0511]: invalid monomorphization of `simd_shuffle4` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x4` with element type `f32`
--> $DIR/simd-intrinsic-generic-elements.rs:75:9 --> $DIR/simd-intrinsic-generic-elements.rs:79:9
| |
LL | simd_shuffle4::<_, f32x4>(x, x, [0; 4]); LL | simd_shuffle4::<_, f32x4>(x, x, [0; 4]);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0511]: invalid monomorphization of `simd_shuffle8` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x8` with element type `f32` error[E0511]: invalid monomorphization of `simd_shuffle8` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x8` with element type `f32`
--> $DIR/simd-intrinsic-generic-elements.rs:77:9 --> $DIR/simd-intrinsic-generic-elements.rs:81:9
| |
LL | simd_shuffle8::<_, f32x8>(x, x, [0; 8]); LL | simd_shuffle8::<_, f32x8>(x, x, [0; 8]);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0511]: invalid monomorphization of `simd_shuffle2` intrinsic: expected return type of length 2, found `i32x8` with length 8 error[E0511]: invalid monomorphization of `simd_shuffle2` intrinsic: expected return type of length 2, found `i32x8` with length 8
--> $DIR/simd-intrinsic-generic-elements.rs:80:9 --> $DIR/simd-intrinsic-generic-elements.rs:84:9
| |
LL | simd_shuffle2::<_, i32x8>(x, x, [0; 2]); LL | simd_shuffle2::<_, i32x8>(x, x, [0; 2]);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0511]: invalid monomorphization of `simd_shuffle3` intrinsic: expected return type of length 3, found `i32x4` with length 4 error[E0511]: invalid monomorphization of `simd_shuffle3` intrinsic: expected return type of length 3, found `i32x4` with length 4
--> $DIR/simd-intrinsic-generic-elements.rs:82:9 --> $DIR/simd-intrinsic-generic-elements.rs:86:9
| |
LL | simd_shuffle3::<_, i32x4>(x, x, [0; 3]); LL | simd_shuffle3::<_, i32x4>(x, x, [0; 3]);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0511]: invalid monomorphization of `simd_shuffle4` intrinsic: expected return type of length 4, found `i32x3` with length 3 error[E0511]: invalid monomorphization of `simd_shuffle4` intrinsic: expected return type of length 4, found `i32x3` with length 3
--> $DIR/simd-intrinsic-generic-elements.rs:84:9 --> $DIR/simd-intrinsic-generic-elements.rs:88:9
| |
LL | simd_shuffle4::<_, i32x3>(x, x, [0; 4]); LL | simd_shuffle4::<_, i32x3>(x, x, [0; 4]);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0511]: invalid monomorphization of `simd_shuffle8` intrinsic: expected return type of length 8, found `i32x2` with length 2 error[E0511]: invalid monomorphization of `simd_shuffle8` intrinsic: expected return type of length 8, found `i32x2` with length 2
--> $DIR/simd-intrinsic-generic-elements.rs:86:9 --> $DIR/simd-intrinsic-generic-elements.rs:90:9
| |
LL | simd_shuffle8::<_, i32x2>(x, x, [0; 8]); LL | simd_shuffle8::<_, i32x2>(x, x, [0; 8]);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

3
src/test/ui/simd-intrinsic/simd-intrinsic-inlining-issue67557-ice.rs
View file

@ -3,9 +3,10 @@
// //
// run-pass // run-pass
// compile-flags: -Zmir-opt-level=3 // compile-flags: -Zmir-opt-level=3
#![feature(platform_intrinsics, repr_simd)] #![feature(platform_intrinsics, repr_simd, rustc_attrs)]
extern "platform-intrinsic" { extern "platform-intrinsic" {
#[rustc_args_required_const(2)]
fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U; fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
} }

3
src/test/ui/simd-intrinsic/simd-intrinsic-inlining-issue67557.rs
View file

@ -3,9 +3,10 @@
// //
// run-pass // run-pass
// compile-flags: -Zmir-opt-level=3 // compile-flags: -Zmir-opt-level=3
#![feature(platform_intrinsics, repr_simd)] #![feature(platform_intrinsics, repr_simd, rustc_attrs)]
extern "platform-intrinsic" { extern "platform-intrinsic" {
#[rustc_args_required_const(2)]
fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U; fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
} }

6
src/test/ui/simd/simd-intrinsic-generic-elements.rs
View file

@ -1,7 +1,7 @@
// run-pass // run-pass
// ignore-emscripten FIXME(#45351) hits an LLVM assert // ignore-emscripten FIXME(#45351) hits an LLVM assert
#![feature(repr_simd, platform_intrinsics)] #![feature(repr_simd, platform_intrinsics, rustc_attrs)]
#[repr(simd)] #[repr(simd)]
#[derive(Copy, Clone, Debug, PartialEq)] #[derive(Copy, Clone, Debug, PartialEq)]
@ -25,9 +25,13 @@ extern "platform-intrinsic" {
fn simd_insert<T, E>(x: T, idx: u32, y: E) -> T; fn simd_insert<T, E>(x: T, idx: u32, y: E) -> T;
fn simd_extract<T, E>(x: T, idx: u32) -> E; fn simd_extract<T, E>(x: T, idx: u32) -> E;
#[rustc_args_required_const(2)]
fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U; fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
#[rustc_args_required_const(2)]
fn simd_shuffle3<T, U>(x: T, y: T, idx: [u32; 3]) -> U; fn simd_shuffle3<T, U>(x: T, y: T, idx: [u32; 3]) -> U;
#[rustc_args_required_const(2)]
fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U; fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
#[rustc_args_required_const(2)]
fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U; fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
} }