switch more statistics over to STATISTIC, eliminating static ctors. Also,
delete some dead ones.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32694 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/LevelRaise.cpp b/lib/Transforms/LevelRaise.cpp
index c5ac8c9..9930d1b 100644
--- a/lib/Transforms/LevelRaise.cpp
+++ b/lib/Transforms/LevelRaise.cpp
@@ -13,6 +13,7 @@
//
//===----------------------------------------------------------------------===//
+#define DEBUG_TYPE "raise"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/Utils/Local.h"
#include "TransformInternals.h"
@@ -34,23 +35,17 @@
StartInst("raise-start-inst", cl::Hidden, cl::value_desc("inst name"),
cl::desc("Start raise pass at the instruction with the specified name"));
-static Statistic
-NumLoadStorePeepholes("raise", "Number of load/store peepholes");
+STATISTIC(NumLoadStorePeepholes, "Number of load/store peepholes");
-static Statistic
-NumGEPInstFormed("raise", "Number of other getelementptr's formed");
+STATISTIC(NumGEPInstFormed, "Number of other getelementptr's formed");
-static Statistic
-NumExprTreesConv("raise", "Number of expression trees converted");
+STATISTIC(NumExprTreesConv, "Number of expression trees converted");
-static Statistic
-NumCastOfCast("raise", "Number of cast-of-self removed");
+STATISTIC(NumCastOfCast, "Number of cast-of-self removed");
-static Statistic
-NumDCEorCP("raise", "Number of insts DCEd or constprop'd");
+STATISTIC(NumDCEorCP, "Number of insts DCEd or constprop'd");
-static Statistic
-NumVarargCallChanges("raise", "Number of vararg call peepholes");
+STATISTIC(NumVarargCallChanges, "Number of vararg call peepholes");
#define PRINT_PEEPHOLE(ID, NUM, I) \
DOUT << "Inst P/H " << ID << "[" << NUM << "] " << I
diff --git a/lib/Transforms/Utils/BreakCriticalEdges.cpp b/lib/Transforms/Utils/BreakCriticalEdges.cpp
index 668d19d..e06a746 100644
--- a/lib/Transforms/Utils/BreakCriticalEdges.cpp
+++ b/lib/Transforms/Utils/BreakCriticalEdges.cpp
@@ -16,6 +16,7 @@
//
//===----------------------------------------------------------------------===//
+#define DEBUG_TYPE "break-crit-edges"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "llvm/Analysis/Dominators.h"
@@ -29,9 +30,9 @@
#include "llvm/ADT/Statistic.h"
using namespace llvm;
-namespace {
- Statistic NumBroken("break-crit-edges", "Number of blocks inserted");
+STATISTIC(NumBroken, "Number of blocks inserted");
+namespace {
struct VISIBILITY_HIDDEN BreakCriticalEdges : public FunctionPass {
virtual bool runOnFunction(Function &F);
diff --git a/lib/Transforms/Utils/LCSSA.cpp b/lib/Transforms/Utils/LCSSA.cpp
index fe98903..554dcbc 100644
--- a/lib/Transforms/Utils/LCSSA.cpp
+++ b/lib/Transforms/Utils/LCSSA.cpp
@@ -27,6 +27,7 @@
//
//===----------------------------------------------------------------------===//
+#define DEBUG_TYPE "lcssa"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Constants.h"
#include "llvm/Pass.h"
@@ -39,13 +40,11 @@
#include "llvm/Support/CFG.h"
#include <algorithm>
#include <map>
-
using namespace llvm;
+STATISTIC(NumLCSSA, "Number of live out of a loop variables");
+
namespace {
- static Statistic NumLCSSA("lcssa",
- "Number of live out of a loop variables");
-
struct LCSSA : public FunctionPass {
// Cached analysis information for the current function.
LoopInfo *LI;
diff --git a/lib/Transforms/Utils/LoopSimplify.cpp b/lib/Transforms/Utils/LoopSimplify.cpp
index 7796022..ab850d5 100644
--- a/lib/Transforms/Utils/LoopSimplify.cpp
+++ b/lib/Transforms/Utils/LoopSimplify.cpp
@@ -32,6 +32,7 @@
//
//===----------------------------------------------------------------------===//
+#define DEBUG_TYPE "loopsimplify"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Constant.h"
#include "llvm/Instructions.h"
@@ -48,12 +49,10 @@
#include "llvm/ADT/DepthFirstIterator.h"
using namespace llvm;
-namespace {
- Statistic
- NumInserted("loopsimplify", "Number of pre-header or exit blocks inserted");
- Statistic
- NumNested("loopsimplify", "Number of nested loops split out");
+STATISTIC(NumInserted, "Number of pre-header or exit blocks inserted");
+STATISTIC(NumNested , "Number of nested loops split out");
+namespace {
struct VISIBILITY_HIDDEN LoopSimplify : public FunctionPass {
// AA - If we have an alias analysis object to update, this is it, otherwise
// this is null.
diff --git a/lib/Transforms/Utils/LowerAllocations.cpp b/lib/Transforms/Utils/LowerAllocations.cpp
index 30b0ab8..da0b9ed 100644
--- a/lib/Transforms/Utils/LowerAllocations.cpp
+++ b/lib/Transforms/Utils/LowerAllocations.cpp
@@ -12,6 +12,7 @@
//
//===----------------------------------------------------------------------===//
+#define DEBUG_TYPE "lowerallocs"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h"
#include "llvm/Module.h"
@@ -24,9 +25,9 @@
#include "llvm/Support/Compiler.h"
using namespace llvm;
-namespace {
- Statistic NumLowered("lowerallocs", "Number of allocations lowered");
+STATISTIC(NumLowered, "Number of allocations lowered");
+namespace {
/// LowerAllocations - Turn malloc and free instructions into %malloc and
/// %free calls.
///
diff --git a/lib/Transforms/Utils/LowerInvoke.cpp b/lib/Transforms/Utils/LowerInvoke.cpp
index 4fbd43c..e4117d5 100644
--- a/lib/Transforms/Utils/LowerInvoke.cpp
+++ b/lib/Transforms/Utils/LowerInvoke.cpp
@@ -34,6 +34,7 @@
//
//===----------------------------------------------------------------------===//
+#define DEBUG_TYPE "lowerinvoke"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Constants.h"
#include "llvm/DerivedTypes.h"
@@ -49,14 +50,14 @@
#include <csetjmp>
using namespace llvm;
-namespace {
- Statistic NumInvokes("lowerinvoke", "Number of invokes replaced");
- Statistic NumUnwinds("lowerinvoke", "Number of unwinds replaced");
- Statistic NumSpilled("lowerinvoke",
- "Number of registers live across unwind edges");
- cl::opt<bool> ExpensiveEHSupport("enable-correct-eh-support",
+STATISTIC(NumInvokes, "Number of invokes replaced");
+STATISTIC(NumUnwinds, "Number of unwinds replaced");
+STATISTIC(NumSpilled, "Number of registers live across unwind edges");
+
+static cl::opt<bool> ExpensiveEHSupport("enable-correct-eh-support",
cl::desc("Make the -lowerinvoke pass insert expensive, but correct, EH code"));
+namespace {
class VISIBILITY_HIDDEN LowerInvoke : public FunctionPass {
// Used for both models.
Function *WriteFn;
diff --git a/lib/Transforms/Utils/LowerSelect.cpp b/lib/Transforms/Utils/LowerSelect.cpp
index 5efdd9b..c0c8a32 100644
--- a/lib/Transforms/Utils/LowerSelect.cpp
+++ b/lib/Transforms/Utils/LowerSelect.cpp
@@ -24,12 +24,9 @@
#include "llvm/Instructions.h"
#include "llvm/Pass.h"
#include "llvm/Type.h"
-#include "llvm/ADT/Statistic.h"
using namespace llvm;
namespace {
- Statistic NumLowered("lowerselect","Number of select instructions lowered");
-
/// LowerSelect - Turn select instructions into conditional branches.
///
class LowerSelect : public FunctionPass {
diff --git a/lib/Transforms/Utils/LowerSwitch.cpp b/lib/Transforms/Utils/LowerSwitch.cpp
index f0ae385..69df51c 100644
--- a/lib/Transforms/Utils/LowerSwitch.cpp
+++ b/lib/Transforms/Utils/LowerSwitch.cpp
@@ -21,13 +21,10 @@
#include "llvm/Pass.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/Compiler.h"
-#include "llvm/ADT/Statistic.h"
#include <algorithm>
using namespace llvm;
namespace {
- Statistic NumLowered("lowerswitch", "Number of SwitchInst's replaced");
-
/// LowerSwitch Pass - Replace all SwitchInst instructions with chained branch
/// instructions. Note that this cannot be a BasicBlock pass because it
/// modifies the CFG!
diff --git a/lib/Transforms/Utils/Mem2Reg.cpp b/lib/Transforms/Utils/Mem2Reg.cpp
index e0f79dd..78117fb 100644
--- a/lib/Transforms/Utils/Mem2Reg.cpp
+++ b/lib/Transforms/Utils/Mem2Reg.cpp
@@ -12,6 +12,7 @@
//
//===----------------------------------------------------------------------===//
+#define DEBUG_TYPE "mem2reg"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/Utils/PromoteMemToReg.h"
#include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h"
@@ -23,9 +24,9 @@
#include "llvm/Support/Compiler.h"
using namespace llvm;
-namespace {
- Statistic NumPromoted("mem2reg", "Number of alloca's promoted");
+STATISTIC(NumPromoted, "Number of alloca's promoted");
+namespace {
struct VISIBILITY_HIDDEN PromotePass : public FunctionPass {
// runOnFunction - To run this pass, first we calculate the alloca
// instructions that are safe for promotion, then we promote each one.