From e8ff1ce7343c697ff90d940c8c5fa8fccc09220d Mon Sep 17 00:00:00 2001 From: Devang Patel Date: Wed, 13 Dec 2006 21:13:31 +0000 Subject: [PATCH] Using PDL as a prefix for PassDebugLevel enums is not a good idea. Fix it. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32562 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Pass.h | 5 ----- lib/VMCore/Pass.cpp | 8 ++++---- lib/VMCore/PassManager.cpp | 17 +++++++++++------ lib/VMCore/PassManagerT.h | 23 ++++++++++++++--------- 4 files changed, 29 insertions(+), 24 deletions(-) diff --git a/include/llvm/Pass.h b/include/llvm/Pass.h index b376b8b1d39..15381ac978b 100644 --- a/include/llvm/Pass.h +++ b/include/llvm/Pass.h @@ -355,11 +355,6 @@ private: /// @brief This is the storage for the -time-passes option. extern bool TimePassesIsEnabled; -// Different debug levels that can be enabled... -enum PassDebugLevel { - PDLNone, PDLArguments, PDLStructure, PDLExecutions, PDLDetails -}; - } // End llvm namespace // Include support files that contain important APIs commonly used by Passes, diff --git a/lib/VMCore/Pass.cpp b/lib/VMCore/Pass.cpp index 650a7e6191a..8c5a2f760eb 100644 --- a/lib/VMCore/Pass.cpp +++ b/lib/VMCore/Pass.cpp @@ -122,7 +122,7 @@ void PMDebug::PrintArgumentInformation(const Pass *P) { void PMDebug::PrintPassInformation(unsigned Depth, const char *Action, Pass *P, Module *M) { - if (PassDebugging >= PDLExecutions) { + if (PassDebugging >= Executions) { 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, void PMDebug::PrintPassInformation(unsigned Depth, const char *Action, Pass *P, Function *F) { - if (PassDebugging >= PDLExecutions) { + if (PassDebugging >= Executions) { 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, void PMDebug::PrintPassInformation(unsigned Depth, const char *Action, Pass *P, BasicBlock *BB) { - if (PassDebugging >= PDLExecutions) { + if (PassDebugging >= Executions) { cerr << (void*)P << std::string(Depth*2+1, ' ') << Action << " '" << P->getPassName(); if (BB) cerr << "' on BasicBlock '" << BB->getName(); @@ -152,7 +152,7 @@ void PMDebug::PrintPassInformation(unsigned Depth, const char *Action, void PMDebug::PrintAnalysisSetInfo(unsigned Depth, const char *Msg, Pass *P, const std::vector &Set){ - if (PassDebugging >= PDLDetails && !Set.empty()) { + if (PassDebugging >= Details && !Set.empty()) { cerr << (void*)P << std::string(Depth*2+3, ' ') << Msg << " Analyses:"; for (unsigned i = 0; i != Set.size(); ++i) { if (i) cerr << ","; diff --git a/lib/VMCore/PassManager.cpp b/lib/VMCore/PassManager.cpp index 056a2a87c24..7057ac0a1a0 100644 --- a/lib/VMCore/PassManager.cpp +++ b/lib/VMCore/PassManager.cpp @@ -94,15 +94,20 @@ namespace llvm { // 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 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"), + 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)); } // End of llvm namespace @@ -1264,7 +1269,7 @@ bool PassManagerImpl_New::run(Module &M) { bool Changed = false; - if (PassDebugging_New >= PDLStructure) + if (PassDebugging_New >= Structure) dumpPasses(); for (std::vector::iterator I = passManagersBegin(), diff --git a/lib/VMCore/PassManagerT.h b/lib/VMCore/PassManagerT.h index bb04cc1ba5b..68376e57373 100644 --- a/lib/VMCore/PassManagerT.h +++ b/lib/VMCore/PassManagerT.h @@ -37,15 +37,20 @@ namespace llvm { // 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 PassDebugging("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"), + 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)); //===----------------------------------------------------------------------===// @@ -55,13 +60,13 @@ PassDebugging("debug-pass", cl::Hidden, struct PMDebug { static void PerformPassStartupStuff(Pass *P) { // If debugging is enabled, print out argument information... - if (PassDebugging >= PDLArguments) { + if (PassDebugging >= Arguments) { cerr << "Pass Arguments: "; PrintArgumentInformation(P); cerr << "\n"; // Print the pass execution structure - if (PassDebugging >= PDLStructure) + if (PassDebugging >= Structure) P->dumpPassStructure(); } } @@ -541,7 +546,7 @@ public: cerr << "Analysis '" << (*I)->getPassName() << "' used but not available!"; assert(0 && "Analysis used but not available!"); - } else if (PassDebugging == PDLDetails) { + } else if (PassDebugging == Details) { if ((*I)->getPassName() != std::string(Impl->getPassName())) cerr << " Interface '" << (*I)->getPassName() << "' implemented by '" << Impl->getPassName() << "'\n"; @@ -630,7 +635,7 @@ private: cerr << "Analysis '" << (*I)->getPassName() << "' used but not available!"; assert(0 && "Analysis used but not available!"); - } else if (PassDebugging == PDLDetails) { + } else if (PassDebugging == Details) { if ((*I)->getPassName() != std::string(Impl->getPassName())) cerr << " Interface '" << (*I)->getPassName() << "' implemented by '" << Impl->getPassName() << "'\n"; -- 2.34.1