Skip to content

Commit aaf9dd9

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#137556
Rollup merge of rust-lang#137556 - RalfJung:simd_shuffle_const_generic, r=oli-obk rename simd_shuffle_generic → simd_shuffle_const_generic I've been confused by this name one time too often. ;) r? `@oli-obk`
2 parents 7d8c6e7 + 0362775 commit aaf9dd9

File tree

10 files changed

+55
-55
lines changed

10 files changed

+55
-55
lines changed

‎compiler/rustc_codegen_cranelift/src/intrinsics/simd.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>(
116116
});
117117
}
118118

119-
// simd_shuffle_generic<T, U, const I: &[u32]>(x: T, y: T) -> U
120-
sym::simd_shuffle_generic => {
119+
// simd_shuffle_const_generic<T, U, const I: &[u32]>(x: T, y: T) -> U
120+
sym::simd_shuffle_const_generic => {
121121
let [x, y] = args else {
122122
bug!("wrong number of args for intrinsic {intrinsic}");
123123
};

‎compiler/rustc_codegen_llvm/src/intrinsic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1329,7 +1329,7 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
13291329
));
13301330
}
13311331

1332-
if name == sym::simd_shuffle_generic {
1332+
if name == sym::simd_shuffle_const_generic {
13331333
let idx = fn_args[2].expect_const().to_value().valtree.unwrap_branch();
13341334
let n = idx.len() as u64;
13351335

‎compiler/rustc_hir_analysis/src/check/intrinsic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ pub fn check_intrinsic_type(
699699
| sym::simd_reduce_min
700700
| sym::simd_reduce_max => (2, 0, vec![param(0)], param(1)),
701701
sym::simd_shuffle => (3, 0, vec![param(0), param(0), param(1)], param(2)),
702-
sym::simd_shuffle_generic => (2, 1, vec![param(0), param(0)], param(1)),
702+
sym::simd_shuffle_const_generic => (2, 1, vec![param(0), param(0)], param(1)),
703703

704704
other => {
705705
tcx.dcx().emit_err(UnrecognizedIntrinsicFunction { span, name: other });

‎compiler/rustc_span/src/symbol.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1916,7 +1916,7 @@ symbols! {
19161916
simd_shl,
19171917
simd_shr,
19181918
simd_shuffle,
1919-
simd_shuffle_generic,
1919+
simd_shuffle_const_generic,
19201920
simd_sub,
19211921
simd_trunc,
19221922
simd_with_exposed_provenance,

‎src/tools/miri/src/intrinsics/simd.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
633633
this.write_immediate(*val, &dest)?;
634634
}
635635
}
636-
"shuffle_generic" => {
636+
"shuffle_const_generic" => {
637637
let [left, right] = check_arg_count(args)?;
638638
let (left, left_len) = this.project_to_simd(left)?;
639639
let (right, right_len) = this.project_to_simd(right)?;
@@ -657,7 +657,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
657657
this.read_immediate(&this.project_index(&right, right_idx)?)?
658658
} else {
659659
throw_ub_format!(
660-
"`simd_shuffle_generic` index {src_index} is out-of-bounds for 2 vectors with length {dest_len}"
660+
"`simd_shuffle_const_generic` index {src_index} is out-of-bounds for 2 vectors with length {dest_len}"
661661
);
662662
};
663663
this.write_immediate(*val, &dest)?;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use std::simd::prelude::*;
1616

1717
#[rustc_intrinsic]
1818
#[rustc_nounwind]
19-
pub unsafe fn simd_shuffle_generic<T, U, const IDX: &'static [u32]>(_x: T, _y: T) -> U;
19+
pub unsafe fn simd_shuffle_const_generic<T, U, const IDX: &'static [u32]>(_x: T, _y: T) -> U;
2020

2121
fn simd_ops_f32() {
2222
let a = f32x4::splat(10.0);
@@ -619,13 +619,13 @@ fn simd_intrinsics() {
619619
simd_select(i8x4::from_array([0, -1, -1, 0]), b, a),
620620
i32x4::from_array([10, 2, 10, 10])
621621
);
622-
assert_eq!(simd_shuffle_generic::<_, i32x4, { &[3, 1, 0, 2] }>(a, b), a,);
622+
assert_eq!(simd_shuffle_const_generic::<_, i32x4, { &[3, 1, 0, 2] }>(a, b), a,);
623623
assert_eq!(
624624
simd_shuffle::<_, _, i32x4>(a, b, const { u32x4::from_array([3u32, 1, 0, 2]) }),
625625
a,
626626
);
627627
assert_eq!(
628-
simd_shuffle_generic::<_, i32x4, { &[7, 5, 4, 6] }>(a, b),
628+
simd_shuffle_const_generic::<_, i32x4, { &[7, 5, 4, 6] }>(a, b),
629629
i32x4::from_array([4, 2, 1, 10]),
630630
);
631631
assert_eq!(

‎tests/ui/simd/intrinsic/generic-elements.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ unsafe fn simd_extract<T, E>(x: T, idx: u32) -> E;
4141
unsafe fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
4242

4343
#[rustc_intrinsic]
44-
unsafe fn simd_shuffle_generic<T, U, const IDX: &'static [u32]>(x: T, y: T) -> U;
44+
unsafe fn simd_shuffle_const_generic<T, U, const IDX: &'static [u32]>(x: T, y: T) -> U;
4545

4646

4747
#[repr(simd)]
@@ -83,27 +83,27 @@ fn main() {
8383
//~^ ERROR expected return type of length 8, found `i32x2` with length 2
8484

8585
const I2: &[u32] = &[0; 2];
86-
simd_shuffle_generic::<i32, i32, I2>(0, 0);
86+
simd_shuffle_const_generic::<i32, i32, I2>(0, 0);
8787
//~^ ERROR expected SIMD input type, found non-SIMD `i32`
8888
const I4: &[u32] = &[0; 4];
89-
simd_shuffle_generic::<i32, i32, I4>(0, 0);
89+
simd_shuffle_const_generic::<i32, i32, I4>(0, 0);
9090
//~^ ERROR expected SIMD input type, found non-SIMD `i32`
9191
const I8: &[u32] = &[0; 8];
92-
simd_shuffle_generic::<i32, i32, I8>(0, 0);
92+
simd_shuffle_const_generic::<i32, i32, I8>(0, 0);
9393
//~^ ERROR expected SIMD input type, found non-SIMD `i32`
9494

95-
simd_shuffle_generic::<_, f32x2, I2>(x, x);
95+
simd_shuffle_const_generic::<_, f32x2, I2>(x, x);
9696
//~^ ERROR element type `i32` (element of input `i32x4`), found `f32x2` with element type `f32`
97-
simd_shuffle_generic::<_, f32x4, I4>(x, x);
97+
simd_shuffle_const_generic::<_, f32x4, I4>(x, x);
9898
//~^ ERROR element type `i32` (element of input `i32x4`), found `f32x4` with element type `f32`
99-
simd_shuffle_generic::<_, f32x8, I8>(x, x);
99+
simd_shuffle_const_generic::<_, f32x8, I8>(x, x);
100100
//~^ ERROR element type `i32` (element of input `i32x4`), found `f32x8` with element type `f32`
101101

102-
simd_shuffle_generic::<_, i32x8, I2>(x, x);
102+
simd_shuffle_const_generic::<_, i32x8, I2>(x, x);
103103
//~^ ERROR expected return type of length 2, found `i32x8` with length 8
104-
simd_shuffle_generic::<_, i32x8, I4>(x, x);
104+
simd_shuffle_const_generic::<_, i32x8, I4>(x, x);
105105
//~^ ERROR expected return type of length 4, found `i32x8` with length 8
106-
simd_shuffle_generic::<_, i32x2, I8>(x, x);
106+
simd_shuffle_const_generic::<_, i32x2, I8>(x, x);
107107
//~^ ERROR expected return type of length 8, found `i32x2` with length 2
108108
}
109109
}

‎tests/ui/simd/intrinsic/generic-elements.stderr

+27-27
Original file line numberDiff line numberDiff line change
@@ -70,59 +70,59 @@ error[E0511]: invalid monomorphization of `simd_shuffle` intrinsic: expected ret
7070
LL | simd_shuffle::<_, _, i32x2>(x, x, IDX8);
7171
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7272

73-
error[E0511]: invalid monomorphization of `simd_shuffle_generic` intrinsic: expected SIMD input type, found non-SIMD `i32`
73+
error[E0511]: invalid monomorphization of `simd_shuffle_const_generic` intrinsic: expected SIMD input type, found non-SIMD `i32`
7474
--> $DIR/generic-elements.rs:86:9
7575
|
76-
LL | simd_shuffle_generic::<i32, i32, I2>(0, 0);
77-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
76+
LL | simd_shuffle_const_generic::<i32, i32, I2>(0, 0);
77+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7878

79-
error[E0511]: invalid monomorphization of `simd_shuffle_generic` intrinsic: expected SIMD input type, found non-SIMD `i32`
79+
error[E0511]: invalid monomorphization of `simd_shuffle_const_generic` intrinsic: expected SIMD input type, found non-SIMD `i32`
8080
--> $DIR/generic-elements.rs:89:9
8181
|
82-
LL | simd_shuffle_generic::<i32, i32, I4>(0, 0);
83-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
82+
LL | simd_shuffle_const_generic::<i32, i32, I4>(0, 0);
83+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
8484

85-
error[E0511]: invalid monomorphization of `simd_shuffle_generic` intrinsic: expected SIMD input type, found non-SIMD `i32`
85+
error[E0511]: invalid monomorphization of `simd_shuffle_const_generic` intrinsic: expected SIMD input type, found non-SIMD `i32`
8686
--> $DIR/generic-elements.rs:92:9
8787
|
88-
LL | simd_shuffle_generic::<i32, i32, I8>(0, 0);
89-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
88+
LL | simd_shuffle_const_generic::<i32, i32, I8>(0, 0);
89+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9090

91-
error[E0511]: invalid monomorphization of `simd_shuffle_generic` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x2` with element type `f32`
91+
error[E0511]: invalid monomorphization of `simd_shuffle_const_generic` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x2` with element type `f32`
9292
--> $DIR/generic-elements.rs:95:9
9393
|
94-
LL | simd_shuffle_generic::<_, f32x2, I2>(x, x);
95-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
94+
LL | simd_shuffle_const_generic::<_, f32x2, I2>(x, x);
95+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9696

97-
error[E0511]: invalid monomorphization of `simd_shuffle_generic` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x4` with element type `f32`
97+
error[E0511]: invalid monomorphization of `simd_shuffle_const_generic` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x4` with element type `f32`
9898
--> $DIR/generic-elements.rs:97:9
9999
|
100-
LL | simd_shuffle_generic::<_, f32x4, I4>(x, x);
101-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
100+
LL | simd_shuffle_const_generic::<_, f32x4, I4>(x, x);
101+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
102102

103-
error[E0511]: invalid monomorphization of `simd_shuffle_generic` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x8` with element type `f32`
103+
error[E0511]: invalid monomorphization of `simd_shuffle_const_generic` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x8` with element type `f32`
104104
--> $DIR/generic-elements.rs:99:9
105105
|
106-
LL | simd_shuffle_generic::<_, f32x8, I8>(x, x);
107-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
106+
LL | simd_shuffle_const_generic::<_, f32x8, I8>(x, x);
107+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
108108

109-
error[E0511]: invalid monomorphization of `simd_shuffle_generic` intrinsic: expected return type of length 2, found `i32x8` with length 8
109+
error[E0511]: invalid monomorphization of `simd_shuffle_const_generic` intrinsic: expected return type of length 2, found `i32x8` with length 8
110110
--> $DIR/generic-elements.rs:102:9
111111
|
112-
LL | simd_shuffle_generic::<_, i32x8, I2>(x, x);
113-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
112+
LL | simd_shuffle_const_generic::<_, i32x8, I2>(x, x);
113+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
114114

115-
error[E0511]: invalid monomorphization of `simd_shuffle_generic` intrinsic: expected return type of length 4, found `i32x8` with length 8
115+
error[E0511]: invalid monomorphization of `simd_shuffle_const_generic` intrinsic: expected return type of length 4, found `i32x8` with length 8
116116
--> $DIR/generic-elements.rs:104:9
117117
|
118-
LL | simd_shuffle_generic::<_, i32x8, I4>(x, x);
119-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
118+
LL | simd_shuffle_const_generic::<_, i32x8, I4>(x, x);
119+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
120120

121-
error[E0511]: invalid monomorphization of `simd_shuffle_generic` intrinsic: expected return type of length 8, found `i32x2` with length 2
121+
error[E0511]: invalid monomorphization of `simd_shuffle_const_generic` intrinsic: expected return type of length 8, found `i32x2` with length 2
122122
--> $DIR/generic-elements.rs:106:9
123123
|
124-
LL | simd_shuffle_generic::<_, i32x2, I8>(x, x);
125-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
124+
LL | simd_shuffle_const_generic::<_, i32x2, I8>(x, x);
125+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
126126

127127
error: aborting due to 21 previous errors
128128

‎tests/ui/simd/monomorphize-shuffle-index.generic.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
error: overly complex generic constant
2-
--> $DIR/monomorphize-shuffle-index.rs:32:45
2+
--> $DIR/monomorphize-shuffle-index.rs:32:51
33
|
4-
LL | return simd_shuffle_generic::<_, _, { &Self::I.0 }>(a, b);
5-
| ^^----------^^
6-
| |
7-
| pointer casts are not allowed in generic constants
4+
LL | return simd_shuffle_const_generic::<_, _, { &Self::I.0 }>(a, b);
5+
| ^^----------^^
6+
| |
7+
| pointer casts are not allowed in generic constants
88
|
99
= help: consider moving this anonymous constant into a `const` function
1010

‎tests/ui/simd/monomorphize-shuffle-index.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ unsafe fn simd_shuffle<T, I, U>(a: T, b: T, i: I) -> U;
1111

1212
#[rustc_intrinsic]
1313
#[cfg(any(generic, generic_with_fn))]
14-
unsafe fn simd_shuffle_generic<T, U, const I: &'static [u32]>(a: T, b: T) -> U;
14+
unsafe fn simd_shuffle_const_generic<T, U, const I: &'static [u32]>(a: T, b: T) -> U;
1515

1616

1717
#[derive(Copy, Clone)]
@@ -29,10 +29,10 @@ trait Shuffle<const N: usize> {
2929
#[cfg(old)]
3030
return simd_shuffle(a, b, Self::I);
3131
#[cfg(generic)]
32-
return simd_shuffle_generic::<_, _, { &Self::I.0 }>(a, b);
32+
return simd_shuffle_const_generic::<_, _, { &Self::I.0 }>(a, b);
3333
//[generic]~^ overly complex generic constant
3434
#[cfg(generic_with_fn)]
35-
return simd_shuffle_generic::<_, _, { Self::J }>(a, b);
35+
return simd_shuffle_const_generic::<_, _, { Self::J }>(a, b);
3636
}
3737
}
3838

0 commit comments

Comments
 (0)