maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

RegisterCoalescer: Some cleanup in removeCopyByCommutingDef(), NFC 

llvm-svn: 225502
This commit is contained in:
Matthias Braun 2015-01-09 03:01:28 +00:00
parent 55586a2f2d
commit ea399e59cf
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
llvm/lib/CodeGen/RegisterCoalescer.cpp
View File

@ -602,7 +602,7 @@ static void addSegmentsWithValNo(LiveRange &Dst, VNInfo *DstValNo,
/// ///
/// B2 = op B0 A2<kill> /// B2 = op B0 A2<kill>
/// ... /// ...
/// B1 = B2 <- now an identify copy /// B1 = B2 <- now an identity copy
/// ... /// ...
/// = op B2 <- more uses /// = op B2 <- more uses
/// ///
@ -610,9 +610,7 @@ static void addSegmentsWithValNo(LiveRange &Dst, VNInfo *DstValNo,
/// ///
bool RegisterCoalescer::removeCopyByCommutingDef(const CoalescerPair &CP, bool RegisterCoalescer::removeCopyByCommutingDef(const CoalescerPair &CP,
MachineInstr *CopyMI) { MachineInstr *CopyMI) {
assert (!CP.isPhys()); assert(!CP.isPhys());
SlotIndex CopyIdx = LIS->getInstructionIndex(CopyMI).getRegSlot();
LiveInterval &IntA = LiveInterval &IntA =
LIS->getInterval(CP.isFlipped() ? CP.getDstReg() : CP.getSrcReg()); LIS->getInterval(CP.isFlipped() ? CP.getDstReg() : CP.getSrcReg());
@ -621,6 +619,7 @@ bool RegisterCoalescer::removeCopyByCommutingDef(const CoalescerPair &CP,
// BValNo is a value number in B that is defined by a copy from A. 'B1' in // BValNo is a value number in B that is defined by a copy from A. 'B1' in
// the example above. // the example above.
SlotIndex CopyIdx = LIS->getInstructionIndex(CopyMI).getRegSlot();
VNInfo *BValNo = IntB.getVNInfoAt(CopyIdx); VNInfo *BValNo = IntB.getVNInfoAt(CopyIdx);
assert(BValNo != nullptr && BValNo->def == CopyIdx); assert(BValNo != nullptr && BValNo->def == CopyIdx);
@ -706,7 +705,8 @@ bool RegisterCoalescer::removeCopyByCommutingDef(const CoalescerPair &CP,
// Update uses of IntA of the specific Val# with IntB. // Update uses of IntA of the specific Val# with IntB.
for (MachineRegisterInfo::use_iterator UI = MRI->use_begin(IntA.reg), for (MachineRegisterInfo::use_iterator UI = MRI->use_begin(IntA.reg),
UE = MRI->use_end(); UI != UE;) { UE = MRI->use_end();
UI != UE;) {
MachineOperand &UseMO = *UI; MachineOperand &UseMO = *UI;
if (UseMO.isUndef()) if (UseMO.isUndef())
continue; continue;
@ -779,7 +779,8 @@ bool RegisterCoalescer::removeCopyByCommutingDef(const CoalescerPair &CP,
if (Common == 0) if (Common == 0)
continue; continue;
DEBUG(dbgs() << format("\t\tCopy+Merge %04X into %04X\n", BMask, Common)); DEBUG(
dbgs() << format("\t\tCopy+Merge %04X into %04X\n", BMask, Common));
unsigned BRest = BMask & ~AMask; unsigned BRest = BMask & ~AMask;
LiveInterval::SubRange *CommonRange; LiveInterval::SubRange *CommonRange;
if (BRest != 0) { if (BRest != 0) {
@ -808,13 +809,6 @@ bool RegisterCoalescer::removeCopyByCommutingDef(const CoalescerPair &CP,
} }
SA.removeValNo(ASubValNo); SA.removeValNo(ASubValNo);
} }
} else if (IntA.hasSubRanges()) {
SlotIndex AIdx = CopyIdx.getRegSlot(true);
for (LiveInterval::SubRange &SA : IntA.subranges()) {
VNInfo *ASubValNo = SA.getVNInfoAt(AIdx);
assert(ASubValNo != nullptr);
SA.removeValNo(ASubValNo);
}
} }
BValNo->def = AValNo->def; BValNo->def = AValNo->def;
@ -822,6 +816,16 @@ bool RegisterCoalescer::removeCopyByCommutingDef(const CoalescerPair &CP,
DEBUG(dbgs() << "\t\textended: " << IntB << '\n'); DEBUG(dbgs() << "\t\textended: " << IntB << '\n');
IntA.removeValNo(AValNo); IntA.removeValNo(AValNo);
// Remove valuenos in subranges (the A+B have subranges case has already been
// handled above)
if (!IntB.hasSubRanges()) {
SlotIndex AIdx = CopyIdx.getRegSlot(true);
for (LiveInterval::SubRange &SA : IntA.subranges()) {
VNInfo *ASubValNo = SA.getVNInfoAt(AIdx);
assert(ASubValNo != nullptr);
SA.removeValNo(ASubValNo);
}
}
DEBUG(dbgs() << "\t\ttrimmed: " << IntA << '\n'); DEBUG(dbgs() << "\t\ttrimmed: " << IntA << '\n');
++numCommutes; ++numCommutes;
return true; return true;