IntRange:

- Changed isSingleNumber method behaviour. Now this flag is calculated on demand.
IntegersSubsetMapping
  - Optimized diff operation.
  - Replaced type of Items field from std::list with std::map.
  - Added new methods:
    bool isOverlapped(self &RHS)
    void add(self& RHS, SuccessorClass *S)
    void detachCase(self& NewMapping, SuccessorClass *Succ)
    void removeCase(SuccessorClass *Succ)
    SuccessorClass *findSuccessor(const IntTy& Val)
    const IntTy* getCaseSingleNumber(SuccessorClass *Succ)
IntegersSubsetTest
  - DiffTest: Added checks for successors.
SimplifyCFG
  Updated SwitchInst usage (now it is case-ragnes compatible) for
    - SimplifyEqualityComparisonWithOnlyPredecessor
    - FoldValueComparisonIntoPredecessors



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159527 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Stepan Dyatkovskiy
2012-07-02 13:02:18 +00:00
parent 4177e6fff5
commit b2833d9dcb
7 changed files with 328 additions and 210 deletions

View File

@ -2450,22 +2450,23 @@ size_t SelectionDAGBuilder::Clusterify(CaseVector& Cases,
size_t numCmps = 0;
for (Clusterifier::RangeIterator i = TheClusterifier.begin(),
e = TheClusterifier.end(); i != e; ++i, ++numCmps) {
Clusterifier::Cluster &C = *i;
const Clusterifier::RangeEx &R = i->first;
MachineBasicBlock *MBB = i->second;
unsigned W = 0;
if (BPI) {
W = BPI->getEdgeWeight(SI.getParent(), C.second->getBasicBlock());
W = BPI->getEdgeWeight(SI.getParent(), MBB->getBasicBlock());
if (!W)
W = 16;
W *= C.first.Weight;
BPI->setEdgeWeight(SI.getParent(), C.second->getBasicBlock(), W);
W *= R.Weight;
BPI->setEdgeWeight(SI.getParent(), MBB->getBasicBlock(), W);
}
// FIXME: Currently work with ConstantInt based numbers.
// Changing it to APInt based is a pretty heavy for this commit.
Cases.push_back(Case(C.first.getLow().toConstantInt(),
C.first.getHigh().toConstantInt(), C.second, W));
Cases.push_back(Case(R.getLow().toConstantInt(),
R.getHigh().toConstantInt(), MBB, W));
if (C.first.getLow() != C.first.getHigh())
if (R.getLow() != R.getHigh())
// A range counts double, since it requires two compares.
++numCmps;
}