[llvm-commits] [llvm] r159703 - 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 22:53:05 PDT 2012
Author: dyatkovskiy
Date: Wed Jul 4 00:53:05 2012
New Revision: 159703
URL: http://llvm.org/viewvc/llvm-project?rev=159703&view=rev
Log:
Reverted r156659, due to probable performance regressions, DenseMap should be used here:
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=159703&r1=159702&r2=159703&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/IntegersSubsetMapping.h (original)
+++ llvm/trunk/include/llvm/Support/IntegersSubsetMapping.h Wed Jul 4 00:53:05 2012
@@ -58,15 +58,22 @@
protected:
- typedef std::map<RangeEx, SuccessorClass*> CaseItems;
+ typedef std::list<Cluster> 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) {
@@ -85,6 +92,18 @@
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,
@@ -282,7 +301,10 @@
typedef std::list<Case> Cases;
typedef typename Cases::iterator CasesIt;
- IntegersSubsetMapping() : SingleNumbersOnly(true) {}
+ IntegersSubsetMapping() {
+ Sorted = false;
+ SingleNumbersOnly = true;
+ }
bool verify() {
RangeIterator DummyErrItem;
@@ -292,6 +314,7 @@
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) {
@@ -332,6 +355,7 @@
void optimize() {
if (Items.size() < 2)
return;
+ sort();
CaseItems OldItems = Items;
Items.clear();
const IntTy *Low = &OldItems.begin()->first.getLow();
@@ -356,6 +380,8 @@
}
RangeEx R(*Low, *High, Weight);
add(R, Successor);
+ // We recollected the Items, but we kept it sorted.
+ Sorted = true;
}
/// Adds a constant value.
@@ -374,7 +400,7 @@
add(REx, S);
}
void add(const RangeEx &R, SuccessorClass *S = 0) {
- Items.insert(std::make_pair(R, S));
+ Items.push_back(std::make_pair(R, S));
if (!R.isSingleNumber())
SingleNumbersOnly = false;
}
@@ -389,7 +415,7 @@
}
void add(self& RHS) {
- Items.insert(RHS.Items.begin(), RHS.Items.end());
+ Items.insert(Items.end(), 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=159703&r1=159702&r2=159703&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Wed Jul 4 00:53:05 2012
@@ -2450,23 +2450,22 @@
size_t numCmps = 0;
for (Clusterifier::RangeIterator i = TheClusterifier.begin(),
e = TheClusterifier.end(); i != e; ++i, ++numCmps) {
- const Clusterifier::RangeEx &R = i->first;
- MachineBasicBlock *MBB = i->second;
+ Clusterifier::Cluster &C = *i;
unsigned W = 0;
if (BPI) {
- W = BPI->getEdgeWeight(SI.getParent(), MBB->getBasicBlock());
+ W = BPI->getEdgeWeight(SI.getParent(), C.second->getBasicBlock());
if (!W)
W = 16;
- W *= R.Weight;
- BPI->setEdgeWeight(SI.getParent(), MBB->getBasicBlock(), W);
+ W *= C.first.Weight;
+ BPI->setEdgeWeight(SI.getParent(), C.second->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(R.getLow().toConstantInt(),
- R.getHigh().toConstantInt(), MBB, W));
+ Cases.push_back(Case(C.first.getLow().toConstantInt(),
+ C.first.getHigh().toConstantInt(), C.second, W));
- if (R.getLow() != R.getHigh())
+ if (C.first.getLow() != C.first.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=159703&r1=159702&r2=159703&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/LowerSwitch.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/LowerSwitch.cpp Wed Jul 4 00:53:05 2012
@@ -238,14 +238,13 @@
size_t numCmps = 0;
for (IntegersSubsetToBB::RangeIterator i = TheClusterifier.begin(),
e = TheClusterifier.end(); i != e; ++i, ++numCmps) {
- const IntegersSubsetToBB::RangeTy &R = i->first;
- BasicBlock *S = i->second;
+ IntegersSubsetToBB::Cluster &C = *i;
// FIXME: Currently work with ConstantInt based numbers.
// Changing it to APInt based is a pretty heavy for this commit.
- Cases.push_back(CaseRange(R.getLow().toConstantInt(),
- R.getHigh().toConstantInt(), S));
- if (R.isSingleNumber())
+ Cases.push_back(CaseRange(C.first.getLow().toConstantInt(),
+ C.first.getHigh().toConstantInt(), C.second));
+ if (C.first.isSingleNumber())
// A range counts double, since it requires two compares.
++numCmps;
}
More information about the llvm-commits
mailing list