[llvm-commits] CVS: llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp CallTargets.cpp CompleteBottomUp.cpp DataStructure.cpp DataStructureOpt.cpp DataStructureStats.cpp EquivClassGraphs.cpp Printer.cpp TopDownClosure.cpp

Chris Lattner sabre at nondot.org
Wed Dec 6 09:47:31 PST 2006



Changes in directory llvm/lib/Analysis/DataStructure:

BottomUpClosure.cpp updated: 1.125 -> 1.126
CallTargets.cpp updated: 1.5 -> 1.6
CompleteBottomUp.cpp updated: 1.38 -> 1.39
DataStructure.cpp updated: 1.252 -> 1.253
DataStructureOpt.cpp updated: 1.13 -> 1.14
DataStructureStats.cpp updated: 1.22 -> 1.23
EquivClassGraphs.cpp updated: 1.51 -> 1.52
Printer.cpp updated: 1.89 -> 1.90
TopDownClosure.cpp updated: 1.94 -> 1.95
---
Log message:

Detemplatize the Statistic class.  The only type it is instantiated with
is 'unsigned'.



---
Diffs of the changes:  (+26 -26)

 BottomUpClosure.cpp    |    6 +++---
 CallTargets.cpp        |    8 ++++----
 CompleteBottomUp.cpp   |    2 +-
 DataStructure.cpp      |   12 ++++++------
 DataStructureOpt.cpp   |    4 ++--
 DataStructureStats.cpp |   10 +++++-----
 EquivClassGraphs.cpp   |    4 ++--
 Printer.cpp            |    4 ++--
 TopDownClosure.cpp     |    2 +-
 9 files changed, 26 insertions(+), 26 deletions(-)


Index: llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp
diff -u llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp:1.125 llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp:1.126
--- llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp:1.125	Tue Nov 28 17:33:06 2006
+++ llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp	Wed Dec  6 11:46:31 2006
@@ -26,9 +26,9 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> MaxSCC("budatastructure", "Maximum SCC Size in Call Graph");
-  Statistic<> NumBUInlines("budatastructures", "Number of graphs inlined");
-  Statistic<> NumCallEdges("budatastructures", "Number of 'actual' call edges");
+  Statistic MaxSCC("budatastructure", "Maximum SCC Size in Call Graph");
+  Statistic NumBUInlines("budatastructures", "Number of graphs inlined");
+  Statistic NumCallEdges("budatastructures", "Number of 'actual' call edges");
 
   cl::opt<bool>
   AddGlobals("budatastructures-annotate-calls", cl::Hidden,


Index: llvm/lib/Analysis/DataStructure/CallTargets.cpp
diff -u llvm/lib/Analysis/DataStructure/CallTargets.cpp:1.5 llvm/lib/Analysis/DataStructure/CallTargets.cpp:1.6
--- llvm/lib/Analysis/DataStructure/CallTargets.cpp:1.5	Tue Nov 28 17:33:06 2006
+++ llvm/lib/Analysis/DataStructure/CallTargets.cpp	Wed Dec  6 11:46:31 2006
@@ -29,10 +29,10 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> DirCall("calltarget", "Number of direct calls");
-  Statistic<> IndCall("calltarget", "Number of indirect calls");
-  Statistic<> CompleteInd("calltarget", "Number of complete indirect calls");
-  Statistic<> CompleteEmpty("calltarget", "Number of complete empty calls");
+  Statistic DirCall("calltarget", "Number of direct calls");
+  Statistic IndCall("calltarget", "Number of indirect calls");
+  Statistic CompleteInd("calltarget", "Number of complete indirect calls");
+  Statistic CompleteEmpty("calltarget", "Number of complete empty calls");
 
   RegisterPass<CallTargetFinder> X("calltarget","Find Call Targets (uses DSA)");
 }


