From 8b9ecca42d2bc2c9d3741d3a15a2fb306b821ab1 Mon Sep 17 00:00:00 2001 From: Stepan Dyatkovskiy Date: Mon, 2 Jul 2012 13:02:18 +0000 Subject: 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 llvm-svn: 159527 --- llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'llvm/lib/CodeGen/SelectionDAG') diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index 957d00ac32b..72e57696ded 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -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; } -- cgit v1.2.3