Skip to content

Commit cd3667d

Browse files
authored
[CodeGen] Update a few places that were passing Register to raw_ostream::operator<< (#106877)
These would implicitly cast the register to `unsigned`. Switch most of them to use printReg will give a more readable output. Change some others to use Register::id() so we can eventually remove the implicit cast to `unsigned`.
1 parent c950ecb commit cd3667d

File tree

8 files changed

+18
-17
lines changed

8 files changed

+18
-17
lines changed

llvm/lib/CodeGen/InitUndef.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ bool InitUndef::fixupIllOperand(MachineInstr *MI, MachineOperand &MO) {
198198

199199
LLVM_DEBUG(
200200
dbgs() << "Emitting PseudoInitUndef Instruction for implicit register "
201-
<< MO.getReg() << '\n');
201+
<< printReg(MO.getReg()) << '\n');
202202

203203
const TargetRegisterClass *TargetRegClass =
204204
TRI->getLargestSuperClass(MRI->getRegClass(MO.getReg()));

llvm/lib/CodeGen/LiveDebugValues/VarLocBasedImpl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,14 +1789,14 @@ void VarLocBasedLDV::transferSpillOrRestoreInst(MachineInstr &MI,
17891789
if (isLocationSpill(MI, MF, Reg)) {
17901790
TKind = TransferKind::TransferSpill;
17911791
LLVM_DEBUG(dbgs() << "Recognized as spill: "; MI.dump(););
1792-
LLVM_DEBUG(dbgs() << "Register: " << Reg << " " << printReg(Reg, TRI)
1792+
LLVM_DEBUG(dbgs() << "Register: " << Reg.id() << " " << printReg(Reg, TRI)
17931793
<< "\n");
17941794
} else {
17951795
if (!(Loc = isRestoreInstruction(MI, MF, Reg)))
17961796
return;
17971797
TKind = TransferKind::TransferRestore;
17981798
LLVM_DEBUG(dbgs() << "Recognized as restore: "; MI.dump(););
1799-
LLVM_DEBUG(dbgs() << "Register: " << Reg << " " << printReg(Reg, TRI)
1799+
LLVM_DEBUG(dbgs() << "Register: " << Reg.id() << " " << printReg(Reg, TRI)
18001800
<< "\n");
18011801
}
18021802
// Check if the register or spill location is the location of a debug value.

llvm/lib/CodeGen/LiveDebugVariables.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1873,12 +1873,10 @@ void LDVImpl::emitDebugValues(VirtRegMap *VRM) {
18731873
Builder.addImm(regSizeInBits);
18741874
}
18751875

1876-
LLVM_DEBUG(
1877-
if (SpillOffset != 0) {
1878-
dbgs() << "DBG_PHI for Vreg " << Reg << " subreg " << SubReg <<
1879-
" has nonzero offset\n";
1880-
}
1881-
);
1876+
LLVM_DEBUG(if (SpillOffset != 0) {
1877+
dbgs() << "DBG_PHI for " << printReg(Reg, TRI, SubReg)
1878+
<< " has nonzero offset\n";
1879+
});
18821880
}
18831881
// If there was no mapping for a value ID, it's optimized out. Create no
18841882
// DBG_PHI, and any variables using this value will become optimized out.

llvm/lib/CodeGen/LocalStackSlotAllocation.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,8 @@ bool LocalStackSlotImpl::insertFrameReferenceRegisters(MachineFunction &Fn) {
407407
if (BaseReg.isValid() &&
408408
lookupCandidateBaseReg(BaseReg, BaseOffset, FrameSizeAdjust,
409409
LocalOffset, MI, TRI)) {
410-
LLVM_DEBUG(dbgs() << " Reusing base register " << BaseReg << "\n");
410+
LLVM_DEBUG(dbgs() << " Reusing base register " << printReg(BaseReg)
411+
<< "\n");
411412
// We found a register to reuse.
412413
Offset = FrameSizeAdjust + LocalOffset - BaseOffset;
413414
} else {

llvm/lib/CodeGen/TargetRegisterInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Printable printReg(Register Reg, const TargetRegisterInfo *TRI,
120120
OS << '%' << Register::virtReg2Index(Reg);
121121
}
122122
} else if (!TRI)
123-
OS << '$' << "physreg" << Reg;
123+
OS << '$' << "physreg" << Reg.id();
124124
else if (Reg < TRI->getNumRegs()) {
125125
OS << '$';
126126
printLowerCase(TRI->getName(Reg), OS);

llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2187,8 +2187,9 @@ bool SILoadStoreOptimizer::promoteConstantOffsetToImm(
21872187
return false;
21882188
}
21892189

2190-
LLVM_DEBUG(dbgs() << " BASE: {" << MAddr.Base.HiReg << ", "
2191-
<< MAddr.Base.LoReg << "} Offset: " << MAddr.Offset << "\n\n";);
2190+
LLVM_DEBUG(dbgs() << " BASE: {" << printReg(MAddr.Base.HiReg, TRI) << ", "
2191+
<< printReg(MAddr.Base.LoReg, TRI)
2192+
<< "} Offset: " << MAddr.Offset << "\n\n";);
21922193

21932194
// Step2: Traverse through MI's basic block and find an anchor(that has the
21942195
// same base-registers) with the highest 13bit distance from MI's offset.

llvm/lib/Target/WebAssembly/WebAssemblyDebugFixup.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ bool WebAssemblyDebugFixup::runOnMachineFunction(MachineFunction &MF) {
107107
for (auto &Elem : reverse(Stack)) {
108108
if (MO.getReg() == Elem.Reg) {
109109
auto Depth = static_cast<unsigned>(&Elem - &Stack[0]);
110-
LLVM_DEBUG(dbgs() << "Debug Value VReg " << MO.getReg()
110+
LLVM_DEBUG(dbgs() << "Debug Value VReg " << printReg(MO.getReg())
111111
<< " -> Stack Relative " << Depth << "\n");
112112
MO.ChangeToTargetIndex(WebAssembly::TI_OPERAND_STACK, Depth);
113113
// Save the DBG_VALUE instruction that defined this stackified

llvm/lib/Target/WebAssembly/WebAssemblyRegNumbering.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ bool WebAssemblyRegNumbering::runOnMachineFunction(MachineFunction &MF) {
7676
break;
7777

7878
int64_t Imm = MI.getOperand(1).getImm();
79-
LLVM_DEBUG(dbgs() << "Arg VReg " << MI.getOperand(0).getReg()
79+
LLVM_DEBUG(dbgs() << "Arg VReg " << printReg(MI.getOperand(0).getReg())
8080
<< " -> WAReg " << Imm << "\n");
8181
MFI.setWAReg(MI.getOperand(0).getReg(), Imm);
8282
}
@@ -95,13 +95,14 @@ bool WebAssemblyRegNumbering::runOnMachineFunction(MachineFunction &MF) {
9595
continue;
9696
// Handle stackified registers.
9797
if (MFI.isVRegStackified(VReg)) {
98-
LLVM_DEBUG(dbgs() << "VReg " << VReg << " -> WAReg "
98+
LLVM_DEBUG(dbgs() << "VReg " << printReg(VReg) << " -> WAReg "
9999
<< (INT32_MIN | NumStackRegs) << "\n");
100100
MFI.setWAReg(VReg, INT32_MIN | NumStackRegs++);
101101
continue;
102102
}
103103
if (MFI.getWAReg(VReg) == WebAssembly::UnusedReg) {
104-
LLVM_DEBUG(dbgs() << "VReg " << VReg << " -> WAReg " << CurReg << "\n");
104+
LLVM_DEBUG(dbgs() << "VReg " << printReg(VReg) << " -> WAReg " << CurReg
105+
<< "\n");
105106
MFI.setWAReg(VReg, CurReg++);
106107
}
107108
}

0 commit comments

Comments
 (0)