Skip to content

Commit 30f0a07

Browse files
dlav-scdlav-sc
committed
[RISCV][CFI] update tests after fix
1 parent 84807a3 commit 30f0a07

File tree

9 files changed

+100
-10
lines changed

9 files changed

+100
-10
lines changed

‎llvm/test/CodeGen/RISCV/GlobalISel/vararg.ll

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ define i32 @va1(ptr %fmt, ...) {
112112
; RV32-WITHFP-NEXT: addi a1, a0, 4
113113
; RV32-WITHFP-NEXT: sw a1, -12(s0)
114114
; RV32-WITHFP-NEXT: lw a0, 0(a0)
115+
; RV32-WITHFP-NEXT: .cfi_def_cfa sp, 48
115116
; RV32-WITHFP-NEXT: lw ra, 12(sp) # 4-byte Folded Reload
116117
; RV32-WITHFP-NEXT: lw s0, 8(sp) # 4-byte Folded Reload
117118
; RV32-WITHFP-NEXT: .cfi_restore ra
@@ -149,6 +150,7 @@ define i32 @va1(ptr %fmt, ...) {
149150
; RV64-WITHFP-NEXT: sw a1, -24(s0)
150151
; RV64-WITHFP-NEXT: sw a2, -20(s0)
151152
; RV64-WITHFP-NEXT: lw a0, 0(a0)
153+
; RV64-WITHFP-NEXT: .cfi_def_cfa sp, 96
152154
; RV64-WITHFP-NEXT: ld ra, 24(sp) # 8-byte Folded Reload
153155
; RV64-WITHFP-NEXT: ld s0, 16(sp) # 8-byte Folded Reload
154156
; RV64-WITHFP-NEXT: .cfi_restore ra
@@ -1692,7 +1694,7 @@ define i32 @va_large_stack(ptr %fmt, ...) {
16921694
; RV32-WITHFP-NEXT: lui a1, 24414
16931695
; RV32-WITHFP-NEXT: addi a1, a1, -1728
16941696
; RV32-WITHFP-NEXT: add sp, sp, a1
1695-
; RV32-WITHFP-NEXT: .cfi_def_cfa_offset 2032
1697+
; RV32-WITHFP-NEXT: .cfi_def_cfa sp, 2032
16961698
; RV32-WITHFP-NEXT: lw ra, 1996(sp) # 4-byte Folded Reload
16971699
; RV32-WITHFP-NEXT: lw s0, 1992(sp) # 4-byte Folded Reload
16981700
; RV32-WITHFP-NEXT: .cfi_restore ra
@@ -1738,7 +1740,7 @@ define i32 @va_large_stack(ptr %fmt, ...) {
17381740
; RV64-WITHFP-NEXT: lui a1, 24414
17391741
; RV64-WITHFP-NEXT: addiw a1, a1, -1680
17401742
; RV64-WITHFP-NEXT: add sp, sp, a1
1741-
; RV64-WITHFP-NEXT: .cfi_def_cfa_offset 2032
1743+
; RV64-WITHFP-NEXT: .cfi_def_cfa sp, 2032
17421744
; RV64-WITHFP-NEXT: ld ra, 1960(sp) # 8-byte Folded Reload
17431745
; RV64-WITHFP-NEXT: ld s0, 1952(sp) # 8-byte Folded Reload
17441746
; RV64-WITHFP-NEXT: .cfi_restore ra
@@ -1811,6 +1813,7 @@ define iXLen @va_vprintf(ptr %fmt, ptr %arg_start) {
18111813
; RV32-WITHFP-NEXT: addi a1, a0, 4
18121814
; RV32-WITHFP-NEXT: sw a1, -16(s0)
18131815
; RV32-WITHFP-NEXT: lw a0, 0(a0)
1816+
; RV32-WITHFP-NEXT: .cfi_def_cfa sp, 16
18141817
; RV32-WITHFP-NEXT: lw ra, 12(sp) # 4-byte Folded Reload
18151818
; RV32-WITHFP-NEXT: lw s0, 8(sp) # 4-byte Folded Reload
18161819
; RV32-WITHFP-NEXT: .cfi_restore ra
@@ -1838,6 +1841,7 @@ define iXLen @va_vprintf(ptr %fmt, ptr %arg_start) {
18381841
; RV64-WITHFP-NEXT: addi a1, a0, 8
18391842
; RV64-WITHFP-NEXT: sd a1, -32(s0)
18401843
; RV64-WITHFP-NEXT: ld a0, 0(a0)
1844+
; RV64-WITHFP-NEXT: .cfi_def_cfa sp, 32
18411845
; RV64-WITHFP-NEXT: ld ra, 24(sp) # 8-byte Folded Reload
18421846
; RV64-WITHFP-NEXT: ld s0, 16(sp) # 8-byte Folded Reload
18431847
; RV64-WITHFP-NEXT: .cfi_restore ra
@@ -1922,6 +1926,7 @@ define i32 @va_printf(ptr %fmt, ...) {
19221926
; RV32-WITHFP-NEXT: sw a6, 24(s0)
19231927
; RV32-WITHFP-NEXT: sw a7, 28(s0)
19241928
; RV32-WITHFP-NEXT: call va_vprintf
1929+
; RV32-WITHFP-NEXT: .cfi_def_cfa sp, 48
19251930
; RV32-WITHFP-NEXT: lw ra, 12(sp) # 4-byte Folded Reload
19261931
; RV32-WITHFP-NEXT: lw s0, 8(sp) # 4-byte Folded Reload
19271932
; RV32-WITHFP-NEXT: .cfi_restore ra
@@ -1951,6 +1956,7 @@ define i32 @va_printf(ptr %fmt, ...) {
19511956
; RV64-WITHFP-NEXT: sd a6, 48(s0)
19521957
; RV64-WITHFP-NEXT: sd a7, 56(s0)
19531958
; RV64-WITHFP-NEXT: call va_vprintf
1959+
; RV64-WITHFP-NEXT: .cfi_def_cfa sp, 96
19541960
; RV64-WITHFP-NEXT: ld ra, 24(sp) # 8-byte Folded Reload
19551961
; RV64-WITHFP-NEXT: ld s0, 16(sp) # 8-byte Folded Reload
19561962
; RV64-WITHFP-NEXT: .cfi_restore ra

‎llvm/test/CodeGen/RISCV/callee-saved-gprs.ll

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2503,6 +2503,7 @@ define void @foo() {
25032503
; RV32I-WITH-FP-NEXT: #APP
25042504
; RV32I-WITH-FP-NEXT: li s4, 0
25052505
; RV32I-WITH-FP-NEXT: #NO_APP
2506+
; RV32I-WITH-FP-NEXT: .cfi_def_cfa sp, 16
25062507
; RV32I-WITH-FP-NEXT: lw ra, 12(sp) # 4-byte Folded Reload
25072508
; RV32I-WITH-FP-NEXT: lw s0, 8(sp) # 4-byte Folded Reload
25082509
; RV32I-WITH-FP-NEXT: lw s4, 4(sp) # 4-byte Folded Reload
@@ -2541,6 +2542,7 @@ define void @foo() {
25412542
; RV32IZCMP-WITH-FP-NEXT: #APP
25422543
; RV32IZCMP-WITH-FP-NEXT: li s4, 0
25432544
; RV32IZCMP-WITH-FP-NEXT: #NO_APP
2545+
; RV32IZCMP-WITH-FP-NEXT: .cfi_def_cfa sp, 16
25442546
; RV32IZCMP-WITH-FP-NEXT: lw ra, 12(sp) # 4-byte Folded Reload
25452547
; RV32IZCMP-WITH-FP-NEXT: lw s0, 8(sp) # 4-byte Folded Reload
25462548
; RV32IZCMP-WITH-FP-NEXT: lw s4, 4(sp) # 4-byte Folded Reload
@@ -2588,6 +2590,7 @@ define void @foo() {
25882590
; RV64I-WITH-FP-NEXT: #APP
25892591
; RV64I-WITH-FP-NEXT: li s4, 0
25902592
; RV64I-WITH-FP-NEXT: #NO_APP
2593+
; RV64I-WITH-FP-NEXT: .cfi_def_cfa sp, 32
25912594
; RV64I-WITH-FP-NEXT: ld ra, 24(sp) # 8-byte Folded Reload
25922595
; RV64I-WITH-FP-NEXT: ld s0, 16(sp) # 8-byte Folded Reload
25932596
; RV64I-WITH-FP-NEXT: ld s4, 8(sp) # 8-byte Folded Reload
@@ -2626,6 +2629,7 @@ define void @foo() {
26262629
; RV64IZCMP-WITH-FP-NEXT: #APP
26272630
; RV64IZCMP-WITH-FP-NEXT: li s4, 0
26282631
; RV64IZCMP-WITH-FP-NEXT: #NO_APP
2632+
; RV64IZCMP-WITH-FP-NEXT: .cfi_def_cfa sp, 32
26292633
; RV64IZCMP-WITH-FP-NEXT: ld ra, 24(sp) # 8-byte Folded Reload
26302634
; RV64IZCMP-WITH-FP-NEXT: ld s0, 16(sp) # 8-byte Folded Reload
26312635
; RV64IZCMP-WITH-FP-NEXT: ld s4, 8(sp) # 8-byte Folded Reload
@@ -2679,6 +2683,7 @@ define void @bar() {
26792683
; RV32I-WITH-FP-NEXT: #APP
26802684
; RV32I-WITH-FP-NEXT: li s11, 0
26812685
; RV32I-WITH-FP-NEXT: #NO_APP
2686+
; RV32I-WITH-FP-NEXT: .cfi_def_cfa sp, 16
26822687
; RV32I-WITH-FP-NEXT: lw ra, 12(sp) # 4-byte Folded Reload
26832688
; RV32I-WITH-FP-NEXT: lw s0, 8(sp) # 4-byte Folded Reload
26842689
; RV32I-WITH-FP-NEXT: lw s11, 4(sp) # 4-byte Folded Reload
@@ -2717,6 +2722,7 @@ define void @bar() {
27172722
; RV32IZCMP-WITH-FP-NEXT: #APP
27182723
; RV32IZCMP-WITH-FP-NEXT: li s11, 0
27192724
; RV32IZCMP-WITH-FP-NEXT: #NO_APP
2725+
; RV32IZCMP-WITH-FP-NEXT: .cfi_def_cfa sp, 16
27202726
; RV32IZCMP-WITH-FP-NEXT: lw ra, 12(sp) # 4-byte Folded Reload
27212727
; RV32IZCMP-WITH-FP-NEXT: lw s0, 8(sp) # 4-byte Folded Reload
27222728
; RV32IZCMP-WITH-FP-NEXT: lw s11, 4(sp) # 4-byte Folded Reload
@@ -2764,6 +2770,7 @@ define void @bar() {
27642770
; RV64I-WITH-FP-NEXT: #APP
27652771
; RV64I-WITH-FP-NEXT: li s11, 0
27662772
; RV64I-WITH-FP-NEXT: #NO_APP
2773+
; RV64I-WITH-FP-NEXT: .cfi_def_cfa sp, 32
27672774
; RV64I-WITH-FP-NEXT: ld ra, 24(sp) # 8-byte Folded Reload
27682775
; RV64I-WITH-FP-NEXT: ld s0, 16(sp) # 8-byte Folded Reload
27692776
; RV64I-WITH-FP-NEXT: ld s11, 8(sp) # 8-byte Folded Reload
@@ -2802,6 +2809,7 @@ define void @bar() {
28022809
; RV64IZCMP-WITH-FP-NEXT: #APP
28032810
; RV64IZCMP-WITH-FP-NEXT: li s11, 0
28042811
; RV64IZCMP-WITH-FP-NEXT: #NO_APP
2812+
; RV64IZCMP-WITH-FP-NEXT: .cfi_def_cfa sp, 32
28052813
; RV64IZCMP-WITH-FP-NEXT: ld ra, 24(sp) # 8-byte Folded Reload
28062814
; RV64IZCMP-WITH-FP-NEXT: ld s0, 16(sp) # 8-byte Folded Reload
28072815
; RV64IZCMP-WITH-FP-NEXT: ld s11, 8(sp) # 8-byte Folded Reload
@@ -2876,6 +2884,7 @@ define void @varargs(...) {
28762884
; RV32I-WITH-FP-NEXT: sw a2, 8(s0)
28772885
; RV32I-WITH-FP-NEXT: sw a3, 12(s0)
28782886
; RV32I-WITH-FP-NEXT: call callee
2887+
; RV32I-WITH-FP-NEXT: .cfi_def_cfa sp, 48
28792888
; RV32I-WITH-FP-NEXT: lw ra, 12(sp) # 4-byte Folded Reload
28802889
; RV32I-WITH-FP-NEXT: lw s0, 8(sp) # 4-byte Folded Reload
28812890
; RV32I-WITH-FP-NEXT: .cfi_restore ra
@@ -2924,6 +2933,7 @@ define void @varargs(...) {
29242933
; RV32IZCMP-WITH-FP-NEXT: sw a2, 8(s0)
29252934
; RV32IZCMP-WITH-FP-NEXT: sw a3, 12(s0)
29262935
; RV32IZCMP-WITH-FP-NEXT: call callee
2936+
; RV32IZCMP-WITH-FP-NEXT: .cfi_def_cfa sp, 48
29272937
; RV32IZCMP-WITH-FP-NEXT: lw ra, 12(sp) # 4-byte Folded Reload
29282938
; RV32IZCMP-WITH-FP-NEXT: lw s0, 8(sp) # 4-byte Folded Reload
29292939
; RV32IZCMP-WITH-FP-NEXT: .cfi_restore ra
@@ -2991,6 +3001,7 @@ define void @varargs(...) {
29913001
; RV64I-WITH-FP-NEXT: sd a2, 16(s0)
29923002
; RV64I-WITH-FP-NEXT: sd a3, 24(s0)
29933003
; RV64I-WITH-FP-NEXT: call callee
3004+
; RV64I-WITH-FP-NEXT: .cfi_def_cfa sp, 80
29943005
; RV64I-WITH-FP-NEXT: ld ra, 8(sp) # 8-byte Folded Reload
29953006
; RV64I-WITH-FP-NEXT: ld s0, 0(sp) # 8-byte Folded Reload
29963007
; RV64I-WITH-FP-NEXT: .cfi_restore ra
@@ -3039,6 +3050,7 @@ define void @varargs(...) {
30393050
; RV64IZCMP-WITH-FP-NEXT: sd a2, 16(s0)
30403051
; RV64IZCMP-WITH-FP-NEXT: sd a3, 24(s0)
30413052
; RV64IZCMP-WITH-FP-NEXT: call callee
3053+
; RV64IZCMP-WITH-FP-NEXT: .cfi_def_cfa sp, 80
30423054
; RV64IZCMP-WITH-FP-NEXT: ld ra, 8(sp) # 8-byte Folded Reload
30433055
; RV64IZCMP-WITH-FP-NEXT: ld s0, 0(sp) # 8-byte Folded Reload
30443056
; RV64IZCMP-WITH-FP-NEXT: .cfi_restore ra

0 commit comments

Comments
 (0)