[llvm-commits] [poolalloc] r120548 - in /poolalloc/trunk/lib/DSA: BottomUpClosure.cpp EquivClassGraphs.cpp

[Arushi Aggarwal]

Author: aggarwa4
Date: Tue Nov 30 21:25:06 2010
New Revision: 120548

URL: http://llvm.org/viewvc/llvm-project?rev=120548&view=rev
Log:
BU - formatting
EQBU - merge information back from globals into
the function graphs at the end of merging of 
graphs.

Modified:
    poolalloc/trunk/lib/DSA/BottomUpClosure.cpp
    poolalloc/trunk/lib/DSA/EquivClassGraphs.cpp

Modified: poolalloc/trunk/lib/DSA/BottomUpClosure.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/BottomUpClosure.cpp?rev=120548&r1=120547&r2=120548&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/BottomUpClosure.cpp (original)
+++ poolalloc/trunk/lib/DSA/BottomUpClosure.cpp Tue Nov 30 21:25:06 2010
@@ -397,7 +397,7 @@
 	  << F->getName() << "\n");
     Stack.pop_back();
     DEBUG(errs() << "  [BU] Calculating graph for: " << F->getName()<< "\n");
-    calculateGraph (Graph);
+    calculateGraph(Graph);
     DEBUG(errs() << "  [BU] Done inlining: " << F->getName() << " ["
 	  << Graph->getGraphSize() << "+" << Graph->getAuxFunctionCalls().size()
 	  << "]\n");
@@ -407,7 +407,7 @@
     //
     // Should we revisit the graph?  Only do it if there are now new resolvable
     // callees.
-    getAllAuxCallees (Graph, CalleeFunctions);
+    getAllAuxCallees(Graph, CalleeFunctions);
     if (!CalleeFunctions.empty()) {
       DEBUG(errs() << "Recalculating " << F->getName() << " due to new knowledge\n");
       ValMap.erase(F);

Modified: poolalloc/trunk/lib/DSA/EquivClassGraphs.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/EquivClassGraphs.cpp?rev=120548&r1=120547&r2=120548&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/EquivClassGraphs.cpp (original)
+++ poolalloc/trunk/lib/DSA/EquivClassGraphs.cpp Tue Nov 30 21:25:06 2010
@@ -66,6 +66,15 @@
     delete (*i);
   }
 
+  formGlobalECs();
+  for (Module::iterator F = M.begin(); F != M.end(); ++F) {
+    if (!(F->isDeclaration())) {
+      if (DSGraph * Graph = getOrCreateGraph(F)) {
+        cloneGlobalsInto (Graph);
+      }
+    }
+  }
+  
   DEBUG(verifyMerging());
   bool result = runOnModuleInternal(M);