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

Use array_pod_sort instead of std::sort.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@168203 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Andrew Trick
2012-11-16 21:33:38 +00:00
parent d522754535
commit cdf493dd0b
1 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
lib/CodeGen/RegisterCoalescer.cpp
View File

@@ -1936,46 +1936,41 @@ bool RegisterCoalescer::joinIntervals(CoalescerPair &CP) {
} }
namespace { namespace {
// Information concerning MBB coalescing priority. // Information concerning MBB coalescing priority.
struct MBBPriorityInfo { struct MBBPriorityInfo {
MachineBasicBlock *MBB; MachineBasicBlock *MBB;
unsigned Depth; unsigned Depth;
bool IsSplit; bool IsSplit;
MBBPriorityInfo(MachineBasicBlock *mbb, unsigned depth, bool issplit) MBBPriorityInfo(MachineBasicBlock *mbb, unsigned depth, bool issplit)
: MBB(mbb), Depth(depth), IsSplit(issplit) {} : MBB(mbb), Depth(depth), IsSplit(issplit) {}
}; };
}
// MBBPriorityCompare - Comparison predicate that sorts first based on the // C-style comparator that sorts first based on the loop depth of the basic
// loop depth of the basic block (the unsigned), and then on the MBB number. // block (the unsigned), and then on the MBB number.
// //
// EnableGlobalCopies assumes that the primary sort key is loop depth. // EnableGlobalCopies assumes that the primary sort key is loop depth.
struct MBBPriorityCompare { static int compareMBBPriority(const void *L, const void *R) {
bool JoinSplitEdges; const MBBPriorityInfo *LHS = static_cast<const MBBPriorityInfo*>(L);
const MBBPriorityInfo *RHS = static_cast<const MBBPriorityInfo*>(R);
// Deeper loops first
if (LHS->Depth != RHS->Depth)
return LHS->Depth > RHS->Depth ? -1 : 1;
MBBPriorityCompare(bool joinsplits): JoinSplitEdges(joinsplits) {} // Try to unsplit critical edges next.
if (LHS->IsSplit != RHS->IsSplit)
return LHS->IsSplit ? -1 : 1;
bool operator()(const MBBPriorityInfo &LHS, // Prefer blocks that are more connected in the CFG. This takes care of
const MBBPriorityInfo &RHS) const { // the most difficult copies first while intervals are short.
// Deeper loops first unsigned cl = LHS->MBB->pred_size() + LHS->MBB->succ_size();
if (LHS.Depth != RHS.Depth) unsigned cr = RHS->MBB->pred_size() + RHS->MBB->succ_size();
return LHS.Depth > RHS.Depth; if (cl != cr)
return cl > cr ? -1 : 1;
// Try to unsplit critical edges next. // As a last resort, sort by block number.
if (JoinSplitEdges && LHS.IsSplit != RHS.IsSplit) return LHS->MBB->getNumber() < RHS->MBB->getNumber() ? -1 : 1;
return LHS.IsSplit;
// Prefer blocks that are more connected in the CFG. This takes care of
// the most difficult copies first while intervals are short.
unsigned cl = LHS.MBB->pred_size() + LHS.MBB->succ_size();
unsigned cr = RHS.MBB->pred_size() + RHS.MBB->succ_size();
if (cl != cr)
return cl > cr;
// As a last resort, sort by block number.
return LHS.MBB->getNumber() < RHS.MBB->getNumber();
}
};
} }
/// \returns true if the given copy uses or defines a local live range. /// \returns true if the given copy uses or defines a local live range.
@@ -2072,9 +2067,9 @@ void RegisterCoalescer::joinAllIntervals() {
for (MachineFunction::iterator I = MF->begin(), E = MF->end();I != E;++I){ for (MachineFunction::iterator I = MF->begin(), E = MF->end();I != E;++I){
MachineBasicBlock *MBB = I; MachineBasicBlock *MBB = I;
MBBs.push_back(MBBPriorityInfo(MBB, Loops->getLoopDepth(MBB), MBBs.push_back(MBBPriorityInfo(MBB, Loops->getLoopDepth(MBB),
isSplitEdge(MBB))); JoinSplitEdges && isSplitEdge(MBB)));
} }
std::sort(MBBs.begin(), MBBs.end(), MBBPriorityCompare(JoinSplitEdges)); array_pod_sort(MBBs.begin(), MBBs.end(), compareMBBPriority);
// Coalesce intervals in MBB priority order. // Coalesce intervals in MBB priority order.
unsigned CurrDepth = UINT_MAX; unsigned CurrDepth = UINT_MAX;