maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[MachineOutliner] Add always and never options to -enable-machine-outliner" 

I accidentally committed this instead of D48683 because I haven't had coffee
yet.

llvm-svn: 335883
This commit is contained in:
Jessica Paquette 2018-06-28 17:26:19 +00:00
parent f3a44fe833
commit d6261bef7b
2 changed files with 4 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/lib/CodeGen/TargetPassConfig.cpp
View File

@ -111,17 +111,9 @@ static cl::opt<bool> VerifyMachineCode("verify-machineinstrs", cl::Hidden,
cl::desc("Verify generated machine code"),
cl::init(false),
cl::ZeroOrMore);
enum RunOutliner { AlwaysOutline, NeverOutline };
// Enable or disable the MachineOutliner.
static cl::opt<RunOutliner> EnableMachineOutliner(
"enable-machine-outliner", cl::desc("Enable the machine outliner"),
cl::Hidden, cl::ValueOptional, cl::init(NeverOutline),
cl::values(clEnumValN(AlwaysOutline, "always",
"Run on all functions guaranteed to be beneficial "
"(pass -enable-linkonceodr-outlining for more)"),
clEnumValN(NeverOutline, "never", "Disable all outlining"),
// Sentinel value for unspecified option.
clEnumValN(AlwaysOutline, "", "")));
static cl::opt<bool> EnableMachineOutliner("enable-machine-outliner",
cl::Hidden,
cl::desc("Enable machine outliner"));
// Enable or disable FastISel. Both options are needed, because
// FastISel is enabled by default with -fast, and we wish to be
// able to enable or disable fast-isel independently from -O0.
@ -914,7 +906,7 @@ void TargetPassConfig::addMachinePasses() {
addPass(&XRayInstrumentationID, false);
addPass(&PatchableFunctionID, false);
if (EnableMachineOutliner == AlwaysOutline)
if (EnableMachineOutliner)
addPass(createMachineOutlinerPass());
// Add passes that directly emit MI after all other MI passes.

30
llvm/test/CodeGen/AArch64/machine-outliner-flags.ll
View File

@ -1,30 +0,0 @@
; RUN: llc %s -debug-pass=Structure -verify-machineinstrs \
; RUN: -enable-machine-outliner=always -mtriple arm64---- -o /dev/null 2>&1 \
; RUN: | FileCheck %s -check-prefix=ALWAYS
; RUN: llc %s -debug-pass=Structure -verify-machineinstrs \
; RUN: -enable-machine-outliner -mtriple arm64---- -o /dev/null 2>&1 \
; RUN: | FileCheck %s -check-prefix=ENABLE
; RUN: llc %s -debug-pass=Structure -verify-machineinstrs \
; RUN: -enable-machine-outliner=never -mtriple arm64---- -o /dev/null 2>&1 \
; RUN: | FileCheck %s -check-prefix=NEVER
; RUN: llc %s -debug-pass=Structure -verify-machineinstrs \
; RUN: -mtriple arm64---- -o /dev/null 2>&1 \
; RUN: | FileCheck %s -check-prefix=NOT-ADDED
; 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
define void @foo() {
ret void;
}