Index: llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp
diff -u llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp:1.38 llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp:1.39
--- llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp:1.38	Fri Nov 17 01:33:59 2006
+++ llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp	Wed Dec  6 11:46:31 2006
@@ -26,7 +26,7 @@
 namespace {
   RegisterPass<CompleteBUDataStructures>
   X("cbudatastructure", "'Complete' Bottom-up Data Structure Analysis");
-  Statistic<> NumCBUInlines("cbudatastructures", "Number of graphs inlined");
+  Statistic NumCBUInlines("cbudatastructures", "Number of graphs inlined");
 }
 
 


Index: llvm/lib/Analysis/DataStructure/DataStructure.cpp
diff -u llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.252 llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.253
--- llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.252	Tue Nov 28 17:33:06 2006
+++ llvm/lib/Analysis/DataStructure/DataStructure.cpp	Wed Dec  6 11:46:31 2006
@@ -34,12 +34,12 @@
 #define COLLAPSE_ARRAYS_AGGRESSIVELY 0
 
 namespace {
-  Statistic<> NumFolds          ("dsa", "Number of nodes completely folded");
-  Statistic<> NumCallNodesMerged("dsa", "Number of call nodes merged");
-  Statistic<> NumNodeAllocated  ("dsa", "Number of nodes allocated");
-  Statistic<> NumDNE            ("dsa", "Number of nodes removed by reachability");
-  Statistic<> NumTrivialDNE     ("dsa", "Number of nodes trivially removed");
-  Statistic<> NumTrivialGlobalDNE("dsa", "Number of globals trivially removed");
+  Statistic NumFolds          ("dsa", "Number of nodes completely folded");
+  Statistic NumCallNodesMerged("dsa", "Number of call nodes merged");
+  Statistic NumNodeAllocated  ("dsa", "Number of nodes allocated");
+  Statistic NumDNE            ("dsa", "Number of nodes removed by reachability");
+  Statistic NumTrivialDNE     ("dsa", "Number of nodes trivially removed");
+  Statistic NumTrivialGlobalDNE("dsa", "Number of globals trivially removed");
   static cl::opt<unsigned>
   DSAFieldLimit("dsa-field-limit", cl::Hidden,
                 cl::desc("Number of fields to track before collapsing a node"),


Index: llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp
diff -u llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp:1.13 llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp:1.14
--- llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp:1.13	Sun Aug 27 17:42:51 2006
+++ llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp	Wed Dec  6 11:46:31 2006
@@ -22,9 +22,9 @@
 using namespace llvm;
 
 namespace {
-  Statistic<>
+  Statistic
   NumGlobalsConstanted("ds-opt", "Number of globals marked constant");
-  Statistic<>
+  Statistic
   NumGlobalsIsolated("ds-opt", "Number of globals with references dropped");
 
   class DSOpt : public ModulePass {


Index: llvm/lib/Analysis/DataStructure/DataStructureStats.cpp
diff -u llvm/lib/Analysis/DataStructure/DataStructureStats.cpp:1.22 llvm/lib/Analysis/DataStructure/DataStructureStats.cpp:1.23
--- llvm/lib/Analysis/DataStructure/DataStructureStats.cpp:1.22	Tue Nov 28 17:33:06 2006
+++ llvm/lib/Analysis/DataStructure/DataStructureStats.cpp	Wed Dec  6 11:46:31 2006
@@ -23,19 +23,19 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> TotalNumCallees("totalcallees",
+  Statistic TotalNumCallees("totalcallees",
                 "Total number of callee functions at all indirect call sites");
-  Statistic<> NumIndirectCalls("numindirect",
+  Statistic NumIndirectCalls("numindirect",
                 "Total number of indirect call sites in the program");
-  Statistic<> NumPoolNodes("numpools",
+  Statistic NumPoolNodes("numpools",
                   "Number of allocation nodes that could be pool allocated");
 
   // Typed/Untyped memory accesses: If DSA can infer that the types the loads
   // and stores are accessing are correct (ie, the node has not been collapsed),
   // increment the appropriate counter.
-  Statistic<> NumTypedMemAccesses("numtypedmemaccesses",
+  Statistic NumTypedMemAccesses("numtypedmemaccesses",
                                 "Number of loads/stores which are fully typed");
-  Statistic<> NumUntypedMemAccesses("numuntypedmemaccesses",
+  Statistic NumUntypedMemAccesses("numuntypedmemaccesses",
                                 "Number of loads/stores which are untyped");
 
   class DSGraphStats : public FunctionPass, public InstVisitor<DSGraphStats> {


Index: llvm/lib/Analysis/DataStructure/EquivClassGraphs.cpp
diff -u llvm/lib/Analysis/DataStructure/EquivClassGraphs.cpp:1.51 llvm/lib/Analysis/DataStructure/EquivClassGraphs.cpp:1.52
--- llvm/lib/Analysis/DataStructure/EquivClassGraphs.cpp:1.51	Tue Nov 28 17:33:06 2006
+++ llvm/lib/Analysis/DataStructure/EquivClassGraphs.cpp	Wed Dec  6 11:46:31 2006
@@ -31,9 +31,9 @@
 namespace {
   RegisterPass<EquivClassGraphs> X("eqdatastructure",
                     "Equivalence-class Bottom-up Data Structure Analysis");
-  Statistic<> NumEquivBUInlines("equivdatastructures",
+  Statistic NumEquivBUInlines("equivdatastructures",
                                 "Number of graphs inlined");
-  Statistic<> NumFoldGraphInlines("Inline equiv-class graphs bottom up",
+  Statistic NumFoldGraphInlines("Inline equiv-class graphs bottom up",
                                   "Number of graphs inlined");
 }
 


Index: llvm/lib/Analysis/DataStructure/Printer.cpp
diff -u llvm/lib/Analysis/DataStructure/Printer.cpp:1.89 llvm/lib/Analysis/DataStructure/Printer.cpp:1.90
--- llvm/lib/Analysis/DataStructure/Printer.cpp:1.89	Wed Dec  6 00:16:21 2006
+++ llvm/lib/Analysis/DataStructure/Printer.cpp	Wed Dec  6 11:46:31 2006
@@ -33,8 +33,8 @@
 namespace {
   cl::opt<bool> OnlyPrintMain("only-print-main-ds", cl::ReallyHidden);
   cl::opt<bool> DontPrintAnything("dont-print-ds", cl::ReallyHidden);
-  Statistic<> MaxGraphSize   ("dsa", "Maximum graph size");
-  Statistic<> NumFoldedNodes ("dsa", "Number of folded nodes (in final graph)");
+  Statistic MaxGraphSize   ("dsa", "Maximum graph size");
+  Statistic NumFoldedNodes ("dsa", "Number of folded nodes (in final graph)");
 }
 
 void DSNode::dump() const { print(llvm_cerr, 0); }


Index: llvm/lib/Analysis/DataStructure/TopDownClosure.cpp
diff -u llvm/lib/Analysis/DataStructure/TopDownClosure.cpp:1.94 llvm/lib/Analysis/DataStructure/TopDownClosure.cpp:1.95
--- llvm/lib/Analysis/DataStructure/TopDownClosure.cpp:1.94	Fri Nov 17 01:33:59 2006
+++ llvm/lib/Analysis/DataStructure/TopDownClosure.cpp	Wed Dec  6 11:46:31 2006
@@ -34,7 +34,7 @@
   RegisterPass<TDDataStructures>   // Register the pass
   Y("tddatastructure", "Top-down Data Structure Analysis");
 
-  Statistic<> NumTDInlines("tddatastructures", "Number of graphs inlined");
+  Statistic NumTDInlines("tddatastructures", "Number of graphs inlined");
 }
 
 void TDDataStructures::markReachableFunctionsExternallyAccessible(DSNode *N,






More information about the llvm-commits mailing list