diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/CodeGen/TargetPassConfig.cpp | 3 | ||||
| -rw-r--r-- | llvm/test/CodeGen/AArch64/machine-outliner-flags.ll | 20 |
2 files changed, 5 insertions, 18 deletions
diff --git a/llvm/lib/CodeGen/TargetPassConfig.cpp b/llvm/lib/CodeGen/TargetPassConfig.cpp index 74cd56b40a7..20771eef620 100644 --- a/llvm/lib/CodeGen/TargetPassConfig.cpp +++ b/llvm/lib/CodeGen/TargetPassConfig.cpp @@ -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. diff --git a/llvm/test/CodeGen/AArch64/machine-outliner-flags.ll b/llvm/test/CodeGen/AArch64/machine-outliner-flags.ll index b3eec9bb2e6..0f232c8a1f0 100644 --- a/llvm/test/CodeGen/AArch64/machine-outliner-flags.ll +++ b/llvm/test/CodeGen/AArch64/machine-outliner-flags.ll @@ -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; |
