Skip to content

Commit d4e7ec1

Browse files
ptersilieptersilie
committed
Fix new upstream tests regarding stackmaps.
1 parent 4f001af commit d4e7ec1

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

‎llvm/test/CodeGen/AArch64/split-deadloop.mir‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ body: |
8686
; CHECK-NEXT: bb.1.bci_19:
8787
; CHECK-NEXT: ADJCALLSTACKDOWN 0, 0, implicit-def dead $sp, implicit $sp
8888
; CHECK-NEXT: $x0 = COPY $xzr
89-
; CHECK-NEXT: STATEPOINT 0, 0, 1, $xzr, killed $x0, 2, 0, 2, 0, 2, 33, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, [[COPY]], 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 1, 2, 0, 2, 0, 2, 1, 0, 0, csr_aarch64_aapcs, implicit-def $sp, implicit-def dead $x0, implicit-def dead early-clobber $lr
89+
; CHECK-NEXT: STATEPOINT 0, 0, 1, $xzr, killed $x0, 2, 0, 2, 0, 2, 33, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, %7, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 1, 2, 0, 3, 2, 0, 2, 1, 0, 0, csr_aarch64_aapcs, implicit-def $sp, implicit-def dead $x0, implicit-def dead early-clobber $lr
9090
; CHECK-NEXT: ADJCALLSTACKUP 0, 0, implicit-def dead $sp, implicit $sp
9191
; CHECK-NEXT: ADJCALLSTACKDOWN 0, 0, implicit-def dead $sp, implicit $sp
9292
; CHECK-NEXT: $w0 = COPY $wzr
@@ -101,7 +101,7 @@ body: |
101101
bb.1.bci_19:
102102
ADJCALLSTACKDOWN 0, 0, implicit-def dead $sp, implicit $sp
103103
$x0 = COPY $xzr
104-
STATEPOINT 0, 0, 1, $xzr, killed $x0, 2, 0, 2, 0, 2, 33, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, %1, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 1, 2, 0, 2, 0, 2, 1, 0, 0, csr_aarch64_aapcs, implicit-def $sp, implicit-def dead $x0, implicit-def dead early-clobber $lr
104+
STATEPOINT 0, 0, 1, $xzr, killed $x0, 2, 0, 2, 0, 2, 33, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, %1, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 0, 3, 2, 1, 2, 0, 3, 2, 0, 2, 1, 0, 0, csr_aarch64_aapcs, implicit-def $sp, implicit-def dead $x0, implicit-def dead early-clobber $lr
105105
ADJCALLSTACKUP 0, 0, implicit-def dead $sp, implicit $sp
106106
ADJCALLSTACKDOWN 0, 0, implicit-def dead $sp, implicit $sp
107107
$w0 = COPY $wzr

