replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add a cache that protects mergefunc's internals from more surprises in DenseSet. 

Also, replace tabs with spaces. Yes, it's 2011.

llvm-svn: 123535
This commit is contained in:
Nick Lewycky 2011-01-15 10:16:23 +00:00
parent 367f98f000
commit 540f9536c8
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
llvm/lib/Transforms/IPO/MergeFunctions.cpp
View File

@ -109,10 +109,23 @@ public:
Func = NULL;
}
bool &getOrInsertCachedComparison(const ComparableFunction &Other,
bool &inserted) const {
typedef DenseMap<Function *, bool>::iterator iterator;
std::pair<iterator, bool> p =
CompareResultCache.insert(std::make_pair(Other.getFunc(), false));
inserted = p.second;
return p.first->second;
}
private:
explicit ComparableFunction(unsigned Hash)
: Func(NULL), Hash(Hash), TD(NULL) {}
// DenseMap::grow() triggers a recomparison of all keys in the map, which is
// wildly expensive. This cache tries to preserve known results.
mutable DenseMap<Function *, bool> CompareResultCache;
AssertingVH<Function> Func;
unsigned Hash;
TargetData *TD;
@ -708,10 +721,10 @@ void MergeFunctions::RemoveUsers(Value *V) {
if (Instruction *I = dyn_cast<Instruction>(U.getUser())) {
Remove(I->getParent()->getParent());
} else if (isa<GlobalValue>(U.getUser())) {
// do nothing
// do nothing
} else if (Constant *C = dyn_cast<Constant>(U.getUser())) {
for (Value::use_iterator CUI = C->use_begin(), CUE = C->use_end();
CUI != CUE; ++CUI)
for (Value::use_iterator CUI = C->use_begin(), CUE = C->use_end();
CUI != CUE; ++CUI)
Worklist.push_back(*CUI);
}
}
@ -777,6 +790,15 @@ bool DenseMapInfo<ComparableFunction>::isEqual(const ComparableFunction &LHS,
return false;
assert(LHS.getTD() == RHS.getTD() &&
"Comparing functions for different targets");
return FunctionComparator(LHS.getTD(),
LHS.getFunc(), RHS.getFunc()).Compare();
bool inserted;
bool &result1 = LHS.getOrInsertCachedComparison(RHS, inserted);
if (!inserted)
return result1;
bool &result2 = RHS.getOrInsertCachedComparison(LHS, inserted);
if (!inserted)
return result1 = result2;
return result1 = result2 = FunctionComparator(LHS.getTD(), LHS.getFunc(),
RHS.getFunc()).Compare();
}