6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-23 02:32:11 +00:00
Code Issues Projects Releases Wiki Activity

Naming convention and whitespace. No functional change.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@156342 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jakob Stoklund Olesen 2012-05-07 23:46:16 +00:00
parent defa0afa14
commit 9790266eea
1 changed files with 67 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
lib/CodeGen/RegisterCoalescer.cpp
View File

@ -97,64 +97,64 @@ namespace {
/// been remat'ed. /// been remat'ed.
SmallPtrSet<MachineInstr*, 8> ReMatDefs; SmallPtrSet<MachineInstr*, 8> ReMatDefs;
/// joinIntervals - join compatible live intervals /// joinAllIntervals - join compatible live intervals
void joinIntervals(); void joinAllIntervals();
/// CopyCoalesceInMBB - Coalesce copies in the specified MBB, putting /// copyCoalesceInMBB - Coalesce copies in the specified MBB, putting
/// copies that cannot yet be coalesced into the "TryAgain" list. /// copies that cannot yet be coalesced into the "TryAgain" list.
void CopyCoalesceInMBB(MachineBasicBlock *MBB, void copyCoalesceInMBB(MachineBasicBlock *MBB,
std::vector<MachineInstr*> &TryAgain); std::vector<MachineInstr*> &TryAgain);
/// JoinCopy - Attempt to join intervals corresponding to SrcReg/DstReg, /// joinCopy - Attempt to join intervals corresponding to SrcReg/DstReg,
/// which are the src/dst of the copy instruction CopyMI. This returns /// which are the src/dst of the copy instruction CopyMI. This returns
/// true if the copy was successfully coalesced away. If it is not /// true if the copy was successfully coalesced away. If it is not
/// currently possible to coalesce this interval, but it may be possible if /// currently possible to coalesce this interval, but it may be possible if
/// other things get coalesced, then it returns true by reference in /// other things get coalesced, then it returns true by reference in
/// 'Again'. /// 'Again'.
bool JoinCopy(MachineInstr *TheCopy, bool &Again); bool joinCopy(MachineInstr *TheCopy, bool &Again);
/// JoinIntervals - Attempt to join these two intervals. On failure, this /// joinIntervals - Attempt to join these two intervals. On failure, this
/// returns false. The output "SrcInt" will not have been modified, so we /// returns false. The output "SrcInt" will not have been modified, so we
/// can use this information below to update aliases. /// can use this information below to update aliases.
bool JoinIntervals(CoalescerPair &CP); bool joinIntervals(CoalescerPair &CP);
/// AdjustCopiesBackFrom - We found a non-trivially-coalescable copy. If /// adjustCopiesBackFrom - We found a non-trivially-coalescable copy. If
/// the source value number is defined by a copy from the destination reg /// the source value number is defined by a copy from the destination reg
/// see if we can merge these two destination reg valno# into a single /// see if we can merge these two destination reg valno# into a single
/// value number, eliminating a copy. /// value number, eliminating a copy.
bool AdjustCopiesBackFrom(const CoalescerPair &CP, MachineInstr *CopyMI); bool adjustCopiesBackFrom(const CoalescerPair &CP, MachineInstr *CopyMI);
/// HasOtherReachingDefs - Return true if there are definitions of IntB /// hasOtherReachingDefs - Return true if there are definitions of IntB
/// other than BValNo val# that can reach uses of AValno val# of IntA. /// other than BValNo val# that can reach uses of AValno val# of IntA.
bool HasOtherReachingDefs(LiveInterval &IntA, LiveInterval &IntB, bool hasOtherReachingDefs(LiveInterval &IntA, LiveInterval &IntB,
VNInfo *AValNo, VNInfo *BValNo); VNInfo *AValNo, VNInfo *BValNo);
/// RemoveCopyByCommutingDef - We found a non-trivially-coalescable copy. /// removeCopyByCommutingDef - We found a non-trivially-coalescable copy.
/// If the source value number is defined by a commutable instruction and /// If the source value number is defined by a commutable instruction and
/// its other operand is coalesced to the copy dest register, see if we /// its other operand is coalesced to the copy dest register, see if we
/// can transform the copy into a noop by commuting the definition. /// can transform the copy into a noop by commuting the definition.
bool RemoveCopyByCommutingDef(const CoalescerPair &CP,MachineInstr *CopyMI); bool removeCopyByCommutingDef(const CoalescerPair &CP,MachineInstr *CopyMI);
/// ReMaterializeTrivialDef - If the source of a copy is defined by a /// reMaterializeTrivialDef - If the source of a copy is defined by a
/// trivial computation, replace the copy by rematerialize the definition. /// trivial computation, replace the copy by rematerialize the definition.
/// If PreserveSrcInt is true, make sure SrcInt is valid after the call. /// If PreserveSrcInt is true, make sure SrcInt is valid after the call.
bool ReMaterializeTrivialDef(LiveInterval &SrcInt, bool PreserveSrcInt, bool reMaterializeTrivialDef(LiveInterval &SrcInt, bool PreserveSrcInt,
unsigned DstReg, MachineInstr *CopyMI); unsigned DstReg, MachineInstr *CopyMI);
/// shouldJoinPhys - Return true if a physreg copy should be joined. /// shouldJoinPhys - Return true if a physreg copy should be joined.
bool shouldJoinPhys(CoalescerPair &CP); bool shouldJoinPhys(CoalescerPair &CP);
/// UpdateRegDefsUses - Replace all defs and uses of SrcReg to DstReg and /// updateRegDefsUses - Replace all defs and uses of SrcReg to DstReg and
/// update the subregister number if it is not zero. If DstReg is a /// update the subregister number if it is not zero. If DstReg is a
/// physical register and the existing subregister number of the def / use /// physical register and the existing subregister number of the def / use
/// being updated is not zero, make sure to set it to the correct physical /// being updated is not zero, make sure to set it to the correct physical
/// subregister. /// subregister.
void UpdateRegDefsUses(const CoalescerPair &CP); void updateRegDefsUses(const CoalescerPair &CP);
/// RemoveDeadDef - If a def of a live interval is now determined dead, /// removeDeadDef - If a def of a live interval is now determined dead,
/// remove the val# it defines. If the live interval becomes empty, remove /// remove the val# it defines. If the live interval becomes empty, remove
/// it as well. /// it as well.
bool RemoveDeadDef(LiveInterval &li, MachineInstr *DefMI); bool removeDeadDef(LiveInterval &li, MachineInstr *DefMI);
/// markAsJoined - Remember that CopyMI has already been joined. /// markAsJoined - Remember that CopyMI has already been joined.
void markAsJoined(MachineInstr *CopyMI); void markAsJoined(MachineInstr *CopyMI);
@ -385,7 +385,7 @@ void RegisterCoalescer::markAsJoined(MachineInstr *CopyMI) {
I->setIsUndef(true); I->setIsUndef(true);
} }
/// AdjustCopiesBackFrom - We found a non-trivially-coalescable copy with IntA /// adjustCopiesBackFrom - We found a non-trivially-coalescable copy with IntA
/// being the source and IntB being the dest, thus this defines a value number /// being the source and IntB being the dest, thus this defines a value number
/// in IntB. If the source value number (in IntA) is defined by a copy from B, /// in IntB. If the source value number (in IntA) is defined by a copy from B,
/// see if we can merge these two pieces of B into a single value number, /// see if we can merge these two pieces of B into a single value number,
@ -400,8 +400,8 @@ void RegisterCoalescer::markAsJoined(MachineInstr *CopyMI) {
/// ///
/// This returns true if an interval was modified. /// This returns true if an interval was modified.
/// ///
bool RegisterCoalescer::AdjustCopiesBackFrom(const CoalescerPair &CP, bool RegisterCoalescer::adjustCopiesBackFrom(const CoalescerPair &CP,
MachineInstr *CopyMI) { MachineInstr *CopyMI) {
// Bail if there is no dst interval - can happen when merging physical subreg // Bail if there is no dst interval - can happen when merging physical subreg
// operations. // operations.
if (!LIS->hasInterval(CP.getDstReg())) if (!LIS->hasInterval(CP.getDstReg()))
@ -532,12 +532,12 @@ bool RegisterCoalescer::AdjustCopiesBackFrom(const CoalescerPair &CP,
return true; return true;
} }
/// HasOtherReachingDefs - Return true if there are definitions of IntB /// hasOtherReachingDefs - Return true if there are definitions of IntB
/// other than BValNo val# that can reach uses of AValno val# of IntA. /// other than BValNo val# that can reach uses of AValno val# of IntA.
bool RegisterCoalescer::HasOtherReachingDefs(LiveInterval &IntA, bool RegisterCoalescer::hasOtherReachingDefs(LiveInterval &IntA,
LiveInterval &IntB, LiveInterval &IntB,
VNInfo *AValNo, VNInfo *AValNo,
VNInfo *BValNo) { VNInfo *BValNo) {
for (LiveInterval::iterator AI = IntA.begin(), AE = IntA.end(); for (LiveInterval::iterator AI = IntA.begin(), AE = IntA.end();
AI != AE; ++AI) { AI != AE; ++AI) {
if (AI->valno != AValNo) continue; if (AI->valno != AValNo) continue;
@ -557,7 +557,7 @@ bool RegisterCoalescer::HasOtherReachingDefs(LiveInterval &IntA,
return false; return false;
} }
/// RemoveCopyByCommutingDef - We found a non-trivially-coalescable copy with /// removeCopyByCommutingDef - We found a non-trivially-coalescable copy with
/// IntA being the source and IntB being the dest, thus this defines a value /// IntA being the source and IntB being the dest, thus this defines a value
/// number in IntB. If the source value number (in IntA) is defined by a /// number in IntB. If the source value number (in IntA) is defined by a
/// commutable instruction and its other operand is coalesced to the copy dest /// commutable instruction and its other operand is coalesced to the copy dest
@ -580,8 +580,8 @@ bool RegisterCoalescer::HasOtherReachingDefs(LiveInterval &IntA,
/// ///
/// This returns true if an interval was modified. /// This returns true if an interval was modified.
/// ///
bool RegisterCoalescer::RemoveCopyByCommutingDef(const CoalescerPair &CP, bool RegisterCoalescer::removeCopyByCommutingDef(const CoalescerPair &CP,
MachineInstr *CopyMI) { MachineInstr *CopyMI) {
// FIXME: For now, only eliminate the copy by commuting its def when the // FIXME: For now, only eliminate the copy by commuting its def when the
// source register is a virtual register. We want to guard against cases // source register is a virtual register. We want to guard against cases
// where the copy is a back edge copy and commuting the def lengthen the // where the copy is a back edge copy and commuting the def lengthen the
@ -645,7 +645,7 @@ bool RegisterCoalescer::RemoveCopyByCommutingDef(const CoalescerPair &CP,
// Make sure there are no other definitions of IntB that would reach the // Make sure there are no other definitions of IntB that would reach the
// uses which the new definition can reach. // uses which the new definition can reach.
if (HasOtherReachingDefs(IntA, IntB, AValNo, BValNo)) if (hasOtherReachingDefs(IntA, IntB, AValNo, BValNo))
return false; return false;
// Abort if the aliases of IntB.reg have values that are not simply the // Abort if the aliases of IntB.reg have values that are not simply the
@ -653,7 +653,7 @@ bool RegisterCoalescer::RemoveCopyByCommutingDef(const CoalescerPair &CP,
if (TargetRegisterInfo::isPhysicalRegister(IntB.reg)) if (TargetRegisterInfo::isPhysicalRegister(IntB.reg))
for (const uint16_t *AS = TRI->getAliasSet(IntB.reg); *AS; ++AS) for (const uint16_t *AS = TRI->getAliasSet(IntB.reg); *AS; ++AS)
if (LIS->hasInterval(*AS) && if (LIS->hasInterval(*AS) &&
HasOtherReachingDefs(IntA, LIS->getInterval(*AS), AValNo, 0)) hasOtherReachingDefs(IntA, LIS->getInterval(*AS), AValNo, 0))
return false; return false;
// If some of the uses of IntA.reg is already coalesced away, return false. // If some of the uses of IntA.reg is already coalesced away, return false.
@ -670,7 +670,7 @@ bool RegisterCoalescer::RemoveCopyByCommutingDef(const CoalescerPair &CP,
return false; return false;
} }
DEBUG(dbgs() << "\tRemoveCopyByCommutingDef: " << AValNo->def << '\t' DEBUG(dbgs() << "\tremoveCopyByCommutingDef: " << AValNo->def << '\t'
<< *DefMI); << *DefMI);
// At this point we have decided that it is legal to do this // At this point we have decided that it is legal to do this
@ -760,12 +760,12 @@ bool RegisterCoalescer::RemoveCopyByCommutingDef(const CoalescerPair &CP,
return true; return true;
} }
/// ReMaterializeTrivialDef - If the source of a copy is defined by a trivial /// reMaterializeTrivialDef - If the source of a copy is defined by a trivial
/// computation, replace the copy by rematerialize the definition. /// computation, replace the copy by rematerialize the definition.
bool RegisterCoalescer::ReMaterializeTrivialDef(LiveInterval &SrcInt, bool RegisterCoalescer::reMaterializeTrivialDef(LiveInterval &SrcInt,
bool preserveSrcInt, bool preserveSrcInt,
unsigned DstReg, unsigned DstReg,
MachineInstr *CopyMI) { MachineInstr *CopyMI) {
SlotIndex CopyIdx = LIS->getInstructionIndex(CopyMI).getRegSlot(true); SlotIndex CopyIdx = LIS->getInstructionIndex(CopyMI).getRegSlot(true);
LiveInterval::iterator SrcLR = SrcInt.FindLiveRangeContaining(CopyIdx); LiveInterval::iterator SrcLR = SrcInt.FindLiveRangeContaining(CopyIdx);
assert(SrcLR != SrcInt.end() && "Live range not found!"); assert(SrcLR != SrcInt.end() && "Live range not found!");
@ -900,13 +900,12 @@ bool RegisterCoalescer::eliminateUndefCopy(MachineInstr *CopyMI,
return true; return true;
} }
/// UpdateRegDefsUses - Replace all defs and uses of SrcReg to DstReg and /// updateRegDefsUses - Replace all defs and uses of SrcReg to DstReg and
/// update the subregister number if it is not zero. If DstReg is a /// update the subregister number if it is not zero. If DstReg is a
/// physical register and the existing subregister number of the def / use /// physical register and the existing subregister number of the def / use
/// being updated is not zero, make sure to set it to the correct physical /// being updated is not zero, make sure to set it to the correct physical
/// subregister. /// subregister.
void void RegisterCoalescer::updateRegDefsUses(const CoalescerPair &CP) {
RegisterCoalescer::UpdateRegDefsUses(const CoalescerPair &CP) {
bool DstIsPhys = CP.isPhys(); bool DstIsPhys = CP.isPhys();
unsigned SrcReg = CP.getSrcReg(); unsigned SrcReg = CP.getSrcReg();
unsigned DstReg = CP.getDstReg(); unsigned DstReg = CP.getDstReg();
@ -925,7 +924,7 @@ RegisterCoalescer::UpdateRegDefsUses(const CoalescerPair &CP) {
UseMI->getOperand(0).getReg() != SrcReg && UseMI->getOperand(0).getReg() != SrcReg &&
UseMI->getOperand(0).getReg() != DstReg && UseMI->getOperand(0).getReg() != DstReg &&
!JoinedCopies.count(UseMI) && !JoinedCopies.count(UseMI) &&
ReMaterializeTrivialDef(LIS->getInterval(SrcReg), false, reMaterializeTrivialDef(LIS->getInterval(SrcReg), false,
UseMI->getOperand(0).getReg(), UseMI)) UseMI->getOperand(0).getReg(), UseMI))
continue; continue;
} }
@ -985,10 +984,9 @@ static bool removeIntervalIfEmpty(LiveInterval &li, LiveIntervals *LIS,
return false; return false;
} }
/// RemoveDeadDef - If a def of a live interval is now determined dead, remove /// removeDeadDef - If a def of a live interval is now determined dead, remove
/// the val# it defines. If the live interval becomes empty, remove it as well. /// the val# it defines. If the live interval becomes empty, remove it as well.
bool RegisterCoalescer::RemoveDeadDef(LiveInterval &li, bool RegisterCoalescer::removeDeadDef(LiveInterval &li, MachineInstr *DefMI) {
MachineInstr *DefMI) {
SlotIndex DefIdx = LIS->getInstructionIndex(DefMI).getRegSlot(); SlotIndex DefIdx = LIS->getInstructionIndex(DefMI).getRegSlot();
LiveInterval::iterator MLR = li.FindLiveRangeContaining(DefIdx); LiveInterval::iterator MLR = li.FindLiveRangeContaining(DefIdx);
if (DefIdx != MLR->valno->def) if (DefIdx != MLR->valno->def)
@ -1051,12 +1049,12 @@ bool RegisterCoalescer::shouldJoinPhys(CoalescerPair &CP) {
} }
/// JoinCopy - Attempt to join intervals corresponding to SrcReg/DstReg, /// joinCopy - Attempt to join intervals corresponding to SrcReg/DstReg,
/// which are the src/dst of the copy instruction CopyMI. This returns true /// which are the src/dst of the copy instruction CopyMI. This returns true
/// if the copy was successfully coalesced away. If it is not currently /// if the copy was successfully coalesced away. If it is not currently
/// possible to coalesce this interval, but it may be possible if other /// possible to coalesce this interval, but it may be possible if other
/// things get coalesced, then it returns true by reference in 'Again'. /// things get coalesced, then it returns true by reference in 'Again'.
bool RegisterCoalescer::JoinCopy(MachineInstr *CopyMI, bool &Again) { bool RegisterCoalescer::joinCopy(MachineInstr *CopyMI, bool &Again) {
Again = false; Again = false;
if (JoinedCopies.count(CopyMI) || ReMatCopies.count(CopyMI)) if (JoinedCopies.count(CopyMI) || ReMatCopies.count(CopyMI))
@ -1094,7 +1092,7 @@ bool RegisterCoalescer::JoinCopy(MachineInstr *CopyMI, bool &Again) {
// Before giving up coalescing, if definition of source is defined by // Before giving up coalescing, if definition of source is defined by
// trivial computation, try rematerializing it. // trivial computation, try rematerializing it.
if (!CP.isFlipped() && if (!CP.isFlipped() &&
ReMaterializeTrivialDef(LIS->getInterval(CP.getSrcReg()), true, reMaterializeTrivialDef(LIS->getInterval(CP.getSrcReg()), true,
CP.getDstReg(), CopyMI)) CP.getDstReg(), CopyMI))
return true; return true;
return false; return false;
@ -1115,20 +1113,20 @@ bool RegisterCoalescer::JoinCopy(MachineInstr *CopyMI, bool &Again) {
// Otherwise, if one of the intervals being joined is a physreg, this method // Otherwise, if one of the intervals being joined is a physreg, this method
// always canonicalizes DstInt to be it. The output "SrcInt" will not have // always canonicalizes DstInt to be it. The output "SrcInt" will not have
// been modified, so we can use this information below to update aliases. // been modified, so we can use this information below to update aliases.
if (!JoinIntervals(CP)) { if (!joinIntervals(CP)) {
// Coalescing failed. // Coalescing failed.
// If definition of source is defined by trivial computation, try // If definition of source is defined by trivial computation, try
// rematerializing it. // rematerializing it.
if (!CP.isFlipped() && if (!CP.isFlipped() &&
ReMaterializeTrivialDef(LIS->getInterval(CP.getSrcReg()), true, reMaterializeTrivialDef(LIS->getInterval(CP.getSrcReg()), true,
CP.getDstReg(), CopyMI)) CP.getDstReg(), CopyMI))
return true; return true;
// If we can eliminate the copy without merging the live ranges, do so now. // If we can eliminate the copy without merging the live ranges, do so now.
if (!CP.isPartial()) { if (!CP.isPartial()) {
if (AdjustCopiesBackFrom(CP, CopyMI) || if (adjustCopiesBackFrom(CP, CopyMI) ||
RemoveCopyByCommutingDef(CP, CopyMI)) { removeCopyByCommutingDef(CP, CopyMI)) {
markAsJoined(CopyMI); markAsJoined(CopyMI);
DEBUG(dbgs() << "\tTrivial!\n"); DEBUG(dbgs() << "\tTrivial!\n");
return true; return true;
@ -1151,13 +1149,13 @@ bool RegisterCoalescer::JoinCopy(MachineInstr *CopyMI, bool &Again) {
// Remember to delete the copy instruction. // Remember to delete the copy instruction.
markAsJoined(CopyMI); markAsJoined(CopyMI);
UpdateRegDefsUses(CP); updateRegDefsUses(CP);
// If we have extended the live range of a physical register, make sure we // If we have extended the live range of a physical register, make sure we
// update live-in lists as well. // update live-in lists as well.
if (CP.isPhys()) { if (CP.isPhys()) {
SmallVector<MachineBasicBlock*, 16> BlockSeq; SmallVector<MachineBasicBlock*, 16> BlockSeq;
// JoinIntervals invalidates the VNInfos in SrcInt, but we only need the // joinIntervals invalidates the VNInfos in SrcInt, but we only need the
// ranges for this, and they are preserved. // ranges for this, and they are preserved.
LiveInterval &SrcInt = LIS->getInterval(CP.getSrcReg()); LiveInterval &SrcInt = LIS->getInterval(CP.getSrcReg());
for (LiveInterval::const_iterator I = SrcInt.begin(), E = SrcInt.end(); for (LiveInterval::const_iterator I = SrcInt.begin(), E = SrcInt.end();
@ -1311,9 +1309,9 @@ static bool RegistersDefinedFromSameValue(LiveIntervals &li,
return true; return true;
} }
/// JoinIntervals - Attempt to join these two intervals. On failure, this /// joinIntervals - Attempt to join these two intervals. On failure, this
/// returns false. /// returns false.
bool RegisterCoalescer::JoinIntervals(CoalescerPair &CP) { bool RegisterCoalescer::joinIntervals(CoalescerPair &CP) {
LiveInterval &RHS = LIS->getInterval(CP.getSrcReg()); LiveInterval &RHS = LIS->getInterval(CP.getSrcReg());
DEBUG({ dbgs() << "\t\tRHS = "; RHS.print(dbgs(), TRI); dbgs() << "\n"; }); DEBUG({ dbgs() << "\t\tRHS = "; RHS.print(dbgs(), TRI); dbgs() << "\n"; });
@ -1614,8 +1612,9 @@ namespace {
}; };
} }
void RegisterCoalescer::CopyCoalesceInMBB(MachineBasicBlock *MBB, void
std::vector<MachineInstr*> &TryAgain) { RegisterCoalescer::copyCoalesceInMBB(MachineBasicBlock *MBB,
std::vector<MachineInstr*> &TryAgain) {
DEBUG(dbgs() << MBB->getName() << ":\n"); DEBUG(dbgs() << MBB->getName() << ":\n");
SmallVector<MachineInstr*, 8> VirtCopies; SmallVector<MachineInstr*, 8> VirtCopies;
@ -1652,27 +1651,27 @@ void RegisterCoalescer::CopyCoalesceInMBB(MachineBasicBlock *MBB,
for (unsigned i = 0, e = ImpDefCopies.size(); i != e; ++i) { for (unsigned i = 0, e = ImpDefCopies.size(); i != e; ++i) {
MachineInstr *TheCopy = ImpDefCopies[i]; MachineInstr *TheCopy = ImpDefCopies[i];
bool Again = false; bool Again = false;
if (!JoinCopy(TheCopy, Again)) if (!joinCopy(TheCopy, Again))
if (Again) if (Again)
TryAgain.push_back(TheCopy); TryAgain.push_back(TheCopy);
} }
for (unsigned i = 0, e = PhysCopies.size(); i != e; ++i) { for (unsigned i = 0, e = PhysCopies.size(); i != e; ++i) {
MachineInstr *TheCopy = PhysCopies[i]; MachineInstr *TheCopy = PhysCopies[i];
bool Again = false; bool Again = false;
if (!JoinCopy(TheCopy, Again)) if (!joinCopy(TheCopy, Again))
if (Again) if (Again)
TryAgain.push_back(TheCopy); TryAgain.push_back(TheCopy);
} }
for (unsigned i = 0, e = VirtCopies.size(); i != e; ++i) { for (unsigned i = 0, e = VirtCopies.size(); i != e; ++i) {
MachineInstr *TheCopy = VirtCopies[i]; MachineInstr *TheCopy = VirtCopies[i];
bool Again = false; bool Again = false;
if (!JoinCopy(TheCopy, Again)) if (!joinCopy(TheCopy, Again))
if (Again) if (Again)
TryAgain.push_back(TheCopy); TryAgain.push_back(TheCopy);
} }
} }
void RegisterCoalescer::joinIntervals() { void RegisterCoalescer::joinAllIntervals() {
DEBUG(dbgs() << "********** JOINING INTERVALS ***********\n"); DEBUG(dbgs() << "********** JOINING INTERVALS ***********\n");
std::vector<MachineInstr*> TryAgainList; std::vector<MachineInstr*> TryAgainList;
@ -1680,7 +1679,7 @@ void RegisterCoalescer::joinIntervals() {
// If there are no loops in the function, join intervals in function order. // If there are no loops in the function, join intervals in function order.
for (MachineFunction::iterator I = MF->begin(), E = MF->end(); for (MachineFunction::iterator I = MF->begin(), E = MF->end();
I != E; ++I) I != E; ++I)
CopyCoalesceInMBB(I, TryAgainList); copyCoalesceInMBB(I, TryAgainList);
} else { } else {
// Otherwise, join intervals in inner loops before other intervals. // Otherwise, join intervals in inner loops before other intervals.
// Unfortunately we can't just iterate over loop hierarchy here because // Unfortunately we can't just iterate over loop hierarchy here because
@ -1699,7 +1698,7 @@ void RegisterCoalescer::joinIntervals() {
// Finally, join intervals in loop nest order. // Finally, join intervals in loop nest order.
for (unsigned i = 0, e = MBBs.size(); i != e; ++i) for (unsigned i = 0, e = MBBs.size(); i != e; ++i)
CopyCoalesceInMBB(MBBs[i].second, TryAgainList); copyCoalesceInMBB(MBBs[i].second, TryAgainList);
} }
// Joining intervals can allow other intervals to be joined. Iteratively join // Joining intervals can allow other intervals to be joined. Iteratively join
@ -1714,7 +1713,7 @@ void RegisterCoalescer::joinIntervals() {
continue; continue;
bool Again = false; bool Again = false;
bool Success = JoinCopy(TheCopy, Again); bool Success = joinCopy(TheCopy, Again);
if (Success || !Again) { if (Success || !Again) {
TheCopy= 0; // Mark this one as done. TheCopy= 0; // Mark this one as done.
ProgressMade = true; ProgressMade = true;
@ -1751,7 +1750,7 @@ bool RegisterCoalescer::runOnMachineFunction(MachineFunction &fn) {
// Join (coalesce) intervals if requested. // Join (coalesce) intervals if requested.
if (EnableJoining) { if (EnableJoining) {
joinIntervals(); joinAllIntervals();
DEBUG({ DEBUG({
dbgs() << "********** INTERVALS POST JOINING **********\n"; dbgs() << "********** INTERVALS POST JOINING **********\n";
for (LiveIntervals::iterator I = LIS->begin(), E = LIS->end(); for (LiveIntervals::iterator I = LIS->begin(), E = LIS->end();
@ -1845,7 +1844,7 @@ bool RegisterCoalescer::runOnMachineFunction(MachineFunction &fn) {
while (!DeadDefs.empty()) { while (!DeadDefs.empty()) {
unsigned DeadDef = DeadDefs.back(); unsigned DeadDef = DeadDefs.back();
DeadDefs.pop_back(); DeadDefs.pop_back();
RemoveDeadDef(LIS->getInterval(DeadDef), MI); removeDeadDef(LIS->getInterval(DeadDef), MI);
} }
LIS->RemoveMachineInstrFromMaps(mii); LIS->RemoveMachineInstrFromMaps(mii);
mii = mbbi->erase(mii); mii = mbbi->erase(mii);