Skip to content

Commit 8b20f1b

Browse files
optimisanoptimisan
authored
[MIR] Fix tests for flags in register info (#112179)
[MIR] Serialize virtual register flags #110228 introduces register flags which appear empty in .mir dumps. Future tests should use `-simplify-mir`.
1 parent 9edc454 commit 8b20f1b

File tree

9 files changed

+278
-278
lines changed

9 files changed

+278
-278
lines changed

‎llvm/test/CodeGen/AArch64/GlobalISel/arm64-regbankselect.mir

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,11 @@ name: phiPropagation
216216
legalized: true
217217
tracksRegLiveness: true
218218
# CHECK: registers:
219-
# CHECK-NEXT: - { id: 0, class: gpr32, preferred-register: '' }
220-
# CHECK-NEXT: - { id: 1, class: gpr64sp, preferred-register: '' }
221-
# CHECK-NEXT: - { id: 2, class: gpr32, preferred-register: '' }
222-
# CHECK-NEXT: - { id: 3, class: gpr, preferred-register: '' }
223-
# CHECK-NEXT: - { id: 4, class: gpr, preferred-register: '' }
219+
# CHECK-NEXT: - { id: 0, class: gpr32, preferred-register: '', flags: [ ] }
220+
# CHECK-NEXT: - { id: 1, class: gpr64sp, preferred-register: '', flags: [ ] }
221+
# CHECK-NEXT: - { id: 2, class: gpr32, preferred-register: '', flags: [ ] }
222+
# CHECK-NEXT: - { id: 3, class: gpr, preferred-register: '', flags: [ ] }
223+
# CHECK-NEXT: - { id: 4, class: gpr, preferred-register: '', flags: [ ] }
224224
registers:
225225
- { id: 0, class: gpr32 }
226226
- { id: 1, class: gpr64sp }
@@ -359,8 +359,8 @@ body: |
359359
name: ignoreTargetSpecificInst
360360
legalized: true
361361
# CHECK: registers:
362-
# CHECK-NEXT: - { id: 0, class: gpr64, preferred-register: '' }
363-
# CHECK-NEXT: - { id: 1, class: gpr64, preferred-register: '' }
362+
# CHECK-NEXT: - { id: 0, class: gpr64, preferred-register: '', flags: [ ] }
363+
# CHECK-NEXT: - { id: 1, class: gpr64, preferred-register: '', flags: [ ] }
364364
registers:
365365
- { id: 0, class: gpr64 }
366366
- { id: 1, class: gpr64 }
@@ -397,9 +397,9 @@ name: bitcast_s32_gpr
397397
legalized: true
398398

399399
# CHECK: registers:
400-
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '' }
401-
# FAST-NEXT: - { id: 1, class: fpr, preferred-register: '' }
402-
# GREEDY-NEXT: - { id: 1, class: gpr, preferred-register: '' }
400+
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '', flags: [ ] }
401+
# FAST-NEXT: - { id: 1, class: fpr, preferred-register: '', flags: [ ] }
402+
# GREEDY-NEXT: - { id: 1, class: gpr, preferred-register: '', flags: [ ] }
403403
registers:
404404
- { id: 0, class: _ }
405405
- { id: 1, class: _ }
@@ -423,9 +423,9 @@ name: bitcast_s32_fpr
423423
legalized: true
424424

425425
# CHECK: registers:
426-
# CHECK-NEXT: - { id: 0, class: fpr, preferred-register: '' }
427-
# FAST-NEXT: - { id: 1, class: gpr, preferred-register: '' }
428-
# GREEDY-NEXT: - { id: 1, class: fpr, preferred-register: '' }
426+
# CHECK-NEXT: - { id: 0, class: fpr, preferred-register: '', flags: [ ] }
427+
# FAST-NEXT: - { id: 1, class: gpr, preferred-register: '', flags: [ ] }
428+
# GREEDY-NEXT: - { id: 1, class: fpr, preferred-register: '', flags: [ ] }
429429
registers:
430430
- { id: 0, class: _ }
431431
- { id: 1, class: _ }
@@ -448,9 +448,9 @@ name: bitcast_s32_gpr_fpr
448448
legalized: true
449449

450450
# CHECK: registers:
451-
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '' }
452-
# FAST-NEXT: - { id: 1, class: fpr, preferred-register: '' }
453-
# GREEDY-NEXT: - { id: 1, class: gpr, preferred-register: '' }
451+
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '', flags: [ ] }
452+
# FAST-NEXT: - { id: 1, class: fpr, preferred-register: '', flags: [ ] }
453+
# GREEDY-NEXT: - { id: 1, class: gpr, preferred-register: '', flags: [ ] }
454454
registers:
455455
- { id: 0, class: _ }
456456
- { id: 1, class: _ }
@@ -632,8 +632,8 @@ registers:
632632
- { id: 0, class: fpr128}
633633
- { id: 1, class: _}
634634
# CHECK: registers:
635-
# CHECK: - { id: 0, class: fpr128, preferred-register: '' }
636-
# CHECK: - { id: 1, class: fpr, preferred-register: '' }
635+
# CHECK: - { id: 0, class: fpr128, preferred-register: '', flags: [ ] }
636+
# CHECK: - { id: 1, class: fpr, preferred-register: '', flags: [ ] }
637637
# CHECK: %1:fpr(s128) = COPY %0
638638
body: |
639639
bb.1:
@@ -659,8 +659,8 @@ registers:
659659
- { id: 0, class: _}
660660
- { id: 1, class: _}
661661
# CHECK: registers:
662-
# CHECK: - { id: 0, class: gpr, preferred-register: '' }
663-
# CHECK: - { id: 1, class: gpr, preferred-register: '' }
662+
# CHECK: - { id: 0, class: gpr, preferred-register: '', flags: [ ] }
663+
# CHECK: - { id: 1, class: gpr, preferred-register: '', flags: [ ] }
664664
# CHECK: %0:gpr(s32) = COPY $w0
665665
# CHECK-NEXT: %1:gpr(s16) = G_TRUNC %0(s32)
666666
body: |
@@ -723,11 +723,11 @@ name: floatingPointLoad
723723
legalized: true
724724

725725
# CHECK: registers:
726-
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '' }
727-
# CHECK-NEXT: - { id: 1, class: gpr, preferred-register: '' }
728-
# CHECK-NEXT: - { id: 2, class: fpr, preferred-register: '' }
729-
# CHECK-NEXT: - { id: 3, class: fpr, preferred-register: '' }
730-
# CHECK-NEXT: - { id: 4, class: fpr, preferred-register: '' }
726+
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '', flags: [ ] }
727+
# CHECK-NEXT: - { id: 1, class: gpr, preferred-register: '', flags: [ ] }
728+
# CHECK-NEXT: - { id: 2, class: fpr, preferred-register: '', flags: [ ] }
729+
# CHECK-NEXT: - { id: 3, class: fpr, preferred-register: '', flags: [ ] }
730+
# CHECK-NEXT: - { id: 4, class: fpr, preferred-register: '', flags: [ ] }
731731
registers:
732732
- { id: 0, class: _ }
733733
- { id: 1, class: _ }
@@ -765,11 +765,11 @@ name: floatingPointStore
765765
legalized: true
766766

