Updates to work with recent Statistic's changes:
* Renamed StatisticReporter.h/cpp to Statistic.h/cpp
* Broke constructor to take two const char * arguments instead of one, so
that indendation can be taken care of automatically.
* Sort the list by pass name when printing
* Make sure to print all statistics as a group, instead of randomly when
the statistics dtors are called.
* Updated ProgrammersManual with new semantics.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4001 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/ExprTypeConvert.cpp b/lib/Transforms/ExprTypeConvert.cpp
index 08ebc03..c276450 100644
--- a/lib/Transforms/ExprTypeConvert.cpp
+++ b/lib/Transforms/ExprTypeConvert.cpp
@@ -13,7 +13,7 @@
#include "llvm/ConstantHandling.h"
#include "llvm/Analysis/Expressions.h"
#include "Support/STLExtras.h"
-#include "Support/StatisticReporter.h"
+#include "Support/Statistic.h"
#include <algorithm>
using std::cerr;
diff --git a/lib/Transforms/IPO/InlineSimple.cpp b/lib/Transforms/IPO/InlineSimple.cpp
index 41f849a..53add2d 100644
--- a/lib/Transforms/IPO/InlineSimple.cpp
+++ b/lib/Transforms/IPO/InlineSimple.cpp
@@ -25,11 +25,10 @@
#include "llvm/iPHINode.h"
#include "llvm/iOther.h"
#include "llvm/Type.h"
-#include "Support/StatisticReporter.h"
+#include "Support/Statistic.h"
#include <algorithm>
-#include <iostream>
-static Statistic<> NumInlined("inline\t\t- Number of functions inlined");
+static Statistic<> NumInlined("inline", "Number of functions inlined");
using std::cerr;
// RemapInstruction - Convert the instruction operands from referencing the
diff --git a/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp b/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp
index f6280e8..2ca0f1d 100644
--- a/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp
+++ b/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp
@@ -8,8 +8,8 @@
#include "llvm/Transforms/Instrumentation/Graph.h"
#include "llvm/iTerminators.h"
#include "llvm/BasicBlock.h"
+#include "Support/Statistic.h"
#include <algorithm>
-#include <iostream>
//using std::list;
//using std::set;
diff --git a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp
index 7610982..3a34131 100644
--- a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp
+++ b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp
@@ -10,12 +10,9 @@
#include "llvm/Transforms/Instrumentation/Graph.h"
#include "llvm/Pass.h"
#include "llvm/Module.h"
-#include "llvm/InstrTypes.h"
#include "llvm/iTerminators.h"
+#include "Support/Statistic.h"
#include <algorithm>
-#include <iostream>
-#include <sstream>
-#include <vector>
//using std::list;
using std::map;
diff --git a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxillary.cpp b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxillary.cpp
index 7610982..3a34131 100644
--- a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxillary.cpp
+++ b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxillary.cpp
@@ -10,12 +10,9 @@
#include "llvm/Transforms/Instrumentation/Graph.h"
#include "llvm/Pass.h"
#include "llvm/Module.h"
-#include "llvm/InstrTypes.h"
#include "llvm/iTerminators.h"
+#include "Support/Statistic.h"
#include <algorithm>
-#include <iostream>
-#include <sstream>
-#include <vector>
//using std::list;
using std::map;
diff --git a/lib/Transforms/LevelRaise.cpp b/lib/Transforms/LevelRaise.cpp
index a1ca7eb..4af53be 100644
--- a/lib/Transforms/LevelRaise.cpp
+++ b/lib/Transforms/LevelRaise.cpp
@@ -17,7 +17,7 @@
#include "llvm/Analysis/Verifier.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "Support/STLExtras.h"
-#include "Support/StatisticReporter.h"
+#include "Support/Statistic.h"
#include "Support/CommandLine.h"
#include <algorithm>
using std::cerr;
@@ -31,19 +31,19 @@
cl::desc("Start raise pass at the instruction with the specified name"));
static Statistic<>
-NumLoadStorePeepholes("raise\t\t- Number of load/store peepholes");
+NumLoadStorePeepholes("raise", "Number of load/store peepholes");
static Statistic<>
-NumGEPInstFormed("raise\t\t- Number of other getelementptr's formed");
+NumGEPInstFormed("raise", "Number of other getelementptr's formed");
static Statistic<>
-NumExprTreesConv("raise\t\t- Number of expression trees converted");
+NumExprTreesConv("raise", "Number of expression trees converted");
static Statistic<>
-NumCastOfCast("raise\t\t- Number of cast-of-self removed");
+NumCastOfCast("raise", "Number of cast-of-self removed");
static Statistic<>
-NumDCEorCP("raise\t\t- Number of insts DCEd or constprop'd");
+NumDCEorCP("raise", "Number of insts DCEd or constprop'd");
#define PRINT_PEEPHOLE(ID, NUM, I) \