‎llvm/test/CodeGen/RISCV/rv64-stackmap-frame-setup.ll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ define void @caller_meta_leaf() {
77
; ISEL-NEXT: [[ADDI:%[0-9]+]]:gpr = ADDI $x0, 13
88
; ISEL-NEXT: SD killed [[ADDI]], %stack.0.metadata, 0 :: (store (s64) into %ir.metadata)
99
; ISEL-NEXT: ADJCALLSTACKDOWN 0, 0, implicit-def $x2, implicit $x2
10-
; ISEL-NEXT: STACKMAP 4, 0, 0, %stack.0.metadata, 0 :: (load (s64) from %stack.0.metadata)
10+
; ISEL-NEXT: STACKMAP 4, 0, 0, %stack.0.metadata, 0, 3 :: (load (s64) from %stack.0.metadata)
1111
; ISEL-NEXT: ADJCALLSTACKUP 0, 0, implicit-def dead $x2, implicit $x2
1212
; ISEL-NEXT: PseudoRET
1313
entry:

‎llvm/test/CodeGen/RISCV/rv64-stackmap.ll‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,27 +62,31 @@
6262
; CHECK-NEXT: .half 0
6363
; CHECK-NEXT: .half 4
6464
; SmallConstant
65+
; CHECK-NEXT: .byte 1
6566
; CHECK-NEXT: .byte 4
6667
; CHECK-NEXT: .byte 0
6768
; CHECK-NEXT: .half 8
6869
; CHECK-NEXT: .half 0
6970
; CHECK-NEXT: .half 0
7071
; CHECK-NEXT: .word 65535
7172
; SmallConstant
73+
; CHECK-NEXT: .byte 1
7274
; CHECK-NEXT: .byte 4
7375
; CHECK-NEXT: .byte 0
7476
; CHECK-NEXT: .half 8
7577
; CHECK-NEXT: .half 0
7678
; CHECK-NEXT: .half 0
7779
; CHECK-NEXT: .word 65536
7880
; SmallConstant
81+
; CHECK-NEXT: .byte 1
7982
; CHECK-NEXT: .byte 5
8083
; CHECK-NEXT: .byte 0
8184
; CHECK-NEXT: .half 8
8285
; CHECK-NEXT: .half 0
8386
; CHECK-NEXT: .half 0
8487
; CHECK-NEXT: .word 0
8588
; LargeConstant at index 0
89+
; CHECK-NEXT: .byte 1
8690
; CHECK-NEXT: .byte 5
8791
; CHECK-NEXT: .byte 0
8892
; CHECK-NEXT: .half 8
@@ -103,12 +107,14 @@ entry:
103107
; CHECK-NEXT: .half 0
104108
; CHECK-NEXT: .half 2
105109
; CHECK-NEXT: .byte 1
110+
; CHECK-NEXT: .byte 1
106111
; CHECK-NEXT: .byte 0
107112
; CHECK-NEXT: .half 8
108113
; CHECK-NEXT: .half {{[0-9]+}}
109114
; CHECK-NEXT: .half 0
110115
; CHECK-NEXT: .word 0
111116
; CHECK-NEXT: .byte 1
117+
; CHECK-NEXT: .byte 1
112118
; CHECK-NEXT: .byte 0
113119
; CHECK-NEXT: .half 8
114120
; CHECK-NEXT: .half {{[0-9]+}}
@@ -131,12 +137,14 @@ entry:
131137
; CHECK-NEXT: .half 0
132138
; CHECK-NEXT: .half 2
133139
; CHECK-NEXT: .byte 1
140+
; CHECK-NEXT: .byte 1
134141
; CHECK-NEXT: .byte 0
135142
; CHECK-NEXT: .half 8
136143
; CHECK-NEXT: .half {{[0-9]+}}
137144
; CHECK-NEXT: .half 0
138145
; CHECK-NEXT: .word 0
139146
; CHECK-NEXT: .byte 1
147+
; CHECK-NEXT: .byte 1
140148
; CHECK-NEXT: .byte 0
141149
; CHECK-NEXT: .half 8
142150
; CHECK-NEXT: .half {{[0-9]+}}
@@ -160,12 +168,14 @@ ret:
160168
; CHECK-NEXT: .half 0
161169
; CHECK-NEXT: .half 2
162170
; CHECK-NEXT: .byte 1
171+
; CHECK-NEXT: .byte 1
163172
; CHECK-NEXT: .byte 0
164173
; CHECK-NEXT: .half 8
165174
; CHECK-NEXT: .half {{[0-9]+}}
166175
; CHECK-NEXT: .half 0
167176
; CHECK-NEXT: .word 0
168177
; CHECK-NEXT: .byte 1
178+
; CHECK-NEXT: .byte 1
169179
; CHECK-NEXT: .byte 0
170180
; CHECK-NEXT: .half 8
171181
; CHECK-NEXT: .half {{[0-9]+}}
@@ -184,12 +194,14 @@ entry:
184194
; CHECK-NEXT: .half 0
185195
; CHECK-NEXT: .half 2
186196
; CHECK-NEXT: .byte 1
197+
; CHECK-NEXT: .byte 1
187198
; CHECK-NEXT: .byte 0
188199
; CHECK-NEXT: .half 8
189200
; CHECK-NEXT: .half {{[0-9]+}}
190201
; CHECK-NEXT: .half 0
191202
; CHECK-NEXT: .word 0
192203
; CHECK-NEXT: .byte 1
204+
; CHECK-NEXT: .byte 1
193205
; CHECK-NEXT: .byte 0
194206
; CHECK-NEXT: .half 8
195207
; CHECK-NEXT: .half {{[0-9]+}}
@@ -210,12 +222,14 @@ entry:
210222
; CHECK-NEXT: .half 0
211223
; CHECK-NEXT: .half 2
212224
; CHECK-NEXT: .byte 1
225+
; CHECK-NEXT: .byte 1
213226
; CHECK-NEXT: .byte 0
214227
; CHECK-NEXT: .half 8
215228
; CHECK-NEXT: .half {{[0-9]+}}
216229
; CHECK-NEXT: .half 0
217230
; CHECK-NEXT: .word 0
218231
; CHECK-NEXT: .byte 1
232+
; CHECK-NEXT: .byte 1
219233
; CHECK-NEXT: .byte 0
220234
; CHECK-NEXT: .half 8
221235
; CHECK-NEXT: .half {{[0-9]+}}
@@ -236,12 +250,14 @@ entry:
236250
; CHECK-NEXT: .half 0
237251
; CHECK-NEXT: .half 2
238252
; CHECK-NEXT: .byte 1
253+
; CHECK-NEXT: .byte 1
239254
; CHECK-NEXT: .byte 0
240255
; CHECK-NEXT: .half 8
241256
; CHECK-NEXT: .half {{[0-9]+}}
242257
; CHECK-NEXT: .half 0
243258
; CHECK-NEXT: .word 0
244259
; CHECK-NEXT: .byte 1
260+
; CHECK-NEXT: .byte 1
245261
; CHECK-NEXT: .byte 0
246262
; CHECK-NEXT: .half 8
247263
; CHECK-NEXT: .half {{[0-9]+}}
@@ -262,6 +278,7 @@ entry:
262278
; 1 location
263279
; CHECK-NEXT: .half 1
264280
; Loc 0: SmallConstant
281+
; CHECK-NEXT: .byte 1
265282
; CHECK-NEXT: .byte 4
266283
; CHECK-NEXT: .byte 0
267284
; CHECK-NEXT: .half 8
@@ -304,6 +321,7 @@ entry:
304321
; 1 location
305322
; CHECK-NEXT: .half 1
306323
; Loc 0: Direct RBP - ofs
324+
; CHECK-NEXT: .byte 1
307325
; CHECK-NEXT: .byte 2
308326
; CHECK-NEXT: .byte 0
309327
; CHECK-NEXT: .half 8
@@ -317,13 +335,15 @@ entry:
317335
; 2 locations
318336
; CHECK-NEXT: .half 2
319337
; Loc 0: Direct RBP - ofs
338+
; CHECK-NEXT: .byte 1
320339
; CHECK-NEXT: .byte 2
321340
; CHECK-NEXT: .byte 0
322341
; CHECK-NEXT: .half 8
323342
; CHECK-NEXT: .half 2
324343
; CHECK-NEXT: .half 0
325344
; CHECK-NEXT: .word
326345
; Loc 1: Direct RBP - ofs
346+
; CHECK-NEXT: .byte 1
327347
; CHECK-NEXT: .byte 2
328348
; CHECK-NEXT: .byte 0
329349
; CHECK-NEXT: .half 8

0 commit comments

Comments
 (0)