This is an archive of the discontinued LLVM Phabricator instance.

Differential D98675

Remove -enable-npm-O3-nontrivial-unswitch option
ClosedPublic

Authored by aeubanks on Mar 15 2021, 6:01 PM.

Details

Reviewers
asbirlea
ctetreau
Commits
rG5f5cf6029852: [Pipeline] Remove -enable-npm-O3-nontrivial-unswitch flag
Summary

This was added to help debugging performance issues, no longer needed.

Diff Detail

Event Timeline

aeubanks created this revision.Mar 15 2021, 6:01 PM
Herald added subscribers: nikic, hiraditya. · View Herald TranscriptMar 15 2021, 6:01 PM
aeubanks requested review of this revision.Mar 15 2021, 6:01 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 15 2021, 6:01 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B93958: Diff 330858.Mar 15 2021, 7:50 PM
aeubanks added a comment.Feb 15 2023, 11:28 AM

ping

Herald added a reviewer: ctetreau. · View Herald TranscriptFeb 15 2023, 11:28 AM
Herald added a project: Restricted Project. · View Herald Transcript
asbirlea accepted this revision.Feb 15 2023, 10:58 PM
This revision is now accepted and ready to land.Feb 15 2023, 10:58 PM
aeubanks updated this revision to Diff 498108.Feb 16 2023, 11:35 AM

rebase

This revision was landed with ongoing or failed builds.Feb 16 2023, 11:36 AM
Closed by commit rG5f5cf6029852: [Pipeline] Remove -enable-npm-O3-nontrivial-unswitch flag (authored by aeubanks). · Explain Why
This revision was automatically updated to reflect the committed changes.
aeubanks added a commit: rG5f5cf6029852: [Pipeline] Remove -enable-npm-O3-nontrivial-unswitch flag.
Harbormaster completed remote builds in B214226: Diff 498108.Feb 16 2023, 1:54 PM

Revision Contents

PathSize
llvm/
lib/
Passes/
7 lines
test/
Transforms/
SimpleLoopUnswitch/
1 line

Diff 498108

llvm/lib/Passes/PassBuilderPipelines.cpp

