summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorSerguei Katkov <serguei.katkov@azul.com>2018-01-26 06:26:56 +0000
committerSerguei Katkov <serguei.katkov@azul.com>2018-01-26 06:26:56 +0000
commit9fe0524ee68eacf51d3ddc135b57ff285df3b0e5 (patch)
treeedf92b0ef05ed50eecd0b15864bb7b2d65507c4b /llvm
parent1ce7137c99f944fbcc771733f73280b5e8c4c51c (diff)
downloadbcm5719-llvm-9fe0524ee68eacf51d3ddc135b57ff285df3b0e5.tar.gz
bcm5719-llvm-9fe0524ee68eacf51d3ddc135b57ff285df3b0e5.zip
[CGP] Re-enable Select in complex addressing mode.
Switch Select handling on after fixing two bugs: rL323192 and rL323497. llvm-svn: 323498
Diffstat (limited to 'llvm')
-rw-r--r--llvm/lib/CodeGen/CodeGenPrepare.cpp2
-rw-r--r--llvm/test/CodeGen/X86/x86-cmov-converter.ll2
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp
index f11bc5afb25..af6f399dfc4 100644
--- a/llvm/lib/CodeGen/CodeGenPrepare.cpp
+++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp
@@ -196,7 +196,7 @@ AddrSinkNewPhis("addr-sink-new-phis", cl::Hidden, cl::init(false),
cl::desc("Allow creation of Phis in Address sinking."));
static cl::opt<bool>
-AddrSinkNewSelects("addr-sink-new-select", cl::Hidden, cl::init(false),
+AddrSinkNewSelects("addr-sink-new-select", cl::Hidden, cl::init(true),
cl::desc("Allow creation of selects in Address sinking."));
static cl::opt<bool> AddrSinkCombineBaseReg(
diff --git a/llvm/test/CodeGen/X86/x86-cmov-converter.ll b/llvm/test/CodeGen/X86/x86-cmov-converter.ll
index 5fec1380e14..62b491e2f3a 100644
--- a/llvm/test/CodeGen/X86/x86-cmov-converter.ll
+++ b/llvm/test/CodeGen/X86/x86-cmov-converter.ll
@@ -234,7 +234,7 @@ for.body: ; preds = %for.body.preheader,
}
; CHECK-LABEL: BinarySearch
-; CHECK: cmov
+; CHECK: set
define i32 @BinarySearch(i32 %Mask, %struct.Node* nocapture readonly %Curr, %struct.Node* nocapture readonly %Next) #0 {
entry:
OpenPOWER on IntegriCloud