6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-21 18:29:45 +00:00
Code Issues Projects Releases Wiki Activity

Rewrite SelectionDAGBuilder::Clusterify to run in linear time. NFC.

Browse Source 
It was previously repeatedly erasing elements from the middle of a vector,
causing O(n^2) worst-case run-time.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@232789 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Hans Wennborg 2015-03-20 00:41:03 +00:00
parent aa01400663
commit ffe6f0ffdd
2 changed files with 34 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
View File

@ -2646,45 +2646,42 @@ bool SelectionDAGBuilder::handleBitTestsSwitchCase(CaseRec& CR,
return true;
}
/// Clusterify - Transform simple list of Cases into list of CaseRange's
void SelectionDAGBuilder::Clusterify(CaseVector& Cases,
const SwitchInst& SI) {
void SelectionDAGBuilder::Clusterify(CaseVector &Cases, const SwitchInst *SI) {
BranchProbabilityInfo *BPI = FuncInfo.BPI;
// Start with "simple" cases.
for (SwitchInst::ConstCaseIt i : SI.cases()) {
const BasicBlock *SuccBB = i.getCaseSuccessor();
MachineBasicBlock *SMBB = FuncInfo.MBBMap[SuccBB];
uint32_t ExtraWeight =
BPI ? BPI->getEdgeWeight(SI.getParent(), i.getSuccessorIndex()) : 0;
// Extract cases from the switch and sort them.
typedef std::pair<const ConstantInt*, unsigned> CasePair;
std::vector<CasePair> Sorted;
Sorted.reserve(SI->getNumCases());
for (auto I : SI->cases())
Sorted.push_back(std::make_pair(I.getCaseValue(), I.getSuccessorIndex()));
std::sort(Sorted.begin(), Sorted.end(), [](CasePair a, CasePair b) {
return a.first->getValue().slt(b.first->getValue());
});
Cases.push_back(Case(i.getCaseValue(), i.getCaseValue(),
SMBB, ExtraWeight));
}
std::sort(Cases.begin(), Cases.end(), CaseCmp());
// Merge adjacent cases with the same destination, build Cases vector.
assert(Cases.empty() && "Cases should be empty before Clusterify;");
Cases.reserve(SI->getNumCases());
MachineBasicBlock *PreviousSucc = nullptr;
for (CasePair &CP : Sorted) {
const ConstantInt *CaseVal = CP.first;
unsigned SuccIndex = CP.second;
MachineBasicBlock *Succ = FuncInfo.MBBMap[SI->getSuccessor(SuccIndex)];
uint32_t Weight = BPI ? BPI->getEdgeWeight(SI->getParent(), SuccIndex) : 0;
// Merge case into clusters
if (Cases.size() >= 2)
// Must recompute end() each iteration because it may be
// invalidated by erase if we hold on to it
for (CaseItr I = Cases.begin(), J = std::next(Cases.begin());
J != Cases.end(); ) {
const APInt& nextValue = J->Low->getValue();
const APInt& currentValue = I->High->getValue();
MachineBasicBlock* nextBB = J->BB;
MachineBasicBlock* currentBB = I->BB;
// If the two neighboring cases go to the same destination, merge them
// into a single case.
if ((nextValue - currentValue == 1) && (currentBB == nextBB)) {
I->High = J->High;
I->ExtraWeight += J->ExtraWeight;
J = Cases.erase(J);
} else {
I = J++;
}
if (PreviousSucc == Succ &&
(CaseVal->getValue() - Cases.back().High->getValue()) == 1) {
// If this case has the same successor and is a neighbour, merge it into
// the previous cluster.
Cases.back().High = CaseVal;
Cases.back().ExtraWeight += Weight;
} else {
Cases.push_back(Case(CaseVal, CaseVal, Succ, Weight));
}
PreviousSucc = Succ;
}
DEBUG({
size_t numCmps = 0;
for (auto &I : Cases)
@ -2715,7 +2712,7 @@ void SelectionDAGBuilder::visitSwitch(const SwitchInst &SI) {
// Create a vector of Cases, sorted so that we can efficiently create a binary
// search tree from them.
CaseVector Cases;
Clusterify(Cases, SI);
Clusterify(Cases, &SI);
// Get the default destination MBB.
MachineBasicBlock *Default = FuncInfo.MBBMap[SI.getDefaultDest()];

12
lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h
View File

@ -190,21 +190,15 @@ private:
typedef std::vector<CaseRec> CaseRecVector;
/// The comparison function for sorting the switch case values in the vector.
/// WARNING: Case ranges should be disjoint!
struct CaseCmp {
bool operator()(const Case &C1, const Case &C2) {
return C1.Low->getValue().slt(C2.High->getValue());
}
};
struct CaseBitsCmp {
bool operator()(const CaseBits &C1, const CaseBits &C2) {
return C1.Bits > C2.Bits;
}
};
void Clusterify(CaseVector &Cases, const SwitchInst &SI);
/// Populate Cases with the cases in SI, clustering adjacent cases with the
/// same destination together.
void Clusterify(CaseVector &Cases, const SwitchInst *SI);
/// CaseBlock - This structure is used to communicate between
/// SelectionDAGBuilder and SDISel for the code generation of additional basic