[llvm] r190990 - Revert "Encapsulate PassManager debug flags to avoid static init and cxa_exit."
Andrew Trick
atrick at apple.com
Wed Sep 18 23:02:44 PDT 2013
Author: atrick
Date: Thu Sep 19 01:02:43 2013
New Revision: 190990
URL: http://llvm.org/viewvc/llvm-project?rev=190990&view=rev
Log:
Revert "Encapsulate PassManager debug flags to avoid static init and cxa_exit."
Working on a better solution to this.
This reverts commit 7d4e9934e7ca83094c5cf41346966c8350179ff2.
Modified:
llvm/trunk/include/llvm/PassManager.h
llvm/trunk/lib/IR/Core.cpp
llvm/trunk/lib/IR/PassManager.cpp
llvm/trunk/tools/llvm-as/llvm-as.cpp
llvm/trunk/tools/llvm-diff/llvm-diff.cpp
llvm/trunk/tools/llvm-dis/llvm-dis.cpp
llvm/trunk/tools/llvm-extract/llvm-extract.cpp
llvm/trunk/tools/llvm-link/llvm-link.cpp
llvm/trunk/tools/llvm-nm/llvm-nm.cpp
llvm/trunk/tools/llvm-prof/llvm-prof.cpp
llvm/trunk/tools/llvm-stress/llvm-stress.cpp
Modified: llvm/trunk/include/llvm/PassManager.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/PassManager.h?rev=190990&r1=190989&r2=190990&view=diff
==============================================================================
--- llvm/trunk/include/llvm/PassManager.h (original)
+++ llvm/trunk/include/llvm/PassManager.h Thu Sep 19 01:02:43 2013
@@ -28,11 +28,6 @@ class Module;
class PassManagerImpl;
class FunctionPassManagerImpl;
-/// Called by tools to initialize globals and register options at a particular
-/// point (before command line parsing). If this is not called, then PassManager
-/// globals are lazily initialized at first use.
-void initializePassManager();
-
/// PassManagerBase - An abstract interface to allow code to add passes to
/// a pass manager without having to hard-code what kind of pass manager
/// it is.
Modified: llvm/trunk/lib/IR/Core.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Core.cpp?rev=190990&r1=190989&r2=190990&view=diff
==============================================================================
--- llvm/trunk/lib/IR/Core.cpp (original)
+++ llvm/trunk/lib/IR/Core.cpp Thu Sep 19 01:02:43 2013
@@ -40,7 +40,6 @@
using namespace llvm;
void llvm::initializeCore(PassRegistry &Registry) {
- initializePassManager();
initializeDominatorTreePass(Registry);
initializePrintModulePassPass(Registry);
initializePrintFunctionPassPass(Registry);
Modified: llvm/trunk/lib/IR/PassManager.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/PassManager.cpp?rev=190990&r1=190989&r2=190990&view=diff
==============================================================================
--- llvm/trunk/lib/IR/PassManager.cpp (original)
+++ llvm/trunk/lib/IR/PassManager.cpp Thu Sep 19 01:02:43 2013
@@ -45,94 +45,65 @@ enum PassDebugLevel {
Disabled, Arguments, Structure, Executions, Details
};
-bool TimePassesIsEnabled = false;
-
-/// Encapsulate PassManager debug options. These are convenient options that
-/// should be available to any LLVM-based tool. They exist purely as
-/// command-line debug options, therefore don't need to be local to an LLVM
-/// context or captured by a formal API. In all respects they are handled like
-/// global variables, but being defined in the LLVMCore library cannot have
-/// static initializers and must be destroyed only at llvm_shutdown.
-struct PassDebugOpts {
- cl::opt<enum PassDebugLevel> PassDebugging;
-
- typedef llvm::cl::list<const llvm::PassInfo *, bool, PassNameParser>
- PassOptionList;
-
- // Print IR out before/after specified passes.
- PassOptionList PrintBefore;
-
- PassOptionList PrintAfter;
-
- cl::opt<bool> PrintBeforeAll;
- cl::opt<bool> PrintAfterAll;
-
- cl::opt<bool,true> EnableTiming;
-
- PassDebugOpts():
- PassDebugging("debug-pass", cl::Hidden,
+static cl::opt<enum PassDebugLevel>
+PassDebugging("debug-pass", cl::Hidden,
cl::desc("Print PassManager debugging information"),
cl::values(
- clEnumVal(Disabled , "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)),
- PrintBefore("print-before",
- llvm::cl::desc("Print IR before specified passes"),
- cl::Hidden),
- PrintAfter("print-after",
- llvm::cl::desc("Print IR after specified passes"),
- cl::Hidden),
- PrintBeforeAll("print-before-all",
- llvm::cl::desc("Print IR before each pass"),
- cl::init(false)),
- PrintAfterAll("print-after-all",
- llvm::cl::desc("Print IR after each pass"),
- cl::init(false)),
- EnableTiming("time-passes", cl::location(TimePassesIsEnabled),
- cl::desc(
- "Time each pass, printing elapsed time for each on exit"))
- {}
-
- /// This is a helper to determine whether to print IR before or
- /// after a pass.
- bool ShouldPrintBeforeOrAfterPass(const PassInfo *PI,
- PassOptionList &PassesToPrint) {
- for (unsigned i = 0, ie = PassesToPrint.size(); i < ie; ++i) {
- const llvm::PassInfo *PassInf = PassesToPrint[i];
- if (PassInf)
- if (PassInf->getPassArgument() == PI->getPassArgument()) {
- return true;
- }
- }
- return false;
- }
-
- /// This is a utility to check whether a pass should have IR dumped
- /// before it.
- bool ShouldPrintBeforePass(const PassInfo *PI) {
- return PrintBeforeAll || ShouldPrintBeforeOrAfterPass(PI, PrintBefore);
- }
-
- /// This is a utility to check whether a pass should have IR dumped
- /// after it.
- bool ShouldPrintAfterPass(const PassInfo *PI) {
- return PrintAfterAll || ShouldPrintBeforeOrAfterPass(PI, PrintAfter);
+ clEnumVal(Disabled , "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));
+
+typedef llvm::cl::list<const llvm::PassInfo *, bool, PassNameParser>
+PassOptionList;
+
+// Print IR out before/after specified passes.
+static PassOptionList
+PrintBefore("print-before",
+ llvm::cl::desc("Print IR before specified passes"),
+ cl::Hidden);
+
+static PassOptionList
+PrintAfter("print-after",
+ llvm::cl::desc("Print IR after specified passes"),
+ cl::Hidden);
+
+static cl::opt<bool>
+PrintBeforeAll("print-before-all",
+ llvm::cl::desc("Print IR before each pass"),
+ cl::init(false));
+static cl::opt<bool>
+PrintAfterAll("print-after-all",
+ llvm::cl::desc("Print IR after each pass"),
+ cl::init(false));
+
+/// This is a helper to determine whether to print IR before or
+/// after a pass.
+
+static bool ShouldPrintBeforeOrAfterPass(const PassInfo *PI,
+ PassOptionList &PassesToPrint) {
+ for (unsigned i = 0, ie = PassesToPrint.size(); i < ie; ++i) {
+ const llvm::PassInfo *PassInf = PassesToPrint[i];
+ if (PassInf)
+ if (PassInf->getPassArgument() == PI->getPassArgument()) {
+ return true;
+ }
}
-};
+ return false;
+}
-static ManagedStatic<PassDebugOpts> GlobalPassDebugOpts;
+/// This is a utility to check whether a pass should have IR dumped
+/// before it.
+static bool ShouldPrintBeforePass(const PassInfo *PI) {
+ return PrintBeforeAll || ShouldPrintBeforeOrAfterPass(PI, PrintBefore);
+}
-/// This is called by tools to force registration of debugging options and
-/// ensure they appear in the tool's -help usage.
-void initializePassManager() {
- // Force instantiation of PassDebugOpts.
- *GlobalPassDebugOpts;
+/// This is a utility to check whether a pass should have IR dumped
+/// after it.
+static bool ShouldPrintAfterPass(const PassInfo *PI) {
+ return PrintAfterAll || ShouldPrintBeforeOrAfterPass(PI, PrintAfter);
}
} // End of llvm namespace
@@ -140,9 +111,12 @@ void initializePassManager() {
/// isPassDebuggingExecutionsOrMore - Return true if -debug-pass=Executions
/// or higher is specified.
bool PMDataManager::isPassDebuggingExecutionsOrMore() const {
- return GlobalPassDebugOpts->PassDebugging >= Executions;
+ return PassDebugging >= Executions;
}
+
+
+
void PassManagerPrettyStackEntry::print(raw_ostream &OS) const {
if (V == 0 && M == 0)
OS << "Releasing pass '";
@@ -694,8 +668,7 @@ void PMTopLevelManager::schedulePass(Pas
return;
}
- if (PI && !PI->isAnalysis() &&
- GlobalPassDebugOpts->ShouldPrintBeforePass(PI)) {
+ if (PI && !PI->isAnalysis() && ShouldPrintBeforePass(PI)) {
Pass *PP = P->createPrinterPass(
dbgs(), std::string("*** IR Dump Before ") + P->getPassName() + " ***");
PP->assignPassManager(activeStack, getTopLevelPassManagerType());
@@ -704,8 +677,7 @@ void PMTopLevelManager::schedulePass(Pas
// Add the requested pass to the best available pass manager.
P->assignPassManager(activeStack, getTopLevelPassManagerType());
- if (PI && !PI->isAnalysis() &&
- GlobalPassDebugOpts->ShouldPrintAfterPass(PI)) {
+ if (PI && !PI->isAnalysis() && ShouldPrintAfterPass(PI)) {
Pass *PP = P->createPrinterPass(
dbgs(), std::string("*** IR Dump After ") + P->getPassName() + " ***");
PP->assignPassManager(activeStack, getTopLevelPassManagerType());
@@ -757,7 +729,7 @@ Pass *PMTopLevelManager::findAnalysisPas
// Print passes managed by this top level manager.
void PMTopLevelManager::dumpPasses() const {
- if (GlobalPassDebugOpts->PassDebugging < Structure)
+ if (PassDebugging < Structure)
return;
// Print out the immutable passes
@@ -776,7 +748,7 @@ void PMTopLevelManager::dumpPasses() con
void PMTopLevelManager::dumpArguments() const {
- if (GlobalPassDebugOpts->PassDebugging < Arguments)
+ if (PassDebugging < Arguments)
return;
dbgs() << "Pass Arguments: ";
@@ -909,7 +881,7 @@ void PMDataManager::removeNotPreservedAn
std::find(PreservedSet.begin(), PreservedSet.end(), Info->first) ==
PreservedSet.end()) {
// Remove this analysis
- if (GlobalPassDebugOpts->PassDebugging >= Details) {
+ if (PassDebugging >= Details) {
Pass *S = Info->second;
dbgs() << " -- '" << P->getPassName() << "' is not preserving '";
dbgs() << S->getPassName() << "'\n";
@@ -933,7 +905,7 @@ void PMDataManager::removeNotPreservedAn
std::find(PreservedSet.begin(), PreservedSet.end(), Info->first) ==
PreservedSet.end()) {
// Remove this analysis
- if (GlobalPassDebugOpts->PassDebugging >= Details) {
+ if (PassDebugging >= Details) {
Pass *S = Info->second;
dbgs() << " -- '" << P->getPassName() << "' is not preserving '";
dbgs() << S->getPassName() << "'\n";
@@ -956,7 +928,7 @@ void PMDataManager::removeDeadPasses(Pas
TPM->collectLastUses(DeadPasses, P);
- if (GlobalPassDebugOpts->PassDebugging >= Details && !DeadPasses.empty()) {
+ if (PassDebugging >= Details && !DeadPasses.empty()) {
dbgs() << " -*- '" << P->getPassName();
dbgs() << "' is the last user of following pass instances.";
dbgs() << " Free these instances\n";
@@ -1174,7 +1146,7 @@ void PMDataManager::dumpPassArguments()
void PMDataManager::dumpPassInfo(Pass *P, enum PassDebuggingString S1,
enum PassDebuggingString S2,
StringRef Msg) {
- if (GlobalPassDebugOpts->PassDebugging < Executions)
+ if (PassDebugging < Executions)
return;
dbgs() << (void*)this << std::string(getDepth()*2+1, ' ');
switch (S1) {
@@ -1215,7 +1187,7 @@ void PMDataManager::dumpPassInfo(Pass *P
}
void PMDataManager::dumpRequiredSet(const Pass *P) const {
- if (GlobalPassDebugOpts->PassDebugging < Details)
+ if (PassDebugging < Details)
return;
AnalysisUsage analysisUsage;
@@ -1224,7 +1196,7 @@ void PMDataManager::dumpRequiredSet(cons
}
void PMDataManager::dumpPreservedSet(const Pass *P) const {
- if (GlobalPassDebugOpts->PassDebugging < Details)
+ if (PassDebugging < Details)
return;
AnalysisUsage analysisUsage;
@@ -1234,7 +1206,7 @@ void PMDataManager::dumpPreservedSet(con
void PMDataManager::dumpAnalysisUsage(StringRef Msg, const Pass *P,
const AnalysisUsage::VectorType &Set) const {
- assert(GlobalPassDebugOpts->PassDebugging >= Details);
+ assert(PassDebugging >= Details);
if (Set.empty())
return;
dbgs() << (const void*)P << std::string(getDepth()*2+3, ' ') << Msg << " Analyses:";
@@ -1769,6 +1741,11 @@ bool PassManager::run(Module &M) {
//===----------------------------------------------------------------------===//
// TimingInfo implementation
+bool llvm::TimePassesIsEnabled = false;
+static cl::opt<bool,true>
+EnableTiming("time-passes", cl::location(TimePassesIsEnabled),
+ cl::desc("Time each pass, printing elapsed time for each on exit"));
+
// createTheTimeInfo - This method either initializes the TheTimeInfo pointer to
// a non null value (if the -time-passes option is enabled) or it leaves it
// null. It may be called multiple times.
Modified: llvm/trunk/tools/llvm-as/llvm-as.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-as/llvm-as.cpp?rev=190990&r1=190989&r2=190990&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-as/llvm-as.cpp (original)
+++ llvm/trunk/tools/llvm-as/llvm-as.cpp Thu Sep 19 01:02:43 2013
@@ -20,7 +20,6 @@
#include "llvm/Assembly/Parser.h"
#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/IR/Module.h"
-#include "llvm/PassManager.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PrettyStackTrace.h"
@@ -90,10 +89,6 @@ int main(int argc, char **argv) {
PrettyStackTraceProgram X(argc, argv);
LLVMContext &Context = getGlobalContext();
llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
-
- // Initialize PassManager for -time-passes support.
- initializePassManager();
-
cl::ParseCommandLineOptions(argc, argv, "llvm .ll -> .bc assembler\n");
// Parse the file now...
Modified: llvm/trunk/tools/llvm-diff/llvm-diff.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-diff/llvm-diff.cpp?rev=190990&r1=190989&r2=190990&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-diff/llvm-diff.cpp (original)
+++ llvm/trunk/tools/llvm-diff/llvm-diff.cpp Thu Sep 19 01:02:43 2013
@@ -20,7 +20,6 @@
#include "llvm/IR/Module.h"
#include "llvm/IR/Type.h"
#include "llvm/IRReader/IRReader.h"
-#include "llvm/PassManager.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/SourceMgr.h"
@@ -68,9 +67,6 @@ static cl::list<std::string> GlobalsToCo
cl::desc("<globals to compare>"));
int main(int argc, char **argv) {
- // Initialize PassManager for -time-passes support.
- initializePassManager();
-
cl::ParseCommandLineOptions(argc, argv);
LLVMContext Context;
Modified: llvm/trunk/tools/llvm-dis/llvm-dis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-dis/llvm-dis.cpp?rev=190990&r1=190989&r2=190990&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-dis/llvm-dis.cpp (original)
+++ llvm/trunk/tools/llvm-dis/llvm-dis.cpp Thu Sep 19 01:02:43 2013
@@ -23,7 +23,6 @@
#include "llvm/IR/IntrinsicInst.h"
#include "llvm/IR/Module.h"
#include "llvm/IR/Type.h"
-#include "llvm/PassManager.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/DataStream.h"
#include "llvm/Support/FormattedStream.h"
@@ -120,8 +119,6 @@ int main(int argc, char **argv) {
LLVMContext &Context = getGlobalContext();
llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
- // Initialize PassManager for -time-passes support.
- initializePassManager();
cl::ParseCommandLineOptions(argc, argv, "llvm .bc -> .ll disassembler\n");
Modified: llvm/trunk/tools/llvm-extract/llvm-extract.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-extract/llvm-extract.cpp?rev=190990&r1=190989&r2=190990&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-extract/llvm-extract.cpp (original)
+++ llvm/trunk/tools/llvm-extract/llvm-extract.cpp Thu Sep 19 01:02:43 2013
@@ -96,10 +96,6 @@ int main(int argc, char **argv) {
LLVMContext &Context = getGlobalContext();
llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
-
- // Initialize PassManager for -time-passes support.
- initializePassManager();
-
cl::ParseCommandLineOptions(argc, argv, "llvm extractor\n");
// Use lazy loading, since we only care about selected global values.
Modified: llvm/trunk/tools/llvm-link/llvm-link.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-link/llvm-link.cpp?rev=190990&r1=190989&r2=190990&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-link/llvm-link.cpp (original)
+++ llvm/trunk/tools/llvm-link/llvm-link.cpp Thu Sep 19 01:02:43 2013
@@ -18,7 +18,6 @@
#include "llvm/IR/LLVMContext.h"
#include "llvm/IR/Module.h"
#include "llvm/IRReader/IRReader.h"
-#include "llvm/PassManager.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/Path.h"
@@ -74,10 +73,6 @@ int main(int argc, char **argv) {
LLVMContext &Context = getGlobalContext();
llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
-
- // Initialize PassManager for -time-passes support.
- initializePassManager();
-
cl::ParseCommandLineOptions(argc, argv, "llvm linker\n");
unsigned BaseArg = 0;
Modified: llvm/trunk/tools/llvm-nm/llvm-nm.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-nm/llvm-nm.cpp?rev=190990&r1=190989&r2=190990&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-nm/llvm-nm.cpp (original)
+++ llvm/trunk/tools/llvm-nm/llvm-nm.cpp Thu Sep 19 01:02:43 2013
@@ -22,7 +22,6 @@
#include "llvm/Object/Archive.h"
#include "llvm/Object/MachOUniversal.h"
#include "llvm/Object/ObjectFile.h"
-#include "llvm/PassManager.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Format.h"
@@ -447,10 +446,6 @@ int main(int argc, char **argv) {
PrettyStackTraceProgram X(argc, argv);
llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
-
- // Initialize PassManager for -time-passes support.
- initializePassManager();
-
cl::ParseCommandLineOptions(argc, argv, "llvm symbol table dumper\n");
// llvm-nm only reads binary files.
Modified: llvm/trunk/tools/llvm-prof/llvm-prof.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-prof/llvm-prof.cpp?rev=190990&r1=190989&r2=190990&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-prof/llvm-prof.cpp (original)
+++ llvm/trunk/tools/llvm-prof/llvm-prof.cpp Thu Sep 19 01:02:43 2013
@@ -260,9 +260,6 @@ int main(int argc, char **argv) {
LLVMContext &Context = getGlobalContext();
llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
- // Initialize PassManager for -time-passes support.
- initializePassManager();
-
cl::ParseCommandLineOptions(argc, argv, "llvm profile dump decoder\n");
// Read in the bitcode file...
Modified: llvm/trunk/tools/llvm-stress/llvm-stress.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-stress/llvm-stress.cpp?rev=190990&r1=190989&r2=190990&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-stress/llvm-stress.cpp (original)
+++ llvm/trunk/tools/llvm-stress/llvm-stress.cpp Thu Sep 19 01:02:43 2013
@@ -681,10 +681,6 @@ void IntroduceControlFlow(Function *F, R
int main(int argc, char **argv) {
// Init LLVM, call llvm_shutdown() on exit, parse args, etc.
llvm::PrettyStackTraceProgram X(argc, argv);
-
- // Initialize PassManager for -time-passes support.
- initializePassManager();
-
cl::ParseCommandLineOptions(argc, argv, "llvm codegen stress-tester\n");
llvm_shutdown_obj Y;
More information about the llvm-commits
mailing list