Skip to content

Commit 0ae6185

Browse files
committed
[RISCV] Manually update MIR inputs to reflect #79e82b6
Since we've changed what get's generated, we should update the snapshots of MIR. Otherwise, we end up testing configurations which are no longer possible from codegen.
1 parent a8575b3 commit 0ae6185

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

llvm/test/CodeGen/RISCV/rvv/fixed-vectors-emergency-slot.mir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
; CHECK-NEXT: vsetivli a5, 1, e16, m1, ta, mu
1616
; CHECK-NEXT: sd a1, 0(sp) # 8-byte Folded Spill
1717
; CHECK-NEXT: addi a1, sp, 24
18-
; CHECK-NEXT: vs1r.v v25, (a1) # Unknown-size Folded Spill
18+
; CHECK-NEXT: vs1r.v v25, (a1) # vscale x 8-byte Folded Spill
1919
; CHECK-NEXT: ld a1, 0(sp) # 8-byte Folded Reload
2020
; CHECK-NEXT: call fixedlen_vector_spillslot
2121
; CHECK-NEXT: ld ra, 40(sp) # 8-byte Folded Reload
@@ -48,7 +48,7 @@ body: |
4848
SD $x10, %stack.0, 0
4949
SD $x10, %stack.2, 0
5050
dead renamable $x15 = PseudoVSETIVLI 1, 72, implicit-def $vl, implicit-def $vtype
51-
VS1R_V killed renamable $v25, %stack.1 :: (store unknown-size into %stack.1, align 8)
51+
VS1R_V killed renamable $v25, %stack.1 :: (store (<vscale x 1 x s64>) into %stack.1, align 8)
5252
; This is here just to make all the eligible registers live at this point.
5353
; This way when we replace the frame index %stack.1 with its actual address
5454
; we have to allocate a virtual register to compute it.

llvm/test/CodeGen/RISCV/rvv/large-rvv-stack-size.mir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
; CHECK-NEXT: sd a0, 8(sp) # 8-byte Folded Spill
3131
; CHECK-NEXT: addi a0, sp, 2047
3232
; CHECK-NEXT: addi a0, a0, 241
33-
; CHECK-NEXT: vs1r.v v25, (a0) # Unknown-size Folded Spill
33+
; CHECK-NEXT: vs1r.v v25, (a0) # vscale x 8-byte Folded Spill
3434
; CHECK-NEXT: ld a0, 8(sp) # 8-byte Folded Reload
3535
; CHECK-NEXT: call spillslot
3636
; CHECK-NEXT: addi sp, s0, -2032
@@ -82,7 +82,7 @@ body: |
8282
bb.0:
8383
liveins: $x1, $x5, $x6, $x7, $x10, $x11, $x12, $x13, $x14, $x15, $x16, $x17, $x28, $x29, $x30, $x31, $v25
8484
85-
VS1R_V killed renamable $v25, %stack.1 :: (store unknown-size into %stack.1, align 8)
85+
VS1R_V killed renamable $v25, %stack.1 :: (store (<vscale x 1 x s64>) into %stack.1, align 8)
8686
; This is here just to make all the eligible registers live at this point.
8787
; This way when we replace the frame index %stack.1 with its actual address
8888
; we have to allocate two virtual registers to compute it.

