Skip to content

Commit 52b42d7

Browse files
calebzulawskicalebzulawski
committed
Update tests for std::simd subtree sync
1 parent 1ff6c55 commit 52b42d7

16 files changed

+15
-36
lines changed

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

-21
Original file line numberDiff line numberDiff line change
@@ -300,27 +300,6 @@ fn simd_mask() {
300300
}
301301
}
302302

303-
// This used to cause an ICE. It exercises simd_select_bitmask with an array as input.
304-
let bitmask = u8x4::from_array([0b00001101, 0, 0, 0]);
305-
assert_eq!(
306-
mask32x4::from_bitmask_vector(bitmask),
307-
mask32x4::from_array([true, false, true, true]),
308-
);
309-
let bitmask = u8x8::from_array([0b01000101, 0, 0, 0, 0, 0, 0, 0]);
310-
assert_eq!(
311-
mask32x8::from_bitmask_vector(bitmask),
312-
mask32x8::from_array([true, false, true, false, false, false, true, false]),
313-
);
314-
let bitmask =
315-
u8x16::from_array([0b01000101, 0b11110000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
316-
assert_eq!(
317-
mask32x16::from_bitmask_vector(bitmask),
318-
mask32x16::from_array([
319-
true, false, true, false, false, false, true, false, false, false, false, false, true,
320-
true, true, true,
321-
]),
322-
);
323-
324303
// Also directly call simd_select_bitmask, to test both kinds of argument types.
325304
unsafe {
326305
// These masks are exactly the results we got out above in the `simd_bitmask` tests.

Diff for: ‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-abort.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727
scope 11 (inlined NonZero::<usize>::get) {
2828
}
29-
scope 12 (inlined without_provenance::<[bool; 0]>) {
29+
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
3030
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
3131
}
3232
}

Diff for: ‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-unwind.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727
scope 11 (inlined NonZero::<usize>::get) {
2828
}
29-
scope 12 (inlined without_provenance::<[bool; 0]>) {
29+
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
3030
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
3131
}
3232
}

Diff for: ‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-abort.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727
scope 11 (inlined NonZero::<usize>::get) {
2828
}
29-
scope 12 (inlined without_provenance::<[bool; 0]>) {
29+
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
3030
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
3131
}
3232
}

Diff for: ‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-unwind.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727
scope 11 (inlined NonZero::<usize>::get) {
2828
}
29-
scope 12 (inlined without_provenance::<[bool; 0]>) {
29+
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
3030
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
3131
}
3232
}

Diff for: ‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-abort.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727
scope 11 (inlined NonZero::<usize>::get) {
2828
}
29-
scope 12 (inlined without_provenance::<[bool; 0]>) {
29+
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
3030
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
3131
}
3232
}

Diff for: ‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-unwind.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727
scope 11 (inlined NonZero::<usize>::get) {
2828
}
29-
scope 12 (inlined without_provenance::<[bool; 0]>) {
29+
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
3030
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
3131
}
3232
}

Diff for: ‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-abort.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727
scope 11 (inlined NonZero::<usize>::get) {
2828
}
29-
scope 12 (inlined without_provenance::<[bool; 0]>) {
29+
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
3030
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
3131
}
3232
}

Diff for: ‎tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-unwind.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727
scope 11 (inlined NonZero::<usize>::get) {
2828
}
29-
scope 12 (inlined without_provenance::<[bool; 0]>) {
29+
scope 12 (inlined std::ptr::without_provenance::<[bool; 0]>) {
3030
scope 13 (inlined without_provenance_mut::<[bool; 0]>) {
3131
}
3232
}

Diff for: ‎tests/mir-opt/gvn_ptr_eq_with_constant.main.GVN.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
scope 8 (inlined NonZero::<usize>::get) {
1818
}
19-
scope 9 (inlined without_provenance::<u8>) {
19+
scope 9 (inlined std::ptr::without_provenance::<u8>) {
2020
scope 10 (inlined without_provenance_mut::<u8>) {
2121
}
2222
}

Diff for: ‎tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-abort.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fn enumerated_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () {
5959
let _9: *const T;
6060
scope 7 {
6161
}
62-
scope 12 (inlined without_provenance::<T>) {
62+
scope 12 (inlined std::ptr::without_provenance::<T>) {
6363
scope 13 (inlined without_provenance_mut::<T>) {
6464
}
6565
}

Diff for: ‎tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-unwind.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fn enumerated_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () {
3434
let _9: *const T;
3535
scope 7 {
3636
}
37-
scope 12 (inlined without_provenance::<T>) {
37+
scope 12 (inlined std::ptr::without_provenance::<T>) {
3838
scope 13 (inlined without_provenance_mut::<T>) {
3939
}
4040
}

Diff for: ‎tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-abort.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fn forward_loop(_1: &[T], _2: impl Fn(&T)) -> () {
3131
let _9: *const T;
3232
scope 7 {
3333
}
34-
scope 12 (inlined without_provenance::<T>) {
34+
scope 12 (inlined std::ptr::without_provenance::<T>) {
3535
scope 13 (inlined without_provenance_mut::<T>) {
3636
}
3737
}

Diff for: ‎tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-unwind.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fn forward_loop(_1: &[T], _2: impl Fn(&T)) -> () {
3131
let _9: *const T;
3232
scope 7 {
3333
}
34-
scope 12 (inlined without_provenance::<T>) {
34+
scope 12 (inlined std::ptr::without_provenance::<T>) {
3535
scope 13 (inlined without_provenance_mut::<T>) {
3636
}
3737
}

Diff for: ‎tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-abort.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fn reverse_loop(_1: &[T], _2: impl Fn(&T)) -> () {
3434
let _9: *const T;
3535
scope 7 {
3636
}
37-
scope 12 (inlined without_provenance::<T>) {
37+
scope 12 (inlined std::ptr::without_provenance::<T>) {
3838
scope 13 (inlined without_provenance_mut::<T>) {
3939
}
4040
}

Diff for: ‎tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-unwind.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fn reverse_loop(_1: &[T], _2: impl Fn(&T)) -> () {
3434
let _9: *const T;
3535
scope 7 {
3636
}
37-
scope 12 (inlined without_provenance::<T>) {
37+
scope 12 (inlined std::ptr::without_provenance::<T>) {
3838
scope 13 (inlined without_provenance_mut::<T>) {
3939
}
4040
}

0 commit comments

Comments
 (0)