Skip to content

Commit 45d5733

Browse files
committed
fmt
1 parent 9a86bba commit 45d5733

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

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

+7-4
Original file line numberDiff line numberDiff line change
@@ -495,16 +495,19 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
495495
let (right, right_len) = this.operand_to_simd(right)?;
496496
let (dest, dest_len) = this.place_to_simd(dest)?;
497497

498-
let index = generic_args[2].expect_const().eval(*this.tcx, this.param_env(), Some(this.tcx.span)).unwrap().unwrap_branch();
498+
let index = generic_args[2]
499+
.expect_const()
500+
.eval(*this.tcx, this.param_env(), Some(this.tcx.span))
501+
.unwrap()
502+
.unwrap_branch();
499503
let index_len = index.len();
500504

501505
assert_eq!(left_len, right_len);
502506
assert_eq!(index_len as u64, dest_len);
503507

504508
for i in 0..dest_len {
505-
let src_index: u64 = index[i as usize].unwrap_leaf()
506-
.try_to_u32().unwrap()
507-
.into();
509+
let src_index: u64 =
510+
index[i as usize].unwrap_leaf().try_to_u32().unwrap().into();
508511
let dest = this.project_index(&dest, i)?;
509512

510513
let val = if src_index < left_len {

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

+4-10
Original file line numberDiff line numberDiff line change
@@ -416,20 +416,14 @@ fn simd_intrinsics() {
416416
simd_select(i8x4::from_array([0, -1, -1, 0]), b, a),
417417
i32x4::from_array([10, 2, 10, 10])
418418
);
419+
assert_eq!(simd_shuffle_generic::<_, i32x4, { &[3, 1, 0, 2] }>(a, b), a,);
420+
assert_eq!(simd_shuffle::<_, _, i32x4>(a, b, const { [3, 1, 0, 2] }), a,);
419421
assert_eq!(
420-
simd_shuffle_generic::<_, i32x4, {&[3, 1, 0, 2]}>(a, b),
421-
a,
422-
);
423-
assert_eq!(
424-
simd_shuffle::<_, _, i32x4>(a, b, const {[3, 1, 0, 2]}),
425-
a,
426-
);
427-
assert_eq!(
428-
simd_shuffle_generic::<_, i32x4, {&[7, 5, 4, 6]}>(a, b),
422+
simd_shuffle_generic::<_, i32x4, { &[7, 5, 4, 6] }>(a, b),
429423
i32x4::from_array([4, 2, 1, 10]),
430424
);
431425
assert_eq!(
432-
simd_shuffle::<_, _, i32x4>(a, b, const {[7, 5, 4, 6]}),
426+
simd_shuffle::<_, _, i32x4>(a, b, const { [7, 5, 4, 6] }),
433427
i32x4::from_array([4, 2, 1, 10]),
434428
);
435429
}

0 commit comments

Comments
 (0)