[llvm-commits] [llvm] r159659 - in /llvm/trunk: include/llvm/Support/IntegersSubsetMapping.h lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp lib/Transforms/Utils/LowerSwitch.cpp
Stepan Dyatkovskiy
stpworld at narod.ru
Tue Jul 3 06:46:45 PDT 2012
Author: dyatkovskiy
Date: Tue Jul 3 08:46:45 2012
New Revision: 159659
URL: http://llvm.org/viewvc/llvm-project?rev=159659&view=rev
Log:
Part of r159527. Splitted into series of patches and gone with fixed PR13256:
IntegersSubsetMapping
- Replaced type of Items field from std::list with std::map. In neares future I'll test it with DenseMap and do the correspond replacement
if possible.
Modified:
llvm/trunk/include/llvm/Support/IntegersSubsetMapping.h
llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
llvm/trunk/lib/Transforms/Utils/LowerSwitch.cpp
Modified: llvm/trunk/include/llvm/Support/IntegersSubsetMapping.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/IntegersSubsetMapping.h?rev=159659&r1=159658&r2=159659&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/IntegersSubsetMapping.h (original)
+++ llvm/trunk/include/llvm/Support/IntegersSubsetMapping.h Tue Jul 3 08:46:45 2012
@@ -58,22 +58,15 @@
protected:
- typedef std::list<Cluster> CaseItems;
+ typedef std::map<RangeEx, SuccessorClass*> CaseItems;
typedef typename CaseItems::iterator CaseItemIt;
typedef typename CaseItems::const_iterator CaseItemConstIt;
// TODO: Change unclean CRS prefixes to SubsetMap for example.
typedef std::map<SuccessorClass*, RangesCollection > CRSMap;
typedef typename CRSMap::iterator CRSMapIt;
-
- struct ClustersCmp {
- bool operator()(const Cluster &C1, const Cluster &C2) {
- return C1.first < C2.first;
- }
- };
CaseItems Items;
- bool Sorted;
bool SingleNumbersOnly;
bool isIntersected(CaseItemIt& LItem, CaseItemIt& RItem) {
@@ -92,18 +85,6 @@
return LItem->first.getHigh() >= RLow;
}
- void sort() {
- if (!Sorted) {
- std::vector<Cluster> clustersVector;
- clustersVector.reserve(Items.size());
- clustersVector.insert(clustersVector.begin(), Items.begin(), Items.end());
- std::sort(clustersVector.begin(), clustersVector.end(), ClustersCmp());
- Items.clear();
- Items.insert(Items.begin(), clustersVector.begin(), clustersVector.end());
- Sorted = true;
- }
- }
-
enum DiffProcessState {
L_OPENED,
INTERSECT_OPENED,
@@ -300,15 +281,11 @@
typedef std::pair<SuccessorClass*, IntegersSubsetTy> Case;
typedef std::list<Case> Cases;
- IntegersSubsetMapping() {
- Sorted = false;
- SingleNumbersOnly = true;
- }
+ IntegersSubsetMapping() : SingleNumbersOnly(true) {}
bool verify(RangeIterator& errItem) {
if (Items.empty())
return true;
- sort();
for (CaseItemIt j = Items.begin(), i = j++, e = Items.end();
j != e; i = j++) {
if (isIntersected(i, j) && i->second != j->second) {
@@ -318,11 +295,10 @@
}
return true;
}
-
+
void optimize() {
if (Items.size() < 2)
return;
- sort();
CaseItems OldItems = Items;
Items.clear();
const IntTy *Low = &OldItems.begin()->first.getLow();
@@ -347,8 +323,6 @@
}
RangeEx R(*Low, *High, Weight);
add(R, Successor);
- // We recollected the Items, but we kept it sorted.
- Sorted = true;
}
/// Adds a constant value.
@@ -367,7 +341,7 @@
add(REx, S);
}
void add(const RangeEx &R, SuccessorClass *S = 0) {
- Items.push_back(std::make_pair(R, S));
+ Items.insert(std::make_pair(R, S));
if (!R.isSingleNumber())
SingleNumbersOnly = false;
}
@@ -382,7 +356,7 @@
}
void add(self& RHS) {
- Items.insert(Items.end(), RHS.Items.begin(), RHS.Items.end());
+ Items.insert(RHS.Items.begin(), RHS.Items.end());
if (!RHS.SingleNumbersOnly)
SingleNumbersOnly = false;
}
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=159659&r1=159658&r2=159659&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Tue Jul 3 08:46:45 2012
@@ -2450,22 +2450,23 @@
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;
}
Modified: llvm/trunk/lib/Transforms/Utils/LowerSwitch.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/LowerSwitch.cpp?rev=159659&r1=159658&r2=159659&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/LowerSwitch.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/LowerSwitch.cpp Tue Jul 3 08:46:45 2012
@@ -238,13 +238,14 @@
size_t numCmps = 0;
for (IntegersSubsetToBB::RangeIterator i = TheClusterifier.begin(),
e = TheClusterifier.end(); i != e; ++i, ++numCmps) {
- IntegersSubsetToBB::Cluster &C = *i;
+ const IntegersSubsetToBB::RangeTy &R = i->first;
+ BasicBlock *S = i->second;
// FIXME: Currently work with ConstantInt based numbers.
// Changing it to APInt based is a pretty heavy for this commit.
- Cases.push_back(CaseRange(C.first.getLow().toConstantInt(),
- C.first.getHigh().toConstantInt(), C.second));
- if (C.first.isSingleNumber())
+ Cases.push_back(CaseRange(R.getLow().toConstantInt(),
+ R.getHigh().toConstantInt(), S));
+ if (R.isSingleNumber())
// A range counts double, since it requires two compares.
++numCmps;
}
More information about the llvm-commits
mailing list