[llvm] 8b8da01 - Revert "[LTO][Legacy] Add -debug-pass-manager option to enable pass run/skip trace."
Wael Yehia via llvm-commits
llvm-commits at lists.llvm.org
Wed Sep 29 12:44:03 PDT 2021
Author: Wael Yehia
Date: 2021-09-29T19:43:35Z
New Revision: 8b8da01d8827fb17412a57c90fd7056828a0ad67
URL: https://github.com/llvm/llvm-project/commit/8b8da01d8827fb17412a57c90fd7056828a0ad67
DIFF: https://github.com/llvm/llvm-project/commit/8b8da01d8827fb17412a57c90fd7056828a0ad67.diff
LOG: Revert "[LTO][Legacy] Add -debug-pass-manager option to enable pass run/skip trace."
This reverts commit a60405cf035dc114e7ee090139bed2577f4ea7ef.
Added:
Modified:
llvm/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
llvm/lib/LTO/LTO.cpp
llvm/lib/LTO/LTOCodeGenerator.cpp
llvm/lib/LTO/ThinLTOCodeGenerator.cpp
llvm/tools/llvm-lto/llvm-lto.cpp
llvm/tools/llvm-lto2/llvm-lto2.cpp
Removed:
llvm/test/tools/llvm-lto/lto-passes.ll
################################################################################
diff --git a/llvm/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h b/llvm/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
index 062be3537e15a..b8daea9441e0d 100644
--- a/llvm/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
+++ b/llvm/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
@@ -229,6 +229,9 @@ class ThinLTOCodeGenerator {
/// Enable or disable the new pass manager.
void setUseNewPM(unsigned Enabled) { UseNewPM = Enabled; }
+ /// Enable or disable debug output for the new pass manager.
+ void setDebugPassManager(unsigned Enabled) { DebugPassManager = Enabled; }
+
/// Disable CodeGen, only run the stages till codegen and stop. The output
/// will be bitcode.
void disableCodeGen(bool Disable) { DisableCodeGen = Disable; }
@@ -348,6 +351,10 @@ class ThinLTOCodeGenerator {
/// Flag to indicate whether the new pass manager should be used for IR
/// optimizations.
bool UseNewPM = LLVM_ENABLE_NEW_PASS_MANAGER;
+
+ /// Flag to indicate whether debug output should be enabled for the new pass
+ /// manager.
+ bool DebugPassManager = false;
};
}
#endif
diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp
index 841ed4de318bc..111fdc8f939ea 100644
--- a/llvm/lib/LTO/LTO.cpp
+++ b/llvm/lib/LTO/LTO.cpp
@@ -73,12 +73,6 @@ cl::opt<bool> EnableLTOInternalization(
"enable-lto-internalization", cl::init(true), cl::Hidden,
cl::desc("Enable global value internalization in LTO"));
-namespace llvm {
-cl::opt<bool>
- DebugPassManager("debug-pass-manager", cl::init(false), cl::Hidden,
- cl::desc("Print pass management debugging information"));
-}
-
// Computes a unique hash for the Module considering the current list of
// export/import and other global analysis results.
// The hash is produced in \p Key.
diff --git a/llvm/lib/LTO/LTOCodeGenerator.cpp b/llvm/lib/LTO/LTOCodeGenerator.cpp
index 5d7252e63c148..7bffcbf01b03a 100644
--- a/llvm/lib/LTO/LTOCodeGenerator.cpp
+++ b/llvm/lib/LTO/LTOCodeGenerator.cpp
@@ -117,8 +117,6 @@ cl::opt<std::string> LTOStatsFile(
"lto-stats-file",
cl::desc("Save statistics to the specified file"),
cl::Hidden);
-
-extern cl::opt<bool> DebugPassManager;
}
LTOCodeGenerator::LTOCodeGenerator(LLVMContext &Context)
@@ -132,7 +130,6 @@ LTOCodeGenerator::LTOCodeGenerator(LLVMContext &Context)
Config.PreCodeGenPassesHook = [](legacy::PassManager &PM) {
PM.add(createObjCARCContractPass());
};
- Config.DebugPassManager = DebugPassManager;
}
LTOCodeGenerator::~LTOCodeGenerator() {}
diff --git a/llvm/lib/LTO/ThinLTOCodeGenerator.cpp b/llvm/lib/LTO/ThinLTOCodeGenerator.cpp
index d1966ca9c1c3b..e9602b3eb9d13 100644
--- a/llvm/lib/LTO/ThinLTOCodeGenerator.cpp
+++ b/llvm/lib/LTO/ThinLTOCodeGenerator.cpp
@@ -84,7 +84,6 @@ extern cl::opt<bool> RemarksWithHotness;
extern cl::opt<Optional<uint64_t>, false, remarks::HotnessThresholdParser>
RemarksHotnessThreshold;
extern cl::opt<std::string> RemarksFormat;
-extern cl::opt<bool> DebugPassManager;
}
namespace {
@@ -270,6 +269,7 @@ static void optimizeModule(Module &TheModule, TargetMachine &TM,
static void optimizeModuleNewPM(Module &TheModule, TargetMachine &TM,
unsigned OptLevel, bool Freestanding,
+ bool DebugPassManager,
ModuleSummaryIndex *Index) {
Optional<PGOOptions> PGOOpt;
LoopAnalysisManager LAM;
@@ -489,7 +489,7 @@ ProcessThinLTOModule(Module &TheModule, ModuleSummaryIndex &Index,
const ThinLTOCodeGenerator::CachingOptions &CacheOptions,
bool DisableCodeGen, StringRef SaveTempsDir,
bool Freestanding, unsigned OptLevel, unsigned count,
- bool UseNewPM) {
+ bool UseNewPM, bool DebugPassManager) {
// "Benchmark"-like optimization: single-source case
bool SingleModule = (ModuleMap.size() == 1);
@@ -530,7 +530,8 @@ ProcessThinLTOModule(Module &TheModule, ModuleSummaryIndex &Index,
}
if (UseNewPM)
- optimizeModuleNewPM(TheModule, TM, OptLevel, Freestanding, &Index);
+ optimizeModuleNewPM(TheModule, TM, OptLevel, Freestanding, DebugPassManager,
+ &Index);
else
optimizeModule(TheModule, TM, OptLevel, Freestanding, &Index);
@@ -1218,7 +1219,7 @@ void ThinLTOCodeGenerator::run() {
ExportList, GUIDPreservedSymbols,
ModuleToDefinedGVSummaries[ModuleIdentifier], CacheOptions,
DisableCodeGen, SaveTempsDir, Freestanding, OptLevel, count,
- UseNewPM);
+ UseNewPM, DebugPassManager);
// Commit to the cache (if enabled)
CacheEntry.write(*OutputBuffer);
diff --git a/llvm/test/tools/llvm-lto/lto-passes.ll b/llvm/test/tools/llvm-lto/lto-passes.ll
deleted file mode 100644
index c8424ec4f3d8b..0000000000000
--- a/llvm/test/tools/llvm-lto/lto-passes.ll
+++ /dev/null
@@ -1,12 +0,0 @@
-; Test that -debug-pass-manager works in LTOCodeGenerator. The actual list of
-; passes that is run during LTO is tested in:
-; llvm/test/Other/new-pm-lto-defaults.ll
-;
-; RUN: llvm-as < %s > %t.bc
-; RUN: llvm-lto %t.bc -O0 --debug-pass-manager 2>&1 | FileCheck %s
-; CHECK: Running pass: WholeProgramDevirtPass
-
-define i32 @main() {
-entry:
- ret i32 42
-}
diff --git a/llvm/tools/llvm-lto/llvm-lto.cpp b/llvm/tools/llvm-lto/llvm-lto.cpp
index dbf0b18a9efb9..45cca0f976118 100644
--- a/llvm/tools/llvm-lto/llvm-lto.cpp
+++ b/llvm/tools/llvm-lto/llvm-lto.cpp
@@ -259,6 +259,11 @@ static cl::opt<bool> UseNewPM(
"use-new-pm", cl::desc("Run LTO passes using the new pass manager"),
cl::init(LLVM_ENABLE_NEW_PASS_MANAGER), cl::Hidden, cl::cat(LTOCategory));
+static cl::opt<bool>
+ DebugPassManager("debug-pass-manager", cl::init(false), cl::Hidden,
+ cl::desc("Print pass management debugging information"),
+ cl::cat(LTOCategory));
+
namespace {
struct ModuleInfo {
@@ -599,6 +604,7 @@ class ThinLTOProcessing {
ThinGenerator.setCacheMaxSizeBytes(ThinLTOCacheMaxSizeBytes);
ThinGenerator.setFreestanding(EnableFreestanding);
ThinGenerator.setUseNewPM(UseNewPM);
+ ThinGenerator.setDebugPassManager(DebugPassManager);
// Add all the exported symbols to the table of symbols to preserve.
for (unsigned i = 0; i < ExportedSymbols.size(); ++i)
diff --git a/llvm/tools/llvm-lto2/llvm-lto2.cpp b/llvm/tools/llvm-lto2/llvm-lto2.cpp
index d6c69bc62e9ed..c0bff1eabee27 100644
--- a/llvm/tools/llvm-lto2/llvm-lto2.cpp
+++ b/llvm/tools/llvm-lto2/llvm-lto2.cpp
@@ -147,6 +147,10 @@ static cl::opt<bool>
cl::desc("Run LTO passes using the new pass manager"),
cl::init(LLVM_ENABLE_NEW_PASS_MANAGER), cl::Hidden);
+static cl::opt<bool>
+ DebugPassManager("debug-pass-manager", cl::init(false), cl::Hidden,
+ cl::desc("Print pass management debugging information"));
+
static cl::opt<std::string>
StatsFile("stats-file", cl::desc("Filename to write statistics to"));
@@ -168,10 +172,6 @@ static void check(Error E, std::string Msg) {
exit(1);
}
-namespace llvm {
-extern cl::opt<bool> DebugPassManager;
-}
-
template <typename T> static T check(Expected<T> E, std::string Msg) {
if (E)
return std::move(*E);
More information about the llvm-commits
mailing list