Changes in directory llvm/lib/Support:
Statistic.cpp updated: 1.22 -> 1.23
---
Log message:
Change the implementation of statistic to not need destructors at all.
Instead, the stat info is printed when llvm_shutdown() is called.
These also don't need static ctors, but getting rid of them is uglier:
still investigating. This reduces the number of static dtors in llvm from
~1400 to ~750.
---
Diffs of the changes: (+76 -61)
Statistic.cpp | 137 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 76 insertions(+), 61 deletions(-)
Index: llvm/lib/Support/Statistic.cpp
diff -u llvm/lib/Support/Statistic.cpp:1.22 llvm/lib/Support/Statistic.cpp:1.23
--- llvm/lib/Support/Statistic.cpp:1.22 Thu Dec 7 17:41:45 2006
+++ llvm/lib/Support/Statistic.cpp Fri Dec 8 14:00:42 2006
@@ -15,7 +15,7 @@
// This is useful for reporting information like the number of instructions
// simplified, optimized or removed by various transformations, like this:
//
-// static Statistic NumInstEliminated("GCSE - Number of instructions killed");
+// static Statistic NumInstEliminated("GCSE", "Number of instructions killed");
//
// Later, in the code: ++NumInstEliminated;
//
@@ -23,84 +23,99 @@
#include "llvm/ADT/Statistic.h"
#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/Streams.h"
#include "llvm/ADT/StringExtras.h"
#include <algorithm>
#include <ostream>
using namespace llvm;
-// GetLibSupportInfoOutputFile - Return a file stream to print our output on...
+// GetLibSupportInfoOutputFile - Return a file stream to print our output on.
namespace llvm { extern std::ostream *GetLibSupportInfoOutputFile(); }
-unsigned Statistic::NumStats = 0;
-
-// -stats - Command line option to cause transformations to emit stats about
-// what they did.
-//
+/// -stats - Command line option to cause transformations to emit stats about
+/// what they did.
+///
static cl::opt<bool>
Enabled("stats", cl::desc("Enable statistics output from program"));
-struct StatRecord {
- std::string Value;
- const char *Name, *Desc;
-
- StatRecord(const std::string &V, const char *N, const char *D)
- : Value(V), Name(N), Desc(D) {}
- bool operator<(const StatRecord &SR) const {
- return std::strcmp(Name, SR.Name) < 0;
- }
-
- void print(unsigned ValFieldSize, unsigned NameFieldSize,
- std::ostream &OS) {
- OS << std::string(ValFieldSize-Value.length(), ' ')
- << Value << " " << Name
- << std::string(NameFieldSize-std::strlen(Name), ' ')
- << " - " << Desc << "\n";
+namespace {
+/// StatisticInfo - This class is used in a ManagedStatic so that it is created
+/// on demand (when the first statistic is bumped) and destroyed only when
+/// llvm_shutdown is called. We print statistics from the destructor.
+class StatisticInfo {
+ std::vector<const Statistic*> Stats;
+public:
+ ~StatisticInfo();
+
+ void addStatistic(const Statistic *S) {
+ Stats.push_back(S);
}
};
+}
-static std::vector<StatRecord> *AccumStats = 0;
+static ManagedStatic<StatisticInfo> StatInfo;
-// Print information when destroyed, iff command line option is specified
-Statistic::~Statistic() {
- if (Enabled && Value != 0) {
- if (AccumStats == 0)
- AccumStats = new std::vector<StatRecord>();
- AccumStats->push_back(StatRecord(utostr(Value), Name, Desc));
- }
+/// RegisterStatistic - The first time a statistic is bumped, this method is
+/// called.
+void Statistic::RegisterStatistic() {
+ // If stats are enabled, inform StatInfo that this statistic should be
+ // printed.
+ if (Enabled)
+ StatInfo->addStatistic(this);
+ // Remember we have been registered.
+ Initialized = true;
+}
- if (--NumStats == 0 && AccumStats) {
- std::ostream *OutStream = GetLibSupportInfoOutputFile();
+struct NameCompare {
+ bool operator()(const Statistic *LHS, const Statistic *RHS) const {
+ int Cmp = std::strcmp(LHS->getName(), RHS->getName());
+ if (Cmp != 0) return Cmp < 0;
+
+ // Secondary key is the description.
+ return std::strcmp(LHS->getDesc(), RHS->getDesc()) < 0;
+ }
+};
- // Figure out how long the biggest Value and Name fields are...
- unsigned MaxNameLen = 0, MaxValLen = 0;
- for (unsigned i = 0, e = AccumStats->size(); i != e; ++i) {
- MaxValLen = std::max(MaxValLen,
- (unsigned)(*AccumStats)[i].Value.length());
- MaxNameLen = std::max(MaxNameLen,
- (unsigned)std::strlen((*AccumStats)[i].Name));
- }
-
- // Sort the fields...
- std::stable_sort(AccumStats->begin(), AccumStats->end());
-
- // Print out the statistics header...
- *OutStream << "===" << std::string(73, '-') << "===\n"
- << " ... Statistics Collected ...\n"
- << "===" << std::string(73, '-') << "===\n\n";
-
- // Print all of the statistics accumulated...
- for (unsigned i = 0, e = AccumStats->size(); i != e; ++i)
- (*AccumStats)[i].print(MaxValLen, MaxNameLen, *OutStream);
-
- *OutStream << std::endl; // Flush the output stream...
-
- // Free all accumulated statistics...
- delete AccumStats;
- AccumStats = 0;
- if (OutStream != cerr.stream() && OutStream != cout.stream())
- delete OutStream; // Close the file...
+// Print information when destroyed, iff command line option is specified.
+StatisticInfo::~StatisticInfo() {
+ // Statistics not enabled?
+ if (Stats.empty()) return;
+
+ // Get the stream to write to.
+ std::ostream &OutStream = *GetLibSupportInfoOutputFile();
+
+ // Figure out how long the biggest Value and Name fields are.
+ unsigned MaxNameLen = 0, MaxValLen = 0;
+ for (unsigned i = 0, e = Stats.size(); i != e; ++i) {
+ MaxValLen = std::max(MaxValLen,
+ (unsigned)utostr(Stats[i]->getValue()).size());
+ MaxNameLen = std::max(MaxNameLen,
+ (unsigned)std::strlen(Stats[i]->getName()));
+ }
+
+ // Sort the fields by name.
+ std::stable_sort(Stats.begin(), Stats.end(), NameCompare());
+
+ // Print out the statistics header...
+ OutStream << "===" << std::string(73, '-') << "===\n"
+ << " ... Statistics Collected ...\n"
+ << "===" << std::string(73, '-') << "===\n\n";
+
+ // Print all of the statistics.
+ for (unsigned i = 0, e = Stats.size(); i != e; ++i) {
+ std::string CountStr = utostr(Stats[i]->getValue());
+ OutStream << std::string(MaxValLen-CountStr.size(), ' ')
+ << CountStr << " " << Stats[i]->getName()
+ << std::string(MaxNameLen-std::strlen(Stats[i]->getName()), ' ')
+ << " - " << Stats[i]->getDesc() << "\n";
+
}
+
+ OutStream << std::endl; // Flush the output stream...
+
+ if (&OutStream != cerr.stream() && &OutStream != cout.stream())
+ delete &OutStream; // Close the file.
}
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