767767
# CHECK: registers:
768-
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '' }
769-
# CHECK-NEXT: - { id: 1, class: gpr, preferred-register: '' }
770-
# CHECK-NEXT: - { id: 2, class: fpr, preferred-register: '' }
771-
# CHECK-NEXT: - { id: 3, class: fpr, preferred-register: '' }
772-
# CHECK-NEXT: - { id: 4, class: fpr, preferred-register: '' }
768+
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '', flags: [ ] }
769+
# CHECK-NEXT: - { id: 1, class: gpr, preferred-register: '', flags: [ ] }
770+
# CHECK-NEXT: - { id: 2, class: fpr, preferred-register: '', flags: [ ] }
771+
# CHECK-NEXT: - { id: 3, class: fpr, preferred-register: '', flags: [ ] }
772+
# CHECK-NEXT: - { id: 4, class: fpr, preferred-register: '', flags: [ ] }
773773
registers:
774774
- { id: 0, class: _ }
775775
- { id: 1, class: _ }
@@ -803,10 +803,10 @@ name: fp16Ext32
803803
alignment: 4
804804
legalized: true
805805
# CHECK: registers:
806-
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '' }
807-
# CHECK-NEXT: - { id: 1, class: gpr, preferred-register: '' }
808-
# CHECK-NEXT: - { id: 2, class: fpr, preferred-register: '' }
809-
# CHECK-NEXT: - { id: 3, class: fpr, preferred-register: '' }
806+
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '', flags: [ ] }
807+
# CHECK-NEXT: - { id: 1, class: gpr, preferred-register: '', flags: [ ] }
808+
# CHECK-NEXT: - { id: 2, class: fpr, preferred-register: '', flags: [ ] }
809+
# CHECK-NEXT: - { id: 3, class: fpr, preferred-register: '', flags: [ ] }
810810
registers:
811811
- { id: 0, class: _ }
812812
- { id: 1, class: _ }
@@ -838,10 +838,10 @@ name: fp16Ext64
838838
alignment: 4
839839
legalized: true
840840
# CHECK: registers:
841-
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '' }
842-
# CHECK-NEXT: - { id: 1, class: gpr, preferred-register: '' }
843-
# CHECK-NEXT: - { id: 2, class: fpr, preferred-register: '' }
844-
# CHECK-NEXT: - { id: 3, class: fpr, preferred-register: '' }
841+
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '', flags: [ ] }
842+
# CHECK-NEXT: - { id: 1, class: gpr, preferred-register: '', flags: [ ] }
843+
# CHECK-NEXT: - { id: 2, class: fpr, preferred-register: '', flags: [ ] }
844+
# CHECK-NEXT: - { id: 3, class: fpr, preferred-register: '', flags: [ ] }
845845
registers:
846846
- { id: 0, class: _ }
847847
- { id: 1, class: _ }
@@ -873,9 +873,9 @@ name: fp32Ext64
873873
alignment: 4
874874
legalized: true
875875
# CHECK: registers:
876-
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '' }
877-
# CHECK-NEXT: - { id: 1, class: fpr, preferred-register: '' }
878-
# CHECK-NEXT: - { id: 2, class: fpr, preferred-register: '' }
876+
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '', flags: [ ] }
877+
# CHECK-NEXT: - { id: 1, class: fpr, preferred-register: '', flags: [ ] }
878+
# CHECK-NEXT: - { id: 2, class: fpr, preferred-register: '', flags: [ ] }
879879
registers:
880880
- { id: 0, class: _ }
881881
- { id: 1, class: _ }
@@ -900,7 +900,7 @@ body: |
900900
# Make sure we map FP16 ABI on FPR register bank.
901901
# CHECK-LABEL: name: passFp16
902902
# CHECK: registers:
903-
# CHECK: - { id: 0, class: fpr, preferred-register: '' }
903+
# CHECK: - { id: 0, class: fpr, preferred-register: '', flags: [ ] }
904904
# CHECK: %0:fpr(s16) = COPY $h0
905905
# CHECK-NEXT: $h0 = COPY %0(s16)
906906
name: passFp16
@@ -922,9 +922,9 @@ body: |
922922
# In that example, the copy comes from an ABI lowering of a fp type.
923923
# CHECK-LABEL: name: passFp16ViaAllocas
924924
# CHECK: registers:
925-
# CHECK: - { id: 0, class: fpr, preferred-register: '' }
926-
# CHECK: - { id: 1, class: gpr, preferred-register: '' }
927-
# CHECK: - { id: 2, class: fpr, preferred-register: '' }
925+
# CHECK: - { id: 0, class: fpr, preferred-register: '', flags: [ ] }
926+
# CHECK: - { id: 1, class: gpr, preferred-register: '', flags: [ ] }
927+
# CHECK: - { id: 2, class: fpr, preferred-register: '', flags: [ ] }
928928
#
929929
# CHECK: %0:fpr(s16) = COPY $h0
930930
# CHECK-NEXT: %1:gpr(p0) = G_FRAME_INDEX %stack.0.p.addr

