From 6cccf03d02936e16319e7cebf7a158643a8b1040 Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Mon, 29 Sep 2008 14:59:04 +0000 Subject: [PATCH] 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 --- lib/Transforms/IPO/AddReadAttrs.cpp | 11 ++++++++--- 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 b70bdaf763a..4c6158c65e8 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 &SCC) { + SmallPtrSet SCCNodes; CallGraph &CG = getAnalysis(); + // 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 &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 adaa9c16809..c7a4b9766a5 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 &SCC) { + SmallPtrSet SCCNodes; CallGraph &CG = getAnalysis(); 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 &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; }