Skip to content

Commit 63a5dc4

Browse files
authored
[CodeGen] Do not pass MF into MachineRegisterInfo methods. NFC. (#84770)
MachineRegisterInfo already knows the MF so there is no need to pass it in as an argument.
1 parent cd55046 commit 63a5dc4

File tree

12 files changed

+22
-26
lines changed

12 files changed

+22
-26
lines changed

llvm/include/llvm/CodeGen/MachineRegisterInfo.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,14 +244,13 @@ class MachineRegisterInfo {
244244
bool isUpdatedCSRsInitialized() const { return IsUpdatedCSRsInitialized; }
245245

246246
/// Returns true if a register can be used as an argument to a function.
247-
bool isArgumentRegister(const MachineFunction &MF, MCRegister Reg) const;
247+
bool isArgumentRegister(MCRegister Reg) const;
248248

249249
/// Returns true if a register is a fixed register.
250-
bool isFixedRegister(const MachineFunction &MF, MCRegister Reg) const;
250+
bool isFixedRegister(MCRegister Reg) const;
251251

252252
/// Returns true if a register is a general purpose register.
253-
bool isGeneralPurposeRegister(const MachineFunction &MF,
254-
MCRegister Reg) const;
253+
bool isGeneralPurposeRegister(MCRegister Reg) const;
255254

256255
/// Disables the register from the list of CSRs.
257256
/// I.e. the register will not appear as part of the CSR mask.
@@ -930,7 +929,7 @@ class MachineRegisterInfo {
930929

931930
/// freezeReservedRegs - Called by the register allocator to freeze the set
932931
/// of reserved registers before allocation begins.
933-
void freezeReservedRegs(const MachineFunction&);
932+
void freezeReservedRegs();
934933

935934
/// reserveReg -- Mark a register as reserved so checks like isAllocatable
936935
/// will not suggest using it. This should not be used during the middle

llvm/lib/CodeGen/MIRParser/MIRParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ MIRParserImpl::initializeMachineFunction(const yaml::MachineFunction &YamlMF,
574574
// FIXME: This is a temporary workaround until the reserved registers can be
575575
// serialized.
576576
MachineRegisterInfo &MRI = MF.getRegInfo();
577-
MRI.freezeReservedRegs(MF);
577+
MRI.freezeReservedRegs();
578578

579579
computeFunctionProperties(MF);
580580

llvm/lib/CodeGen/MachineOutliner.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ MachineFunction *MachineOutliner::createOutlinedFunction(
759759
MF.getProperties().set(MachineFunctionProperties::Property::NoPHIs);
760760
MF.getProperties().set(MachineFunctionProperties::Property::NoVRegs);
761761
MF.getProperties().set(MachineFunctionProperties::Property::TracksLiveness);
762-
MF.getRegInfo().freezeReservedRegs(MF);
762+
MF.getRegInfo().freezeReservedRegs();
763763

764764
// Compute live-in set for outlined fn
765765
const MachineRegisterInfo &MRI = MF.getRegInfo();

llvm/lib/CodeGen/MachineRegisterInfo.cpp

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,8 @@ LLVM_DUMP_METHOD void MachineRegisterInfo::dumpUses(Register Reg) const {
517517
}
518518
#endif
519519

520-
void MachineRegisterInfo::freezeReservedRegs(const MachineFunction &MF) {
521-
ReservedRegs = getTargetRegisterInfo()->getReservedRegs(MF);
520+
void MachineRegisterInfo::freezeReservedRegs() {
521+
ReservedRegs = getTargetRegisterInfo()->getReservedRegs(*MF);
522522
assert(ReservedRegs.size() == getTargetRegisterInfo()->getNumRegs() &&
523523
"Invalid ReservedRegs vector from target");
524524
}
@@ -660,17 +660,14 @@ bool MachineRegisterInfo::isReservedRegUnit(unsigned Unit) const {
660660
return false;
661661
}
662662

663-
bool MachineRegisterInfo::isArgumentRegister(const MachineFunction &MF,
664-
MCRegister Reg) const {
665-
return getTargetRegisterInfo()->isArgumentRegister(MF, Reg);
663+
bool MachineRegisterInfo::isArgumentRegister(MCRegister Reg) const {
664+
return getTargetRegisterInfo()->isArgumentRegister(*MF, Reg);
666665
}
667666

668-
bool MachineRegisterInfo::isFixedRegister(const MachineFunction &MF,
669-
MCRegister Reg) const {
670-
return getTargetRegisterInfo()->isFixedRegister(MF, Reg);
667+
bool MachineRegisterInfo::isFixedRegister(MCRegister Reg) const {
668+
return getTargetRegisterInfo()->isFixedRegister(*MF, Reg);
671669
}
672670

673-
bool MachineRegisterInfo::isGeneralPurposeRegister(const MachineFunction &MF,
674-
MCRegister Reg) const {
675-
return getTargetRegisterInfo()->isGeneralPurposeRegister(MF, Reg);
671+
bool MachineRegisterInfo::isGeneralPurposeRegister(MCRegister Reg) const {
672+
return getTargetRegisterInfo()->isGeneralPurposeRegister(*MF, Reg);
676673
}

llvm/lib/CodeGen/RegAllocBase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void RegAllocBase::init(VirtRegMap &vrm, LiveIntervals &lis,
6161
VRM = &vrm;
6262
LIS = &lis;
6363
Matrix = &mat;
64-
MRI->freezeReservedRegs(vrm.getMachineFunction());
64+
MRI->freezeReservedRegs();
6565
RegClassInfo.runOnMachineFunction(vrm.getMachineFunction());
6666
}
6767

llvm/lib/CodeGen/RegAllocFast.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1740,7 +1740,7 @@ bool RegAllocFast::runOnMachineFunction(MachineFunction &MF) {
17401740
TRI = STI.getRegisterInfo();
17411741
TII = STI.getInstrInfo();
17421742
MFI = &MF.getFrameInfo();
1743-
MRI->freezeReservedRegs(MF);
1743+
MRI->freezeReservedRegs();
17441744
RegClassInfo.runOnMachineFunction(MF);
17451745
unsigned NumRegUnits = TRI->getNumRegUnits();
17461746
UsedInInstr.clear();

llvm/lib/CodeGen/RegAllocPBQP.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ bool RegAllocPBQP::runOnMachineFunction(MachineFunction &MF) {
809809
std::unique_ptr<Spiller> VRegSpiller(
810810
createInlineSpiller(*this, MF, VRM, DefaultVRAI));
811811

812-
MF.getRegInfo().freezeReservedRegs(MF);
812+
MF.getRegInfo().freezeReservedRegs();
813813

814814
LLVM_DEBUG(dbgs() << "PBQP Register Allocating for " << MF.getName() << "\n");
815815

llvm/lib/CodeGen/TargetLoweringBase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2336,7 +2336,7 @@ bool TargetLoweringBase::isLoadBitCastBeneficial(
23362336
}
23372337

23382338
void TargetLoweringBase::finalizeLowering(MachineFunction &MF) const {
2339-
MF.getRegInfo().freezeReservedRegs(MF);
2339+
MF.getRegInfo().freezeReservedRegs();
23402340
}
23412341

23422342
MachineMemOperand::Flags TargetLoweringBase::getLoadMemOperandFlags(

llvm/lib/Target/AArch64/AArch64LowerHomogeneousPrologEpilog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ static MachineFunction &createFrameHelperMachineFunction(Module *M,
183183
MF.getProperties().reset(MachineFunctionProperties::Property::TracksLiveness);
184184
MF.getProperties().reset(MachineFunctionProperties::Property::IsSSA);
185185
MF.getProperties().set(MachineFunctionProperties::Property::NoVRegs);
186-
MF.getRegInfo().freezeReservedRegs(MF);
186+
MF.getRegInfo().freezeReservedRegs();
187187

188188
// Create entry block.
189189
BasicBlock *EntryBB = BasicBlock::Create(C, "entry", F);

llvm/lib/Target/AMDGPU/SIPreAllocateWWMRegs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ void SIPreAllocateWWMRegs::rewriteRegs(MachineFunction &MF) {
156156
RegsToRewrite.clear();
157157

158158
// Update the set of reserved registers to include WWM ones.
159-
MRI->freezeReservedRegs(MF);
159+
MRI->freezeReservedRegs();
160160
}
161161

162162
#ifndef NDEBUG

llvm/tools/llvm-exegesis/lib/Assembler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ Error assembleToStream(const ExegesisTarget &ET,
305305

306306
// prologue/epilogue pass needs the reserved registers to be frozen, this
307307
// is usually done by the SelectionDAGISel pass.
308-
MF.getRegInfo().freezeReservedRegs(MF);
308+
MF.getRegInfo().freezeReservedRegs();
309309

310310
// We create the pass manager, run the passes to populate AsmBuffer.
311311
MCContext &MCContext = MMIWP->getMMI().getContext();

llvm/tools/llvm-reduce/ReducerWorkItem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ static std::unique_ptr<MachineFunction> cloneMF(MachineFunction *SrcMF,
414414
if (!DstMF->cloneInfoFrom(*SrcMF, Src2DstMBB))
415415
report_fatal_error("target does not implement MachineFunctionInfo cloning");
416416

417-
DstMRI->freezeReservedRegs(*DstMF);
417+
DstMRI->freezeReservedRegs();
418418

419419
DstMF->verify(nullptr, "", /*AbortOnError=*/true);
420420
return DstMF;

0 commit comments

Comments
 (0)