[llvm] r335882 - Revert "[MachineOutliner] Never add the outliner in -O0"
Jessica Paquette via llvm-commits
llvm-commits at lists.llvm.org
Thu Jun 28 10:26:18 PDT 2018
Author: paquette
Date: Thu Jun 28 10:26:18 2018
New Revision: 335882
URL: http://llvm.org/viewvc/llvm-project?rev=335882&view=rev
Log:
Revert "[MachineOutliner] Never add the outliner in -O0"
This reverts commit 9c7c10e4073a0bc6a759ce5cd33afbac74930091.
It relies on r335872 since that introduces the machine outliner
flags test. I meant to commit D48683 in that commit, but got mixed
up and committed D48682 instead. So, I'm reverting this and
r335872, since D48682 hasn't made it through review yet.
Modified:
llvm/trunk/lib/CodeGen/TargetPassConfig.cpp
llvm/trunk/test/CodeGen/AArch64/machine-outliner-flags.ll
Modified: llvm/trunk/lib/CodeGen/TargetPassConfig.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/TargetPassConfig.cpp?rev=335882&r1=335881&r2=335882&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/TargetPassConfig.cpp (original)
+++ llvm/trunk/lib/CodeGen/TargetPassConfig.cpp Thu Jun 28 10:26:18 2018
@@ -914,8 +914,7 @@ void TargetPassConfig::addMachinePasses(
addPass(&XRayInstrumentationID, false);
addPass(&PatchableFunctionID, false);
- if (getOptLevel() != CodeGenOpt::None &&
- EnableMachineOutliner == AlwaysOutline)
+ if (EnableMachineOutliner == AlwaysOutline)
addPass(createMachineOutlinerPass());
// Add passes that directly emit MI after all other MI passes.
Modified: llvm/trunk/test/CodeGen/AArch64/machine-outliner-flags.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/machine-outliner-flags.ll?rev=335882&r1=335881&r2=335882&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AArch64/machine-outliner-flags.ll (original)
+++ llvm/trunk/test/CodeGen/AArch64/machine-outliner-flags.ll Thu Jun 28 10:26:18 2018
@@ -14,27 +14,15 @@
; RUN: -mtriple arm64---- -o /dev/null 2>&1 \
; RUN: | FileCheck %s -check-prefix=NOT-ADDED
-; RUN: llc %s -O=0 -debug-pass=Structure -verify-machineinstrs \
-; RUN: -mtriple arm64---- -o /dev/null 2>&1 \
-; RUN: | FileCheck %s -check-prefix=OPTNONE
-
-; Make sure that the outliner is added to the pass pipeline only when the
-; appropriate flags/settings are set. Make sure it isn't added otherwise.
-;
-; Cases where it should be added:
-; * -enable-machine-outliner
-; * -enable-machine-outliner=always
-;
-; Cases where it should not be added:
-; * -enable-machine-outliner=never
-; * -O0 or equivalent
-; * -enable-machine-outliner is not passed
+; Make sure that the outliner flags all work properly. If we specify
+; -enable-machine-outliner with always or no argument, it should be added to the
+; pass pipeline. If we specify it with never, or don't pass the flag,
+; then we shouldn't add it.
; ALWAYS: Machine Outliner
; ENABLE: Machine Outliner
; NEVER-NOT: Machine Outliner
; NOT-ADDED-NOT: Machine Outliner
-; OPTNONE-NOT: Machine Outliner
define void @foo() {
ret void;
More information about the llvm-commits
mailing list