‎llvm/test/CodeGen/AArch64/GlobalISel/call-translator.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ define void @test_simple_arg(i32 %in) {
3535
; CHECK-LABEL: name: test_indirect_call
3636
; CHECK: registers:
3737
; Make sure the register feeding the indirect call is properly constrained.
38-
; CHECK: - { id: [[FUNC:[0-9]+]], class: gpr64, preferred-register: '' }
38+
; CHECK: - { id: [[FUNC:[0-9]+]], class: gpr64, preferred-register: '', flags: [ ] }
3939
; CHECK: %[[FUNC]]:gpr64(p0) = COPY $x0
4040
; CHECK: BLR %[[FUNC]](p0), csr_aarch64_aapcs, implicit-def $lr, implicit $sp
4141
; CHECK: RET_ReallyLR

‎llvm/test/CodeGen/AArch64/GlobalISel/regbankselect-dbg-value.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
name: test_dbg_value
3232
legalized: true
3333
# CHECK: registers:
34-
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '' }
34+
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '', flags: [ ] }
3535
body: |
3636
bb.0:
3737
liveins: $w0

‎llvm/test/CodeGen/AArch64/GlobalISel/select-intrinsic-aarch64-hint.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ legalized: true
1414
regBankSelected: true
1515

1616
# CHECK: registers:
17-
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '' }
17+
# CHECK-NEXT: - { id: 0, class: gpr, preferred-register: '', flags: [ ] }
1818
registers:
1919
- { id: 0, class: gpr }
2020

‎llvm/test/CodeGen/AArch64/GlobalISel/select-static.mir

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ legalized: true
3131
regBankSelected: true
3232

3333
# CHECK: registers:
34-
# CHECK-NEXT: - { id: 0, class: gpr64sp, preferred-register: '' }
34+
# CHECK-NEXT: - { id: 0, class: gpr64sp, preferred-register: '', flags: [ ] }
3535
registers:
3636
- { id: 0, class: gpr }
3737

@@ -105,12 +105,12 @@ legalized: true
105105
regBankSelected: true
106106

107107
# CHECK: registers:
108-
# CHECK-NEXT: - { id: 0, class: gpr32, preferred-register: '' }
109-
# CHECK-NEXT: - { id: 1, class: gpr32, preferred-register: '' }
110-
# CHECK-NEXT: - { id: 2, class: gpr64, preferred-register: '' }
111-
# CHECK-NEXT: - { id: 3, class: gpr32, preferred-register: '' }
112-
# CHECK-NEXT: - { id: 4, class: gpr64, preferred-register: '' }
113-
# CHECK-NEXT: - { id: 5, class: gpr32, preferred-register: '' }
108+
# CHECK-NEXT: - { id: 0, class: gpr32, preferred-register: '', flags: [ ] }
109+
# CHECK-NEXT: - { id: 1, class: gpr32, preferred-register: '', flags: [ ] }
110+
# CHECK-NEXT: - { id: 2, class: gpr64, preferred-register: '', flags: [ ] }
111+
# CHECK-NEXT: - { id: 3, class: gpr32, preferred-register: '', flags: [ ] }
112+
# CHECK-NEXT: - { id: 4, class: gpr64, preferred-register: '', flags: [ ] }
113+
# CHECK-NEXT: - { id: 5, class: gpr32, preferred-register: '', flags: [ ] }
114114
registers:
115115
- { id: 0, class: gpr }
116116
- { id: 1, class: gpr }
@@ -159,12 +159,12 @@ legalized: true
159159
regBankSelected: true
160160

