Skip to content

Commit f86eb04

Browse files
authored
Rollup merge of #135966 - mustartt:fix-ppc-abi-test, r=workingjubilee
[AIX] Allow different sized load and store in `tests/assembly/powerpc64-struct-abi.rs` Sometimes in the llvm backend generates 2 different copy assembly sequence. 1. `lxvd2x` followed immediately by `stxvd2x` (Load VSX Vector 2 Dword, Store VSX Vector 2 Dword) is semantically equivalent to; 2. `lxvw4x` followed immediately by `stxvw4x` (Load VSX Vector 4 Word, Store VSX Vector 4 Word)
2 parents b344e14 + 56c9267 commit f86eb04

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Diff for: tests/assembly/powerpc64-struct-abi.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ struct ThreeU8s(u8, u8, u8);
5050

5151
// CHECK-LABEL: read_large
5252
// aix: lwz [[REG1:.*]], 16(4)
53-
// aix-NEXT: lxvd2x 0, 0, 4
53+
// aix-NEXT: lxv{{d2x|w4x}} 0, 0, 4
5454
// aix-NEXT: stw [[REG1]], 16(3)
55-
// aix-NEXT: stxvd2x 0, 0, 3
55+
// aix-NEXT: stxv{{d2x|w4x}} 0, 0, 3
5656
// be: lwz [[REG1:.*]], 16(4)
5757
// be-NEXT: stw [[REG1]], 16(3)
5858
// be-NEXT: ld [[REG2:.*]], 8(4)
@@ -118,8 +118,8 @@ extern "C" fn read_small(x: &ThreeU8s) -> ThreeU8s {
118118
// aix-NEXT: std 4, 56(1)
119119
// aix-NEXT: stw [[REG1]], 16(6)
120120
// aix-NEXT: addi [[REG2:.*]], 1, 48
121-
// aix-NEXT: lxvd2x 0, 0, [[REG2]]
122-
// aix-NEXT: stxvd2x 0, 0, 6
121+
// aix-NEXT: lxv{{d2x|w4x}} 0, 0, [[REG2]]
122+
// aix-NEXT: stxv{{d2x|w4x}} 0, 0, 6
123123
// elf: std 3, 0(6)
124124
// be-NEXT: rldicl [[REG1:.*]], 5, 32, 32
125125
// elf-NEXT: std 4, 8(6)

0 commit comments

Comments
 (0)