Skip to content

Commit 4a486e7

Browse files
committed
[CodeGen] Use Register/MCRegister::isPhysical. NFC
1 parent 8135762 commit 4a486e7

13 files changed

+18
-22
lines changed

llvm/lib/CodeGen/EarlyIfConversion.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ bool EarlyIfConverter::shouldConvertIf() {
895895
if (!MO.isReg() || !MO.isUse())
896896
return false;
897897
Register Reg = MO.getReg();
898-
if (Register::isPhysicalRegister(Reg))
898+
if (Reg.isPhysical())
899899
return false;
900900

901901
MachineInstr *Def = MRI->getVRegDef(Reg);
@@ -906,7 +906,7 @@ bool EarlyIfConverter::shouldConvertIf() {
906906
if (!MO.isReg() || !MO.isUse())
907907
return false;
908908
Register Reg = MO.getReg();
909-
if (Register::isPhysicalRegister(Reg))
909+
if (Reg.isPhysical())
910910
return false;
911911

912912
MachineInstr *Def = MRI->getVRegDef(Reg);

llvm/lib/CodeGen/MachineBasicBlock.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ void MachineBasicBlock::sortUniqueLiveIns() {
644644
Register
645645
MachineBasicBlock::addLiveIn(MCRegister PhysReg, const TargetRegisterClass *RC) {
646646
assert(getParent() && "MBB must be inserted in function");
647-
assert(Register::isPhysicalRegister(PhysReg) && "Expected physreg");
647+
assert(PhysReg.isPhysical() && "Expected physreg");
648648
assert(RC && "Register class is required");
649649
assert((isEHPad() || this == &getParent()->front()) &&
650650
"Only the entry block and landing pads can have physreg live ins");

llvm/lib/CodeGen/MachineOperand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void MachineOperand::substVirtReg(Register Reg, unsigned SubIdx,
9191
}
9292

9393
void MachineOperand::substPhysReg(MCRegister Reg, const TargetRegisterInfo &TRI) {
94-
assert(Register::isPhysicalRegister(Reg));
94+
assert(Reg.isPhysical());
9595
if (getSubReg()) {
9696
Reg = TRI.getSubReg(Reg, getSubReg());
9797
// Note that getSubReg() may return 0 if the sub-register doesn't exist.

llvm/lib/CodeGen/MachinePipeliner.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3204,7 +3204,7 @@ bool SMSchedule::isValidSchedule(SwingSchedulerDAG *SSD) {
32043204
for (auto &OE : SSD->getDDG()->getOutEdges(&SU)) {
32053205
SUnit *Dst = OE.getDst();
32063206
if (OE.isAssignedRegDep() && !Dst->isBoundaryNode())
3207-
if (Register::isPhysicalRegister(OE.getReg())) {
3207+
if (OE.getReg().isPhysical()) {
32083208
if (stageScheduled(Dst) != StageDef)
32093209
return false;
32103210
if (InstrToCycle[Dst] <= CycleDef)

llvm/lib/CodeGen/MachineRegisterInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ void MachineRegisterInfo::freezeReservedRegs() {
526526
}
527527

528528
bool MachineRegisterInfo::isConstantPhysReg(MCRegister PhysReg) const {
529-
assert(Register::isPhysicalRegister(PhysReg));
529+
assert(PhysReg.isPhysical());
530530

531531
const TargetRegisterInfo *TRI = getTargetRegisterInfo();
532532
if (TRI->isConstantPhysReg(PhysReg))

llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12769,7 +12769,7 @@ void SelectionDAGBuilder::visitCallBrLandingPad(const CallInst &I) {
1276912769
// the OpInfo.ConstraintVT is legal on the target or not.
1277012770
for (Register &Reg : OpInfo.AssignedRegs.Regs) {
1277112771
Register OriginalDef = FollowCopyChain(MRI, InitialDef++);
12772-
if (Register::isPhysicalRegister(OriginalDef))
12772+
if (OriginalDef.isPhysical())
1277312773
FuncInfo.MBB->addLiveIn(OriginalDef);
1277412774
// Update the assigned registers to use the original defs.
1277512775
Reg = OriginalDef;

llvm/lib/CodeGen/TargetRegisterInfo.cpp

+5-8
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,7 @@ static const TargetRegisterClass *
206206
getMinimalPhysRegClass(const TargetRegisterInfo *TRI, MCRegister Reg,
207207
TypeT Ty) {
208208
static_assert(std::is_same_v<TypeT, MVT> || std::is_same_v<TypeT, LLT>);
209-
assert(Register::isPhysicalRegister(Reg) &&
210-
"reg must be a physical register");
209+
assert(Reg.isPhysical() && "reg must be a physical register");
211210

212211
bool IsDefault = [&]() {
213212
if constexpr (std::is_same_v<TypeT, MVT>)
@@ -235,8 +234,7 @@ static const TargetRegisterClass *
235234
getCommonMinimalPhysRegClass(const TargetRegisterInfo *TRI, MCRegister Reg1,
236235
MCRegister Reg2, TypeT Ty) {
237236
static_assert(std::is_same_v<TypeT, MVT> || std::is_same_v<TypeT, LLT>);
238-
assert(Register::isPhysicalRegister(Reg1) &&
239-
Register::isPhysicalRegister(Reg2) &&
237+
assert(Reg1.isPhysical() && Reg2.isPhysical() &&
240238
"Reg1/Reg2 must be a physical register");
241239

242240
bool IsDefault = [&]() {
@@ -504,14 +502,13 @@ bool TargetRegisterInfo::getRegAllocationHints(
504502

505503
bool TargetRegisterInfo::isCalleeSavedPhysReg(
506504
MCRegister PhysReg, const MachineFunction &MF) const {
507-
if (PhysReg == 0)
505+
if (!PhysReg)
508506
return false;
509507
const uint32_t *callerPreservedRegs =
510508
getCallPreservedMask(MF, MF.getFunction().getCallingConv());
511509
if (callerPreservedRegs) {
512-
assert(Register::isPhysicalRegister(PhysReg) &&
513-
"Expected physical register");
514-
return (callerPreservedRegs[PhysReg / 32] >> PhysReg % 32) & 1;
510+
assert(PhysReg.isPhysical() && "Expected physical register");
511+
return (callerPreservedRegs[PhysReg.id() / 32] >> PhysReg.id() % 32) & 1;
515512
}
516513
return false;
517514
}

llvm/lib/Target/AArch64/AArch64InstrInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4830,7 +4830,7 @@ static const MachineInstrBuilder &AddSubReg(const MachineInstrBuilder &MIB,
48304830
if (!SubIdx)
48314831
return MIB.addReg(Reg, State);
48324832

4833-
if (Register::isPhysicalRegister(Reg))
4833+
if (Reg.isPhysical())
48344834
return MIB.addReg(TRI->getSubReg(Reg, SubIdx), State);
48354835
return MIB.addReg(Reg, State, SubIdx);
48364836
}

llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4280,7 +4280,7 @@ bool AMDGPULegalizerInfo::loadInputValue(Register DstReg, MachineIRBuilder &B,
42804280
const TargetRegisterClass *ArgRC,
42814281
LLT ArgTy) const {
42824282
MCRegister SrcReg = Arg->getRegister();
4283-
assert(Register::isPhysicalRegister(SrcReg) && "Physical register expected");
4283+
assert(SrcReg.isPhysical() && "Physical register expected");
42844284
assert(DstReg.isVirtual() && "Virtual register expected");
42854285

42864286
Register LiveIn = getFunctionLiveInPhysReg(B.getMF(), B.getTII(), SrcReg,

llvm/lib/Target/NVPTX/NVPTXRegisterInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ void NVPTXRegisterInfo::addToDebugRegisterMap(
171171
}
172172

173173
int64_t NVPTXRegisterInfo::getDwarfRegNum(MCRegister RegNum, bool isEH) const {
174-
if (Register::isPhysicalRegister(RegNum)) {
174+
if (RegNum.isPhysical()) {
175175
std::string name = NVPTXInstPrinter::getRegisterName(RegNum.id());
176176
// In NVPTXFrameLowering.cpp, we do arrange for %Depot to be accessible from
177177
// %SP. Using the %Depot register doesn't provide any debug info in

llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ bool PPCRegisterInfo::requiresVirtualBaseRegisters(
531531

532532
bool PPCRegisterInfo::isCallerPreservedPhysReg(MCRegister PhysReg,
533533
const MachineFunction &MF) const {
534-
assert(Register::isPhysicalRegister(PhysReg));
534+
assert(PhysReg.isPhysical());
535535
const PPCSubtarget &Subtarget = MF.getSubtarget<PPCSubtarget>();
536536
const MachineFrameInfo &MFI = MF.getFrameInfo();
537537

llvm/lib/Target/X86/X86ArgumentStackSlotRebase.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ bool X86ArgumentStackSlotPass::runOnMachineFunction(MachineFunction &MF) {
128128
if (!MO.isReg())
129129
continue;
130130
Register Reg = MO.getReg();
131-
if (!Register::isPhysicalRegister(Reg))
131+
if (!Reg.isPhysical())
132132
continue;
133133
if (TRI->isSuperOrSubRegisterEq(BasePtr, Reg))
134134
return true;

llvm/lib/Target/X86/X86RegisterInfo.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -1183,8 +1183,7 @@ bool X86RegisterInfo::getRegAllocationHints(Register VirtReg,
11831183

11841184
auto TryAddNDDHint = [&](const MachineOperand &MO) {
11851185
Register Reg = MO.getReg();
1186-
Register PhysReg =
1187-
Register::isPhysicalRegister(Reg) ? Reg : Register(VRM->getPhys(Reg));
1186+
Register PhysReg = Reg.isPhysical() ? Reg : Register(VRM->getPhys(Reg));
11881187
if (PhysReg && !MRI->isReserved(PhysReg) && !is_contained(Hints, PhysReg))
11891188
TwoAddrHints.insert(PhysReg);
11901189
};

0 commit comments

Comments
 (0)