Skip to content

Commit 4d16ebd

Browse files
committed
[Pipeline] Remove -enable-no-rerun-simplification-pipeline flag
This has been on without complaint for a while. Reviewed By: asbirlea Differential Revision: https://reviews.llvm.org/D144130
1 parent dccd1d7 commit 4d16ebd

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

llvm/lib/Passes/PassBuilderPipelines.cpp

+3-11
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,6 @@ static cl::opt<bool> EnableEagerlyInvalidateAnalyses(
173173
"eagerly-invalidate-analyses", cl::init(true), cl::Hidden,
174174
cl::desc("Eagerly invalidate more analyses in default pipelines"));
175175

176-
static cl::opt<bool> EnableNoRerunSimplificationPipeline(
177-
"enable-no-rerun-simplification-pipeline", cl::init(true), cl::Hidden,
178-
cl::desc(
179-
"Prevent running the simplification pipeline on a function more "
180-
"than once in the case that SCC mutations cause a function to be "
181-
"visited multiple times as long as the function has not been changed"));
182-
183176
static cl::opt<bool> EnableMergeFunctions(
184177
"enable-merge-functions", cl::init(false), cl::Hidden,
185178
cl::desc("Enable function merging as part of the optimization pipeline"));
@@ -876,13 +869,12 @@ PassBuilder::buildInlinerPipeline(OptimizationLevel Level,
876869
// CGSCC walk.
877870
MainCGPipeline.addPass(createCGSCCToFunctionPassAdaptor(
878871
buildFunctionSimplificationPipeline(Level, Phase),
879-
PTO.EagerlyInvalidateAnalyses, EnableNoRerunSimplificationPipeline));
872+
PTO.EagerlyInvalidateAnalyses, /*NoRerun=*/true));
880873

881874
MainCGPipeline.addPass(CoroSplitPass(Level != OptimizationLevel::O0));
882875

883-
if (EnableNoRerunSimplificationPipeline)
884-
MIWP.addLateModulePass(createModuleToFunctionPassAdaptor(
885-
InvalidateAnalysisPass<ShouldNotRunFunctionPassesAnalysis>()));
876+
MIWP.addLateModulePass(createModuleToFunctionPassAdaptor(
877+
InvalidateAnalysisPass<ShouldNotRunFunctionPassesAnalysis>()));
886878

887879
return MIWP;
888880
}

llvm/test/Other/no-rerun-function-simplification-pipeline.ll

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
; RUN: opt < %s -passes='default<O1>' -disable-output -debug-pass-manager=verbose -enable-no-rerun-simplification-pipeline=0 2>&1 | FileCheck %s --check-prefixes=CHECK,RERUNSP
2-
; RUN: opt < %s -passes='default<O2>' -disable-output -debug-pass-manager=verbose -enable-no-rerun-simplification-pipeline=0 2>&1 | FileCheck %s --check-prefixes=CHECK,RERUNSP
3-
; RUN: opt < %s -passes='default<O1>' -disable-output -debug-pass-manager=verbose -enable-no-rerun-simplification-pipeline=1 2>&1 | FileCheck %s --check-prefixes=CHECK,NORERUN
4-
; RUN: opt < %s -passes='default<O2>' -disable-output -debug-pass-manager=verbose -enable-no-rerun-simplification-pipeline=1 2>&1 | FileCheck %s --check-prefixes=CHECK,NORERUN
1+
; RUN: opt < %s -passes='default<O1>' -disable-output -debug-pass-manager=verbose 2>&1 | FileCheck %s
2+
; RUN: opt < %s -passes='default<O2>' -disable-output -debug-pass-manager=verbose 2>&1 | FileCheck %s
53

64
; BDCE only runs once in the function simplification pipeline and nowhere else so we use that to check for reruns.
75

@@ -11,8 +9,7 @@
119
; CHECK: Running pass: BDCEPass on f2
1210
; CHECK-NOT: BDCEPass
1311
; CHECK: PassManager{{.*}}SCC{{.*}} on (f2)
14-
; RERUNSP: Running pass: BDCEPass on f2
15-
; NORERUN-NOT: Running pass: BDCEPass on f2
12+
; CHECK-NOT: Running pass: BDCEPass on f2
1613
; CHECK: PassManager{{.*}}SCC{{.*}} on (f3)
1714
; CHECK: Running pass: BDCEPass on f3
1815

0 commit comments

Comments
 (0)