161161
# CHECK: registers:
162-
# CHECK-NEXT: - { id: 0, class: fpr32, preferred-register: '' }
163-
# CHECK-NEXT: - { id: 1, class: gpr32, preferred-register: '' }
164-
# CHECK-NEXT: - { id: 2, class: fpr64, preferred-register: '' }
165-
# CHECK-NEXT: - { id: 3, class: gpr32, preferred-register: '' }
166-
# CHECK-NEXT: - { id: 4, class: gpr32, preferred-register: '' }
167-
# CHECK-NEXT: - { id: 5, class: gpr32, preferred-register: '' }
162+
# CHECK-NEXT: - { id: 0, class: fpr32, preferred-register: '', flags: [ ] }
163+
# CHECK-NEXT: - { id: 1, class: gpr32, preferred-register: '', flags: [ ] }
164+
# CHECK-NEXT: - { id: 2, class: fpr64, preferred-register: '', flags: [ ] }
165+
# CHECK-NEXT: - { id: 3, class: gpr32, preferred-register: '', flags: [ ] }
166+
# CHECK-NEXT: - { id: 4, class: gpr32, preferred-register: '', flags: [ ] }
167+
# CHECK-NEXT: - { id: 5, class: gpr32, preferred-register: '', flags: [ ] }
168168
registers:
169169
- { id: 0, class: fpr }
170170
- { id: 1, class: gpr }
@@ -202,10 +202,10 @@ regBankSelected: true
202202
tracksRegLiveness: true
203203

204204
# CHECK: registers:
205-
# CHECK-NEXT: - { id: 0, class: fpr32, preferred-register: '' }
206-
# CHECK-NEXT: - { id: 1, class: gpr, preferred-register: '' }
207-
# CHECK-NEXT: - { id: 2, class: fpr32, preferred-register: '' }
208-
# CHECK-NEXT: - { id: 3, class: gpr32, preferred-register: '' }
205+
# CHECK-NEXT: - { id: 0, class: fpr32, preferred-register: '', flags: [ ] }
206+
# CHECK-NEXT: - { id: 1, class: gpr, preferred-register: '', flags: [ ] }
207+
# CHECK-NEXT: - { id: 2, class: fpr32, preferred-register: '', flags: [ ] }
208+
# CHECK-NEXT: - { id: 3, class: gpr32, preferred-register: '', flags: [ ] }
209209
registers:
210210
- { id: 0, class: fpr }
211211
- { id: 1, class: gpr }
@@ -240,16 +240,16 @@ regBankSelected: true
240240
tracksRegLiveness: true
241241

242242
# CHECK: registers:
243-
# CHECK-NEXT: - { id: 0, class: gpr32, preferred-register: '' }
244-
# CHECK-NEXT: - { id: 1, class: gpr32, preferred-register: '' }
245-
# CHECK-NEXT: - { id: 2, class: gpr32, preferred-register: '' }
246-
# CHECK-NEXT: - { id: 3, class: gpr32, preferred-register: '' }
247-
# CHECK-NEXT: - { id: 4, class: gpr64, preferred-register: '' }
248-
# CHECK-NEXT: - { id: 5, class: gpr64, preferred-register: '' }
249-
# CHECK-NEXT: - { id: 6, class: gpr64, preferred-register: '' }
250-
# CHECK-NEXT: - { id: 7, class: gpr64, preferred-register: '' }
251-
# CHECK-NEXT: - { id: 8, class: gpr64, preferred-register: '' }
252-
# CHECK-NEXT: - { id: 9, class: gpr64, preferred-register: '' }
243+
# CHECK-NEXT: - { id: 0, class: gpr32, preferred-register: '', flags: [ ] }
244+
# CHECK-NEXT: - { id: 1, class: gpr32, preferred-register: '', flags: [ ] }
245+
# CHECK-NEXT: - { id: 2, class: gpr32, preferred-register: '', flags: [ ] }
246+
# CHECK-NEXT: - { id: 3, class: gpr32, preferred-register: '', flags: [ ] }
247+
# CHECK-NEXT: - { id: 4, class: gpr64, preferred-register: '', flags: [ ] }
248+
# CHECK-NEXT: - { id: 5, class: gpr64, preferred-register: '', flags: [ ] }
249+
# CHECK-NEXT: - { id: 6, class: gpr64, preferred-register: '', flags: [ ] }
250+
# CHECK-NEXT: - { id: 7, class: gpr64, preferred-register: '', flags: [ ] }
251+
# CHECK-NEXT: - { id: 8, class: gpr64, preferred-register: '', flags: [ ] }
252+
# CHECK-NEXT: - { id: 9, class: gpr64, preferred-register: '', flags: [ ] }
253253
registers:
254254
- { id: 0, class: gpr }
255255
- { id: 1, class: gpr }

0 commit comments

Comments
 (0)