[llvm-commits] CVS: llvm/lib/Transforms/IPO/ArgumentPromotion.cpp ConstantMerge.cpp DeadArgumentElimination.cpp DeadTypeElimination.cpp FunctionResolution.cpp GlobalDCE.cpp GlobalOpt.cpp IPConstantPropagation.cpp IndMemRemoval.cpp Inliner.cpp Internalize.cpp LoopExtractor.cpp LowerSetJmp.cpp PruneEH.cpp RaiseAllocations.cpp SimplifyLibCalls.cpp

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



Changes in directory llvm/lib/Transforms/IPO:

ArgumentPromotion.cpp updated: 1.30 -> 1.31
ConstantMerge.cpp updated: 1.32 -> 1.33
DeadArgumentElimination.cpp updated: 1.30 -> 1.31
DeadTypeElimination.cpp updated: 1.56 -> 1.57
FunctionResolution.cpp updated: 1.60 -> 1.61
GlobalDCE.cpp updated: 1.38 -> 1.39
GlobalOpt.cpp updated: 1.76 -> 1.77
IPConstantPropagation.cpp updated: 1.19 -> 1.20
IndMemRemoval.cpp updated: 1.6 -> 1.7
Inliner.cpp updated: 1.33 -> 1.34
Internalize.cpp updated: 1.37 -> 1.38
LoopExtractor.cpp updated: 1.19 -> 1.20
LowerSetJmp.cpp updated: 1.32 -> 1.33
PruneEH.cpp updated: 1.24 -> 1.25
RaiseAllocations.cpp updated: 1.31 -> 1.32
SimplifyLibCalls.cpp updated: 1.73 -> 1.74
---
Log message:

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



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

 ArgumentPromotion.cpp       |    6 +++---
 ConstantMerge.cpp           |    2 +-
 DeadArgumentElimination.cpp |    4 ++--
 DeadTypeElimination.cpp     |    2 +-
 FunctionResolution.cpp      |    4 ++--
 GlobalDCE.cpp               |    4 ++--
 GlobalOpt.cpp               |   22 +++++++++++-----------
 IPConstantPropagation.cpp   |    4 ++--
 IndMemRemoval.cpp           |    4 ++--
 Inliner.cpp                 |    4 ++--
 Internalize.cpp             |    4 ++--
 LoopExtractor.cpp           |    2 +-
 LowerSetJmp.cpp             |    8 ++++----
 PruneEH.cpp                 |    4 ++--
 RaiseAllocations.cpp        |    2 +-
 SimplifyLibCalls.cpp        |    4 ++--
 16 files changed, 40 insertions(+), 40 deletions(-)


Index: llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
diff -u llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.30 llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.31
--- llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.30	Sun Nov 26 04:02:32 2006
+++ llvm/lib/Transforms/IPO/ArgumentPromotion.cpp	Wed Dec  6 11:46:32 2006
@@ -48,11 +48,11 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> NumArgumentsPromoted("argpromotion",
+  Statistic NumArgumentsPromoted("argpromotion",
                                    "Number of pointer arguments promoted");
-  Statistic<> NumAggregatesPromoted("argpromotion",
+  Statistic NumAggregatesPromoted("argpromotion",
                                     "Number of aggregate arguments promoted");
-  Statistic<> NumArgumentsDead("argpromotion",
+  Statistic NumArgumentsDead("argpromotion",
                                "Number of dead pointer args eliminated");
 
   /// ArgPromotion - The 'by reference' to 'by value' argument promotion pass.


Index: llvm/lib/Transforms/IPO/ConstantMerge.cpp
diff -u llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.32 llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.33
--- llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.32	Sun Aug 27 17:42:52 2006
+++ llvm/lib/Transforms/IPO/ConstantMerge.cpp	Wed Dec  6 11:46:32 2006
@@ -24,7 +24,7 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> NumMerged("constmerge", "Number of global constants merged");
+  Statistic NumMerged("constmerge", "Number of global constants merged");
 
   struct ConstantMerge : public ModulePass {
     // run - For this pass, process all of the globals in the module,


Index: llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
diff -u llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.30 llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.31
--- llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.30	Sun Nov 26 04:02:32 2006
+++ llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp	Wed Dec  6 11:46:32 2006
@@ -33,9 +33,9 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> NumArgumentsEliminated("deadargelim",
+  Statistic NumArgumentsEliminated("deadargelim",
                                      "Number of unread args removed");
-  Statistic<> NumRetValsEliminated("deadargelim",
+  Statistic NumRetValsEliminated("deadargelim",
                                    "Number of unused return values removed");
 
   /// DAE - The dead argument elimination pass.


Index: llvm/lib/Transforms/IPO/DeadTypeElimination.cpp
diff -u llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.56 llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.57
--- llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.56	Sun Aug 27 17:42:52 2006
+++ llvm/lib/Transforms/IPO/DeadTypeElimination.cpp	Wed Dec  6 11:46:32 2006
@@ -37,7 +37,7 @@
     }
   };
   RegisterPass<DTE> X("deadtypeelim", "Dead Type Elimination");
-  Statistic<>
+  Statistic
   NumKilled("deadtypeelim", "Number of unused typenames removed from symtab");
 }
 


Index: llvm/lib/Transforms/IPO/FunctionResolution.cpp
diff -u llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.60 llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.61
--- llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.60	Sun Aug 27 17:42:52 2006
+++ llvm/lib/Transforms/IPO/FunctionResolution.cpp	Wed Dec  6 11:46:32 2006
@@ -33,8 +33,8 @@
 using namespace llvm;
 
 namespace {
-  Statistic<>NumResolved("funcresolve", "Number of varargs functions resolved");
-  Statistic<> NumGlobals("funcresolve", "Number of global variables resolved");
+  Statistic NumResolved("funcresolve", "Number of varargs functions resolved");
+  Statistic NumGlobals("funcresolve", "Number of global variables resolved");
 
   struct FunctionResolvingPass : public ModulePass {
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {


Index: llvm/lib/Transforms/IPO/GlobalDCE.cpp
diff -u llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.38 llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.39
--- llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.38	Sun Aug 27 17:42:52 2006
+++ llvm/lib/Transforms/IPO/GlobalDCE.cpp	Wed Dec  6 11:46:32 2006
@@ -24,8 +24,8 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> NumFunctions("globaldce","Number of functions removed");
-  Statistic<> NumVariables("globaldce","Number of global variables removed");
+  Statistic NumFunctions("globaldce","Number of functions removed");
+  Statistic NumVariables("globaldce","Number of global variables removed");
 
   struct GlobalDCE : public ModulePass {
     // run - Do the GlobalDCE pass on the specified module, optionally updating


Index: llvm/lib/Transforms/IPO/GlobalOpt.cpp
diff -u llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.76 llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.77
--- llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.76	Thu Nov 30 11:35:08 2006
+++ llvm/lib/Transforms/IPO/GlobalOpt.cpp	Wed Dec  6 11:46:32 2006
@@ -32,21 +32,21 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> NumMarked   ("globalopt", "Number of globals marked constant");
-  Statistic<> NumSRA      ("globalopt", "Number of aggregate globals broken "
+  Statistic NumMarked   ("globalopt", "Number of globals marked constant");
+  Statistic NumSRA      ("globalopt", "Number of aggregate globals broken "
                            "into scalars");
-  Statistic<> NumHeapSRA  ("globalopt", "Number of heap objects SRA'd");
-  Statistic<> NumSubstitute("globalopt",
+  Statistic NumHeapSRA  ("globalopt", "Number of heap objects SRA'd");
+  Statistic NumSubstitute("globalopt",
                         "Number of globals with initializers stored into them");
-  Statistic<> NumDeleted  ("globalopt", "Number of globals deleted");
-  Statistic<> NumFnDeleted("globalopt", "Number of functions deleted");
-  Statistic<> NumGlobUses ("globalopt", "Number of global uses devirtualized");
-  Statistic<> NumLocalized("globalopt", "Number of globals localized");
-  Statistic<> NumShrunkToBool("globalopt",
+  Statistic NumDeleted  ("globalopt", "Number of globals deleted");
+  Statistic NumFnDeleted("globalopt", "Number of functions deleted");
+  Statistic NumGlobUses ("globalopt", "Number of global uses devirtualized");
+  Statistic NumLocalized("globalopt", "Number of globals localized");
+  Statistic NumShrunkToBool("globalopt",
                               "Number of global vars shrunk to booleans");
-  Statistic<> NumFastCallFns("globalopt",
+  Statistic NumFastCallFns("globalopt",
                              "Number of functions converted to fastcc");
-  Statistic<> NumCtorsEvaluated("globalopt","Number of static ctors evaluated");
+  Statistic NumCtorsEvaluated("globalopt","Number of static ctors evaluated");
 
   struct GlobalOpt : public ModulePass {
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {


Index: llvm/lib/Transforms/IPO/IPConstantPropagation.cpp
diff -u llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.19 llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.20
--- llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.19	Sun Aug 27 17:42:52 2006
+++ llvm/lib/Transforms/IPO/IPConstantPropagation.cpp	Wed Dec  6 11:46:32 2006
@@ -25,9 +25,9 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> NumArgumentsProped("ipconstprop",
+  Statistic NumArgumentsProped("ipconstprop",
                                  "Number of args turned into constants");
-  Statistic<> NumReturnValProped("ipconstprop",
+  Statistic NumReturnValProped("ipconstprop",
                               "Number of return values turned into constants");
 
   /// IPCP - The interprocedural constant propagation pass


Index: llvm/lib/Transforms/IPO/IndMemRemoval.cpp
diff -u llvm/lib/Transforms/IPO/IndMemRemoval.cpp:1.6 llvm/lib/Transforms/IPO/IndMemRemoval.cpp:1.7
--- llvm/lib/Transforms/IPO/IndMemRemoval.cpp:1.6	Sun Nov 26 19:05:10 2006
+++ llvm/lib/Transforms/IPO/IndMemRemoval.cpp	Wed Dec  6 11:46:32 2006
@@ -28,8 +28,8 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> NumBounceSites("indmemrem", "Number of sites modified");
-  Statistic<> NumBounce  ("indmemrem", "Number of bounce functions created");
+  Statistic NumBounceSites("indmemrem", "Number of sites modified");
+  Statistic NumBounce  ("indmemrem", "Number of bounce functions created");
 
   class IndMemRemPass : public ModulePass {
 


Index: llvm/lib/Transforms/IPO/Inliner.cpp
diff -u llvm/lib/Transforms/IPO/Inliner.cpp:1.33 llvm/lib/Transforms/IPO/Inliner.cpp:1.34
--- llvm/lib/Transforms/IPO/Inliner.cpp:1.33	Sun Nov 26 04:02:32 2006
+++ llvm/lib/Transforms/IPO/Inliner.cpp	Wed Dec  6 11:46:32 2006
@@ -26,8 +26,8 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> NumInlined("inline", "Number of functions inlined");
-  Statistic<> NumDeleted("inline",
+  Statistic NumInlined("inline", "Number of functions inlined");
+  Statistic NumDeleted("inline",
                        "Number of functions deleted because all callers found");
   cl::opt<unsigned>             // FIXME: 200 is VERY conservative
   InlineLimit("inline-threshold", cl::Hidden, cl::init(200),


Index: llvm/lib/Transforms/IPO/Internalize.cpp
diff -u llvm/lib/Transforms/IPO/Internalize.cpp:1.37 llvm/lib/Transforms/IPO/Internalize.cpp:1.38
--- llvm/lib/Transforms/IPO/Internalize.cpp:1.37	Sun Nov 26 04:02:32 2006
+++ llvm/lib/Transforms/IPO/Internalize.cpp	Wed Dec  6 11:46:32 2006
@@ -24,8 +24,8 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> NumFunctions("internalize", "Number of functions internalized");
-  Statistic<> NumGlobals  ("internalize", "Number of global vars internalized");
+  Statistic NumFunctions("internalize", "Number of functions internalized");
+  Statistic NumGlobals  ("internalize", "Number of global vars internalized");
 
   // APIFile - A file which contains a list of symbols that should not be marked
   // external.


Index: llvm/lib/Transforms/IPO/LoopExtractor.cpp
diff -u llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.19 llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.20
--- llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.19	Sun Aug 27 17:42:52 2006
+++ llvm/lib/Transforms/IPO/LoopExtractor.cpp	Wed Dec  6 11:46:32 2006
@@ -26,7 +26,7 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> NumExtracted("loop-extract", "Number of loops extracted");
+  Statistic NumExtracted("loop-extract", "Number of loops extracted");
 
   // FIXME: This is not a function pass, but the PassManager doesn't allow
   // Module passes to require FunctionPasses, so we can't get loop info if we're


Index: llvm/lib/Transforms/IPO/LowerSetJmp.cpp
diff -u llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.32 llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.33
--- llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.32	Sun Nov 26 19:05:10 2006
+++ llvm/lib/Transforms/IPO/LowerSetJmp.cpp	Wed Dec  6 11:46:32 2006
@@ -50,13 +50,13 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> LongJmpsTransformed("lowersetjmp",
+  Statistic LongJmpsTransformed("lowersetjmp",
                                   "Number of longjmps transformed");
-  Statistic<> SetJmpsTransformed("lowersetjmp",
+  Statistic SetJmpsTransformed("lowersetjmp",
                                  "Number of setjmps transformed");
-  Statistic<> CallsTransformed("lowersetjmp",
+  Statistic CallsTransformed("lowersetjmp",
                                "Number of calls invokified");
-  Statistic<> InvokesTransformed("lowersetjmp",
+  Statistic InvokesTransformed("lowersetjmp",
                                  "Number of invokes modified");
 
   //===--------------------------------------------------------------------===//


Index: llvm/lib/Transforms/IPO/PruneEH.cpp
diff -u llvm/lib/Transforms/IPO/PruneEH.cpp:1.24 llvm/lib/Transforms/IPO/PruneEH.cpp:1.25
--- llvm/lib/Transforms/IPO/PruneEH.cpp:1.24	Sun Aug 27 17:42:52 2006
+++ llvm/lib/Transforms/IPO/PruneEH.cpp	Wed Dec  6 11:46:32 2006
@@ -28,8 +28,8 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> NumRemoved("prune-eh", "Number of invokes removed");
-  Statistic<> NumUnreach("prune-eh", "Number of noreturn calls optimized");
+  Statistic NumRemoved("prune-eh", "Number of invokes removed");
+  Statistic NumUnreach("prune-eh", "Number of noreturn calls optimized");
 
   struct PruneEH : public CallGraphSCCPass {
     /// DoesNotUnwind - This set contains all of the functions which we have


Index: llvm/lib/Transforms/IPO/RaiseAllocations.cpp
diff -u llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.31 llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.32
--- llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.31	Sun Nov 26 19:05:10 2006
+++ llvm/lib/Transforms/IPO/RaiseAllocations.cpp	Wed Dec  6 11:46:32 2006
@@ -23,7 +23,7 @@
 using namespace llvm;
 
 namespace {
-  Statistic<> NumRaised("raiseallocs", "Number of allocations raised");
+  Statistic NumRaised("raiseallocs", "Number of allocations raised");
 
   // RaiseAllocations - Turn %malloc and %free calls into the appropriate
   // instruction.


Index: llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp
diff -u llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.73 llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.74
--- llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.73	Sun Nov 26 19:05:10 2006
+++ llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp	Wed Dec  6 11:46:32 2006
@@ -35,7 +35,7 @@
 
 /// This statistic keeps track of the total number of library calls that have
 /// been simplified regardless of which call it is.
-Statistic<> SimplifiedLibCalls("simplify-libcalls",
+Statistic SimplifiedLibCalls("simplify-libcalls",
   "Number of library calls simplified");
 
 // Forward declarations
@@ -68,7 +68,7 @@
   LibCallOptimization **Prev, *Next;
   const char *FunctionName; ///< Name of the library call we optimize
 #ifndef NDEBUG
-  Statistic<> occurrences; ///< debug statistic (-debug-only=simplify-libcalls)
+  Statistic occurrences; ///< debug statistic (-debug-only=simplify-libcalls)
 #endif
 public:
   /// The \p fname argument must be the name of the library function being






More information about the llvm-commits mailing list