[X86] Add i686 and fast/slow-inc test coverage to constant select tests

Extend tests for D144449 to ensure we aren't regressing code on targets with a slow INC/DEC instruction (or i686 without CMOV)

diff --git a/llvm/test/CodeGen/X86/select-constant-xor.ll b/llvm/test/CodeGen/X86/select-constant-xor.ll
index 806c1de..622e0ce 100644 (file)
--- a/llvm/test/CodeGen/X86/select-constant-xor.ll
+++ b/llvm/test/CodeGen/X86/select-constant-xor.ll
@@ -1,14 +1,23 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: llc -mtriple=x86_64-unknown-linux-gnu %s -o - | FileCheck %s
+; RUN: llc < %s -mtriple=i686-unknown-unknown | FileCheck %s --check-prefixes=X86
+; RUN: llc < %s -mtriple=x86_64-unknown-unknown -mattr=-slow-incdec | FileCheck %s --check-prefixes=X64,X64-FASTINC
+; RUN: llc < %s -mtriple=x86_64-unknown-unknown -mattr=+slow-incdec | FileCheck %s --check-prefixes=X64,X64-SLOWINC
 
 define i32 @xori64i32(i64 %a) {
-; CHECK-LABEL: xori64i32:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movq %rdi, %rax
-; CHECK-NEXT:    sarq $63, %rax
-; CHECK-NEXT:    xorl $2147483647, %eax # imm = 0x7FFFFFFF
-; CHECK-NEXT:    # kill: def $eax killed $eax killed $rax
-; CHECK-NEXT:    retq
+; X86-LABEL: xori64i32:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    sarl $31, %eax
+; X86-NEXT:    xorl $2147483647, %eax # imm = 0x7FFFFFFF
+; X86-NEXT:    retl
+;
+; X64-LABEL: xori64i32:
+; X64:       # %bb.0:
+; X64-NEXT:    movq %rdi, %rax
+; X64-NEXT:    sarq $63, %rax
+; X64-NEXT:    xorl $2147483647, %eax # imm = 0x7FFFFFFF
+; X64-NEXT:    # kill: def $eax killed $eax killed $rax
+; X64-NEXT:    retq
   %shr4 = ashr i64 %a, 63
   %conv5 = trunc i64 %shr4 to i32
   %xor = xor i32 %conv5, 2147483647
@@ -16,38 +25,63 @@ define i32 @xori64i32(i64 %a) {
 }
 
 define i64 @selecti64i64(i64 %a) {
-; CHECK-LABEL: selecti64i64:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movq %rdi, %rax
-; CHECK-NEXT:    sarq $63, %rax
-; CHECK-NEXT:    xorq $2147483647, %rax # imm = 0x7FFFFFFF
-; CHECK-NEXT:    retq
+; X86-LABEL: selecti64i64:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %edx
+; X86-NEXT:    sarl $31, %edx
+; X86-NEXT:    movl %edx, %eax
+; X86-NEXT:    xorl $2147483647, %eax # imm = 0x7FFFFFFF
+; X86-NEXT:    retl
+;
+; X64-LABEL: selecti64i64:
+; X64:       # %bb.0:
+; X64-NEXT:    movq %rdi, %rax
+; X64-NEXT:    sarq $63, %rax
+; X64-NEXT:    xorq $2147483647, %rax # imm = 0x7FFFFFFF
+; X64-NEXT:    retq
   %c = icmp sgt i64 %a, -1
   %s = select i1 %c, i64 2147483647, i64 -2147483648
   ret i64 %s
 }
 
 define i32 @selecti64i32(i64 %a) {
-; CHECK-LABEL: selecti64i32:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    xorl %ecx, %ecx
-; CHECK-NEXT:    testq %rdi, %rdi
-; CHECK-NEXT:    setns %cl
-; CHECK-NEXT:    movl $-2147483648, %eax # imm = 0x80000000
-; CHECK-NEXT:    subl %ecx, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: selecti64i32:
+; X86:       # %bb.0:
+; X86-NEXT:    xorl %ecx, %ecx
+; X86-NEXT:    cmpl $0, {{[0-9]+}}(%esp)
+; X86-NEXT:    setns %cl
+; X86-NEXT:    movl $-2147483648, %eax # imm = 0x80000000
+; X86-NEXT:    subl %ecx, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: selecti64i32:
+; X64:       # %bb.0:
+; X64-NEXT:    xorl %ecx, %ecx
+; X64-NEXT:    testq %rdi, %rdi
+; X64-NEXT:    setns %cl
+; X64-NEXT:    movl $-2147483648, %eax # imm = 0x80000000
+; X64-NEXT:    subl %ecx, %eax
+; X64-NEXT:    retq
   %c = icmp sgt i64 %a, -1
   %s = select i1 %c, i32 2147483647, i32 -2147483648
   ret i32 %s
 }
 
 define i64 @selecti32i64(i32 %a) {
-; CHECK-LABEL: selecti32i64:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    sarl $31, %edi
-; CHECK-NEXT:    movslq %edi, %rax
-; CHECK-NEXT:    xorq $2147483647, %rax # imm = 0x7FFFFFFF
-; CHECK-NEXT:    retq
+; X86-LABEL: selecti32i64:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %edx
+; X86-NEXT:    sarl $31, %edx
+; X86-NEXT:    movl %edx, %eax
+; X86-NEXT:    xorl $2147483647, %eax # imm = 0x7FFFFFFF
+; X86-NEXT:    retl
+;
+; X64-LABEL: selecti32i64:
+; X64:       # %bb.0:
+; X64-NEXT:    sarl $31, %edi
+; X64-NEXT:    movslq %edi, %rax
+; X64-NEXT:    xorq $2147483647, %rax # imm = 0x7FFFFFFF
+; X64-NEXT:    retq
   %c = icmp sgt i32 %a, -1
   %s = select i1 %c, i64 2147483647, i64 -2147483648
   ret i64 %s
@@ -56,13 +90,21 @@ define i64 @selecti32i64(i32 %a) {
 
 
 define i8 @xori32i8(i32 %a) {
-; CHECK-LABEL: xori32i8:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl %edi, %eax
-; CHECK-NEXT:    sarl $31, %eax
-; CHECK-NEXT:    xorb $84, %al
-; CHECK-NEXT:    # kill: def $al killed $al killed $eax
-; CHECK-NEXT:    retq
+; X86-LABEL: xori32i8:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    sarl $31, %eax
+; X86-NEXT:    xorb $84, %al
+; X86-NEXT:    # kill: def $al killed $al killed $eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: xori32i8:
+; X64:       # %bb.0:
+; X64-NEXT:    movl %edi, %eax
+; X64-NEXT:    sarl $31, %eax
+; X64-NEXT:    xorb $84, %al
+; X64-NEXT:    # kill: def $al killed $al killed $eax
+; X64-NEXT:    retq
   %shr4 = ashr i32 %a, 31
   %conv5 = trunc i32 %shr4 to i8
   %xor = xor i8 %conv5, 84
@@ -70,49 +112,85 @@ define i8 @xori32i8(i32 %a) {
 }
 
 define i32 @selecti32i32(i32 %a) {
-; CHECK-LABEL: selecti32i32:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl %edi, %eax
-; CHECK-NEXT:    sarl $31, %eax
-; CHECK-NEXT:    xorl $84, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: selecti32i32:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    sarl $31, %eax
+; X86-NEXT:    xorl $84, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: selecti32i32:
+; X64:       # %bb.0:
+; X64-NEXT:    movl %edi, %eax
+; X64-NEXT:    sarl $31, %eax
+; X64-NEXT:    xorl $84, %eax
+; X64-NEXT:    retq
   %c = icmp sgt i32 %a, -1
   %s = select i1 %c, i32 84, i32 -85
   ret i32 %s
 }
 
 define i8 @selecti32i8(i32 %a) {
-; CHECK-LABEL: selecti32i8:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl %edi, %eax
-; CHECK-NEXT:    sarl $31, %eax
-; CHECK-NEXT:    xorb $84, %al
-; CHECK-NEXT:    # kill: def $al killed $al killed $eax
-; CHECK-NEXT:    retq
+; X86-LABEL: selecti32i8:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    sarl $31, %eax
+; X86-NEXT:    xorb $84, %al
+; X86-NEXT:    # kill: def $al killed $al killed $eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: selecti32i8:
+; X64:       # %bb.0:
+; X64-NEXT:    movl %edi, %eax
+; X64-NEXT:    sarl $31, %eax
+; X64-NEXT:    xorb $84, %al
+; X64-NEXT:    # kill: def $al killed $al killed $eax
+; X64-NEXT:    retq
   %c = icmp sgt i32 %a, -1
   %s = select i1 %c, i8 84, i8 -85
   ret i8 %s
 }
 
 define i32 @selecti8i32(i8 %a) {
-; CHECK-LABEL: selecti8i32:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    sarb $7, %dil
-; CHECK-NEXT:    movsbl %dil, %eax
-; CHECK-NEXT:    xorl $84, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: selecti8i32:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    sarb $7, %al
+; X86-NEXT:    movsbl %al, %eax
+; X86-NEXT:    xorl $84, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: selecti8i32:
+; X64:       # %bb.0:
+; X64-NEXT:    sarb $7, %dil
+; X64-NEXT:    movsbl %dil, %eax
+; X64-NEXT:    xorl $84, %eax
+; X64-NEXT:    retq
   %c = icmp sgt i8 %a, -1
   %s = select i1 %c, i32 84, i32 -85
   ret i32 %s
 }
 
 define i32 @icmpasreq(i32 %input, i32 %a, i32 %b) {
-; CHECK-LABEL: icmpasreq:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl %esi, %eax
-; CHECK-NEXT:    testl %edi, %edi
-; CHECK-NEXT:    cmovnsl %edx, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: icmpasreq:
+; X86:       # %bb.0:
+; X86-NEXT:    cmpl $0, {{[0-9]+}}(%esp)
+; X86-NEXT:    js .LBB8_1
+; X86-NEXT:  # %bb.2:
+; X86-NEXT:    leal {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    movl (%eax), %eax
+; X86-NEXT:    retl
+; X86-NEXT:  .LBB8_1:
+; X86-NEXT:    leal {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    movl (%eax), %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: icmpasreq:
+; X64:       # %bb.0:
+; X64-NEXT:    movl %esi, %eax
+; X64-NEXT:    testl %edi, %edi
+; X64-NEXT:    cmovnsl %edx, %eax
+; X64-NEXT:    retq
   %sh = ashr i32 %input, 31
   %c = icmp eq i32 %sh, -1
   %s = select i1 %c, i32 %a, i32 %b
@@ -120,12 +198,25 @@ define i32 @icmpasreq(i32 %input, i32 %a, i32 %b) {
 }
 
 define i32 @icmpasrne(i32 %input, i32 %a, i32 %b) {
-; CHECK-LABEL: icmpasrne:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl %esi, %eax
-; CHECK-NEXT:    testl %edi, %edi
-; CHECK-NEXT:    cmovsl %edx, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: icmpasrne:
+; X86:       # %bb.0:
+; X86-NEXT:    cmpl $0, {{[0-9]+}}(%esp)
+; X86-NEXT:    jns .LBB9_1
+; X86-NEXT:  # %bb.2:
+; X86-NEXT:    leal {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    movl (%eax), %eax
+; X86-NEXT:    retl
+; X86-NEXT:  .LBB9_1:
+; X86-NEXT:    leal {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    movl (%eax), %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: icmpasrne:
+; X64:       # %bb.0:
+; X64-NEXT:    movl %esi, %eax
+; X64-NEXT:    testl %edi, %edi
+; X64-NEXT:    cmovsl %edx, %eax
+; X64-NEXT:    retq
   %sh = ashr i32 %input, 31
   %c = icmp ne i32 %sh, -1
   %s = select i1 %c, i32 %a, i32 %b
@@ -133,18 +224,38 @@ define i32 @icmpasrne(i32 %input, i32 %a, i32 %b) {
 }
 
 define i32 @oneusecmp(i32 %a, i32 %b, i32 %d) {
-; CHECK-LABEL: oneusecmp:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl %edi, %eax
-; CHECK-NEXT:    sarl $31, %eax
-; CHECK-NEXT:    xorl $127, %eax
-; CHECK-NEXT:    testl %edi, %edi
-; CHECK-NEXT:    cmovsl %edx, %esi
-; CHECK-NEXT:    addl %esi, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: oneusecmp:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    movl %ecx, %eax
+; X86-NEXT:    sarl $31, %eax
+; X86-NEXT:    xorl $127, %eax
+; X86-NEXT:    testl %ecx, %ecx
+; X86-NEXT:    js .LBB10_1
+; X86-NEXT:  # %bb.2:
+; X86-NEXT:    leal {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    addl (%ecx), %eax
+; X86-NEXT:    retl
+; X86-NEXT:  .LBB10_1:
+; X86-NEXT:    leal {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    addl (%ecx), %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: oneusecmp:
+; X64:       # %bb.0:
+; X64-NEXT:    movl %edi, %eax
+; X64-NEXT:    sarl $31, %eax
+; X64-NEXT:    xorl $127, %eax
+; X64-NEXT:    testl %edi, %edi
+; X64-NEXT:    cmovsl %edx, %esi
+; X64-NEXT:    addl %esi, %eax
+; X64-NEXT:    retq
   %c = icmp sle i32 %a, -1
   %s = select i1 %c, i32 -128, i32 127
   %s2 = select i1 %c, i32 %d, i32 %b
   %x = add i32 %s, %s2
   ret i32 %x
 }
+;; NOTE: These prefixes are unused and the list is autogenerated. Do not add tests below this line:
+; X64-FASTINC: {{.*}}
+; X64-SLOWINC: {{.*}}

diff --git a/llvm/test/CodeGen/X86/select_const.ll b/llvm/test/CodeGen/X86/select_const.ll
index fbabd9b..900dcd3 100644 (file)
--- a/llvm/test/CodeGen/X86/select_const.ll
+++ b/llvm/test/CodeGen/X86/select_const.ll
@@ -1,5 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: llc < %s -mtriple=x86_64-unknown-unknown | FileCheck %s
+; RUN: llc < %s -mtriple=i686-unknown-unknown | FileCheck %s --check-prefixes=X86
+; RUN: llc < %s -mtriple=x86_64-unknown-unknown -mattr=-slow-incdec | FileCheck %s --check-prefixes=X64,X64-FASTINC
+; RUN: llc < %s -mtriple=x86_64-unknown-unknown -mattr=+slow-incdec | FileCheck %s --check-prefixes=X64,X64-SLOWINC
 
 ; Select of constants: control flow / conditional moves can always be replaced by logic+math (but may not be worth it?).
 ; Test the zeroext/signext variants of each pattern to see if that makes a difference.
@@ -7,33 +9,56 @@
 ; select Cond, 0, 1 --> zext (!Cond)
 
 define i32 @select_0_or_1(i1 %cond) {
-; CHECK-LABEL: select_0_or_1:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    notb %dil
-; CHECK-NEXT:    movzbl %dil, %eax
-; CHECK-NEXT:    andl $1, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_0_or_1:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    notb %al
+; X86-NEXT:    movzbl %al, %eax
+; X86-NEXT:    andl $1, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_0_or_1:
+; X64:       # %bb.0:
+; X64-NEXT:    notb %dil
+; X64-NEXT:    movzbl %dil, %eax
+; X64-NEXT:    andl $1, %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 0, i32 1
   ret i32 %sel
 }
 
 define i32 @select_0_or_1_zeroext(i1 zeroext %cond) {
-; CHECK-LABEL: select_0_or_1_zeroext:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    xorb $1, %dil
-; CHECK-NEXT:    movzbl %dil, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_0_or_1_zeroext:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    xorb $1, %al
+; X86-NEXT:    movzbl %al, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_0_or_1_zeroext:
+; X64:       # %bb.0:
+; X64-NEXT:    xorb $1, %dil
+; X64-NEXT:    movzbl %dil, %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 0, i32 1
   ret i32 %sel
 }
 
 define i32 @select_0_or_1_signext(i1 signext %cond) {
-; CHECK-LABEL: select_0_or_1_signext:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    notb %dil
-; CHECK-NEXT:    movzbl %dil, %eax
-; CHECK-NEXT:    andl $1, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_0_or_1_signext:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    notb %al
+; X86-NEXT:    movzbl %al, %eax
+; X86-NEXT:    andl $1, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_0_or_1_signext:
+; X64:       # %bb.0:
+; X64-NEXT:    notb %dil
+; X64-NEXT:    movzbl %dil, %eax
+; X64-NEXT:    andl $1, %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 0, i32 1
   ret i32 %sel
 }
@@ -41,30 +66,47 @@ define i32 @select_0_or_1_signext(i1 signext %cond) {
 ; select Cond, 1, 0 --> zext (Cond)
 
 define i32 @select_1_or_0(i1 %cond) {
-; CHECK-LABEL: select_1_or_0:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl %edi, %eax
-; CHECK-NEXT:    andl $1, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_1_or_0:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    andl $1, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_1_or_0:
+; X64:       # %bb.0:
+; X64-NEXT:    movl %edi, %eax
+; X64-NEXT:    andl $1, %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 1, i32 0
   ret i32 %sel
 }
 
 define i32 @select_1_or_0_zeroext(i1 zeroext %cond) {
-; CHECK-LABEL: select_1_or_0_zeroext:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl %edi, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_1_or_0_zeroext:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_1_or_0_zeroext:
+; X64:       # %bb.0:
+; X64-NEXT:    movl %edi, %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 1, i32 0
   ret i32 %sel
 }
 
 define i32 @select_1_or_0_signext(i1 signext %cond) {
-; CHECK-LABEL: select_1_or_0_signext:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl %edi, %eax
-; CHECK-NEXT:    andl $1, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_1_or_0_signext:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    andl $1, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_1_or_0_signext:
+; X64:       # %bb.0:
+; X64-NEXT:    movl %edi, %eax
+; X64-NEXT:    andl $1, %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 1, i32 0
   ret i32 %sel
 }
@@ -72,32 +114,52 @@ define i32 @select_1_or_0_signext(i1 signext %cond) {
 ; select Cond, 0, -1 --> sext (!Cond)
 
 define i32 @select_0_or_neg1(i1 %cond) {
-; CHECK-LABEL: select_0_or_neg1:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    # kill: def $edi killed $edi def $rdi
-; CHECK-NEXT:    andl $1, %edi
-; CHECK-NEXT:    leal -1(%rdi), %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_0_or_neg1:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    andl $1, %eax
+; X86-NEXT:    decl %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_0_or_neg1:
+; X64:       # %bb.0:
+; X64-NEXT:    # kill: def $edi killed $edi def $rdi
+; X64-NEXT:    andl $1, %edi
+; X64-NEXT:    leal -1(%rdi), %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 0, i32 -1
   ret i32 %sel
 }
 
 define i32 @select_0_or_neg1_zeroext(i1 zeroext %cond) {
-; CHECK-LABEL: select_0_or_neg1_zeroext:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    # kill: def $edi killed $edi def $rdi
-; CHECK-NEXT:    leal -1(%rdi), %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_0_or_neg1_zeroext:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    decl %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_0_or_neg1_zeroext:
+; X64:       # %bb.0:
+; X64-NEXT:    # kill: def $edi killed $edi def $rdi
+; X64-NEXT:    leal -1(%rdi), %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 0, i32 -1
   ret i32 %sel
 }
 
 define i32 @select_0_or_neg1_signext(i1 signext %cond) {
-; CHECK-LABEL: select_0_or_neg1_signext:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl %edi, %eax
-; CHECK-NEXT:    notl %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_0_or_neg1_signext:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    andl $1, %eax
+; X86-NEXT:    decl %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_0_or_neg1_signext:
+; X64:       # %bb.0:
+; X64-NEXT:    movl %edi, %eax
+; X64-NEXT:    notl %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 0, i32 -1
   ret i32 %sel
 }
@@ -105,31 +167,49 @@ define i32 @select_0_or_neg1_signext(i1 signext %cond) {
 ; select Cond, -1, 0 --> sext (Cond)
 
 define i32 @select_neg1_or_0(i1 %cond) {
-; CHECK-LABEL: select_neg1_or_0:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl %edi, %eax
-; CHECK-NEXT:    andl $1, %eax
-; CHECK-NEXT:    negl %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_neg1_or_0:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    andl $1, %eax
+; X86-NEXT:    negl %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_neg1_or_0:
+; X64:       # %bb.0:
+; X64-NEXT:    movl %edi, %eax
+; X64-NEXT:    andl $1, %eax
+; X64-NEXT:    negl %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 -1, i32 0
   ret i32 %sel
 }
 
 define i32 @select_neg1_or_0_zeroext(i1 zeroext %cond) {
-; CHECK-LABEL: select_neg1_or_0_zeroext:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl %edi, %eax
-; CHECK-NEXT:    negl %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_neg1_or_0_zeroext:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    negl %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_neg1_or_0_zeroext:
+; X64:       # %bb.0:
+; X64-NEXT:    movl %edi, %eax
+; X64-NEXT:    negl %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 -1, i32 0
   ret i32 %sel
 }
 
 define i32 @select_neg1_or_0_signext(i1 signext %cond) {
-; CHECK-LABEL: select_neg1_or_0_signext:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl %edi, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_neg1_or_0_signext:
+; X86:       # %bb.0:
+; X86-NEXT:    movsbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_neg1_or_0_signext:
+; X64:       # %bb.0:
+; X64-NEXT:    movl %edi, %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 -1, i32 0
   ret i32 %sel
 }
@@ -137,32 +217,52 @@ define i32 @select_neg1_or_0_signext(i1 signext %cond) {
 ; select Cond, C+1, C --> add (zext Cond), C
 
 define i32 @select_Cplus1_C(i1 %cond) {
-; CHECK-LABEL: select_Cplus1_C:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    # kill: def $edi killed $edi def $rdi
-; CHECK-NEXT:    andl $1, %edi
-; CHECK-NEXT:    leal 41(%rdi), %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_Cplus1_C:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    andl $1, %eax
+; X86-NEXT:    addl $41, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_Cplus1_C:
+; X64:       # %bb.0:
+; X64-NEXT:    # kill: def $edi killed $edi def $rdi
+; X64-NEXT:    andl $1, %edi
+; X64-NEXT:    leal 41(%rdi), %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 42, i32 41
   ret i32 %sel
 }
 
 define i32 @select_Cplus1_C_zeroext(i1 zeroext %cond) {
-; CHECK-LABEL: select_Cplus1_C_zeroext:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    # kill: def $edi killed $edi def $rdi
-; CHECK-NEXT:    leal 41(%rdi), %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_Cplus1_C_zeroext:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    addl $41, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_Cplus1_C_zeroext:
+; X64:       # %bb.0:
+; X64-NEXT:    # kill: def $edi killed $edi def $rdi
+; X64-NEXT:    leal 41(%rdi), %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 42, i32 41
   ret i32 %sel
 }
 
 define i32 @select_Cplus1_C_signext(i1 signext %cond) {
-; CHECK-LABEL: select_Cplus1_C_signext:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl $41, %eax
-; CHECK-NEXT:    subl %edi, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_Cplus1_C_signext:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    andl $1, %eax
+; X86-NEXT:    addl $41, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_Cplus1_C_signext:
+; X64:       # %bb.0:
+; X64-NEXT:    movl $41, %eax
+; X64-NEXT:    subl %edi, %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 42, i32 41
   ret i32 %sel
 }
@@ -170,32 +270,55 @@ define i32 @select_Cplus1_C_signext(i1 signext %cond) {
 ; select Cond, C, C+1 --> add (sext Cond), C
 
 define i32 @select_C_Cplus1(i1 %cond) {
-; CHECK-LABEL: select_C_Cplus1:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    andl $1, %edi
-; CHECK-NEXT:    movl $42, %eax
-; CHECK-NEXT:    subl %edi, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_C_Cplus1:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    andl $1, %ecx
+; X86-NEXT:    movl $42, %eax
+; X86-NEXT:    subl %ecx, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_C_Cplus1:
+; X64:       # %bb.0:
+; X64-NEXT:    andl $1, %edi
+; X64-NEXT:    movl $42, %eax
+; X64-NEXT:    subl %edi, %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 41, i32 42
   ret i32 %sel
 }
 
 define i32 @select_C_Cplus1_zeroext(i1 zeroext %cond) {
-; CHECK-LABEL: select_C_Cplus1_zeroext:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl $42, %eax
-; CHECK-NEXT:    subl %edi, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_C_Cplus1_zeroext:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    movl $42, %eax
+; X86-NEXT:    subl %ecx, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_C_Cplus1_zeroext:
+; X64:       # %bb.0:
+; X64-NEXT:    movl $42, %eax
+; X64-NEXT:    subl %edi, %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 41, i32 42
   ret i32 %sel
 }
 
 define i32 @select_C_Cplus1_signext(i1 signext %cond) {
-; CHECK-LABEL: select_C_Cplus1_signext:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    # kill: def $edi killed $edi def $rdi
-; CHECK-NEXT:    leal 42(%rdi), %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_C_Cplus1_signext:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    andl $1, %ecx
+; X86-NEXT:    movl $42, %eax
+; X86-NEXT:    subl %ecx, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_C_Cplus1_signext:
+; X64:       # %bb.0:
+; X64-NEXT:    # kill: def $edi killed $edi def $rdi
+; X64-NEXT:    leal 42(%rdi), %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 41, i32 42
   ret i32 %sel
 }
@@ -204,45 +327,96 @@ define i32 @select_C_Cplus1_signext(i1 signext %cond) {
 ; select Cond, C1, C2 --> add (mul (zext Cond), C1-C2), C2 --> LEA C2(Cond * (C1-C2))
 
 define i32 @select_lea_2(i1 zeroext %cond) {
-; CHECK-LABEL: select_lea_2:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl %edi, %eax
-; CHECK-NEXT:    negl %eax
-; CHECK-NEXT:    orl $1, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_lea_2:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    negl %eax
+; X86-NEXT:    orl $1, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_lea_2:
+; X64:       # %bb.0:
+; X64-NEXT:    movl %edi, %eax
+; X64-NEXT:    negl %eax
+; X64-NEXT:    orl $1, %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 -1, i32 1
   ret i32 %sel
 }
 
 define i64 @select_lea_3(i1 zeroext %cond) {
-; CHECK-LABEL: select_lea_3:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    xorb $1, %dil
-; CHECK-NEXT:    movzbl %dil, %eax
-; CHECK-NEXT:    leaq -2(%rax,%rax,2), %rax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_lea_3:
+; X86:       # %bb.0:
+; X86-NEXT:    cmpb $0, {{[0-9]+}}(%esp)
+; X86-NEXT:    movl $-2, %eax
+; X86-NEXT:    je .LBB19_1
+; X86-NEXT:  # %bb.2:
+; X86-NEXT:    movl $-1, %edx
+; X86-NEXT:    je .LBB19_3
+; X86-NEXT:  .LBB19_4:
+; X86-NEXT:    retl
+; X86-NEXT:  .LBB19_1:
+; X86-NEXT:    movl $1, %eax
+; X86-NEXT:    movl $-1, %edx
+; X86-NEXT:    jne .LBB19_4
+; X86-NEXT:  .LBB19_3:
+; X86-NEXT:    xorl %edx, %edx
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_lea_3:
+; X64:       # %bb.0:
+; X64-NEXT:    xorb $1, %dil
+; X64-NEXT:    movzbl %dil, %eax
+; X64-NEXT:    leaq -2(%rax,%rax,2), %rax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i64 -2, i64 1
   ret i64 %sel
 }
 
 define i32 @select_lea_5(i1 zeroext %cond) {
-; CHECK-LABEL: select_lea_5:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    xorb $1, %dil
-; CHECK-NEXT:    movzbl %dil, %eax
-; CHECK-NEXT:    leal -2(%rax,%rax,4), %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_lea_5:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    xorb $1, %al
+; X86-NEXT:    movzbl %al, %eax
+; X86-NEXT:    leal -2(%eax,%eax,4), %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_lea_5:
+; X64:       # %bb.0:
+; X64-NEXT:    xorb $1, %dil
+; X64-NEXT:    movzbl %dil, %eax
+; X64-NEXT:    leal -2(%rax,%rax,4), %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 -2, i32 3
   ret i32 %sel
 }
 
 define i64 @select_lea_9(i1 zeroext %cond) {
-; CHECK-LABEL: select_lea_9:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    xorb $1, %dil
-; CHECK-NEXT:    movzbl %dil, %eax
-; CHECK-NEXT:    leaq -7(%rax,%rax,8), %rax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_lea_9:
+; X86:       # %bb.0:
+; X86-NEXT:    cmpb $0, {{[0-9]+}}(%esp)
+; X86-NEXT:    movl $-7, %eax
+; X86-NEXT:    je .LBB21_1
+; X86-NEXT:  # %bb.2:
+; X86-NEXT:    movl $-1, %edx
+; X86-NEXT:    je .LBB21_3
+; X86-NEXT:  .LBB21_4:
+; X86-NEXT:    retl
+; X86-NEXT:  .LBB21_1:
+; X86-NEXT:    movl $2, %eax
+; X86-NEXT:    movl $-1, %edx
+; X86-NEXT:    jne .LBB21_4
+; X86-NEXT:  .LBB21_3:
+; X86-NEXT:    xorl %edx, %edx
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_lea_9:
+; X64:       # %bb.0:
+; X64-NEXT:    xorb $1, %dil
+; X64-NEXT:    movzbl %dil, %eax
+; X64-NEXT:    leaq -7(%rax,%rax,8), %rax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i64 -7, i64 2
   ret i64 %sel
 }
@@ -250,12 +424,25 @@ define i64 @select_lea_9(i1 zeroext %cond) {
 ; Should this be 'sbb x,x' or 'sbb 0,x' with simpler LEA or add?
 
 define i64 @sel_1_2(i64 %x, i64 %y) {
-; CHECK-LABEL: sel_1_2:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    cmpq $42, %rdi
-; CHECK-NEXT:    sbbq $0, %rsi
-; CHECK-NEXT:    leaq 2(%rsi), %rax
-; CHECK-NEXT:    retq
+; X86-LABEL: sel_1_2:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %edx
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    cmpl $42, {{[0-9]+}}(%esp)
+; X86-NEXT:    sbbl $0, %ecx
+; X86-NEXT:    sbbl $0, %eax
+; X86-NEXT:    sbbl $0, %edx
+; X86-NEXT:    addl $2, %eax
+; X86-NEXT:    adcl $0, %edx
+; X86-NEXT:    retl
+;
+; X64-LABEL: sel_1_2:
+; X64:       # %bb.0:
+; X64-NEXT:    cmpq $42, %rdi
+; X64-NEXT:    sbbq $0, %rsi
+; X64-NEXT:    leaq 2(%rsi), %rax
+; X64-NEXT:    retq
   %cmp = icmp ult i64 %x, 42
   %sel = select i1 %cmp, i64 1, i64 2
   %sub = add i64 %sel, %y
@@ -265,13 +452,21 @@ define i64 @sel_1_2(i64 %x, i64 %y) {
 ; No LEA with 8-bit, but this shouldn't need branches or cmov.
 
 define i8 @sel_1_neg1(i32 %x) {
-; CHECK-LABEL: sel_1_neg1:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    cmpl $43, %edi
-; CHECK-NEXT:    setl %al
-; CHECK-NEXT:    negb %al
-; CHECK-NEXT:    orb $3, %al
-; CHECK-NEXT:    retq
+; X86-LABEL: sel_1_neg1:
+; X86:       # %bb.0:
+; X86-NEXT:    cmpl $43, {{[0-9]+}}(%esp)
+; X86-NEXT:    setl %al
+; X86-NEXT:    negb %al
+; X86-NEXT:    orb $3, %al
+; X86-NEXT:    retl
+;
+; X64-LABEL: sel_1_neg1:
+; X64:       # %bb.0:
+; X64-NEXT:    cmpl $43, %edi
+; X64-NEXT:    setl %al
+; X64-NEXT:    negb %al
+; X64-NEXT:    orb $3, %al
+; X64-NEXT:    retq
   %cmp = icmp sgt i32 %x, 42
   %sel = select i1 %cmp, i8 3, i8 -1
   ret i8 %sel
@@ -280,14 +475,23 @@ define i8 @sel_1_neg1(i32 %x) {
 ; We get an LEA for 16-bit because we ignore the high-bits.
 
 define i16 @sel_neg1_1(i32 %x) {
-; CHECK-LABEL: sel_neg1_1:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    xorl %eax, %eax
-; CHECK-NEXT:    cmpl $43, %edi
-; CHECK-NEXT:    setl %al
-; CHECK-NEXT:    leal -1(,%rax,4), %eax
-; CHECK-NEXT:    # kill: def $ax killed $ax killed $eax
-; CHECK-NEXT:    retq
+; X86-LABEL: sel_neg1_1:
+; X86:       # %bb.0:
+; X86-NEXT:    xorl %eax, %eax
+; X86-NEXT:    cmpl $43, {{[0-9]+}}(%esp)
+; X86-NEXT:    setl %al
+; X86-NEXT:    leal -1(,%eax,4), %eax
+; X86-NEXT:    # kill: def $ax killed $ax killed $eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: sel_neg1_1:
+; X64:       # %bb.0:
+; X64-NEXT:    xorl %eax, %eax
+; X64-NEXT:    cmpl $43, %edi
+; X64-NEXT:    setl %al
+; X64-NEXT:    leal -1(,%rax,4), %eax
+; X64-NEXT:    # kill: def $ax killed $ax killed $eax
+; X64-NEXT:    retq
   %cmp = icmp sgt i32 %x, 42
   %sel = select i1 %cmp, i16 -1, i16 3
   ret i16 %sel
@@ -296,26 +500,42 @@ define i16 @sel_neg1_1(i32 %x) {
 ; If the comparison is available, the predicate can be inverted.
 
 define i32 @sel_1_neg1_32(i32 %x) {
-; CHECK-LABEL: sel_1_neg1_32:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    xorl %eax, %eax
-; CHECK-NEXT:    cmpl $43, %edi
-; CHECK-NEXT:    setge %al
-; CHECK-NEXT:    leal -1(%rax,%rax,8), %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: sel_1_neg1_32:
+; X86:       # %bb.0:
+; X86-NEXT:    xorl %eax, %eax
+; X86-NEXT:    cmpl $43, {{[0-9]+}}(%esp)
+; X86-NEXT:    setge %al
+; X86-NEXT:    leal -1(%eax,%eax,8), %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: sel_1_neg1_32:
+; X64:       # %bb.0:
+; X64-NEXT:    xorl %eax, %eax
+; X64-NEXT:    cmpl $43, %edi
+; X64-NEXT:    setge %al
+; X64-NEXT:    leal -1(%rax,%rax,8), %eax
+; X64-NEXT:    retq
   %cmp = icmp sgt i32 %x, 42
   %sel = select i1 %cmp, i32 8, i32 -1
   ret i32 %sel
 }
 
 define i32 @sel_neg1_1_32(i32 %x) {
-; CHECK-LABEL: sel_neg1_1_32:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    xorl %eax, %eax
-; CHECK-NEXT:    cmpl $43, %edi
-; CHECK-NEXT:    setl %al
-; CHECK-NEXT:    leal -7(%rax,%rax,8), %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: sel_neg1_1_32:
+; X86:       # %bb.0:
+; X86-NEXT:    xorl %eax, %eax
+; X86-NEXT:    cmpl $43, {{[0-9]+}}(%esp)
+; X86-NEXT:    setl %al
+; X86-NEXT:    leal -7(%eax,%eax,8), %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: sel_neg1_1_32:
+; X64:       # %bb.0:
+; X64-NEXT:    xorl %eax, %eax
+; X64-NEXT:    cmpl $43, %edi
+; X64-NEXT:    setl %al
+; X64-NEXT:    leal -7(%rax,%rax,8), %eax
+; X64-NEXT:    retq
   %cmp = icmp sgt i32 %x, 42
   %sel = select i1 %cmp, i32 -7, i32 2
   ret i32 %sel
@@ -326,49 +546,91 @@ define i32 @sel_neg1_1_32(i32 %x) {
 ; select Cond, C1, C2 --> add (mul (zext Cond), C1-C2), C2
 
 define i8 @select_pow2_diff(i1 zeroext %cond) {
-; CHECK-LABEL: select_pow2_diff:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    # kill: def $edi killed $edi def $rdi
-; CHECK-NEXT:    shlb $4, %dil
-; CHECK-NEXT:    leal 3(%rdi), %eax
-; CHECK-NEXT:    # kill: def $al killed $al killed $eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_pow2_diff:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    shlb $4, %al
+; X86-NEXT:    orb $3, %al
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_pow2_diff:
+; X64:       # %bb.0:
+; X64-NEXT:    # kill: def $edi killed $edi def $rdi
+; X64-NEXT:    shlb $4, %dil
+; X64-NEXT:    leal 3(%rdi), %eax
+; X64-NEXT:    # kill: def $al killed $al killed $eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i8 19, i8 3
   ret i8 %sel
 }
 
 define i16 @select_pow2_diff_invert(i1 zeroext %cond) {
-; CHECK-LABEL: select_pow2_diff_invert:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    xorb $1, %dil
-; CHECK-NEXT:    movzbl %dil, %eax
-; CHECK-NEXT:    shll $6, %eax
-; CHECK-NEXT:    orl $7, %eax
-; CHECK-NEXT:    # kill: def $ax killed $ax killed $eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_pow2_diff_invert:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    xorb $1, %al
+; X86-NEXT:    movzbl %al, %eax
+; X86-NEXT:    shll $6, %eax
+; X86-NEXT:    orl $7, %eax
+; X86-NEXT:    # kill: def $ax killed $ax killed $eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_pow2_diff_invert:
+; X64:       # %bb.0:
+; X64-NEXT:    xorb $1, %dil
+; X64-NEXT:    movzbl %dil, %eax
+; X64-NEXT:    shll $6, %eax
+; X64-NEXT:    orl $7, %eax
+; X64-NEXT:    # kill: def $ax killed $ax killed $eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i16 7, i16 71
   ret i16 %sel
 }
 
 define i32 @select_pow2_diff_neg(i1 zeroext %cond) {
-; CHECK-LABEL: select_pow2_diff_neg:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    # kill: def $edi killed $edi def $rdi
-; CHECK-NEXT:    shll $4, %edi
-; CHECK-NEXT:    leal -25(%rdi), %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_pow2_diff_neg:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    shll $4, %eax
+; X86-NEXT:    orl $-25, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_pow2_diff_neg:
+; X64:       # %bb.0:
+; X64-NEXT:    # kill: def $edi killed $edi def $rdi
+; X64-NEXT:    shll $4, %edi
+; X64-NEXT:    leal -25(%rdi), %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 -9, i32 -25
   ret i32 %sel
 }
 
 define i64 @select_pow2_diff_neg_invert(i1 zeroext %cond) {
-; CHECK-LABEL: select_pow2_diff_neg_invert:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    xorb $1, %dil
-; CHECK-NEXT:    movzbl %dil, %eax
-; CHECK-NEXT:    shlq $7, %rax
-; CHECK-NEXT:    addq $-99, %rax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_pow2_diff_neg_invert:
+; X86:       # %bb.0:
+; X86-NEXT:    cmpb $0, {{[0-9]+}}(%esp)
+; X86-NEXT:    movl $-99, %eax
+; X86-NEXT:    je .LBB30_1
+; X86-NEXT:  # %bb.2:
+; X86-NEXT:    movl $-1, %edx
+; X86-NEXT:    je .LBB30_3
+; X86-NEXT:  .LBB30_4:
+; X86-NEXT:    retl
+; X86-NEXT:  .LBB30_1:
+; X86-NEXT:    movl $29, %eax
+; X86-NEXT:    movl $-1, %edx
+; X86-NEXT:    jne .LBB30_4
+; X86-NEXT:  .LBB30_3:
+; X86-NEXT:    xorl %edx, %edx
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_pow2_diff_neg_invert:
+; X64:       # %bb.0:
+; X64-NEXT:    xorb $1, %dil
+; X64-NEXT:    movzbl %dil, %eax
+; X64-NEXT:    shlq $7, %rax
+; X64-NEXT:    addq $-99, %rax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i64 -99, i64 29
   ret i64 %sel
 }
@@ -376,14 +638,24 @@ define i64 @select_pow2_diff_neg_invert(i1 zeroext %cond) {
 ; This doesn't need a branch, but don't do the wrong thing if subtraction of the constants overflows.
 
 define i8 @sel_67_neg125(i32 %x) {
-; CHECK-LABEL: sel_67_neg125:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    cmpl $43, %edi
-; CHECK-NEXT:    movl $67, %ecx
-; CHECK-NEXT:    movl $131, %eax
-; CHECK-NEXT:    cmovgel %ecx, %eax
-; CHECK-NEXT:    # kill: def $al killed $al killed $eax
-; CHECK-NEXT:    retq
+; X86-LABEL: sel_67_neg125:
+; X86:       # %bb.0:
+; X86-NEXT:    cmpl $43, {{[0-9]+}}(%esp)
+; X86-NEXT:    movb $67, %al
+; X86-NEXT:    jge .LBB31_2
+; X86-NEXT:  # %bb.1:
+; X86-NEXT:    movb $-125, %al
+; X86-NEXT:  .LBB31_2:
+; X86-NEXT:    retl
+;
+; X64-LABEL: sel_67_neg125:
+; X64:       # %bb.0:
+; X64-NEXT:    cmpl $43, %edi
+; X64-NEXT:    movl $67, %ecx
+; X64-NEXT:    movl $131, %eax
+; X64-NEXT:    cmovgel %ecx, %eax
+; X64-NEXT:    # kill: def $al killed $al killed $eax
+; X64-NEXT:    retq
   %cmp = icmp sgt i32 %x, 42
   %sel = select i1 %cmp, i8 67, i8 -125
   ret i8 %sel
@@ -394,48 +666,86 @@ define i8 @sel_67_neg125(i32 %x) {
 ; select Cond, C1, C2 --> add (mul (zext Cond), C1-C2), C2 --> add (and (sext Cond), C1-C2), C2
 
 define i32 @select_C1_C2(i1 %cond) {
-; CHECK-LABEL: select_C1_C2:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    testb $1, %dil
-; CHECK-NEXT:    movl $421, %ecx # imm = 0x1A5
-; CHECK-NEXT:    movl $42, %eax
-; CHECK-NEXT:    cmovnel %ecx, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_C1_C2:
+; X86:       # %bb.0:
+; X86-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; X86-NEXT:    movl $421, %eax # imm = 0x1A5
+; X86-NEXT:    jne .LBB32_2
+; X86-NEXT:  # %bb.1:
+; X86-NEXT:    movl $42, %eax
+; X86-NEXT:  .LBB32_2:
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_C1_C2:
+; X64:       # %bb.0:
+; X64-NEXT:    testb $1, %dil
+; X64-NEXT:    movl $421, %ecx # imm = 0x1A5
+; X64-NEXT:    movl $42, %eax
+; X64-NEXT:    cmovnel %ecx, %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 421, i32 42
   ret i32 %sel
 }
 
 define i32 @select_C1_C2_zeroext(i1 zeroext %cond) {
-; CHECK-LABEL: select_C1_C2_zeroext:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    testl %edi, %edi
-; CHECK-NEXT:    movl $421, %ecx # imm = 0x1A5
-; CHECK-NEXT:    movl $42, %eax
-; CHECK-NEXT:    cmovnel %ecx, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_C1_C2_zeroext:
+; X86:       # %bb.0:
+; X86-NEXT:    cmpb $0, {{[0-9]+}}(%esp)
+; X86-NEXT:    movl $421, %eax # imm = 0x1A5
+; X86-NEXT:    jne .LBB33_2
+; X86-NEXT:  # %bb.1:
+; X86-NEXT:    movl $42, %eax
+; X86-NEXT:  .LBB33_2:
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_C1_C2_zeroext:
+; X64:       # %bb.0:
+; X64-NEXT:    testl %edi, %edi
+; X64-NEXT:    movl $421, %ecx # imm = 0x1A5
+; X64-NEXT:    movl $42, %eax
+; X64-NEXT:    cmovnel %ecx, %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 421, i32 42
   ret i32 %sel
 }
 
 define i32 @select_C1_C2_signext(i1 signext %cond) {
-; CHECK-LABEL: select_C1_C2_signext:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    testb $1, %dil
-; CHECK-NEXT:    movl $421, %ecx # imm = 0x1A5
-; CHECK-NEXT:    movl $42, %eax
-; CHECK-NEXT:    cmovnel %ecx, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_C1_C2_signext:
+; X86:       # %bb.0:
+; X86-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; X86-NEXT:    movl $421, %eax # imm = 0x1A5
+; X86-NEXT:    jne .LBB34_2
+; X86-NEXT:  # %bb.1:
+; X86-NEXT:    movl $42, %eax
+; X86-NEXT:  .LBB34_2:
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_C1_C2_signext:
+; X64:       # %bb.0:
+; X64-NEXT:    testb $1, %dil
+; X64-NEXT:    movl $421, %ecx # imm = 0x1A5
+; X64-NEXT:    movl $42, %eax
+; X64-NEXT:    cmovnel %ecx, %eax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 421, i32 42
   ret i32 %sel
 }
 
 define i32 @select_n_or_minus1(i1 signext %cond) {
-; CHECK-LABEL: select_n_or_minus1:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl %edi, %eax
-; CHECK-NEXT:    notl %eax
-; CHECK-NEXT:    orl $12414, %eax # imm = 0x307E
-; CHECK-NEXT:    retq
+; X86-LABEL: select_n_or_minus1:
+; X86:       # %bb.0:
+; X86-NEXT:    movzbl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    andl $1, %eax
+; X86-NEXT:    decl %eax
+; X86-NEXT:    orl $12414, %eax # imm = 0x307E
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_n_or_minus1:
+; X64:       # %bb.0:
+; X64-NEXT:    movl %edi, %eax
+; X64-NEXT:    notl %eax
+; X64-NEXT:    orl $12414, %eax # imm = 0x307E
+; X64-NEXT:    retq
   %sel = select i1 %cond, i32 12414, i32 -1
   ret i32 %sel
 }
@@ -443,12 +753,44 @@ define i32 @select_n_or_minus1(i1 signext %cond) {
 ; select (x == 2), 2, (x + 1) --> select (x == 2), x, (x + 1)
 
 define i64 @select_2_or_inc(i64 %x) {
-; CHECK-LABEL: select_2_or_inc:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    leaq 1(%rdi), %rax
-; CHECK-NEXT:    cmpq $2, %rdi
-; CHECK-NEXT:    cmoveq %rdi, %rax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_2_or_inc:
+; X86:       # %bb.0:
+; X86-NEXT:    pushl %edi
+; X86-NEXT:    .cfi_def_cfa_offset 8
+; X86-NEXT:    pushl %esi
+; X86-NEXT:    .cfi_def_cfa_offset 12
+; X86-NEXT:    .cfi_offset %esi, -12
+; X86-NEXT:    .cfi_offset %edi, -8
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %esi
+; X86-NEXT:    movl %ecx, %edi
+; X86-NEXT:    xorl $2, %edi
+; X86-NEXT:    addl $1, %ecx
+; X86-NEXT:    movl %esi, %eax
+; X86-NEXT:    adcl $0, %eax
+; X86-NEXT:    xorl %edx, %edx
+; X86-NEXT:    orl %esi, %edi
+; X86-NEXT:    je .LBB36_2
+; X86-NEXT:  # %bb.1:
+; X86-NEXT:    movl %eax, %edx
+; X86-NEXT:  .LBB36_2:
+; X86-NEXT:    movl $2, %eax
+; X86-NEXT:    je .LBB36_4
+; X86-NEXT:  # %bb.3:
+; X86-NEXT:    movl %ecx, %eax
+; X86-NEXT:  .LBB36_4:
+; X86-NEXT:    popl %esi
+; X86-NEXT:    .cfi_def_cfa_offset 8
+; X86-NEXT:    popl %edi
+; X86-NEXT:    .cfi_def_cfa_offset 4
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_2_or_inc:
+; X64:       # %bb.0:
+; X64-NEXT:    leaq 1(%rdi), %rax
+; X64-NEXT:    cmpq $2, %rdi
+; X64-NEXT:    cmoveq %rdi, %rax
+; X64-NEXT:    retq
   %cmp = icmp eq i64 %x, 2
   %add = add i64 %x, 1
   %retval.0 = select i1 %cmp, i64 2, i64 %add
@@ -456,32 +798,96 @@ define i64 @select_2_or_inc(i64 %x) {
 }
 
 define <4 x i32> @sel_constants_add_constant_vec(i1 %cond) {
-; CHECK-LABEL: sel_constants_add_constant_vec:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    testb $1, %dil
-; CHECK-NEXT:    jne .LBB37_1
-; CHECK-NEXT:  # %bb.2:
-; CHECK-NEXT:    movaps {{.*#+}} xmm0 = [12,13,14,15]
-; CHECK-NEXT:    retq
-; CHECK-NEXT:  .LBB37_1:
-; CHECK-NEXT:    movaps {{.*#+}} xmm0 = [4294967293,14,4,4]
-; CHECK-NEXT:    retq
+; X86-LABEL: sel_constants_add_constant_vec:
+; X86:       # %bb.0:
+; X86-NEXT:    pushl %ebx
+; X86-NEXT:    .cfi_def_cfa_offset 8
+; X86-NEXT:    pushl %edi
+; X86-NEXT:    .cfi_def_cfa_offset 12
+; X86-NEXT:    pushl %esi
+; X86-NEXT:    .cfi_def_cfa_offset 16
+; X86-NEXT:    .cfi_offset %esi, -16
+; X86-NEXT:    .cfi_offset %edi, -12
+; X86-NEXT:    .cfi_offset %ebx, -8
+; X86-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; X86-NEXT:    movl $-3, %ecx
+; X86-NEXT:    jne .LBB37_2
+; X86-NEXT:  # %bb.1:
+; X86-NEXT:    movl $12, %ecx
+; X86-NEXT:  .LBB37_2:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    movl $4, %esi
+; X86-NEXT:    movl $4, %edx
+; X86-NEXT:    jne .LBB37_4
+; X86-NEXT:  # %bb.3:
+; X86-NEXT:    movl $14, %edx
+; X86-NEXT:  .LBB37_4:
+; X86-NEXT:    jne .LBB37_6
+; X86-NEXT:  # %bb.5:
+; X86-NEXT:    movl $15, %esi
+; X86-NEXT:  .LBB37_6:
+; X86-NEXT:    setne %bl
+; X86-NEXT:    movzbl %bl, %edi
+; X86-NEXT:    addl $13, %edi
+; X86-NEXT:    movl %esi, 12(%eax)
+; X86-NEXT:    movl %edx, 8(%eax)
+; X86-NEXT:    movl %edi, 4(%eax)
+; X86-NEXT:    movl %ecx, (%eax)
+; X86-NEXT:    popl %esi
+; X86-NEXT:    .cfi_def_cfa_offset 12
+; X86-NEXT:    popl %edi
+; X86-NEXT:    .cfi_def_cfa_offset 8
+; X86-NEXT:    popl %ebx
+; X86-NEXT:    .cfi_def_cfa_offset 4
+; X86-NEXT:    retl $4
+;
+; X64-LABEL: sel_constants_add_constant_vec:
+; X64:       # %bb.0:
+; X64-NEXT:    testb $1, %dil
+; X64-NEXT:    jne .LBB37_1
+; X64-NEXT:  # %bb.2:
+; X64-NEXT:    movaps {{.*#+}} xmm0 = [12,13,14,15]
+; X64-NEXT:    retq
+; X64-NEXT:  .LBB37_1:
+; X64-NEXT:    movaps {{.*#+}} xmm0 = [4294967293,14,4,4]
+; X64-NEXT:    retq
   %sel = select i1 %cond, <4 x i32> <i32 -4, i32 12, i32 1, i32 0>, <4 x i32> <i32 11, i32 11, i32 11, i32 11>
   %bo = add <4 x i32> %sel, <i32 1, i32 2, i32 3, i32 4>
   ret <4 x i32> %bo
 }
 
 define <2 x double> @sel_constants_fmul_constant_vec(i1 %cond) {
-; CHECK-LABEL: sel_constants_fmul_constant_vec:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    testb $1, %dil
-; CHECK-NEXT:    jne .LBB38_1
-; CHECK-NEXT:  # %bb.2:
-; CHECK-NEXT:    movaps {{.*#+}} xmm0 = [1.1883E+2,3.4539999999999999E+1]
-; CHECK-NEXT:    retq
-; CHECK-NEXT:  .LBB38_1:
-; CHECK-NEXT:    movaps {{.*#+}} xmm0 = [-2.0399999999999999E+1,3.768E+1]
-; CHECK-NEXT:    retq
+; X86-LABEL: sel_constants_fmul_constant_vec:
+; X86:       # %bb.0:
+; X86-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; X86-NEXT:    fldl {{\.?LCPI[0-9]+_[0-9]+}}
+; X86-NEXT:    fldl {{\.?LCPI[0-9]+_[0-9]+}}
+; X86-NEXT:    jne .LBB38_2
+; X86-NEXT:  # %bb.1:
+; X86-NEXT:    fstp %st(1)
+; X86-NEXT:    fldz
+; X86-NEXT:  .LBB38_2:
+; X86-NEXT:    fstp %st(0)
+; X86-NEXT:    fldl {{\.?LCPI[0-9]+_[0-9]+}}
+; X86-NEXT:    fldl {{\.?LCPI[0-9]+_[0-9]+}}
+; X86-NEXT:    jne .LBB38_4
+; X86-NEXT:  # %bb.3:
+; X86-NEXT:    fstp %st(1)
+; X86-NEXT:    fldz
+; X86-NEXT:  .LBB38_4:
+; X86-NEXT:    fstp %st(0)
+; X86-NEXT:    retl
+;
+; X64-LABEL: sel_constants_fmul_constant_vec:
+; X64:       # %bb.0:
+; X64-NEXT:    testb $1, %dil
+; X64-NEXT:    jne .LBB38_1
+; X64-NEXT:  # %bb.2:
+; X64-NEXT:    movaps {{.*#+}} xmm0 = [1.1883E+2,3.4539999999999999E+1]
+; X64-NEXT:    retq
+; X64-NEXT:  .LBB38_1:
+; X64-NEXT:    movaps {{.*#+}} xmm0 = [-2.0399999999999999E+1,3.768E+1]
+; X64-NEXT:    retq
   %sel = select i1 %cond, <2 x double> <double -4.0, double 12.0>, <2 x double> <double 23.3, double 11.0>
   %bo = fmul <2 x double> %sel, <double 5.1, double 3.14>
   ret <2 x double> %bo
@@ -491,19 +897,51 @@ define <2 x double> @sel_constants_fmul_constant_vec(i1 %cond) {
 ; This becomes an opaque constant via ConstantHoisting, so we don't fold it into the select.
 
 define i64 @opaque_constant(i1 %cond, i64 %x) {
-; CHECK-LABEL: opaque_constant:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    testb $1, %dil
-; CHECK-NEXT:    movq $-4, %rcx
-; CHECK-NEXT:    movl $23, %eax
-; CHECK-NEXT:    cmovneq %rcx, %rax
-; CHECK-NEXT:    movabsq $4294967297, %rcx # imm = 0x100000001
-; CHECK-NEXT:    andq %rcx, %rax
-; CHECK-NEXT:    xorl %edx, %edx
-; CHECK-NEXT:    cmpq %rcx, %rsi
-; CHECK-NEXT:    sete %dl
-; CHECK-NEXT:    subq %rdx, %rax
-; CHECK-NEXT:    retq
+; X86-LABEL: opaque_constant:
+; X86:       # %bb.0:
+; X86-NEXT:    pushl %ebx
+; X86-NEXT:    .cfi_def_cfa_offset 8
+; X86-NEXT:    pushl %esi
+; X86-NEXT:    .cfi_def_cfa_offset 12
+; X86-NEXT:    .cfi_offset %esi, -12
+; X86-NEXT:    .cfi_offset %ebx, -8
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %esi
+; X86-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; X86-NEXT:    movl $-4, %eax
+; X86-NEXT:    jne .LBB39_2
+; X86-NEXT:  # %bb.1:
+; X86-NEXT:    movl $23, %eax
+; X86-NEXT:  .LBB39_2:
+; X86-NEXT:    setne %dl
+; X86-NEXT:    movzbl %dl, %edx
+; X86-NEXT:    andl $1, %eax
+; X86-NEXT:    xorl $1, %esi
+; X86-NEXT:    xorl $1, %ecx
+; X86-NEXT:    xorl %ebx, %ebx
+; X86-NEXT:    orl %esi, %ecx
+; X86-NEXT:    sete %bl
+; X86-NEXT:    subl %ebx, %eax
+; X86-NEXT:    sbbl $0, %edx
+; X86-NEXT:    popl %esi
+; X86-NEXT:    .cfi_def_cfa_offset 8
+; X86-NEXT:    popl %ebx
+; X86-NEXT:    .cfi_def_cfa_offset 4
+; X86-NEXT:    retl
+;
+; X64-LABEL: opaque_constant:
+; X64:       # %bb.0:
+; X64-NEXT:    testb $1, %dil
+; X64-NEXT:    movq $-4, %rcx
+; X64-NEXT:    movl $23, %eax
+; X64-NEXT:    cmovneq %rcx, %rax
+; X64-NEXT:    movabsq $4294967297, %rcx # imm = 0x100000001
+; X64-NEXT:    andq %rcx, %rax
+; X64-NEXT:    xorl %edx, %edx
+; X64-NEXT:    cmpq %rcx, %rsi
+; X64-NEXT:    sete %dl
+; X64-NEXT:    subq %rdx, %rax
+; X64-NEXT:    retq
   %sel = select i1 %cond, i64 -4, i64 23
   %bo = and i64 %sel, 4294967297
   %cmp = icmp eq i64 %x, 4294967297
@@ -513,85 +951,138 @@ define i64 @opaque_constant(i1 %cond, i64 %x) {
 }
 
 define float @select_undef_fp(float %x) {
-; CHECK-LABEL: select_undef_fp:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movss {{.*#+}} xmm0 = mem[0],zero,zero,zero
-; CHECK-NEXT:    retq
+; X86-LABEL: select_undef_fp:
+; X86:       # %bb.0:
+; X86-NEXT:    flds {{\.?LCPI[0-9]+_[0-9]+}}
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_undef_fp:
+; X64:       # %bb.0:
+; X64-NEXT:    movss {{.*#+}} xmm0 = mem[0],zero,zero,zero
+; X64-NEXT:    retq
   %f = select i1 undef, float 4.0, float %x
   ret float %f
 }
 
 define i32 @select_eq0_3_2(i32 %X) {
-; CHECK-LABEL: select_eq0_3_2:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    xorl %eax, %eax
-; CHECK-NEXT:    cmpl $1, %edi
-; CHECK-NEXT:    adcl $2, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_eq0_3_2:
+; X86:       # %bb.0:
+; X86-NEXT:    xorl %eax, %eax
+; X86-NEXT:    cmpl $1, {{[0-9]+}}(%esp)
+; X86-NEXT:    adcl $2, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_eq0_3_2:
+; X64:       # %bb.0:
+; X64-NEXT:    xorl %eax, %eax
+; X64-NEXT:    cmpl $1, %edi
+; X64-NEXT:    adcl $2, %eax
+; X64-NEXT:    retq
   %cmp = icmp eq i32 %X, 0
   %sel = select i1 %cmp, i32 3, i32 2
   ret i32 %sel
 }
 
 define i32 @select_ugt3_2_3(i32 %X) {
-; CHECK-LABEL: select_ugt3_2_3:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    xorl %eax, %eax
-; CHECK-NEXT:    cmpl $4, %edi
-; CHECK-NEXT:    adcl $2, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_ugt3_2_3:
+; X86:       # %bb.0:
+; X86-NEXT:    xorl %eax, %eax
+; X86-NEXT:    cmpl $4, {{[0-9]+}}(%esp)
+; X86-NEXT:    adcl $2, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_ugt3_2_3:
+; X64:       # %bb.0:
+; X64-NEXT:    xorl %eax, %eax
+; X64-NEXT:    cmpl $4, %edi
+; X64-NEXT:    adcl $2, %eax
+; X64-NEXT:    retq
   %cmp = icmp ugt i32 %X, 3
   %sel = select i1 %cmp, i32 2, i32 3
   ret i32 %sel
 }
 
 define i32 @select_ult9_7_6(i32 %X) {
-; CHECK-LABEL: select_ult9_7_6:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    xorl %eax, %eax
-; CHECK-NEXT:    cmpl $9, %edi
-; CHECK-NEXT:    adcl $6, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_ult9_7_6:
+; X86:       # %bb.0:
+; X86-NEXT:    xorl %eax, %eax
+; X86-NEXT:    cmpl $9, {{[0-9]+}}(%esp)
+; X86-NEXT:    adcl $6, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_ult9_7_6:
+; X64:       # %bb.0:
+; X64-NEXT:    xorl %eax, %eax
+; X64-NEXT:    cmpl $9, %edi
+; X64-NEXT:    adcl $6, %eax
+; X64-NEXT:    retq
   %cmp = icmp ult i32 %X, 9
   %sel = select i1 %cmp, i32 7, i32 6
   ret i32 %sel
 }
 
 define i32 @select_ult2_2_3(i32 %X) {
-; CHECK-LABEL: select_ult2_2_3:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    cmpl $2, %edi
-; CHECK-NEXT:    movl $3, %eax
-; CHECK-NEXT:    sbbl $0, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_ult2_2_3:
+; X86:       # %bb.0:
+; X86-NEXT:    cmpl $2, {{[0-9]+}}(%esp)
+; X86-NEXT:    movl $3, %eax
+; X86-NEXT:    sbbl $0, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_ult2_2_3:
+; X64:       # %bb.0:
+; X64-NEXT:    cmpl $2, %edi
+; X64-NEXT:    movl $3, %eax
+; X64-NEXT:    sbbl $0, %eax
+; X64-NEXT:    retq
   %cmp = icmp ult i32 %X, 2
   %cond = select i1 %cmp, i32 2, i32 3
   ret i32 %cond
 }
 
 define i32 @select_ugt3_3_2(i32 %X) {
-; CHECK-LABEL: select_ugt3_3_2:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    cmpl $4, %edi
-; CHECK-NEXT:    movl $2, %eax
-; CHECK-NEXT:    sbbl $-1, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_ugt3_3_2:
+; X86:       # %bb.0:
+; X86-NEXT:    cmpl $4, {{[0-9]+}}(%esp)
+; X86-NEXT:    movl $2, %eax
+; X86-NEXT:    sbbl $-1, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_ugt3_3_2:
+; X64:       # %bb.0:
+; X64-NEXT:    cmpl $4, %edi
+; X64-NEXT:    movl $2, %eax
+; X64-NEXT:    sbbl $-1, %eax
+; X64-NEXT:    retq
   %cmp.inv = icmp ugt i32 %X, 3
   %cond = select i1 %cmp.inv, i32 3, i32 2
   ret i32 %cond
 }
 
 define i32 @select_eq_1_2(i32 %a, i32 %b) {
-; CHECK-LABEL: select_eq_1_2:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    xorl %ecx, %ecx
-; CHECK-NEXT:    cmpl %esi, %edi
-; CHECK-NEXT:    sete %cl
-; CHECK-NEXT:    movl $2, %eax
-; CHECK-NEXT:    subl %ecx, %eax
-; CHECK-NEXT:    retq
+; X86-LABEL: select_eq_1_2:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    xorl %ecx, %ecx
+; X86-NEXT:    cmpl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    sete %cl
+; X86-NEXT:    movl $2, %eax
+; X86-NEXT:    subl %ecx, %eax
+; X86-NEXT:    retl
+;
+; X64-LABEL: select_eq_1_2:
+; X64:       # %bb.0:
+; X64-NEXT:    xorl %ecx, %ecx
+; X64-NEXT:    cmpl %esi, %edi
+; X64-NEXT:    sete %cl
+; X64-NEXT:    movl $2, %eax
+; X64-NEXT:    subl %ecx, %eax
+; X64-NEXT:    retq
 
   %cmp = icmp eq i32 %a, %b
   %cond = select i1 %cmp, i32 1, i32 2
   ret i32 %cond
 }
+;; NOTE: These prefixes are unused and the list is autogenerated. Do not add tests below this line:
+; X64-FASTINC: {{.*}}
+; X64-SLOWINC: {{.*}}