Skip to content

Commit 9fdebf6

Browse files
authored
Rollup merge of #135454 - maurer:sized-word-ymmword, r=jieyouxu
llvm: Allow sized-word rather than ymmword in tests llvm/llvm-project#122530 changes LLVM to use sized-word rather than ymmword for scatter gather pointers. While this will not always be qword, it is for these two tests. `@rustbot` label: +llvm-main
2 parents ab77d15 + aa14931 commit 9fdebf6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

tests/assembly/simd-intrinsic-gather.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ pub unsafe extern "C" fn gather_f64x4(mask: m64x4, ptrs: pf64x4) -> f64x4 {
3838
// x86-avx512: vpsllq ymm0, ymm0, 63
3939
// x86-avx512-NEXT: vpmovq2m k1, ymm0
4040
// x86-avx512-NEXT: vpxor xmm0, xmm0, xmm0
41-
// x86-avx512-NEXT: vgatherqpd ymm0 {k1}, ymmword ptr [1*ymm1]
41+
// x86-avx512-NEXT: vgatherqpd ymm0 {k1}, {{(ymmword)|(qword)}} ptr [1*ymm1]
4242
simd_gather(f64x4([0_f64, 0_f64, 0_f64, 0_f64]), ptrs, mask)
4343
}

tests/assembly/simd-intrinsic-scatter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ extern "rust-intrinsic" {
3434
pub unsafe extern "C" fn scatter_f64x4(values: f64x4, ptrs: pf64x4, mask: m64x4) {
3535
// x86-avx512: vpsllq ymm2, ymm2, 63
3636
// x86-avx512-NEXT: vpmovq2m k1, ymm2
37-
// x86-avx512-NEXT: vscatterqpd ymmword ptr [1*ymm1] {k1}, ymm0
37+
// x86-avx512-NEXT: vscatterqpd {{(ymmword)|(qword)}} ptr [1*ymm1] {k1}, ymm0
3838
simd_scatter(values, ptrs, mask)
3939
}

0 commit comments

Comments
 (0)