llvm/test/CodeGen/RISCV/rvv/wrong-stack-slot-rv32.mir

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
; CHECK-NEXT: sub sp, sp, a1
1717
; CHECK-NEXT: sw a0, 8(sp) # 4-byte Folded Spill
1818
; CHECK-NEXT: addi a0, sp, 16
19-
; CHECK-NEXT: vs2r.v v30, (a0) # Unknown-size Folded Spill
19+
; CHECK-NEXT: vs2r.v v30, (a0) # vscale x 16-byte Folded Spill
2020
; CHECK-NEXT: csrr a0, vlenb
2121
; CHECK-NEXT: slli a0, a0, 1
2222
; CHECK-NEXT: add sp, sp, a0
@@ -41,7 +41,7 @@
4141
; CHECK-NEXT: andi sp, sp, -32
4242
; CHECK-NEXT: sw a0, 32(sp) # 4-byte Folded Spill
4343
; CHECK-NEXT: addi a0, sp, 64
44-
; CHECK-NEXT: vs2r.v v30, (a0) # Unknown-size Folded Spill
44+
; CHECK-NEXT: vs2r.v v30, (a0) # vscale x 16-byte Folded Spill
4545
; CHECK-NEXT: addi sp, s0, -80
4646
; CHECK-NEXT: lw ra, 76(sp) # 4-byte Folded Reload
4747
; CHECK-NEXT: lw s0, 72(sp) # 4-byte Folded Reload
@@ -69,7 +69,7 @@ body: |
6969
7070
$x25 = COPY $x10
7171
SW renamable $x25, %stack.0, 0 :: (store (s32) into %stack.0)
72-
VS2R_V renamable $v30m2, %stack.1 :: (store unknown-size into %stack.1, align 8)
72+
VS2R_V renamable $v30m2, %stack.1 :: (store (<vscale x 2 x s64>) into %stack.1, align 8)
7373
PseudoRET
7474
7575
...
@@ -88,7 +88,7 @@ body: |
8888
8989
$x25 = COPY $x10
9090
SW renamable $x25, %stack.0, 0 :: (store (s32) into %stack.0)
91-
VS2R_V renamable $v30m2, %stack.1 :: (store unknown-size into %stack.1, align 8)
91+
VS2R_V renamable $v30m2, %stack.1 :: (store (<vscale x 2 x s64>) into %stack.1, align 8)
9292
PseudoRET
9393
9494
...

llvm/test/CodeGen/RISCV/rvv/wrong-stack-slot-rv64.mir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
; CHECK-NEXT: sub sp, sp, a1
1717
; CHECK-NEXT: sd a0, 16(sp) # 8-byte Folded Spill
1818
; CHECK-NEXT: addi a0, sp, 32
19-
; CHECK-NEXT: vs2r.v v30, (a0) # Unknown-size Folded Spill
19+
; CHECK-NEXT: vs2r.v v30, (a0) # vscale x 16-byte Folded Spill
2020
; CHECK-NEXT: csrr a0, vlenb
2121
; CHECK-NEXT: slli a0, a0, 1
2222
; CHECK-NEXT: add sp, sp, a0
@@ -45,7 +45,7 @@ body: |
4545
4646
$x25 = COPY $x10
4747
SD renamable $x25, %stack.0, 0 :: (store (s64) into %stack.0)
48-
VS2R_V renamable $v30m2, %stack.1 :: (store unknown-size into %stack.1, align 8)
48+
VS2R_V renamable $v30m2, %stack.1 :: (store (<vscale x 2 x s64>) into %stack.1, align 8)
4949
PseudoRET
5050
5151
...

llvm/test/CodeGen/RISCV/rvv/zvlsseg-spill.mir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ body: |
7070
%0:gpr = COPY $x10
7171
%1:gprnox0 = COPY $x11
7272
$v0_v1_v2_v3_v4_v5_v6 = PseudoVLSEG7E64_V_M1 undef $v0_v1_v2_v3_v4_v5_v6, %0, %1, 6, 0
73-
PseudoVSPILL7_M1 killed renamable $v0_v1_v2_v3_v4_v5_v6, %stack.0 :: (store unknown-size into %stack.0, align 8)
74-
renamable $v7_v8_v9_v10_v11_v12_v13 = PseudoVRELOAD7_M1 %stack.0 :: (load unknown-size from %stack.0, align 8)
73+
PseudoVSPILL7_M1 killed renamable $v0_v1_v2_v3_v4_v5_v6, %stack.0 :: (store (<vscale x 7 x s64>) into %stack.0, align 8)
74+
renamable $v7_v8_v9_v10_v11_v12_v13 = PseudoVRELOAD7_M1 %stack.0 :: (load (<vscale x 7 x s64>) from %stack.0, align 8)
7575
VS1R_V killed $v8, %0:gpr
7676
PseudoRET
7777
...

0 commit comments

Comments
 (0)