[llvm-commits] CVS: llvm/lib/VMCore/Pass.cpp PassManager.cpp PassManagerT.h
Devang Patel
dpatel at apple.com
Wed Dec 13 12:04:06 PST 2006
Changes in directory llvm/lib/VMCore:
Pass.cpp updated: 1.78 -> 1.79
PassManager.cpp updated: 1.93 -> 1.94
PassManagerT.h updated: 1.72 -> 1.73
---
Log message:
Move enum PassDebugLevel from PassManagerT.h to Pass.h.
Use PDL as the prefix for these enums.
Define and use PassDebugging_New in new PassManager.
---
Diffs of the changes: (+42 -21)
Pass.cpp | 8 ++++----
PassManager.cpp | 26 ++++++++++++++++++++++++++
PassManagerT.h | 29 ++++++++++++-----------------
3 files changed, 42 insertions(+), 21 deletions(-)
Index: llvm/lib/VMCore/Pass.cpp
diff -u llvm/lib/VMCore/Pass.cpp:1.78 llvm/lib/VMCore/Pass.cpp:1.79
--- llvm/lib/VMCore/Pass.cpp:1.78 Tue Dec 12 20:36:01 2006
+++ llvm/lib/VMCore/Pass.cpp Wed Dec 13 14:03:48 2006
@@ -122,7 +122,7 @@
void PMDebug::PrintPassInformation(unsigned Depth, const char *Action,
Pass *P, Module *M) {
- if (PassDebugging >= Executions) {
+ if (PassDebugging >= PDLExecutions) {
cerr << (void*)P << std::string(Depth*2+1, ' ') << Action << " '"
<< P->getPassName();
if (M) cerr << "' on Module '" << M->getModuleIdentifier() << "'\n";
@@ -132,7 +132,7 @@
void PMDebug::PrintPassInformation(unsigned Depth, const char *Action,
Pass *P, Function *F) {
- if (PassDebugging >= Executions) {
+ if (PassDebugging >= PDLExecutions) {
cerr << (void*)P << std::string(Depth*2+1, ' ') << Action << " '"
<< P->getPassName();
if (F) cerr << "' on Function '" << F->getName();
@@ -142,7 +142,7 @@
void PMDebug::PrintPassInformation(unsigned Depth, const char *Action,
Pass *P, BasicBlock *BB) {
- if (PassDebugging >= Executions) {
+ if (PassDebugging >= PDLExecutions) {
cerr << (void*)P << std::string(Depth*2+1, ' ') << Action << " '"
<< P->getPassName();
if (BB) cerr << "' on BasicBlock '" << BB->getName();
@@ -152,7 +152,7 @@
void PMDebug::PrintAnalysisSetInfo(unsigned Depth, const char *Msg,
Pass *P, const std::vector<AnalysisID> &Set){
- if (PassDebugging >= Details && !Set.empty()) {
+ if (PassDebugging >= PDLDetails && !Set.empty()) {
cerr << (void*)P << std::string(Depth*2+3, ' ') << Msg << " Analyses:";
for (unsigned i = 0; i != Set.size(); ++i) {
if (i) cerr << ",";
Index: llvm/lib/VMCore/PassManager.cpp
diff -u llvm/lib/VMCore/PassManager.cpp:1.93 llvm/lib/VMCore/PassManager.cpp:1.94
--- llvm/lib/VMCore/PassManager.cpp:1.93 Tue Dec 12 20:36:01 2006
+++ llvm/lib/VMCore/PassManager.cpp Wed Dec 13 14:03:48 2006
@@ -13,6 +13,7 @@
#include "llvm/PassManager.h"
+#include "llvm/Support/CommandLine.h"
#include "llvm/Module.h"
#include "llvm/ModuleProvider.h"
#include "llvm/Support/Streams.h"
@@ -84,6 +85,27 @@
// ModulePassManagers.
//===----------------------------------------------------------------------===//
+namespace llvm {
+
+//===----------------------------------------------------------------------===//
+// Pass debugging information. Often it is useful to find out what pass is
+// running when a crash occurs in a utility. When this library is compiled with
+// debugging on, a command line option (--debug-pass) is enabled that causes the
+// pass name to be printed before it executes.
+//
+
+static cl::opt<enum PassDebugLevel>
+PassDebugging_New("debug-pass", cl::Hidden,
+ cl::desc("Print PassManager debugging information"),
+ cl::values(
+ clEnumVal(PDLNone , "disable debug output"),
+ clEnumVal(PDLArguments , "print pass arguments to pass to 'opt'"),
+ clEnumVal(PDLStructure , "print pass structure before run()"),
+ clEnumVal(PDLExecutions, "print pass name before it is executed"),
+ clEnumVal(PDLDetails , "print pass details when it is executed"),
+ clEnumValEnd));
+} // End of llvm namespace
+
#ifndef USE_OLD_PASSMANAGER
namespace llvm {
@@ -1241,6 +1263,10 @@
bool PassManagerImpl_New::run(Module &M) {
bool Changed = false;
+
+ if (PassDebugging_New >= PDLStructure)
+ dumpPasses();
+
for (std::vector<Pass *>::iterator I = passManagersBegin(),
E = passManagersEnd(); I != E; ++I) {
ModulePassManager *MP = dynamic_cast<ModulePassManager *>(*I);
Index: llvm/lib/VMCore/PassManagerT.h
diff -u llvm/lib/VMCore/PassManagerT.h:1.72 llvm/lib/VMCore/PassManagerT.h:1.73
--- llvm/lib/VMCore/PassManagerT.h:1.72 Sun Dec 10 01:40:46 2006
+++ llvm/lib/VMCore/PassManagerT.h Wed Dec 13 14:03:48 2006
@@ -37,21 +37,16 @@
// pass name to be printed before it executes.
//
-// Different debug levels that can be enabled...
-enum PassDebugLevel {
- None, Arguments, Structure, Executions, Details
-};
-
static cl::opt<enum PassDebugLevel>
PassDebugging("debug-pass", cl::Hidden,
- cl::desc("Print PassManager debugging information"),
- cl::values(
- clEnumVal(None , "disable debug output"),
- clEnumVal(Arguments , "print pass arguments to pass to 'opt'"),
- clEnumVal(Structure , "print pass structure before run()"),
- clEnumVal(Executions, "print pass name before it is executed"),
- clEnumVal(Details , "print pass details when it is executed"),
- clEnumValEnd));
+ cl::desc("Print PassManager debugging information"),
+ cl::values(
+ clEnumVal(PDLNone , "disable debug output"),
+ clEnumVal(PDLArguments , "print pass arguments to pass to 'opt'"),
+ clEnumVal(PDLStructure , "print pass structure before run()"),
+ clEnumVal(PDLExecutions, "print pass name before it is executed"),
+ clEnumVal(PDLDetails , "print pass details when it is executed"),
+ clEnumValEnd));
//===----------------------------------------------------------------------===//
// PMDebug class - a set of debugging functions, that are not to be
@@ -60,13 +55,13 @@
struct PMDebug {
static void PerformPassStartupStuff(Pass *P) {
// If debugging is enabled, print out argument information...
- if (PassDebugging >= Arguments) {
+ if (PassDebugging >= PDLArguments) {
cerr << "Pass Arguments: ";
PrintArgumentInformation(P);
cerr << "\n";
// Print the pass execution structure
- if (PassDebugging >= Structure)
+ if (PassDebugging >= PDLStructure)
P->dumpPassStructure();
}
}
@@ -546,7 +541,7 @@
cerr << "Analysis '" << (*I)->getPassName()
<< "' used but not available!";
assert(0 && "Analysis used but not available!");
- } else if (PassDebugging == Details) {
+ } else if (PassDebugging == PDLDetails) {
if ((*I)->getPassName() != std::string(Impl->getPassName()))
cerr << " Interface '" << (*I)->getPassName()
<< "' implemented by '" << Impl->getPassName() << "'\n";
@@ -635,7 +630,7 @@
cerr << "Analysis '" << (*I)->getPassName()
<< "' used but not available!";
assert(0 && "Analysis used but not available!");
- } else if (PassDebugging == Details) {
+ } else if (PassDebugging == PDLDetails) {
if ((*I)->getPassName() != std::string(Impl->getPassName()))
cerr << " Interface '" << (*I)->getPassName()
<< "' implemented by '" << Impl->getPassName() << "'\n";
More information about the llvm-commits
mailing list