Skip to content

Commit 9baf76a

Browse files
authored
[MCAsmStreamer] Print register names in --show-inst mode
Passing the context to `Inst.dump_pretty()` allows printing symbolic register names instead of `<MCOperand Reg:1234>` in the output. I plan to use this in a future RVY test cases where we have register class with the same name in assembly syntax, but different underlying register enum values. Printing the name of the enum value makes it easier to test that we selected the correct register. Reviewed By: lenary Pull Request: #171252
1 parent 773a6a9 commit 9baf76a

File tree

11 files changed

+1702
-1702
lines changed

11 files changed

+1702
-1702
lines changed

llvm/lib/MC/MCAsmStreamer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2452,7 +2452,7 @@ void MCAsmStreamer::emitInstruction(const MCInst &Inst,
24522452

24532453
// Show the MCInst if enabled.
24542454
if (ShowInst) {
2455-
Inst.dump_pretty(getCommentOS(), InstPrinter.get(), "\n ");
2455+
Inst.dump_pretty(getCommentOS(), InstPrinter.get(), "\n ", &getContext());
24562456
getCommentOS() << "\n";
24572457
}
24582458

llvm/test/CodeGen/Mips/llvm-ir/fptosi.ll

Lines changed: 148 additions & 148 deletions
Large diffs are not rendered by default.

llvm/test/CodeGen/Mips/llvm-ir/load.ll

Lines changed: 795 additions & 795 deletions
Large diffs are not rendered by default.

llvm/test/CodeGen/Mips/llvm-ir/store.ll

Lines changed: 450 additions & 450 deletions
Large diffs are not rendered by default.

llvm/test/CodeGen/Mips/micromips-pseudo-mtlohi-expand.ll

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,53 +7,53 @@
77
define i64 @test(i32 signext %a, i32 signext %b) {
88
; MMR2-LABEL: test:
99
; MMR2: # %bb.0: # %entry
10-
; MMR2-NEXT: li16 $2, 0 # <MCInst #{{[0-9]+}} LI16_MM
11-
; MMR2-NEXT: # <MCOperand Reg:{{[0-9]+}}>
10+
; MMR2-NEXT: li16 $2, 0 # <MCInst #[[#MCINST1:]] LI16_MM
11+
; MMR2-NEXT: # <MCOperand Reg:V0>
1212
; MMR2-NEXT: # <MCOperand Imm:0>>
13-
; MMR2-NEXT: li16 $3, 1 # <MCInst #{{[0-9]+}} LI16_MM
14-
; MMR2-NEXT: # <MCOperand Reg:{{[0-9]+}}>
13+
; MMR2-NEXT: li16 $3, 1 # <MCInst #[[#MCINST1]] LI16_MM
14+
; MMR2-NEXT: # <MCOperand Reg:V1>
1515
; MMR2-NEXT: # <MCOperand Imm:1>>
16-
; MMR2-NEXT: mtlo $3 # <MCInst #{{[0-9]+}} MTLO_MM
17-
; MMR2-NEXT: # <MCOperand Reg:{{[0-9]+}}>>
18-
; MMR2-NEXT: mthi $2 # <MCInst #{{[0-9]+}} MTHI_MM
19-
; MMR2-NEXT: # <MCOperand Reg:{{[0-9]+}}>>
20-
; MMR2-NEXT: madd $4, $5 # <MCInst #{{[0-9]+}} MADD
21-
; MMR2-NEXT: # <MCOperand Reg:{{[0-9]+}}>
22-
; MMR2-NEXT: # <MCOperand Reg:{{[0-9]+}}>>
23-
; MMR2-NEXT: mflo16 $2 # <MCInst #{{[0-9]+}} MFLO16_MM
24-
; MMR2-NEXT: # <MCOperand Reg:{{[0-9]+}}>>
25-
; MMR2-NEXT: mfhi16 $3 # <MCInst #{{[0-9]+}} MFHI16_MM
26-
; MMR2-NEXT: # <MCOperand Reg:{{[0-9]+}}>>
27-
; MMR2-NEXT: jrc $ra # <MCInst #{{[0-9]+}} JRC16_MM
28-
; MMR2-NEXT: # <MCOperand Reg:{{[0-9]+}}>>
16+
; MMR2-NEXT: mtlo $3 # <MCInst #[[#MCINST2:]] MTLO_MM
17+
; MMR2-NEXT: # <MCOperand Reg:V1>>
18+
; MMR2-NEXT: mthi $2 # <MCInst #[[#MCINST3:]] MTHI_MM
19+
; MMR2-NEXT: # <MCOperand Reg:V0>>
20+
; MMR2-NEXT: madd $4, $5 # <MCInst #[[#MCINST4:]] MADD
21+
; MMR2-NEXT: # <MCOperand Reg:A0>
22+
; MMR2-NEXT: # <MCOperand Reg:A1>>
23+
; MMR2-NEXT: mflo16 $2 # <MCInst #[[#MCINST5:]] MFLO16_MM
24+
; MMR2-NEXT: # <MCOperand Reg:V0>>
25+
; MMR2-NEXT: mfhi16 $3 # <MCInst #[[#MCINST6:]] MFHI16_MM
26+
; MMR2-NEXT: # <MCOperand Reg:V1>>
27+
; MMR2-NEXT: jrc $ra # <MCInst #[[#MCINST7:]] JRC16_MM
28+
; MMR2-NEXT: # <MCOperand Reg:RA>>
2929
;
3030
; MMR2-DSP-LABEL: test:
3131
; MMR2-DSP: # %bb.0: # %entry
32-
; MMR2-DSP-NEXT: li16 $2, 0 # <MCInst #{{[0-9]+}} LI16_MM
33-
; MMR2-DSP-NEXT: # <MCOperand Reg:{{[0-9]+}}>
32+
; MMR2-DSP-NEXT: li16 $2, 0 # <MCInst #[[#MCINST1:]] LI16_MM
33+
; MMR2-DSP-NEXT: # <MCOperand Reg:V0>
3434
; MMR2-DSP-NEXT: # <MCOperand Imm:0>>
35-
; MMR2-DSP-NEXT: li16 $3, 1 # <MCInst #{{[0-9]+}} LI16_MM
36-
; MMR2-DSP-NEXT: # <MCOperand Reg:{{[0-9]+}}>
35+
; MMR2-DSP-NEXT: li16 $3, 1 # <MCInst #[[#MCINST1]] LI16_MM
36+
; MMR2-DSP-NEXT: # <MCOperand Reg:V1>
3737
; MMR2-DSP-NEXT: # <MCOperand Imm:1>>
38-
; MMR2-DSP-NEXT: mtlo $3, $ac0 # <MCInst #{{[0-9]+}} MTLO_DSP
39-
; MMR2-DSP-NEXT: # <MCOperand Reg:{{[0-9]+}}>
40-
; MMR2-DSP-NEXT: # <MCOperand Reg:{{[0-9]+}}>>
41-
; MMR2-DSP-NEXT: mthi $2, $ac0 # <MCInst #{{[0-9]+}} MTHI_DSP
42-
; MMR2-DSP-NEXT: # <MCOperand Reg:{{[0-9]+}}>
43-
; MMR2-DSP-NEXT: # <MCOperand Reg:{{[0-9]+}}>>
44-
; MMR2-DSP-NEXT: madd $ac0, $4, $5 # <MCInst #{{[0-9]+}} MADD_DSP
45-
; MMR2-DSP-NEXT: # <MCOperand Reg:{{[0-9]+}}>
46-
; MMR2-DSP-NEXT: # <MCOperand Reg:{{[0-9]+}}>
47-
; MMR2-DSP-NEXT: # <MCOperand Reg:{{[0-9]+}}>
48-
; MMR2-DSP-NEXT: # <MCOperand Reg:{{[0-9]+}}>>
49-
; MMR2-DSP-NEXT: mflo $2, $ac0 # <MCInst #{{[0-9]+}} MFLO_DSP
50-
; MMR2-DSP-NEXT: # <MCOperand Reg:{{[0-9]+}}>
51-
; MMR2-DSP-NEXT: # <MCOperand Reg:{{[0-9]+}}>>
52-
; MMR2-DSP-NEXT: jr $ra # <MCInst #{{[0-9]+}} JR_MM
53-
; MMR2-DSP-NEXT: # <MCOperand Reg:{{[0-9]+}}>>
54-
; MMR2-DSP-NEXT: mfhi $3, $ac0 # <MCInst #{{[0-9]+}} MFHI_DSP
55-
; MMR2-DSP-NEXT: # <MCOperand Reg:{{[0-9]+}}>
56-
; MMR2-DSP-NEXT: # <MCOperand Reg:{{[0-9]+}}>>
38+
; MMR2-DSP-NEXT: mtlo $3, $ac0 # <MCInst #[[#MCINST8:]] MTLO_DSP
39+
; MMR2-DSP-NEXT: # <MCOperand Reg:LO0>
40+
; MMR2-DSP-NEXT: # <MCOperand Reg:V1>>
41+
; MMR2-DSP-NEXT: mthi $2, $ac0 # <MCInst #[[#MCINST9:]] MTHI_DSP
42+
; MMR2-DSP-NEXT: # <MCOperand Reg:HI0>
43+
; MMR2-DSP-NEXT: # <MCOperand Reg:V0>>
44+
; MMR2-DSP-NEXT: madd $ac0, $4, $5 # <MCInst #[[#MCINST10:]] MADD_DSP
45+
; MMR2-DSP-NEXT: # <MCOperand Reg:AC0>
46+
; MMR2-DSP-NEXT: # <MCOperand Reg:A0>
47+
; MMR2-DSP-NEXT: # <MCOperand Reg:A1>
48+
; MMR2-DSP-NEXT: # <MCOperand Reg:AC0>>
49+
; MMR2-DSP-NEXT: mflo $2, $ac0 # <MCInst #[[#MCINST11:]] MFLO_DSP
50+
; MMR2-DSP-NEXT: # <MCOperand Reg:V0>
51+
; MMR2-DSP-NEXT: # <MCOperand Reg:AC0>>
52+
; MMR2-DSP-NEXT: jr $ra # <MCInst #[[#MCINST12:]] JR_MM
53+
; MMR2-DSP-NEXT: # <MCOperand Reg:RA>>
54+
; MMR2-DSP-NEXT: mfhi $3, $ac0 # <MCInst #[[#MCINST13:]] MFHI_DSP
55+
; MMR2-DSP-NEXT: # <MCOperand Reg:V1>
56+
; MMR2-DSP-NEXT: # <MCOperand Reg:AC0>>
5757
entry:
5858
%conv = sext i32 %a to i64
5959
%conv1 = sext i32 %b to i64

0 commit comments

Comments
 (0)