[llvm] 9e6494c - [CodeGen] Rename RegisterMaskPair to VRegMaskOrUnit. NFC (#123799)
via llvm-commits
llvm-commits at lists.llvm.org
Wed Jan 22 09:11:25 PST 2025
Author: Craig Topper
Date: 2025-01-22T09:11:22-08:00
New Revision: 9e6494c0fb29dfb5d4d2b7bf3ed7af261efee034
URL: https://github.com/llvm/llvm-project/commit/9e6494c0fb29dfb5d4d2b7bf3ed7af261efee034
DIFF: https://github.com/llvm/llvm-project/commit/9e6494c0fb29dfb5d4d2b7bf3ed7af261efee034.diff
LOG: [CodeGen] Rename RegisterMaskPair to VRegMaskOrUnit. NFC (#123799)
This holds a physical register unit or virtual register and mask.
While I was here I've used emplace_back and removed an unneeded use of a
template.
Added:
Modified:
llvm/include/llvm/CodeGen/MachineScheduler.h
llvm/include/llvm/CodeGen/RegisterPressure.h
llvm/lib/CodeGen/MachinePipeliner.cpp
llvm/lib/CodeGen/MachineScheduler.cpp
llvm/lib/CodeGen/RegisterPressure.cpp
llvm/lib/Target/AMDGPU/GCNRegPressure.cpp
llvm/lib/Target/AMDGPU/GCNRegPressure.h
Removed:
################################################################################
diff --git a/llvm/include/llvm/CodeGen/MachineScheduler.h b/llvm/include/llvm/CodeGen/MachineScheduler.h
index 3dd62b2ba333c3..660670ccdcd75b 100644
--- a/llvm/include/llvm/CodeGen/MachineScheduler.h
+++ b/llvm/include/llvm/CodeGen/MachineScheduler.h
@@ -525,7 +525,7 @@ class ScheduleDAGMILive : public ScheduleDAGMI {
void initRegPressure();
- void updatePressureDiffs(ArrayRef<RegisterMaskPair> LiveUses);
+ void updatePressureDiffs(ArrayRef<VRegMaskOrUnit> LiveUses);
void updateScheduledPressure(const SUnit *SU,
const std::vector<unsigned> &NewMaxPressure);
diff --git a/llvm/include/llvm/CodeGen/RegisterPressure.h b/llvm/include/llvm/CodeGen/RegisterPressure.h
index 8a46e505affd2f..407afee343ce2b 100644
--- a/llvm/include/llvm/CodeGen/RegisterPressure.h
+++ b/llvm/include/llvm/CodeGen/RegisterPressure.h
@@ -35,11 +35,11 @@ class MachineInstr;
class MachineRegisterInfo;
class RegisterClassInfo;
-struct RegisterMaskPair {
+struct VRegMaskOrUnit {
Register RegUnit; ///< Virtual register or register unit.
LaneBitmask LaneMask;
- RegisterMaskPair(Register RegUnit, LaneBitmask LaneMask)
+ VRegMaskOrUnit(Register RegUnit, LaneBitmask LaneMask)
: RegUnit(RegUnit), LaneMask(LaneMask) {}
};
@@ -49,8 +49,8 @@ struct RegisterPressure {
std::vector<unsigned> MaxSetPressure;
/// List of live in virtual registers or physical register units.
- SmallVector<RegisterMaskPair,8> LiveInRegs;
- SmallVector<RegisterMaskPair,8> LiveOutRegs;
+ SmallVector<VRegMaskOrUnit, 8> LiveInRegs;
+ SmallVector<VRegMaskOrUnit, 8> LiveOutRegs;
void dump(const TargetRegisterInfo *TRI) const;
};
@@ -166,13 +166,13 @@ class PressureDiff {
class RegisterOperands {
public:
/// List of virtual registers and register units read by the instruction.
- SmallVector<RegisterMaskPair, 8> Uses;
+ SmallVector<VRegMaskOrUnit, 8> Uses;
/// List of virtual registers and register units defined by the
/// instruction which are not dead.
- SmallVector<RegisterMaskPair, 8> Defs;
+ SmallVector<VRegMaskOrUnit, 8> Defs;
/// List of virtual registers and register units defined by the
/// instruction but dead.
- SmallVector<RegisterMaskPair, 8> DeadDefs;
+ SmallVector<VRegMaskOrUnit, 8> DeadDefs;
/// Analyze the given instruction \p MI and fill in the Uses, Defs and
/// DeadDefs list based on the MachineOperand flags.
@@ -185,7 +185,7 @@ class RegisterOperands {
void detectDeadDefs(const MachineInstr &MI, const LiveIntervals &LIS);
/// Use liveness information to find out which uses/defs are partially
- /// undefined/dead and adjust the RegisterMaskPairs accordingly.
+ /// undefined/dead and adjust the VRegMaskOrUnits accordingly.
/// If \p AddFlagsMI is given then missing read-undef and dead flags will be
/// added to the instruction.
void adjustLaneLiveness(const LiveIntervals &LIS,
@@ -303,7 +303,7 @@ class LiveRegSet {
/// Mark the \p Pair.LaneMask lanes of \p Pair.Reg as live.
/// Returns the previously live lanes of \p Pair.Reg.
- LaneBitmask insert(RegisterMaskPair Pair) {
+ LaneBitmask insert(VRegMaskOrUnit Pair) {
unsigned SparseIndex = getSparseIndexFromReg(Pair.RegUnit);
auto InsertRes = Regs.insert(IndexMaskPair(SparseIndex, Pair.LaneMask));
if (!InsertRes.second) {
@@ -316,7 +316,7 @@ class LiveRegSet {
/// Clears the \p Pair.LaneMask lanes of \p Pair.Reg (mark them as dead).
/// Returns the previously live lanes of \p Pair.Reg.
- LaneBitmask erase(RegisterMaskPair Pair) {
+ LaneBitmask erase(VRegMaskOrUnit Pair) {
unsigned SparseIndex = getSparseIndexFromReg(Pair.RegUnit);
RegSet::iterator I = Regs.find(SparseIndex);
if (I == Regs.end())
@@ -330,12 +330,11 @@ class LiveRegSet {
return Regs.size();
}
- template<typename ContainerT>
- void appendTo(ContainerT &To) const {
+ void appendTo(SmallVectorImpl<VRegMaskOrUnit> &To) const {
for (const IndexMaskPair &P : Regs) {
Register Reg = getRegFromSparseIndex(P.Index);
if (P.LaneMask.any())
- To.push_back(RegisterMaskPair(Reg, P.LaneMask));
+ To.emplace_back(Reg, P.LaneMask);
}
}
};
@@ -409,7 +408,7 @@ class RegPressureTracker {
/// Force liveness of virtual registers or physical register
/// units. Particularly useful to initialize the livein/out state of the
/// tracker before the first call to advance/recede.
- void addLiveRegs(ArrayRef<RegisterMaskPair> Regs);
+ void addLiveRegs(ArrayRef<VRegMaskOrUnit> Regs);
/// Get the MI position corresponding to this register pressure.
MachineBasicBlock::const_iterator getPos() const { return CurrPos; }
@@ -421,14 +420,14 @@ class RegPressureTracker {
void setPos(MachineBasicBlock::const_iterator Pos) { CurrPos = Pos; }
/// Recede across the previous instruction.
- void recede(SmallVectorImpl<RegisterMaskPair> *LiveUses = nullptr);
+ void recede(SmallVectorImpl<VRegMaskOrUnit> *LiveUses = nullptr);
/// Recede across the previous instruction.
/// This "low-level" variant assumes that recedeSkipDebugValues() was
/// called previously and takes precomputed RegisterOperands for the
/// instruction.
void recede(const RegisterOperands &RegOpers,
- SmallVectorImpl<RegisterMaskPair> *LiveUses = nullptr);
+ SmallVectorImpl<VRegMaskOrUnit> *LiveUses = nullptr);
/// Recede until we find an instruction which is not a DebugValue.
void recedeSkipDebugValues();
@@ -546,21 +545,21 @@ class RegPressureTracker {
protected:
/// Add Reg to the live out set and increase max pressure.
- void discoverLiveOut(RegisterMaskPair Pair);
+ void discoverLiveOut(VRegMaskOrUnit Pair);
/// Add Reg to the live in set and increase max pressure.
- void discoverLiveIn(RegisterMaskPair Pair);
+ void discoverLiveIn(VRegMaskOrUnit Pair);
/// Get the SlotIndex for the first nondebug instruction including or
/// after the current position.
SlotIndex getCurrSlot() const;
- void bumpDeadDefs(ArrayRef<RegisterMaskPair> DeadDefs);
+ void bumpDeadDefs(ArrayRef<VRegMaskOrUnit> DeadDefs);
void bumpUpwardPressure(const MachineInstr *MI);
void bumpDownwardPressure(const MachineInstr *MI);
- void discoverLiveInOrOut(RegisterMaskPair Pair,
- SmallVectorImpl<RegisterMaskPair> &LiveInOrOut);
+ void discoverLiveInOrOut(VRegMaskOrUnit Pair,
+ SmallVectorImpl<VRegMaskOrUnit> &LiveInOrOut);
LaneBitmask getLastUsedLanes(Register RegUnit, SlotIndex Pos) const;
LaneBitmask getLiveLanesAt(Register RegUnit, SlotIndex Pos) const;
diff --git a/llvm/lib/CodeGen/MachinePipeliner.cpp b/llvm/lib/CodeGen/MachinePipeliner.cpp
index 54d9c1cf08e35b..0d5dc961590036 100644
--- a/llvm/lib/CodeGen/MachinePipeliner.cpp
+++ b/llvm/lib/CodeGen/MachinePipeliner.cpp
@@ -1981,7 +1981,7 @@ static void computeLiveOuts(MachineFunction &MF, RegPressureTracker &RPTracker,
NodeSet &NS) {
const TargetRegisterInfo *TRI = MF.getSubtarget().getRegisterInfo();
MachineRegisterInfo &MRI = MF.getRegInfo();
- SmallVector<RegisterMaskPair, 8> LiveOutRegs;
+ SmallVector<VRegMaskOrUnit, 8> LiveOutRegs;
SmallSet<unsigned, 4> Uses;
for (SUnit *SU : NS) {
const MachineInstr *MI = SU->getInstr();
@@ -2002,13 +2002,11 @@ static void computeLiveOuts(MachineFunction &MF, RegPressureTracker &RPTracker,
Register Reg = MO.getReg();
if (Reg.isVirtual()) {
if (!Uses.count(Reg))
- LiveOutRegs.push_back(RegisterMaskPair(Reg,
- LaneBitmask::getNone()));
+ LiveOutRegs.emplace_back(Reg, LaneBitmask::getNone());
} else if (MRI.isAllocatable(Reg)) {
for (MCRegUnit Unit : TRI->regunits(Reg.asMCReg()))
if (!Uses.count(Unit))
- LiveOutRegs.push_back(
- RegisterMaskPair(Unit, LaneBitmask::getNone()));
+ LiveOutRegs.emplace_back(Unit, LaneBitmask::getNone());
}
}
RPTracker.addLiveRegs(LiveOutRegs);
diff --git a/llvm/lib/CodeGen/MachineScheduler.cpp b/llvm/lib/CodeGen/MachineScheduler.cpp
index 91aaeea156c4a1..393530f56cc27e 100644
--- a/llvm/lib/CodeGen/MachineScheduler.cpp
+++ b/llvm/lib/CodeGen/MachineScheduler.cpp
@@ -1288,7 +1288,7 @@ void ScheduleDAGMILive::initRegPressure() {
// Account for liveness generated by the region boundary.
if (LiveRegionEnd != RegionEnd) {
- SmallVector<RegisterMaskPair, 8> LiveUses;
+ SmallVector<VRegMaskOrUnit, 8> LiveUses;
BotRPTracker.recede(&LiveUses);
updatePressureDiffs(LiveUses);
}
@@ -1352,9 +1352,8 @@ updateScheduledPressure(const SUnit *SU,
/// Update the PressureDiff array for liveness after scheduling this
/// instruction.
-void ScheduleDAGMILive::updatePressureDiffs(
- ArrayRef<RegisterMaskPair> LiveUses) {
- for (const RegisterMaskPair &P : LiveUses) {
+void ScheduleDAGMILive::updatePressureDiffs(ArrayRef<VRegMaskOrUnit> LiveUses) {
+ for (const VRegMaskOrUnit &P : LiveUses) {
Register Reg = P.RegUnit;
/// FIXME: Currently assuming single-use physregs.
if (!Reg.isVirtual())
@@ -1579,7 +1578,7 @@ unsigned ScheduleDAGMILive::computeCyclicCriticalPath() {
unsigned MaxCyclicLatency = 0;
// Visit each live out vreg def to find def/use pairs that cross iterations.
- for (const RegisterMaskPair &P : RPTracker.getPressure().LiveOutRegs) {
+ for (const VRegMaskOrUnit &P : RPTracker.getPressure().LiveOutRegs) {
Register Reg = P.RegUnit;
if (!Reg.isVirtual())
continue;
@@ -1707,7 +1706,7 @@ void ScheduleDAGMILive::scheduleMI(SUnit *SU, bool IsTopNode) {
if (BotRPTracker.getPos() != CurrentBottom)
BotRPTracker.recedeSkipDebugValues();
- SmallVector<RegisterMaskPair, 8> LiveUses;
+ SmallVector<VRegMaskOrUnit, 8> LiveUses;
BotRPTracker.recede(RegOpers, &LiveUses);
assert(BotRPTracker.getPos() == CurrentBottom && "out of sync");
LLVM_DEBUG(dbgs() << "Bottom Pressure:\n"; dumpRegSetPressure(
diff --git a/llvm/lib/CodeGen/RegisterPressure.cpp b/llvm/lib/CodeGen/RegisterPressure.cpp
index 037986ec48afbc..e8e6db1e3b3bd1 100644
--- a/llvm/lib/CodeGen/RegisterPressure.cpp
+++ b/llvm/lib/CodeGen/RegisterPressure.cpp
@@ -95,7 +95,7 @@ void RegisterPressure::dump(const TargetRegisterInfo *TRI) const {
dbgs() << "Max Pressure: ";
dumpRegSetPressure(MaxSetPressure, TRI);
dbgs() << "Live In: ";
- for (const RegisterMaskPair &P : LiveInRegs) {
+ for (const VRegMaskOrUnit &P : LiveInRegs) {
dbgs() << printVRegOrUnit(P.RegUnit, TRI);
if (!P.LaneMask.all())
dbgs() << ':' << PrintLaneMask(P.LaneMask);
@@ -103,7 +103,7 @@ void RegisterPressure::dump(const TargetRegisterInfo *TRI) const {
}
dbgs() << '\n';
dbgs() << "Live Out: ";
- for (const RegisterMaskPair &P : LiveOutRegs) {
+ for (const VRegMaskOrUnit &P : LiveOutRegs) {
dbgs() << printVRegOrUnit(P.RegUnit, TRI);
if (!P.LaneMask.all())
dbgs() << ':' << PrintLaneMask(P.LaneMask);
@@ -358,7 +358,7 @@ void RegPressureTracker::closeRegion() {
void RegPressureTracker::initLiveThru(const RegPressureTracker &RPTracker) {
LiveThruPressure.assign(TRI->getNumRegPressureSets(), 0);
assert(isBottomClosed() && "need bottom-up tracking to intialize.");
- for (const RegisterMaskPair &Pair : P.LiveOutRegs) {
+ for (const VRegMaskOrUnit &Pair : P.LiveOutRegs) {
Register RegUnit = Pair.RegUnit;
if (RegUnit.isVirtual() && !RPTracker.hasUntiedDef(RegUnit))
increaseSetPressure(LiveThruPressure, *MRI, RegUnit,
@@ -366,9 +366,9 @@ void RegPressureTracker::initLiveThru(const RegPressureTracker &RPTracker) {
}
}
-static LaneBitmask getRegLanes(ArrayRef<RegisterMaskPair> RegUnits,
+static LaneBitmask getRegLanes(ArrayRef<VRegMaskOrUnit> RegUnits,
Register RegUnit) {
- auto I = llvm::find_if(RegUnits, [RegUnit](const RegisterMaskPair Other) {
+ auto I = llvm::find_if(RegUnits, [RegUnit](const VRegMaskOrUnit Other) {
return Other.RegUnit == RegUnit;
});
if (I == RegUnits.end())
@@ -376,11 +376,11 @@ static LaneBitmask getRegLanes(ArrayRef<RegisterMaskPair> RegUnits,
return I->LaneMask;
}
-static void addRegLanes(SmallVectorImpl<RegisterMaskPair> &RegUnits,
- RegisterMaskPair Pair) {
+static void addRegLanes(SmallVectorImpl<VRegMaskOrUnit> &RegUnits,
+ VRegMaskOrUnit Pair) {
Register RegUnit = Pair.RegUnit;
assert(Pair.LaneMask.any());
- auto I = llvm::find_if(RegUnits, [RegUnit](const RegisterMaskPair Other) {
+ auto I = llvm::find_if(RegUnits, [RegUnit](const VRegMaskOrUnit Other) {
return Other.RegUnit == RegUnit;
});
if (I == RegUnits.end()) {
@@ -390,23 +390,23 @@ static void addRegLanes(SmallVectorImpl<RegisterMaskPair> &RegUnits,
}
}
-static void setRegZero(SmallVectorImpl<RegisterMaskPair> &RegUnits,
+static void setRegZero(SmallVectorImpl<VRegMaskOrUnit> &RegUnits,
Register RegUnit) {
- auto I = llvm::find_if(RegUnits, [RegUnit](const RegisterMaskPair Other) {
+ auto I = llvm::find_if(RegUnits, [RegUnit](const VRegMaskOrUnit Other) {
return Other.RegUnit == RegUnit;
});
if (I == RegUnits.end()) {
- RegUnits.push_back(RegisterMaskPair(RegUnit, LaneBitmask::getNone()));
+ RegUnits.emplace_back(RegUnit, LaneBitmask::getNone());
} else {
I->LaneMask = LaneBitmask::getNone();
}
}
-static void removeRegLanes(SmallVectorImpl<RegisterMaskPair> &RegUnits,
- RegisterMaskPair Pair) {
+static void removeRegLanes(SmallVectorImpl<VRegMaskOrUnit> &RegUnits,
+ VRegMaskOrUnit Pair) {
Register RegUnit = Pair.RegUnit;
assert(Pair.LaneMask.any());
- auto I = llvm::find_if(RegUnits, [RegUnit](const RegisterMaskPair Other) {
+ auto I = llvm::find_if(RegUnits, [RegUnit](const VRegMaskOrUnit Other) {
return Other.RegUnit == RegUnit;
});
if (I != RegUnits.end()) {
@@ -480,7 +480,7 @@ class RegisterOperandsCollector {
collectOperand(*OperI);
// Remove redundant physreg dead defs.
- for (const RegisterMaskPair &P : RegOpers.Defs)
+ for (const VRegMaskOrUnit &P : RegOpers.Defs)
removeRegLanes(RegOpers.DeadDefs, P);
}
@@ -489,7 +489,7 @@ class RegisterOperandsCollector {
collectOperandLanes(*OperI);
// Remove redundant physreg dead defs.
- for (const RegisterMaskPair &P : RegOpers.Defs)
+ for (const VRegMaskOrUnit &P : RegOpers.Defs)
removeRegLanes(RegOpers.DeadDefs, P);
}
@@ -515,13 +515,12 @@ class RegisterOperandsCollector {
}
}
- void pushReg(Register Reg,
- SmallVectorImpl<RegisterMaskPair> &RegUnits) const {
+ void pushReg(Register Reg, SmallVectorImpl<VRegMaskOrUnit> &RegUnits) const {
if (Reg.isVirtual()) {
- addRegLanes(RegUnits, RegisterMaskPair(Reg, LaneBitmask::getAll()));
+ addRegLanes(RegUnits, VRegMaskOrUnit(Reg, LaneBitmask::getAll()));
} else if (MRI.isAllocatable(Reg)) {
for (MCRegUnit Unit : TRI.regunits(Reg.asMCReg()))
- addRegLanes(RegUnits, RegisterMaskPair(Unit, LaneBitmask::getAll()));
+ addRegLanes(RegUnits, VRegMaskOrUnit(Unit, LaneBitmask::getAll()));
}
}
@@ -548,15 +547,15 @@ class RegisterOperandsCollector {
}
void pushRegLanes(Register Reg, unsigned SubRegIdx,
- SmallVectorImpl<RegisterMaskPair> &RegUnits) const {
+ SmallVectorImpl<VRegMaskOrUnit> &RegUnits) const {
if (Reg.isVirtual()) {
LaneBitmask LaneMask = SubRegIdx != 0
? TRI.getSubRegIndexLaneMask(SubRegIdx)
: MRI.getMaxLaneMaskForVReg(Reg);
- addRegLanes(RegUnits, RegisterMaskPair(Reg, LaneMask));
+ addRegLanes(RegUnits, VRegMaskOrUnit(Reg, LaneMask));
} else if (MRI.isAllocatable(Reg)) {
for (MCRegUnit Unit : TRI.regunits(Reg.asMCReg()))
- addRegLanes(RegUnits, RegisterMaskPair(Unit, LaneBitmask::getAll()));
+ addRegLanes(RegUnits, VRegMaskOrUnit(Unit, LaneBitmask::getAll()));
}
}
};
@@ -622,7 +621,7 @@ void RegisterOperands::adjustLaneLiveness(const LiveIntervals &LIS,
LaneMask = getLiveLanesAt(LIS, MRI, true, RegUnit, Pos.getBaseIndex());
if (AddFlagsMI != nullptr) {
- for (const RegisterMaskPair &P : DeadDefs) {
+ for (const VRegMaskOrUnit &P : DeadDefs) {
Register RegUnit = P.RegUnit;
if (!RegUnit.isVirtual())
continue;
@@ -651,10 +650,10 @@ void PressureDiffs::addInstruction(unsigned Idx,
const MachineRegisterInfo &MRI) {
PressureDiff &PDiff = (*this)[Idx];
assert(!PDiff.begin()->isValid() && "stale PDiff");
- for (const RegisterMaskPair &P : RegOpers.Defs)
+ for (const VRegMaskOrUnit &P : RegOpers.Defs)
PDiff.addPressureChange(P.RegUnit, true, &MRI);
- for (const RegisterMaskPair &P : RegOpers.Uses)
+ for (const VRegMaskOrUnit &P : RegOpers.Uses)
PDiff.addPressureChange(P.RegUnit, false, &MRI);
}
@@ -694,20 +693,20 @@ void PressureDiff::addPressureChange(Register RegUnit, bool IsDec,
}
/// Force liveness of registers.
-void RegPressureTracker::addLiveRegs(ArrayRef<RegisterMaskPair> Regs) {
- for (const RegisterMaskPair &P : Regs) {
+void RegPressureTracker::addLiveRegs(ArrayRef<VRegMaskOrUnit> Regs) {
+ for (const VRegMaskOrUnit &P : Regs) {
LaneBitmask PrevMask = LiveRegs.insert(P);
LaneBitmask NewMask = PrevMask | P.LaneMask;
increaseRegPressure(P.RegUnit, PrevMask, NewMask);
}
}
-void RegPressureTracker::discoverLiveInOrOut(RegisterMaskPair Pair,
- SmallVectorImpl<RegisterMaskPair> &LiveInOrOut) {
+void RegPressureTracker::discoverLiveInOrOut(
+ VRegMaskOrUnit Pair, SmallVectorImpl<VRegMaskOrUnit> &LiveInOrOut) {
assert(Pair.LaneMask.any());
Register RegUnit = Pair.RegUnit;
- auto I = llvm::find_if(LiveInOrOut, [RegUnit](const RegisterMaskPair &Other) {
+ auto I = llvm::find_if(LiveInOrOut, [RegUnit](const VRegMaskOrUnit &Other) {
return Other.RegUnit == RegUnit;
});
LaneBitmask PrevMask;
@@ -724,22 +723,22 @@ void RegPressureTracker::discoverLiveInOrOut(RegisterMaskPair Pair,
increaseSetPressure(P.MaxSetPressure, *MRI, RegUnit, PrevMask, NewMask);
}
-void RegPressureTracker::discoverLiveIn(RegisterMaskPair Pair) {
+void RegPressureTracker::discoverLiveIn(VRegMaskOrUnit Pair) {
discoverLiveInOrOut(Pair, P.LiveInRegs);
}
-void RegPressureTracker::discoverLiveOut(RegisterMaskPair Pair) {
+void RegPressureTracker::discoverLiveOut(VRegMaskOrUnit Pair) {
discoverLiveInOrOut(Pair, P.LiveOutRegs);
}
-void RegPressureTracker::bumpDeadDefs(ArrayRef<RegisterMaskPair> DeadDefs) {
- for (const RegisterMaskPair &P : DeadDefs) {
+void RegPressureTracker::bumpDeadDefs(ArrayRef<VRegMaskOrUnit> DeadDefs) {
+ for (const VRegMaskOrUnit &P : DeadDefs) {
Register Reg = P.RegUnit;
LaneBitmask LiveMask = LiveRegs.contains(Reg);
LaneBitmask BumpedMask = LiveMask | P.LaneMask;
increaseRegPressure(Reg, LiveMask, BumpedMask);
}
- for (const RegisterMaskPair &P : DeadDefs) {
+ for (const VRegMaskOrUnit &P : DeadDefs) {
Register Reg = P.RegUnit;
LaneBitmask LiveMask = LiveRegs.contains(Reg);
LaneBitmask BumpedMask = LiveMask | P.LaneMask;
@@ -753,7 +752,7 @@ void RegPressureTracker::bumpDeadDefs(ArrayRef<RegisterMaskPair> DeadDefs) {
///
diff erence pointer is provided record the changes is pressure caused by this
/// instruction independent of liveness.
void RegPressureTracker::recede(const RegisterOperands &RegOpers,
- SmallVectorImpl<RegisterMaskPair> *LiveUses) {
+ SmallVectorImpl<VRegMaskOrUnit> *LiveUses) {
assert(!CurrPos->isDebugOrPseudoInstr());
// Boost pressure for all dead defs together.
@@ -761,7 +760,7 @@ void RegPressureTracker::recede(const RegisterOperands &RegOpers,
// Kill liveness at live defs.
// TODO: consider earlyclobbers?
- for (const RegisterMaskPair &Def : RegOpers.Defs) {
+ for (const VRegMaskOrUnit &Def : RegOpers.Defs) {
Register Reg = Def.RegUnit;
LaneBitmask PreviousMask = LiveRegs.erase(Def);
@@ -769,7 +768,7 @@ void RegPressureTracker::recede(const RegisterOperands &RegOpers,
LaneBitmask LiveOut = Def.LaneMask & ~PreviousMask;
if (LiveOut.any()) {
- discoverLiveOut(RegisterMaskPair(Reg, LiveOut));
+ discoverLiveOut(VRegMaskOrUnit(Reg, LiveOut));
// Retroactively model effects on pressure of the live out lanes.
increaseSetPressure(CurrSetPressure, *MRI, Reg, LaneBitmask::getNone(),
LiveOut);
@@ -791,7 +790,7 @@ void RegPressureTracker::recede(const RegisterOperands &RegOpers,
SlotIdx = LIS->getInstructionIndex(*CurrPos).getRegSlot();
// Generate liveness for uses.
- for (const RegisterMaskPair &Use : RegOpers.Uses) {
+ for (const VRegMaskOrUnit &Use : RegOpers.Uses) {
Register Reg = Use.RegUnit;
assert(Use.LaneMask.any());
LaneBitmask PreviousMask = LiveRegs.insert(Use);
@@ -803,19 +802,18 @@ void RegPressureTracker::recede(const RegisterOperands &RegOpers,
if (PreviousMask.none()) {
if (LiveUses != nullptr) {
if (!TrackLaneMasks) {
- addRegLanes(*LiveUses, RegisterMaskPair(Reg, NewMask));
+ addRegLanes(*LiveUses, VRegMaskOrUnit(Reg, NewMask));
} else {
- auto I =
- llvm::find_if(*LiveUses, [Reg](const RegisterMaskPair Other) {
- return Other.RegUnit == Reg;
- });
+ auto I = llvm::find_if(*LiveUses, [Reg](const VRegMaskOrUnit Other) {
+ return Other.RegUnit == Reg;
+ });
bool IsRedef = I != LiveUses->end();
if (IsRedef) {
// ignore re-defs here...
assert(I->LaneMask.none());
- removeRegLanes(*LiveUses, RegisterMaskPair(Reg, NewMask));
+ removeRegLanes(*LiveUses, VRegMaskOrUnit(Reg, NewMask));
} else {
- addRegLanes(*LiveUses, RegisterMaskPair(Reg, NewMask));
+ addRegLanes(*LiveUses, VRegMaskOrUnit(Reg, NewMask));
}
}
}
@@ -824,14 +822,14 @@ void RegPressureTracker::recede(const RegisterOperands &RegOpers,
if (RequireIntervals) {
LaneBitmask LiveOut = getLiveThroughAt(Reg, SlotIdx);
if (LiveOut.any())
- discoverLiveOut(RegisterMaskPair(Reg, LiveOut));
+ discoverLiveOut(VRegMaskOrUnit(Reg, LiveOut));
}
}
increaseRegPressure(Reg, PreviousMask, NewMask);
}
if (TrackUntiedDefs) {
- for (const RegisterMaskPair &Def : RegOpers.Defs) {
+ for (const VRegMaskOrUnit &Def : RegOpers.Defs) {
Register RegUnit = Def.RegUnit;
if (RegUnit.isVirtual() &&
(LiveRegs.contains(RegUnit) & Def.LaneMask).none())
@@ -861,7 +859,7 @@ void RegPressureTracker::recedeSkipDebugValues() {
static_cast<IntervalPressure&>(P).openTop(SlotIdx);
}
-void RegPressureTracker::recede(SmallVectorImpl<RegisterMaskPair> *LiveUses) {
+void RegPressureTracker::recede(SmallVectorImpl<VRegMaskOrUnit> *LiveUses) {
recedeSkipDebugValues();
if (CurrPos->isDebugInstr() || CurrPos->isPseudoProbe()) {
// It's possible to only have debug_value and pseudo probe instructions and
@@ -902,27 +900,27 @@ void RegPressureTracker::advance(const RegisterOperands &RegOpers) {
static_cast<RegionPressure&>(P).openBottom(CurrPos);
}
- for (const RegisterMaskPair &Use : RegOpers.Uses) {
+ for (const VRegMaskOrUnit &Use : RegOpers.Uses) {
Register Reg = Use.RegUnit;
LaneBitmask LiveMask = LiveRegs.contains(Reg);
LaneBitmask LiveIn = Use.LaneMask & ~LiveMask;
if (LiveIn.any()) {
- discoverLiveIn(RegisterMaskPair(Reg, LiveIn));
+ discoverLiveIn(VRegMaskOrUnit(Reg, LiveIn));
increaseRegPressure(Reg, LiveMask, LiveMask | LiveIn);
- LiveRegs.insert(RegisterMaskPair(Reg, LiveIn));
+ LiveRegs.insert(VRegMaskOrUnit(Reg, LiveIn));
}
// Kill liveness at last uses.
if (RequireIntervals) {
LaneBitmask LastUseMask = getLastUsedLanes(Reg, SlotIdx);
if (LastUseMask.any()) {
- LiveRegs.erase(RegisterMaskPair(Reg, LastUseMask));
+ LiveRegs.erase(VRegMaskOrUnit(Reg, LastUseMask));
decreaseRegPressure(Reg, LiveMask, LiveMask & ~LastUseMask);
}
}
}
// Generate liveness for defs.
- for (const RegisterMaskPair &Def : RegOpers.Defs) {
+ for (const VRegMaskOrUnit &Def : RegOpers.Defs) {
LaneBitmask PreviousMask = LiveRegs.insert(Def);
LaneBitmask NewMask = PreviousMask | Def.LaneMask;
increaseRegPressure(Def.RegUnit, PreviousMask, NewMask);
@@ -1051,7 +1049,7 @@ void RegPressureTracker::bumpUpwardPressure(const MachineInstr *MI) {
bumpDeadDefs(RegOpers.DeadDefs);
// Kill liveness at live defs.
- for (const RegisterMaskPair &P : RegOpers.Defs) {
+ for (const VRegMaskOrUnit &P : RegOpers.Defs) {
Register Reg = P.RegUnit;
LaneBitmask LiveAfter = LiveRegs.contains(Reg);
LaneBitmask UseLanes = getRegLanes(RegOpers.Uses, Reg);
@@ -1063,7 +1061,7 @@ void RegPressureTracker::bumpUpwardPressure(const MachineInstr *MI) {
decreaseRegPressure(Reg, LiveAfter, LiveAfter & LiveBefore);
}
// Generate liveness for uses. Also handle any uses which overlap with defs.
- for (const RegisterMaskPair &P : RegOpers.Uses) {
+ for (const VRegMaskOrUnit &P : RegOpers.Uses) {
Register Reg = P.RegUnit;
LaneBitmask LiveAfter = LiveRegs.contains(Reg);
LaneBitmask LiveBefore = LiveAfter | P.LaneMask;
@@ -1288,7 +1286,7 @@ void RegPressureTracker::bumpDownwardPressure(const MachineInstr *MI) {
RegOpers.adjustLaneLiveness(*LIS, *MRI, SlotIdx);
if (RequireIntervals) {
- for (const RegisterMaskPair &Use : RegOpers.Uses) {
+ for (const VRegMaskOrUnit &Use : RegOpers.Uses) {
Register Reg = Use.RegUnit;
LaneBitmask LastUseMask = getLastUsedLanes(Reg, SlotIdx);
if (LastUseMask.none())
@@ -1311,7 +1309,7 @@ void RegPressureTracker::bumpDownwardPressure(const MachineInstr *MI) {
}
// Generate liveness for defs.
- for (const RegisterMaskPair &Def : RegOpers.Defs) {
+ for (const VRegMaskOrUnit &Def : RegOpers.Defs) {
Register Reg = Def.RegUnit;
LaneBitmask LiveMask = LiveRegs.contains(Reg);
LaneBitmask NewMask = LiveMask | Def.LaneMask;
diff --git a/llvm/lib/Target/AMDGPU/GCNRegPressure.cpp b/llvm/lib/Target/AMDGPU/GCNRegPressure.cpp
index d46c4cf23a221e..a438ad00bc41df 100644
--- a/llvm/lib/Target/AMDGPU/GCNRegPressure.cpp
+++ b/llvm/lib/Target/AMDGPU/GCNRegPressure.cpp
@@ -256,7 +256,7 @@ static LaneBitmask getDefRegMask(const MachineOperand &MO,
}
static void
-collectVirtualRegUses(SmallVectorImpl<RegisterMaskPair> &RegMaskPairs,
+collectVirtualRegUses(SmallVectorImpl<VRegMaskOrUnit> &VRegMaskOrUnits,
const MachineInstr &MI, const LiveIntervals &LIS,
const MachineRegisterInfo &MRI) {
@@ -268,12 +268,12 @@ collectVirtualRegUses(SmallVectorImpl<RegisterMaskPair> &RegMaskPairs,
continue;
Register Reg = MO.getReg();
- auto I = llvm::find_if(RegMaskPairs, [Reg](const RegisterMaskPair &RM) {
+ auto I = llvm::find_if(VRegMaskOrUnits, [Reg](const VRegMaskOrUnit &RM) {
return RM.RegUnit == Reg;
});
- auto &P = I == RegMaskPairs.end()
- ? RegMaskPairs.emplace_back(Reg, LaneBitmask::getNone())
+ auto &P = I == VRegMaskOrUnits.end()
+ ? VRegMaskOrUnits.emplace_back(Reg, LaneBitmask::getNone())
: *I;
P.LaneMask |= MO.getSubReg() ? TRI.getSubRegIndexLaneMask(MO.getSubReg())
@@ -281,7 +281,7 @@ collectVirtualRegUses(SmallVectorImpl<RegisterMaskPair> &RegMaskPairs,
}
SlotIndex InstrSI;
- for (auto &P : RegMaskPairs) {
+ for (auto &P : VRegMaskOrUnits) {
auto &LI = LIS.getInterval(P.RegUnit);
if (!LI.hasSubRanges())
continue;
@@ -477,9 +477,9 @@ void GCNUpwardRPTracker::recede(const MachineInstr &MI) {
MaxPressure = max(DefPressure, MaxPressure);
// Make uses alive.
- SmallVector<RegisterMaskPair, 8> RegUses;
+ SmallVector<VRegMaskOrUnit, 8> RegUses;
collectVirtualRegUses(RegUses, MI, LIS, *MRI);
- for (const RegisterMaskPair &U : RegUses) {
+ for (const VRegMaskOrUnit &U : RegUses) {
LaneBitmask &LiveMask = LiveRegs[U.RegUnit];
LaneBitmask PrevMask = LiveMask;
LiveMask |= U.LaneMask;
@@ -665,7 +665,7 @@ GCNDownwardRPTracker::bumpDownwardPressure(const MachineInstr *MI,
RegOpers.adjustLaneLiveness(LIS, *MRI, SlotIdx);
GCNRegPressure TempPressure = CurPressure;
- for (const RegisterMaskPair &Use : RegOpers.Uses) {
+ for (const VRegMaskOrUnit &Use : RegOpers.Uses) {
Register Reg = Use.RegUnit;
if (!Reg.isVirtual())
continue;
@@ -699,7 +699,7 @@ GCNDownwardRPTracker::bumpDownwardPressure(const MachineInstr *MI,
}
// Generate liveness for defs.
- for (const RegisterMaskPair &Def : RegOpers.Defs) {
+ for (const VRegMaskOrUnit &Def : RegOpers.Defs) {
Register Reg = Def.RegUnit;
if (!Reg.isVirtual())
continue;
@@ -908,4 +908,4 @@ bool GCNRegPressurePrinter::runOnMachineFunction(MachineFunction &MF) {
return false;
#undef PFX
-}
\ No newline at end of file
+}
diff --git a/llvm/lib/Target/AMDGPU/GCNRegPressure.h b/llvm/lib/Target/AMDGPU/GCNRegPressure.h
index 06c3d9027db1b5..7554b9f578fcbb 100644
--- a/llvm/lib/Target/AMDGPU/GCNRegPressure.h
+++ b/llvm/lib/Target/AMDGPU/GCNRegPressure.h
@@ -170,7 +170,7 @@ class GCNRPTracker {
bool After);
/// Mostly copy/paste from CodeGen/RegisterPressure.cpp
- void bumpDeadDefs(ArrayRef<RegisterMaskPair> DeadDefs);
+ void bumpDeadDefs(ArrayRef<VRegMaskOrUnit> DeadDefs);
LaneBitmask getLastUsedLanes(Register RegUnit, SlotIndex Pos) const;
More information about the llvm-commits
mailing list