[llvm] r322358 - [CGP] Re-enable Select in complex addressing mode

[Serguei Katkov via llvm-commits]

Author: skatkov
Date: Fri Jan 12 00:33:34 2018
New Revision: 322358

URL: http://llvm.org/viewvc/llvm-project?rev=322358&view=rev
Log:
[CGP] Re-enable Select in complex addressing mode

Re-enable Select after a couple of fixes.

Differential Revision: https://reviews.llvm.org/D40634


Modified:
    llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp
    llvm/trunk/test/CodeGen/X86/x86-cmov-converter.ll

Modified: llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp?rev=322358&r1=322357&r2=322358&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp (original)
+++ llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp Fri Jan 12 00:33:34 2018
@@ -196,7 +196,7 @@ AddrSinkNewPhis("addr-sink-new-phis", cl
                 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(

Modified: llvm/trunk/test/CodeGen/X86/x86-cmov-converter.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-cmov-converter.ll?rev=322358&r1=322357&r2=322358&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/x86-cmov-converter.ll (original)
+++ llvm/trunk/test/CodeGen/X86/x86-cmov-converter.ll Fri Jan 12 00:33:34 2018
@@ -234,7 +234,7 @@ for.body:
 }
 
 ; CHECK-LABEL: BinarySearch
-; CHECK: cmov
+; CHECK: set
 
 define i32 @BinarySearch(i32 %Mask, %struct.Node* nocapture readonly %Curr, %struct.Node* nocapture readonly %Next) #0 {
 entry: