[llvm-commits] CVS: llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp AlphaCodeEmitter.cpp AlphaISelDAGToDAG.cpp AlphaLLRP.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/Alpha:

AlphaAsmPrinter.cpp updated: 1.59 -> 1.60
AlphaCodeEmitter.cpp updated: 1.20 -> 1.21
AlphaISelDAGToDAG.cpp updated: 1.63 -> 1.64
AlphaLLRP.cpp updated: 1.6 -> 1.7
---
Log message:

eliminate static ctors for Statistic objects.


---
Diffs of the changes:  (+10 -15)

 AlphaAsmPrinter.cpp   |    5 +++--
 AlphaCodeEmitter.cpp  |    7 +------
 AlphaISelDAGToDAG.cpp |    1 -
 AlphaLLRP.cpp         |   12 ++++++------
 4 files changed, 10 insertions(+), 15 deletions(-)


Index: llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp
diff -u llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp:1.59 llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp:1.60
--- llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp:1.59	Thu Dec  7 17:55:55 2006
+++ llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp	Tue Dec 19 16:59:25 2006
@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#define DEBUG_TYPE "asm-printer"
 #include "Alpha.h"
 #include "AlphaInstrInfo.h"
 #include "AlphaTargetMachine.h"
@@ -26,9 +27,9 @@
 #include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
+STATISTIC(EmittedInsts, "Number of machine instrs printed");
+
 namespace {
-  Statistic EmittedInsts("asm-printer", "Number of machine instrs printed");
-  
   struct VISIBILITY_HIDDEN AlphaAsmPrinter : public AsmPrinter {
 
     /// Unique incrementer for label values for referencing Global values.


Index: llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp
diff -u llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp:1.20 llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp:1.21
--- llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp:1.20	Thu Dec  7 16:21:48 2006
+++ llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp	Tue Dec 19 16:59:25 2006
@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#define DEBUG_TYPE "alpha-emitter"
 #include "AlphaTargetMachine.h"
 #include "AlphaRelocations.h"
 #include "Alpha.h"
@@ -22,15 +23,9 @@
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/Function.h"
 #include "llvm/Support/Debug.h"
-#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
-  Statistic
-  NumEmitted("alpha-emitter", "Number of machine instructions emitted");
-}
-
-namespace {
   class AlphaCodeEmitter : public MachineFunctionPass {
     const AlphaInstrInfo  *II;
     TargetMachine &TM;


Index: llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp
diff -u llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp:1.63 llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp:1.64
--- llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp:1.63	Thu Dec  7 16:21:48 2006
+++ llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp	Tue Dec 19 16:59:25 2006
@@ -22,7 +22,6 @@
 #include "llvm/CodeGen/SelectionDAG.h"
 #include "llvm/CodeGen/SelectionDAGISel.h"
 #include "llvm/Target/TargetOptions.h"
-#include "llvm/ADT/Statistic.h"
 #include "llvm/Constants.h"
 #include "llvm/GlobalValue.h"
 #include "llvm/Intrinsics.h"


Index: llvm/lib/Target/Alpha/AlphaLLRP.cpp
diff -u llvm/lib/Target/Alpha/AlphaLLRP.cpp:1.6 llvm/lib/Target/Alpha/AlphaLLRP.cpp:1.7
--- llvm/lib/Target/Alpha/AlphaLLRP.cpp:1.6	Thu Dec  7 17:55:55 2006
+++ llvm/lib/Target/Alpha/AlphaLLRP.cpp	Tue Dec 19 16:59:25 2006
@@ -8,10 +8,11 @@
 //===----------------------------------------------------------------------===//
 //
 // Here we check for potential replay traps introduced by the spiller
-// We also align some branch targets if we can do so for free
+// We also align some branch targets if we can do so for free.
+//
 //===----------------------------------------------------------------------===//
 
-
+#define DEBUG_TYPE "alpha-nops"
 #include "Alpha.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
@@ -22,11 +23,10 @@
 #include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
-namespace {
-  Statistic nopintro("alpha-nops", "Number of nops inserted");
-  Statistic nopalign("alpha-nops-align", 
-		       "Number of nops inserted for alignment");
+STATISTIC(nopintro, "Number of nops inserted");
+STATISTIC(nopalign, "Number of nops inserted for alignment");
 
+namespace {
   cl::opt<bool>
   AlignAll("alpha-align-all", cl::Hidden,
                    cl::desc("Align all blocks"));