Show First 20 Lines • Show All 159 Lines • ▼ Show 20 Linesstatic cl::opt<bool> EnableModuleInliner("enable-module-inliner",
cl::init(false), cl::Hidden, cl::init(false), cl::Hidden,
cl::desc("Enable module inliner")); cl::desc("Enable module inliner"));
static cl::opt<bool> PerformMandatoryInliningsFirst( static cl::opt<bool> PerformMandatoryInliningsFirst(
"mandatory-inlining-first", cl::init(true), cl::Hidden, "mandatory-inlining-first", cl::init(true), cl::Hidden,
cl::desc("Perform mandatory inlinings module-wide, before performing " cl::desc("Perform mandatory inlinings module-wide, before performing "
"inlining")); "inlining"));
static cl::opt<bool> EnableO3NonTrivialUnswitching(
"enable-npm-O3-nontrivial-unswitch", cl::init(true), cl::Hidden,
cl::desc("Enable non-trivial loop unswitching for -O3"));
static cl::opt<bool> EnableEagerlyInvalidateAnalyses( static cl::opt<bool> EnableEagerlyInvalidateAnalyses(
"eagerly-invalidate-analyses", cl::init(true), cl::Hidden, "eagerly-invalidate-analyses", cl::init(true), cl::Hidden,
cl::desc("Eagerly invalidate more analyses in default pipelines")); cl::desc("Eagerly invalidate more analyses in default pipelines"));
static cl::opt<bool> EnableMergeFunctions( static cl::opt<bool> EnableMergeFunctions(
"enable-merge-functions", cl::init(false), cl::Hidden, "enable-merge-functions", cl::init(false), cl::Hidden,
cl::desc("Enable function merging as part of the optimization pipeline")); cl::desc("Enable function merging as part of the optimization pipeline"));
▲ Show 20 Lines • Show All 382 Lines • ▼ Show 20 LinesPassBuilder::buildFunctionSimplificationPipeline(OptimizationLevel Level,
// Disable header duplication in loop rotation at -Oz. // Disable header duplication in loop rotation at -Oz.
LPM1.addPass( LPM1.addPass(
LoopRotatePass(Level != OptimizationLevel::Oz, isLTOPreLink(Phase))); LoopRotatePass(Level != OptimizationLevel::Oz, isLTOPreLink(Phase)));
// TODO: Investigate promotion cap for O1. // TODO: Investigate promotion cap for O1.
LPM1.addPass(LICMPass(PTO.LicmMssaOptCap, PTO.LicmMssaNoAccForPromotionCap, LPM1.addPass(LICMPass(PTO.LicmMssaOptCap, PTO.LicmMssaNoAccForPromotionCap,
/*AllowSpeculation=*/true)); /*AllowSpeculation=*/true));
LPM1.addPass( LPM1.addPass(
SimpleLoopUnswitchPass(/* NonTrivial */ Level == OptimizationLevel::O3 && SimpleLoopUnswitchPass(/* NonTrivial */ Level == OptimizationLevel::O3));
EnableO3NonTrivialUnswitching));
if (EnableLoopFlatten) if (EnableLoopFlatten)
LPM1.addPass(LoopFlattenPass()); LPM1.addPass(LoopFlattenPass());
LPM2.addPass(LoopIdiomRecognizePass()); LPM2.addPass(LoopIdiomRecognizePass());
LPM2.addPass(IndVarSimplifyPass()); LPM2.addPass(IndVarSimplifyPass());
for (auto &C : LateLoopOptimizationsEPCallbacks) for (auto &C : LateLoopOptimizationsEPCallbacks)
C(LPM2, Level); C(LPM2, Level);
▲ Show 20 Lines • Show All 1,428 Lines • Show Last 20 Lines

llvm/test/Transforms/SimpleLoopUnswitch/pipeline.ll

; RUN: opt < %s -S -passes="default<O1>" | FileCheck %s -check-prefixes=TRIVIAL,CHECK ; RUN: opt < %s -S -passes="default<O1>" | FileCheck %s -check-prefixes=TRIVIAL,CHECK
; RUN: opt < %s -S -passes="default<O2>" | FileCheck %s -check-prefixes=TRIVIAL,CHECK ; RUN: opt < %s -S -passes="default<O2>" | FileCheck %s -check-prefixes=TRIVIAL,CHECK
; RUN: opt < %s -S -passes="default<O3>" | FileCheck %s -check-prefixes=NONTRIVIAL,CHECK ; RUN: opt < %s -S -passes="default<O3>" | FileCheck %s -check-prefixes=NONTRIVIAL,CHECK
; RUN: opt < %s -S -passes="default<O3>" -enable-npm-O3-nontrivial-unswitch=0 | FileCheck %s -check-prefixes=TRIVIAL,CHECK
; RUN: opt < %s -S -passes="default<Os>" | FileCheck %s -check-prefixes=TRIVIAL,CHECK ; RUN: opt < %s -S -passes="default<Os>" | FileCheck %s -check-prefixes=TRIVIAL,CHECK
; RUN: opt < %s -S -passes="default<Oz>" | FileCheck %s -check-prefixes=TRIVIAL,CHECK ; RUN: opt < %s -S -passes="default<Oz>" | FileCheck %s -check-prefixes=TRIVIAL,CHECK
declare i32 @a() declare i32 @a()
declare i32 @b() declare i32 @b()
declare i32 @c() declare i32 @c()
; TRIVIAL-NOT: loop_begin.us: ; TRIVIAL-NOT: loop_begin.us:
▲ Show 20 Lines • Show All 62 Lines • Show Last 20 Lines