[llvm-commits] [llvm] r56787 - in /llvm/trunk/lib/Transforms/IPO: AddReadAttrs.cpp PruneEH.cpp

[Duncan Sands]

Author: baldrick
Date: Mon Sep 29 09:59:04 2008
New Revision: 56787

URL: http://llvm.org/viewvc/llvm-project?rev=56787&view=rev
Log:
Speed up these passes when the callgraph has
huge simply connected components.  Suggested
by Chris.

Modified:
    llvm/trunk/lib/Transforms/IPO/AddReadAttrs.cpp
    llvm/trunk/lib/Transforms/IPO/PruneEH.cpp

Modified: llvm/trunk/lib/Transforms/IPO/AddReadAttrs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/AddReadAttrs.cpp?rev=56787&r1=56786&r2=56787&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/AddReadAttrs.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/AddReadAttrs.cpp Mon Sep 29 09:59:04 2008
@@ -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 @@
 
 
 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 @@
       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())

Modified: llvm/trunk/lib/Transforms/IPO/PruneEH.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/PruneEH.cpp?rev=56787&r1=56786&r2=56787&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/PruneEH.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/PruneEH.cpp Mon Sep 29 09:59:04 2008
@@ -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 @@
 
 
 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 @@
                 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;
                 }