diff options
author | Duncan Sands <baldrick@free.fr> | 2008-09-29 14:59:04 +0000 |
---|---|---|
committer | Duncan Sands <baldrick@free.fr> | 2008-09-29 14:59:04 +0000 |
commit | 6cccf03d02936e16319e7cebf7a158643a8b1040 (patch) | |
tree | 8ae433f42948bc350a0270335f782df9c19f75f7 /lib | |
parent | 5ed3b894c913b0d4f4a0f3bd47f3ea1adf6eb52e (diff) | |
download | external_llvm-6cccf03d02936e16319e7cebf7a158643a8b1040.zip external_llvm-6cccf03d02936e16319e7cebf7a158643a8b1040.tar.gz external_llvm-6cccf03d02936e16319e7cebf7a158643a8b1040.tar.bz2 |
Speed up these passes when the callgraph has
huge simply connected components. Suggested
by Chris.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@56787 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Transforms/IPO/AddReadAttrs.cpp | 11 | ||||
-rw-r--r-- | lib/Transforms/IPO/PruneEH.cpp | 9 |
2 files changed, 16 insertions, 4 deletions
diff --git a/lib/Transforms/IPO/AddReadAttrs.cpp b/lib/Transforms/IPO/AddReadAttrs.cpp index b70bdaf..4c6158c 100644 --- a/lib/Transforms/IPO/AddReadAttrs.cpp +++ b/lib/Transforms/IPO/AddReadAttrs.cpp @@ -19,6 +19,7 @@ #include "llvm/CallGraphSCCPass.h" #include "llvm/Instructions.h" #include "llvm/Analysis/CallGraph.h" +#include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/Statistic.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/InstIterator.h" @@ -45,8 +46,14 @@ Pass *llvm::createAddReadAttrsPass() { return new AddReadAttrs(); } bool AddReadAttrs::runOnSCC(const std::vector<CallGraphNode *> &SCC) { + SmallPtrSet<CallGraphNode *, 8> SCCNodes; CallGraph &CG = getAnalysis<CallGraph>(); + // Fill SCCNodes with the elements of the SCC. Used for quickly + // looking up whether a given CallGraphNode is in this SCC. + for (unsigned i = 0, e = SCC.size(); i != e; ++i) + SCCNodes.insert(SCC[i]); + // Check if any of the functions in the SCC read or write memory. If they // write memory then they can't be marked readnone or readonly. bool ReadsMemory = false; @@ -77,9 +84,7 @@ bool AddReadAttrs::runOnSCC(const std::vector<CallGraphNode *> &SCC) { CallSite CS = CallSite::get(&*II); // Ignore calls to functions in the same SCC. - if (CS.getInstruction() && - std::find(SCC.begin(), SCC.end(), CG[CS.getCalledFunction()]) != - SCC.end()) + if (CS.getInstruction() && SCCNodes.count(CG[CS.getCalledFunction()])) continue; if (II->mayWriteToMemory()) diff --git a/lib/Transforms/IPO/PruneEH.cpp b/lib/Transforms/IPO/PruneEH.cpp index adaa9c1..c7a4b97 100644 --- a/lib/Transforms/IPO/PruneEH.cpp +++ b/lib/Transforms/IPO/PruneEH.cpp @@ -21,6 +21,7 @@ #include "llvm/Function.h" #include "llvm/Instructions.h" #include "llvm/Analysis/CallGraph.h" +#include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/Statistic.h" #include "llvm/Support/CFG.h" @@ -53,9 +54,15 @@ Pass *llvm::createPruneEHPass() { return new PruneEH(); } bool PruneEH::runOnSCC(const std::vector<CallGraphNode *> &SCC) { + SmallPtrSet<CallGraphNode *, 8> SCCNodes; CallGraph &CG = getAnalysis<CallGraph>(); bool MadeChange = false; + // Fill SCCNodes with the elements of the SCC. Used for quickly + // looking up whether a given CallGraphNode is in this SCC. + for (unsigned i = 0, e = SCC.size(); i != e; ++i) + SCCNodes.insert(SCC[i]); + // First pass, scan all of the functions in the SCC, simplifying them // according to what we know. for (unsigned i = 0, e = SCC.size(); i != e; ++i) @@ -107,7 +114,7 @@ bool PruneEH::runOnSCC(const std::vector<CallGraphNode *> &SCC) { CallGraphNode *CalleeNode = CG[Callee]; // If the callee is outside our current SCC then we may // throw because it might. - if (std::find(SCC.begin(), SCC.end(), CalleeNode) == SCC.end()){ + if (!SCCNodes.count(CalleeNode)) { SCCMightUnwind = true; break; } |