diff --git a/llvm/lib/CodeGen/BranchFolding.cpp b/llvm/lib/CodeGen/BranchFolding.cpp index 0dfa4928f99e..69c6f4e62eaf 100644 --- a/llvm/lib/CodeGen/BranchFolding.cpp +++ b/llvm/lib/CodeGen/BranchFolding.cpp @@ -30,9 +30,9 @@ #include using namespace llvm; -static Statistic NumDeadBlocks("branchfold", "Number of dead blocks removed"); -static Statistic NumBranchOpts("branchfold", "Number of branches optimized"); -static Statistic NumTailMerge ("branchfold", "Number of block tails merged"); +STATISTIC(NumDeadBlocks, "Number of dead blocks removed"); +STATISTIC(NumBranchOpts, "Number of branches optimized"); +STATISTIC(NumTailMerge , "Number of block tails merged"); static cl::opt EnableTailMerge("enable-tail-merge", cl::Hidden); namespace { diff --git a/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp b/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp index 2175d3584832..68d194883757 100644 --- a/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -36,24 +36,15 @@ #include using namespace llvm; +STATISTIC(numIntervals, "Number of original intervals"); +STATISTIC(numIntervalsAfter, "Number of intervals after coalescing"); +STATISTIC(numJoins , "Number of interval joins performed"); +STATISTIC(numPeep , "Number of identity moves eliminated after coalescing"); +STATISTIC(numFolded , "Number of loads/stores folded into instructions"); + namespace { RegisterPass X("liveintervals", "Live Interval Analysis"); - static Statistic numIntervals - ("liveintervals", "Number of original intervals"); - - static Statistic numIntervalsAfter - ("liveintervals", "Number of intervals after coalescing"); - - static Statistic numJoins - ("liveintervals", "Number of interval joins performed"); - - static Statistic numPeep - ("liveintervals", "Number of identity moves eliminated after coalescing"); - - static Statistic numFolded - ("liveintervals", "Number of loads/stores folded into instructions"); - static cl::opt EnableJoining("join-liveintervals", cl::desc("Coallesce copies (default=true)"), diff --git a/llvm/lib/CodeGen/PHIElimination.cpp b/llvm/lib/CodeGen/PHIElimination.cpp index fec54eac3739..a5d17c2e4b07 100644 --- a/llvm/lib/CodeGen/PHIElimination.cpp +++ b/llvm/lib/CodeGen/PHIElimination.cpp @@ -13,6 +13,7 @@ // //===----------------------------------------------------------------------===// +#define DEBUG_TYPE "phielim" #include "llvm/CodeGen/LiveVariables.h" #include "llvm/CodeGen/Passes.h" #include "llvm/CodeGen/MachineFunctionPass.h" @@ -28,10 +29,10 @@ #include using namespace llvm; +STATISTIC(NumAtomic, "Number of atomic phis lowered"); +//STATISTIC(NumSimple, "Number of simple phis lowered"); + namespace { - static Statistic NumAtomic("phielim", "Number of atomic phis lowered"); - static Statistic NumSimple("phielim", "Number of simple phis lowered"); - struct VISIBILITY_HIDDEN PNE : public MachineFunctionPass { bool runOnMachineFunction(MachineFunction &Fn) { analyzePHINodes(Fn); diff --git a/llvm/lib/CodeGen/RegAllocLinearScan.cpp b/llvm/lib/CodeGen/RegAllocLinearScan.cpp index 1977a5489de8..5c6512d8ed7b 100644 --- a/llvm/lib/CodeGen/RegAllocLinearScan.cpp +++ b/llvm/lib/CodeGen/RegAllocLinearScan.cpp @@ -35,17 +35,14 @@ #include using namespace llvm; +STATISTIC(NumIters , "Number of iterations performed"); +STATISTIC(NumBacktracks, "Number of times we had to backtrack"); + +static RegisterRegAlloc +linearscanRegAlloc("linearscan", " linear scan register allocator", + createLinearScanRegisterAllocator); + namespace { - - static Statistic NumIters - ("regalloc", "Number of iterations performed"); - static Statistic NumBacktracks - ("regalloc", "Number of times we had to backtrack"); - - static RegisterRegAlloc - linearscanRegAlloc("linearscan", " linear scan register allocator", - createLinearScanRegisterAllocator); - static unsigned numIterations = 0; static unsigned numIntervals = 0; diff --git a/llvm/lib/CodeGen/RegAllocLocal.cpp b/llvm/lib/CodeGen/RegAllocLocal.cpp index 876eb950d9e3..644e221212ae 100644 --- a/llvm/lib/CodeGen/RegAllocLocal.cpp +++ b/llvm/lib/CodeGen/RegAllocLocal.cpp @@ -32,12 +32,11 @@ #include using namespace llvm; -namespace { - static Statistic NumStores("ra-local", "Number of stores added"); - static Statistic NumLoads ("ra-local", "Number of loads added"); - static Statistic NumFolded("ra-local", "Number of loads/stores folded " - "into instructions"); +STATISTIC(NumStores, "Number of stores added"); +STATISTIC(NumLoads , "Number of loads added"); +STATISTIC(NumFolded, "Number of loads/stores folded into instructions"); +namespace { static RegisterRegAlloc localRegAlloc("local", " local register allocator", createLocalRegisterAllocator); diff --git a/llvm/lib/CodeGen/RegAllocSimple.cpp b/llvm/lib/CodeGen/RegAllocSimple.cpp index 01504045c899..e632e3599ac6 100644 --- a/llvm/lib/CodeGen/RegAllocSimple.cpp +++ b/llvm/lib/CodeGen/RegAllocSimple.cpp @@ -29,10 +29,10 @@ #include "llvm/ADT/STLExtras.h" using namespace llvm; -namespace { - static Statistic NumStores("ra-simple", "Number of stores added"); - static Statistic NumLoads ("ra-simple", "Number of loads added"); +STATISTIC(NumStores, "Number of stores added"); +STATISTIC(NumLoads , "Number of loads added"); +namespace { static RegisterRegAlloc simpleRegAlloc("simple", " simple register allocator", createSimpleRegisterAllocator); diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 3e53130ba508..33509536eb5e 100644 --- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -40,15 +40,11 @@ #include using namespace llvm; +STATISTIC(NodesCombined , "Number of dag nodes combined"); +STATISTIC(PreIndexedNodes , "Number of pre-indexed nodes created"); +STATISTIC(PostIndexedNodes, "Number of post-indexed nodes created"); + namespace { - static Statistic NodesCombined ("dagcombiner", - "Number of dag nodes combined"); - - static Statistic PreIndexedNodes ("pre_indexed_ops", - "Number of pre-indexed nodes created"); - static Statistic PostIndexedNodes ("post_indexed_ops", - "Number of post-indexed nodes created"); - static cl::opt CombinerAA("combiner-alias-analysis", cl::Hidden, cl::desc("Turn on alias analysis during testing")); diff --git a/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp b/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp index 401b0249db64..d21ef34c6457 100644 --- a/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp @@ -34,10 +34,8 @@ #include using namespace llvm; -namespace { - static Statistic NumNoops ("scheduler", "Number of noops inserted"); - static Statistic NumStalls("scheduler", "Number of pipeline stalls"); -} +STATISTIC(NumNoops , "Number of noops inserted"); +STATISTIC(NumStalls, "Number of pipeline stalls"); static RegisterScheduler tdListDAGScheduler("list-td", " Top-down list scheduler", diff --git a/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp b/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp index be19e46168e5..ba768ba19fa5 100644 --- a/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp +++ b/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp @@ -43,14 +43,11 @@ #include "llvm/ADT/STLExtras.h" using namespace llvm; -namespace { - static Statistic NumTwoAddressInstrs("twoaddressinstruction", - "Number of two-address instructions"); - static Statistic NumCommuted("twoaddressinstruction", - "Number of instructions commuted to coalesce"); - static Statistic NumConvertedTo3Addr("twoaddressinstruction", - "Number of instructions promoted to 3-address"); +STATISTIC(NumTwoAddressInstrs, "Number of two-address instructions"); +STATISTIC(NumCommuted , "Number of instructions commuted to coalesce"); +STATISTIC(NumConvertedTo3Addr, "Number of instructions promoted to 3-address"); +namespace { struct VISIBILITY_HIDDEN TwoAddressInstructionPass : public MachineFunctionPass { virtual void getAnalysisUsage(AnalysisUsage &AU) const; diff --git a/llvm/lib/CodeGen/VirtRegMap.cpp b/llvm/lib/CodeGen/VirtRegMap.cpp index 26b6eebf4295..2c93e09e3f27 100644 --- a/llvm/lib/CodeGen/VirtRegMap.cpp +++ b/llvm/lib/CodeGen/VirtRegMap.cpp @@ -32,14 +32,14 @@ #include using namespace llvm; -namespace { - static Statistic NumSpills("spiller", "Number of register spills"); - static Statistic NumStores("spiller", "Number of stores added"); - static Statistic NumLoads ("spiller", "Number of loads added"); - static Statistic NumReused("spiller", "Number of values reused"); - static Statistic NumDSE ("spiller", "Number of dead stores elided"); - static Statistic NumDCE ("spiller", "Number of copies elided"); +STATISTIC(NumSpills, "Number of register spills"); +STATISTIC(NumStores, "Number of stores added"); +STATISTIC(NumLoads , "Number of loads added"); +STATISTIC(NumReused, "Number of values reused"); +STATISTIC(NumDSE , "Number of dead stores elided"); +STATISTIC(NumDCE , "Number of copies elided"); +namespace { enum SpillerName { simple, local }; static cl::opt