forked from OSchip/llvm-project
Revert r342942 "[MachineCopyPropagation] Reimplement CopyTracker in terms of register units"
It seems to have broken several targets, see comments on the llvm-commits thread. > Change the copy tracker to keep a single map of register units instead > of 3 maps of registers. This gives a very significant compile time > performance improvement to the pass. I measured a 30-40% decrease in > time spent in MCP on x86 and AArch64 and much more significant > improvements on out of tree targets with more registers. > > Differential Revision: https://reviews.llvm.org/D52374 llvm-svn: 343189
This commit is contained in:
parent
70ac019efa
commit
5008d9014b
llvm/lib/CodeGen
|
@ -75,36 +75,40 @@ DEBUG_COUNTER(FwdCounter, "machine-cp-fwd",
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
class CopyTracker {
|
class CopyTracker {
|
||||||
struct CopyInfo {
|
using RegList = SmallVector<unsigned, 4>;
|
||||||
MachineInstr *MI;
|
using SourceMap = DenseMap<unsigned, RegList>;
|
||||||
SmallVector<unsigned, 4> DefRegs;
|
using Reg2MIMap = DenseMap<unsigned, MachineInstr *>;
|
||||||
bool Avail;
|
|
||||||
};
|
|
||||||
|
|
||||||
DenseMap<unsigned, CopyInfo> Copies;
|
/// Def -> available copies map.
|
||||||
|
Reg2MIMap AvailCopyMap;
|
||||||
|
|
||||||
|
/// Def -> copies map.
|
||||||
|
Reg2MIMap CopyMap;
|
||||||
|
|
||||||
|
/// Src -> Def map
|
||||||
|
SourceMap SrcMap;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/// Mark all of the given registers and their subregisters as unavailable for
|
/// Mark all of the given registers and their subregisters as unavailable for
|
||||||
/// copying.
|
/// copying.
|
||||||
void markRegsUnavailable(ArrayRef<unsigned> Regs,
|
void markRegsUnavailable(const RegList &Regs, const TargetRegisterInfo &TRI) {
|
||||||
const TargetRegisterInfo &TRI) {
|
|
||||||
for (unsigned Reg : Regs) {
|
for (unsigned Reg : Regs) {
|
||||||
// Source of copy is no longer available for propagation.
|
// Source of copy is no longer available for propagation.
|
||||||
for (MCRegUnitIterator RUI(Reg, &TRI); RUI.isValid(); ++RUI) {
|
for (MCSubRegIterator SR(Reg, &TRI, true); SR.isValid(); ++SR)
|
||||||
auto CI = Copies.find(*RUI);
|
AvailCopyMap.erase(*SR);
|
||||||
if (CI != Copies.end())
|
|
||||||
CI->second.Avail = false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Clobber a single register, removing it from the tracker's copy maps.
|
/// Clobber a single register, removing it from the tracker's copy maps.
|
||||||
void clobberRegister(unsigned Reg, const TargetRegisterInfo &TRI) {
|
void clobberRegister(unsigned Reg, const TargetRegisterInfo &TRI) {
|
||||||
for (MCRegUnitIterator RUI(Reg, &TRI); RUI.isValid(); ++RUI) {
|
for (MCRegAliasIterator AI(Reg, &TRI, true); AI.isValid(); ++AI) {
|
||||||
auto I = Copies.find(*RUI);
|
CopyMap.erase(*AI);
|
||||||
if (I != Copies.end()) {
|
AvailCopyMap.erase(*AI);
|
||||||
markRegsUnavailable(I->second.DefRegs, TRI);
|
|
||||||
Copies.erase(I);
|
SourceMap::iterator SI = SrcMap.find(*AI);
|
||||||
|
if (SI != SrcMap.end()) {
|
||||||
|
markRegsUnavailable(SI->second, TRI);
|
||||||
|
SrcMap.erase(SI);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -117,60 +121,52 @@ public:
|
||||||
unsigned Src = Copy->getOperand(1).getReg();
|
unsigned Src = Copy->getOperand(1).getReg();
|
||||||
|
|
||||||
// Remember Def is defined by the copy.
|
// Remember Def is defined by the copy.
|
||||||
for (MCRegUnitIterator RUI(Def, &TRI); RUI.isValid(); ++RUI)
|
for (MCSubRegIterator SR(Def, &TRI, /*IncludeSelf=*/true); SR.isValid();
|
||||||
Copies[*RUI] = {Copy, {}, true};
|
++SR) {
|
||||||
|
CopyMap[*SR] = Copy;
|
||||||
|
AvailCopyMap[*SR] = Copy;
|
||||||
|
}
|
||||||
|
|
||||||
// Remember source that's copied to Def. Once it's clobbered, then
|
// Remember source that's copied to Def. Once it's clobbered, then
|
||||||
// it's no longer available for copy propagation.
|
// it's no longer available for copy propagation.
|
||||||
for (MCRegUnitIterator RUI(Src, &TRI); RUI.isValid(); ++RUI) {
|
RegList &DestList = SrcMap[Src];
|
||||||
auto I = Copies.insert({*RUI, {nullptr, {}, false}});
|
if (!is_contained(DestList, Def))
|
||||||
auto &Copy = I.first->second;
|
DestList.push_back(Def);
|
||||||
if (!is_contained(Copy.DefRegs, Def))
|
|
||||||
Copy.DefRegs.push_back(Def);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool hasAnyCopies() {
|
bool hasAvailableCopies() { return !AvailCopyMap.empty(); }
|
||||||
return !Copies.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
MachineInstr *findCopyForUnit(unsigned RegUnit, const TargetRegisterInfo &TRI,
|
MachineInstr *findAvailCopy(MachineInstr &DestCopy, unsigned Reg) {
|
||||||
bool MustBeAvailable = false) {
|
auto CI = AvailCopyMap.find(Reg);
|
||||||
auto CI = Copies.find(RegUnit);
|
if (CI == AvailCopyMap.end())
|
||||||
if (CI == Copies.end())
|
|
||||||
return nullptr;
|
|
||||||
if (MustBeAvailable && !CI->second.Avail)
|
|
||||||
return nullptr;
|
|
||||||
return CI->second.MI;
|
|
||||||
}
|
|
||||||
|
|
||||||
MachineInstr *findAvailCopy(MachineInstr &DestCopy, unsigned Reg,
|
|
||||||
const TargetRegisterInfo &TRI) {
|
|
||||||
// We check the first RegUnit here, since we'll only be interested in the
|
|
||||||
// copy if it copies the entire register anyway.
|
|
||||||
MCRegUnitIterator RUI(Reg, &TRI);
|
|
||||||
MachineInstr *AvailCopy =
|
|
||||||
findCopyForUnit(*RUI, TRI, /*MustBeAvailable=*/true);
|
|
||||||
if (!AvailCopy ||
|
|
||||||
!TRI.isSubRegisterEq(AvailCopy->getOperand(0).getReg(), Reg))
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
MachineInstr &AvailCopy = *CI->second;
|
||||||
|
|
||||||
// Check that the available copy isn't clobbered by any regmasks between
|
// Check that the available copy isn't clobbered by any regmasks between
|
||||||
// itself and the destination.
|
// itself and the destination.
|
||||||
unsigned AvailSrc = AvailCopy->getOperand(1).getReg();
|
unsigned AvailSrc = AvailCopy.getOperand(1).getReg();
|
||||||
unsigned AvailDef = AvailCopy->getOperand(0).getReg();
|
unsigned AvailDef = AvailCopy.getOperand(0).getReg();
|
||||||
for (const MachineInstr &MI :
|
for (const MachineInstr &MI :
|
||||||
make_range(AvailCopy->getIterator(), DestCopy.getIterator()))
|
make_range(AvailCopy.getIterator(), DestCopy.getIterator()))
|
||||||
for (const MachineOperand &MO : MI.operands())
|
for (const MachineOperand &MO : MI.operands())
|
||||||
if (MO.isRegMask())
|
if (MO.isRegMask())
|
||||||
if (MO.clobbersPhysReg(AvailSrc) || MO.clobbersPhysReg(AvailDef))
|
if (MO.clobbersPhysReg(AvailSrc) || MO.clobbersPhysReg(AvailDef))
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
||||||
return AvailCopy;
|
return &AvailCopy;
|
||||||
|
}
|
||||||
|
|
||||||
|
MachineInstr *findCopy(unsigned Reg) {
|
||||||
|
auto CI = CopyMap.find(Reg);
|
||||||
|
if (CI != CopyMap.end())
|
||||||
|
return CI->second;
|
||||||
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void clear() {
|
void clear() {
|
||||||
Copies.clear();
|
AvailCopyMap.clear();
|
||||||
|
CopyMap.clear();
|
||||||
|
SrcMap.clear();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -228,8 +224,8 @@ INITIALIZE_PASS(MachineCopyPropagation, DEBUG_TYPE,
|
||||||
void MachineCopyPropagation::ReadRegister(unsigned Reg) {
|
void MachineCopyPropagation::ReadRegister(unsigned Reg) {
|
||||||
// If 'Reg' is defined by a copy, the copy is no longer a candidate
|
// If 'Reg' is defined by a copy, the copy is no longer a candidate
|
||||||
// for elimination.
|
// for elimination.
|
||||||
for (MCRegUnitIterator RUI(Reg, TRI); RUI.isValid(); ++RUI) {
|
for (MCRegAliasIterator AI(Reg, TRI, true); AI.isValid(); ++AI) {
|
||||||
if (MachineInstr *Copy = Tracker.findCopyForUnit(*RUI, *TRI)) {
|
if (MachineInstr *Copy = Tracker.findCopy(*AI)) {
|
||||||
LLVM_DEBUG(dbgs() << "MCP: Copy is used - not dead: "; Copy->dump());
|
LLVM_DEBUG(dbgs() << "MCP: Copy is used - not dead: "; Copy->dump());
|
||||||
MaybeDeadCopies.remove(Copy);
|
MaybeDeadCopies.remove(Copy);
|
||||||
}
|
}
|
||||||
|
@ -267,7 +263,7 @@ bool MachineCopyPropagation::eraseIfRedundant(MachineInstr &Copy, unsigned Src,
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Search for an existing copy.
|
// Search for an existing copy.
|
||||||
MachineInstr *PrevCopy = Tracker.findAvailCopy(Copy, Def, *TRI);
|
MachineInstr *PrevCopy = Tracker.findAvailCopy(Copy, Def);
|
||||||
if (!PrevCopy)
|
if (!PrevCopy)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
@ -361,7 +357,7 @@ bool MachineCopyPropagation::hasImplicitOverlap(const MachineInstr &MI,
|
||||||
/// Look for available copies whose destination register is used by \p MI and
|
/// Look for available copies whose destination register is used by \p MI and
|
||||||
/// replace the use in \p MI with the copy's source register.
|
/// replace the use in \p MI with the copy's source register.
|
||||||
void MachineCopyPropagation::forwardUses(MachineInstr &MI) {
|
void MachineCopyPropagation::forwardUses(MachineInstr &MI) {
|
||||||
if (!Tracker.hasAnyCopies())
|
if (!Tracker.hasAvailableCopies())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Look for non-tied explicit vreg uses that have an active COPY
|
// Look for non-tied explicit vreg uses that have an active COPY
|
||||||
|
@ -388,7 +384,7 @@ void MachineCopyPropagation::forwardUses(MachineInstr &MI) {
|
||||||
if (!MOUse.isRenamable())
|
if (!MOUse.isRenamable())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
MachineInstr *Copy = Tracker.findAvailCopy(MI, MOUse.getReg(), *TRI);
|
MachineInstr *Copy = Tracker.findAvailCopy(MI, MOUse.getReg());
|
||||||
if (!Copy)
|
if (!Copy)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue