RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 11:02:59 +02:00
Code Issues Projects Releases Wiki Activity

Revert "[NewPM] Provide method to run all pipeline callbacks, used for -O0"

Browse Source 
This reverts commit ae38540042668675dd16c642d850115f217ea59f.
As well as some follow-up test fixes.

The original change causes new-pass-manager.ll to fail when polly is enabled.
This commit is contained in:
Arthur Eubanks 2020-11-08 00:18:42 -08:00
parent 8e0220801f
commit 35a4ce12d4
5 changed files with 6 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/llvm/Passes/PassBuilder.h
View File

@ -594,20 +594,15 @@ public:
/// Register a callback for a default optimizer pipeline extension point
///
/// This extension point allows adding optimizations at the very end of the
/// function optimization pipeline.
/// function optimization pipeline. A key difference between this and the
/// legacy PassManager's OptimizerLast callback is that this extension point
/// is not triggered at O0. Extensions to the O0 pipeline should append their
/// passes to the end of the overall pipeline.
void registerOptimizerLastEPCallback(
const std::function<void(ModulePassManager &, OptimizationLevel)> &C) {
OptimizerLastEPCallbacks.push_back(C);
}
/// Run all registered extension point callbacks
///
/// This runs the registered callbacks in the order they would be run in a
/// typical build*Pipeline(). This allows for reusing register*EPCallback()
/// between O0 and O[123] pipelines.
void runRegisteredEPCallbacks(ModulePassManager &MPM, OptimizationLevel Level,
bool DebugLogging);
/// Register a callback for parsing an AliasAnalysis Name to populate
/// the given AAManager \p AA
void registerParseAACallback(

45
lib/Passes/PassBuilder.cpp
View File

@ -1658,49 +1658,6 @@ PassBuilder::buildLTODefaultPipeline(OptimizationLevel Level,
return MPM;
}
void PassBuilder::runRegisteredEPCallbacks(ModulePassManager &MPM,
OptimizationLevel Level,
bool DebugLogging) {
assert(Level == OptimizationLevel::O0 &&
"runRegisteredEPCallbacks should only be used with O0");
for (auto &C : PipelineStartEPCallbacks)
C(MPM, Level);
if (!LateLoopOptimizationsEPCallbacks.empty()) {
LoopPassManager LPM(DebugLogging);
for (auto &C : LateLoopOptimizationsEPCallbacks)
C(LPM, Level);
MPM.addPass(createModuleToFunctionPassAdaptor(
createFunctionToLoopPassAdaptor(std::move(LPM))));
}
if (!LoopOptimizerEndEPCallbacks.empty()) {
LoopPassManager LPM(DebugLogging);
for (auto &C : LoopOptimizerEndEPCallbacks)
C(LPM, Level);
MPM.addPass(createModuleToFunctionPassAdaptor(
createFunctionToLoopPassAdaptor(std::move(LPM))));
}
if (!ScalarOptimizerLateEPCallbacks.empty()) {
FunctionPassManager FPM(DebugLogging);
for (auto &C : ScalarOptimizerLateEPCallbacks)
C(FPM, Level);
MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
}
if (!CGSCCOptimizerLateEPCallbacks.empty()) {
CGSCCPassManager CGPM(DebugLogging);
for (auto &C : CGSCCOptimizerLateEPCallbacks)
C(CGPM, Level);
MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
}
if (!VectorizerStartEPCallbacks.empty()) {
FunctionPassManager FPM(DebugLogging);
for (auto &C : VectorizerStartEPCallbacks)
C(FPM, Level);
MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
}
for (auto &C : OptimizerLastEPCallbacks)
C(MPM, Level);
}
AAManager PassBuilder::buildDefaultAAPipeline() {
AAManager AA;
@ -2283,8 +2240,6 @@ Error PassBuilder::parseModulePass(ModulePassManager &MPM,
MPM.addPass(createModuleToFunctionPassAdaptor(CoroCleanupPass()));
}
runRegisteredEPCallbacks(MPM, L, DebugLogging);
// Do nothing else at all!
return Error::success();
}

2
test/CodeGen/BPF/optnone-2.ll
View File

@ -1,5 +1,5 @@
; RUN: opt < %s -passes='default<O2>' | llc -march=bpfel -filetype=asm -o /dev/null -
; RUN: opt < %s -passes='default<O0>' | llc -march=bpfel -filetype=asm -o /dev/null -
; TODO: add -O0 once that's supported
; IR generated by
; $ cat /tmp/a.c

9
test/Other/new-pass-manager.ll
View File

@ -356,17 +356,10 @@
; CHECK-CALLGRAPH: Running analysis: CallGraphAnalysis
; CHECK-CALLGRAPH: Finished llvm::Module pass manager run
;; If Polly is enabled, registerPollyPasses adds an ep-vectorizer-start callback.
;; There may or may not be a function pass manager run.
;; Add a no-op-function to unify the two cases.
; RUN: opt -disable-output -disable-verify -debug-pass-manager \
; RUN: -passes='default<O0>' -passes-ep-vectorizer-start=no-op-function %s 2>&1 \
; RUN: -passes='default<O0>' %s 2>&1 \
; RUN: | FileCheck %s --check-prefix=CHECK-O0
; CHECK-O0: Starting llvm::Module pass manager run
; CHECK-O0-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*}}>
; CHECK-O0-NEXT: Starting llvm::Function pass manager run
; CHECK-O0-NEXT: Running pass: NoOpFunctionPass on foo
; CHECK-O0-NEXT: Finished llvm::Function pass manager run
; CHECK-O0-NEXT: Finished llvm::Module pass manager run
; RUN: opt -disable-output -disable-verify -debug-pass-manager \

24
test/Other/new-pm-O0-ep-callbacks.ll
View File

@ -1,24 +0,0 @@
; RUN: opt -disable-output -debug-pass-manager -passes-ep-late-loop-optimizations=no-op-loop -passes='default<O0>' 2>&1 < %s | FileCheck %s
; RUN: opt -disable-output -debug-pass-manager -passes-ep-loop-optimizer-end=no-op-loop -passes='default<O0>' 2>&1 < %s | FileCheck %s
; RUN: opt -disable-output -debug-pass-manager -passes-ep-scalar-optimizer-late=no-op-function -passes='default<O0>' 2>&1 < %s | FileCheck %s
; RUN: opt -disable-output -debug-pass-manager -passes-ep-cgscc-optimizer-late=no-op-cgscc -passes='default<O0>' 2>&1 < %s | FileCheck %s
; RUN: opt -disable-output -debug-pass-manager -passes-ep-vectorizer-start=no-op-function -passes='default<O0>' 2>&1 < %s | FileCheck %s
; RUN: opt -disable-output -debug-pass-manager -passes-ep-pipeline-start=no-op-module -passes='default<O0>' 2>&1 < %s | FileCheck %s
; RUN: opt -disable-output -debug-pass-manager -passes-ep-optimizer-last=no-op-function -passes='default<O0>' 2>&1 < %s | FileCheck %s
; CHECK: Running pass: NoOp
declare void @bar() local_unnamed_addr
define void @foo(i32 %n) local_unnamed_addr {
entry:
br label %loop
loop:
%iv = phi i32 [ 0, %entry ], [ %iv.next, %loop ]
%iv.next = add i32 %iv, 1
tail call void @bar()
%cmp = icmp eq i32 %iv, %n
br i1 %cmp, label %exit, label %loop
exit:
ret void
}