From 987ef2ddfd3298514e2e7c8d55a981161661c7b1 Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper@intel.com>
Date: Thu, 30 Aug 2018 06:01:03 +0000
Subject: [PATCH] [X86] Update test command line to not use 64-bit mode on a
 32-bit only athlon cpu.

llvm-svn: 341021
---
 llvm/test/CodeGen/X86/select.ll | 477 +++++++++++++++++++-------------
 1 file changed, 289 insertions(+), 188 deletions(-)

diff --git a/llvm/test/CodeGen/X86/select.ll b/llvm/test/CodeGen/X86/select.ll
index ae9f01d09373..f82d43893b4e 100644
--- a/llvm/test/CodeGen/X86/select.ll
+++ b/llvm/test/CodeGen/X86/select.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
 ; RUN: llc < %s -mtriple=x86_64-apple-darwin10 -mcpu=generic | FileCheck %s --check-prefix=CHECK --check-prefix=GENERIC
 ; RUN: llc < %s -mtriple=x86_64-apple-darwin10 -mcpu=atom    | FileCheck %s --check-prefix=CHECK --check-prefix=ATOM
-; RUN: llc < %s -mtriple=x86_64-apple-darwin10 -mcpu=athlon  | FileCheck %s --check-prefix=ATHLON
+; RUN: llc < %s -mtriple=i386-apple-darwin10 -mcpu=athlon    | FileCheck %s --check-prefix=ATHLON
 ; RUN: llc < %s -mtriple=i386-intel-elfiamcu                 | FileCheck %s --check-prefix=MCU
 
 ; PR5757
@@ -19,12 +19,14 @@ define i32 @test1(%0* %p, %0* %q, i1 %r) nounwind {
 ;
 ; ATHLON-LABEL: test1:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    addq $8, %rdi
-; ATHLON-NEXT:    addq $8, %rsi
-; ATHLON-NEXT:    testb $1, %dl
-; ATHLON-NEXT:    cmovneq %rdi, %rsi
-; ATHLON-NEXT:    movl (%rsi), %eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    addl $8, %ecx
+; ATHLON-NEXT:    addl $8, %eax
+; ATHLON-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; ATHLON-NEXT:    cmovnel %ecx, %eax
+; ATHLON-NEXT:    movl (%eax), %eax
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test1:
 ; MCU:       # %bb.0:
@@ -85,8 +87,8 @@ define i32 @test2() nounwind {
 ;
 ; ATHLON-LABEL: test2:
 ; ATHLON:       ## %bb.0: ## %entry
-; ATHLON-NEXT:    pushq %rax
-; ATHLON-NEXT:    callq _return_false
+; ATHLON-NEXT:    subl $12, %esp
+; ATHLON-NEXT:    calll _return_false
 ; ATHLON-NEXT:    xorl %ecx, %ecx
 ; ATHLON-NEXT:    testb $1, %al
 ; ATHLON-NEXT:    movl $-480, %eax ## imm = 0xFE20
@@ -96,8 +98,8 @@ define i32 @test2() nounwind {
 ; ATHLON-NEXT:    jge LBB1_1
 ; ATHLON-NEXT:  ## %bb.2: ## %bb91
 ; ATHLON-NEXT:    xorl %eax, %eax
-; ATHLON-NEXT:    popq %rcx
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    addl $12, %esp
+; ATHLON-NEXT:    retl
 ; ATHLON-NEXT:  LBB1_1: ## %bb90
 ; ATHLON-NEXT:    ud2
 ;
@@ -155,11 +157,10 @@ define float @test3(i32 %x) nounwind readnone {
 ; ATHLON-LABEL: test3:
 ; ATHLON:       ## %bb.0: ## %entry
 ; ATHLON-NEXT:    xorl %eax, %eax
-; ATHLON-NEXT:    testl %edi, %edi
+; ATHLON-NEXT:    cmpl $0, {{[0-9]+}}(%esp)
 ; ATHLON-NEXT:    sete %al
-; ATHLON-NEXT:    leaq {{.*}}(%rip), %rcx
-; ATHLON-NEXT:    movss {{.*#+}} xmm0 = mem[0],zero,zero,zero
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    flds LCPI2_0(,%eax,4)
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test3:
 ; MCU:       # %bb.0: # %entry
@@ -186,12 +187,15 @@ define signext i8 @test4(i8* nocapture %P, double %F) nounwind readonly {
 ;
 ; ATHLON-LABEL: test4:
 ; ATHLON:       ## %bb.0: ## %entry
-; ATHLON-NEXT:    movsd {{.*#+}} xmm1 = mem[0],zero
-; ATHLON-NEXT:    xorl %eax, %eax
-; ATHLON-NEXT:    ucomisd %xmm0, %xmm1
-; ATHLON-NEXT:    seta %al
-; ATHLON-NEXT:    movsbl (%rdi,%rax,4), %eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    fldl {{[0-9]+}}(%esp)
+; ATHLON-NEXT:    flds LCPI3_0
+; ATHLON-NEXT:    xorl %ecx, %ecx
+; ATHLON-NEXT:    fucompi %st(1)
+; ATHLON-NEXT:    fstp %st(0)
+; ATHLON-NEXT:    seta %cl
+; ATHLON-NEXT:    movsbl (%eax,%ecx,4), %eax
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test4:
 ; MCU:       # %bb.0: # %entry
@@ -229,15 +233,21 @@ define void @test5(i1 %c, <2 x i16> %a, <2 x i16> %b, <2 x i16>* %p) nounwind {
 ;
 ; ATHLON-LABEL: test5:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    testb $1, %dil
-; ATHLON-NEXT:    jne LBB4_2
-; ATHLON-NEXT:  ## %bb.1:
-; ATHLON-NEXT:    movdqa %xmm1, %xmm0
-; ATHLON-NEXT:  LBB4_2:
-; ATHLON-NEXT:    pshufd {{.*#+}} xmm0 = xmm0[0,2,2,3]
-; ATHLON-NEXT:    pshuflw {{.*#+}} xmm0 = xmm0[0,2,2,3,4,5,6,7]
-; ATHLON-NEXT:    movd %xmm0, (%rsi)
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    pushl %esi
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %edx
+; ATHLON-NEXT:    cmovnel %ecx, %edx
+; ATHLON-NEXT:    movzwl (%edx), %ecx
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %edx
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %esi
+; ATHLON-NEXT:    cmovnel %edx, %esi
+; ATHLON-NEXT:    movzwl (%esi), %edx
+; ATHLON-NEXT:    movw %dx, 2(%eax)
+; ATHLON-NEXT:    movw %cx, (%eax)
+; ATHLON-NEXT:    popl %esi
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test5:
 ; MCU:       # %bb.0:
@@ -276,17 +286,40 @@ define void @test6(i32 %C, <4 x float>* %A, <4 x float>* %B) nounwind {
 ;
 ; ATHLON-LABEL: test6:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    testl %edi, %edi
-; ATHLON-NEXT:    je LBB5_1
-; ATHLON-NEXT:  ## %bb.2:
-; ATHLON-NEXT:    movaps (%rsi), %xmm0
-; ATHLON-NEXT:    movaps %xmm0, (%rsi)
-; ATHLON-NEXT:    retq
-; ATHLON-NEXT:  LBB5_1:
-; ATHLON-NEXT:    movaps (%rdx), %xmm0
-; ATHLON-NEXT:    mulps %xmm0, %xmm0
-; ATHLON-NEXT:    movaps %xmm0, (%rsi)
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    flds 12(%ecx)
+; ATHLON-NEXT:    flds 8(%ecx)
+; ATHLON-NEXT:    flds 4(%ecx)
+; ATHLON-NEXT:    flds (%ecx)
+; ATHLON-NEXT:    flds (%eax)
+; ATHLON-NEXT:    fmul %st(0), %st(0)
+; ATHLON-NEXT:    cmpl $0, {{[0-9]+}}(%esp)
+; ATHLON-NEXT:    fxch %st(1)
+; ATHLON-NEXT:    fcmove %st(1), %st(0)
+; ATHLON-NEXT:    fstp %st(1)
+; ATHLON-NEXT:    flds 4(%eax)
+; ATHLON-NEXT:    fmul %st(0), %st(0)
+; ATHLON-NEXT:    fxch %st(2)
+; ATHLON-NEXT:    fcmove %st(2), %st(0)
+; ATHLON-NEXT:    fstp %st(2)
+; ATHLON-NEXT:    flds 8(%eax)
+; ATHLON-NEXT:    fmul %st(0), %st(0)
+; ATHLON-NEXT:    fxch %st(3)
+; ATHLON-NEXT:    fcmove %st(3), %st(0)
+; ATHLON-NEXT:    fstp %st(3)
+; ATHLON-NEXT:    flds 12(%eax)
+; ATHLON-NEXT:    fmul %st(0), %st(0)
+; ATHLON-NEXT:    fxch %st(4)
+; ATHLON-NEXT:    fcmove %st(4), %st(0)
+; ATHLON-NEXT:    fstp %st(4)
+; ATHLON-NEXT:    fxch %st(3)
+; ATHLON-NEXT:    fstps 12(%ecx)
+; ATHLON-NEXT:    fxch %st(1)
+; ATHLON-NEXT:    fstps 8(%ecx)
+; ATHLON-NEXT:    fstps 4(%ecx)
+; ATHLON-NEXT:    fstps (%ecx)
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test6:
 ; MCU:       # %bb.0:
@@ -371,13 +404,12 @@ define x86_fp80 @test7(i32 %tmp8) nounwind {
 ;
 ; ATHLON-LABEL: test7:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    xorl %eax, %eax
-; ATHLON-NEXT:    testl %edi, %edi
-; ATHLON-NEXT:    setns %al
-; ATHLON-NEXT:    shlq $4, %rax
-; ATHLON-NEXT:    leaq {{.*}}(%rip), %rcx
-; ATHLON-NEXT:    fldt (%rax,%rcx)
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    notl %eax
+; ATHLON-NEXT:    shrl $27, %eax
+; ATHLON-NEXT:    andl $-16, %eax
+; ATHLON-NEXT:    fldt LCPI6_0(%eax)
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test7:
 ; MCU:       # %bb.0:
@@ -462,37 +494,53 @@ define void @test8(i1 %c, <6 x i32>* %dst.addr, <6 x i32> %src1,<6 x i32> %src2)
 ;
 ; ATHLON-LABEL: test8:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    testb $1, %dil
-; ATHLON-NEXT:    jne LBB7_1
-; ATHLON-NEXT:  ## %bb.2:
-; ATHLON-NEXT:    movd {{.*#+}} xmm0 = mem[0],zero,zero,zero
-; ATHLON-NEXT:    movd {{.*#+}} xmm1 = mem[0],zero,zero,zero
-; ATHLON-NEXT:    punpckldq {{.*#+}} xmm1 = xmm1[0],xmm0[0],xmm1[1],xmm0[1]
-; ATHLON-NEXT:    movd {{.*#+}} xmm2 = mem[0],zero,zero,zero
-; ATHLON-NEXT:    movd {{.*#+}} xmm0 = mem[0],zero,zero,zero
-; ATHLON-NEXT:    punpckldq {{.*#+}} xmm0 = xmm0[0],xmm2[0],xmm0[1],xmm2[1]
-; ATHLON-NEXT:    punpcklqdq {{.*#+}} xmm0 = xmm0[0],xmm1[0]
-; ATHLON-NEXT:    movd {{.*#+}} xmm2 = mem[0],zero,zero,zero
-; ATHLON-NEXT:    movd {{.*#+}} xmm1 = mem[0],zero,zero,zero
-; ATHLON-NEXT:    jmp LBB7_3
-; ATHLON-NEXT:  LBB7_1:
-; ATHLON-NEXT:    movd %r9d, %xmm0
-; ATHLON-NEXT:    movd %r8d, %xmm1
-; ATHLON-NEXT:    punpckldq {{.*#+}} xmm1 = xmm1[0],xmm0[0],xmm1[1],xmm0[1]
-; ATHLON-NEXT:    movd %ecx, %xmm2
-; ATHLON-NEXT:    movd %edx, %xmm0
-; ATHLON-NEXT:    punpckldq {{.*#+}} xmm0 = xmm0[0],xmm2[0],xmm0[1],xmm2[1]
-; ATHLON-NEXT:    punpcklqdq {{.*#+}} xmm0 = xmm0[0],xmm1[0]
-; ATHLON-NEXT:    movd {{.*#+}} xmm2 = mem[0],zero,zero,zero
-; ATHLON-NEXT:    movd {{.*#+}} xmm1 = mem[0],zero,zero,zero
-; ATHLON-NEXT:  LBB7_3:
-; ATHLON-NEXT:    punpckldq {{.*#+}} xmm1 = xmm1[0],xmm2[0],xmm1[1],xmm2[1]
-; ATHLON-NEXT:    pcmpeqd %xmm2, %xmm2
-; ATHLON-NEXT:    paddd %xmm2, %xmm0
-; ATHLON-NEXT:    paddd %xmm2, %xmm1
-; ATHLON-NEXT:    movq %xmm1, 16(%rsi)
-; ATHLON-NEXT:    movdqa %xmm0, (%rsi)
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    pushl %ebp
+; ATHLON-NEXT:    pushl %ebx
+; ATHLON-NEXT:    pushl %edi
+; ATHLON-NEXT:    pushl %esi
+; ATHLON-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    cmovnel %eax, %ecx
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %edx
+; ATHLON-NEXT:    cmovnel %eax, %edx
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %esi
+; ATHLON-NEXT:    cmovnel %eax, %esi
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %edi
+; ATHLON-NEXT:    cmovnel %eax, %edi
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %ebx
+; ATHLON-NEXT:    cmovnel %eax, %ebx
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %ebp
+; ATHLON-NEXT:    cmovnel %eax, %ebp
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    movl (%ecx), %ecx
+; ATHLON-NEXT:    movl (%edx), %edx
+; ATHLON-NEXT:    movl (%esi), %esi
+; ATHLON-NEXT:    movl (%edi), %edi
+; ATHLON-NEXT:    movl (%ebx), %ebx
+; ATHLON-NEXT:    movl (%ebp), %ebp
+; ATHLON-NEXT:    decl %ecx
+; ATHLON-NEXT:    movl %ecx, 20(%eax)
+; ATHLON-NEXT:    decl %edx
+; ATHLON-NEXT:    movl %edx, 16(%eax)
+; ATHLON-NEXT:    decl %esi
+; ATHLON-NEXT:    movl %esi, 12(%eax)
+; ATHLON-NEXT:    decl %edi
+; ATHLON-NEXT:    movl %edi, 8(%eax)
+; ATHLON-NEXT:    decl %ebx
+; ATHLON-NEXT:    movl %ebx, 4(%eax)
+; ATHLON-NEXT:    decl %ebp
+; ATHLON-NEXT:    movl %ebp, (%eax)
+; ATHLON-NEXT:    popl %esi
+; ATHLON-NEXT:    popl %edi
+; ATHLON-NEXT:    popl %ebx
+; ATHLON-NEXT:    popl %ebp
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test8:
 ; MCU:       # %bb.0:
@@ -594,10 +642,16 @@ define i64 @test9(i64 %x, i64 %y) nounwind readnone ssp noredzone {
 ;
 ; ATHLON-LABEL: test9:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    cmpq $1, %rdi
-; ATHLON-NEXT:    sbbq %rax, %rax
-; ATHLON-NEXT:    orq %rsi, %rax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    orl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    movl $-1, %eax
+; ATHLON-NEXT:    movl $-1, %edx
+; ATHLON-NEXT:    je LBB8_2
+; ATHLON-NEXT:  ## %bb.1:
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %edx
+; ATHLON-NEXT:  LBB8_2:
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test9:
 ; MCU:       # %bb.0:
@@ -636,10 +690,16 @@ define i64 @test9a(i64 %x, i64 %y) nounwind readnone ssp noredzone {
 ;
 ; ATHLON-LABEL: test9a:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    cmpq $1, %rdi
-; ATHLON-NEXT:    sbbq %rax, %rax
-; ATHLON-NEXT:    orq %rsi, %rax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    orl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    movl $-1, %eax
+; ATHLON-NEXT:    movl $-1, %edx
+; ATHLON-NEXT:    je LBB9_2
+; ATHLON-NEXT:  ## %bb.1:
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %edx
+; ATHLON-NEXT:  LBB9_2:
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test9a:
 ; MCU:       # %bb.0:
@@ -676,10 +736,15 @@ define i64 @test9b(i64 %x, i64 %y) nounwind readnone ssp noredzone {
 ;
 ; ATHLON-LABEL: test9b:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    cmpq $1, %rdi
-; ATHLON-NEXT:    sbbq %rax, %rax
-; ATHLON-NEXT:    orq %rsi, %rax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    xorl %edx, %edx
+; ATHLON-NEXT:    orl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    sete %dl
+; ATHLON-NEXT:    negl %edx
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    orl %edx, %eax
+; ATHLON-NEXT:    orl {{[0-9]+}}(%esp), %edx
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test9b:
 ; MCU:       # %bb.0:
@@ -710,11 +775,14 @@ define i64 @test10(i64 %x, i64 %y) nounwind readnone ssp noredzone {
 ;
 ; ATHLON-LABEL: test10:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    xorl %eax, %eax
-; ATHLON-NEXT:    testq %rdi, %rdi
-; ATHLON-NEXT:    setne %al
-; ATHLON-NEXT:    leaq -1(%rax,%rax), %rax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    xorl %edx, %edx
+; ATHLON-NEXT:    orl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    movl $-1, %ecx
+; ATHLON-NEXT:    movl $1, %eax
+; ATHLON-NEXT:    cmovel %ecx, %eax
+; ATHLON-NEXT:    cmovel %ecx, %edx
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test10:
 ; MCU:       # %bb.0:
@@ -743,11 +811,16 @@ define i64 @test11(i64 %x, i64 %y) nounwind readnone ssp noredzone {
 ;
 ; ATHLON-LABEL: test11:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    cmpq $1, %rdi
-; ATHLON-NEXT:    sbbq %rax, %rax
-; ATHLON-NEXT:    notq %rax
-; ATHLON-NEXT:    orq %rsi, %rax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    orl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    movl $-1, %eax
+; ATHLON-NEXT:    movl $-1, %edx
+; ATHLON-NEXT:    jne LBB12_2
+; ATHLON-NEXT:  ## %bb.1:
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %edx
+; ATHLON-NEXT:  LBB12_2:
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test11:
 ; MCU:       # %bb.0:
@@ -777,11 +850,16 @@ define i64 @test11a(i64 %x, i64 %y) nounwind readnone ssp noredzone {
 ;
 ; ATHLON-LABEL: test11a:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    cmpq $1, %rdi
-; ATHLON-NEXT:    sbbq %rax, %rax
-; ATHLON-NEXT:    notq %rax
-; ATHLON-NEXT:    orq %rsi, %rax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    orl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    movl $-1, %eax
+; ATHLON-NEXT:    movl $-1, %edx
+; ATHLON-NEXT:    jne LBB13_2
+; ATHLON-NEXT:  ## %bb.1:
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %edx
+; ATHLON-NEXT:  LBB13_2:
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test11a:
 ; MCU:       # %bb.0:
@@ -818,9 +896,10 @@ define i32 @test13(i32 %a, i32 %b) nounwind {
 ;
 ; ATHLON-LABEL: test13:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    cmpl %esi, %edi
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    cmpl {{[0-9]+}}(%esp), %eax
 ; ATHLON-NEXT:    sbbl %eax, %eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test13:
 ; MCU:       # %bb.0:
@@ -843,11 +922,12 @@ define i32 @test14(i32 %a, i32 %b) nounwind {
 ;
 ; ATHLON-LABEL: test14:
 ; ATHLON:       ## %bb.0:
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %ecx
 ; ATHLON-NEXT:    xorl %eax, %eax
-; ATHLON-NEXT:    cmpl %esi, %edi
+; ATHLON-NEXT:    cmpl {{[0-9]+}}(%esp), %ecx
 ; ATHLON-NEXT:    setae %al
 ; ATHLON-NEXT:    negl %eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test14:
 ; MCU:       # %bb.0:
@@ -882,9 +962,10 @@ define i32 @test15(i32 %x) nounwind {
 ;
 ; ATHLON-LABEL: test15:
 ; ATHLON:       ## %bb.0: ## %entry
-; ATHLON-NEXT:    negl %edi
+; ATHLON-NEXT:    xorl %eax, %eax
+; ATHLON-NEXT:    cmpl {{[0-9]+}}(%esp), %eax
 ; ATHLON-NEXT:    sbbl %eax, %eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test15:
 ; MCU:       # %bb.0: # %entry
@@ -916,9 +997,13 @@ define i64 @test16(i64 %x) nounwind uwtable readnone ssp {
 ;
 ; ATHLON-LABEL: test16:
 ; ATHLON:       ## %bb.0: ## %entry
-; ATHLON-NEXT:    negq %rdi
-; ATHLON-NEXT:    sbbq %rax, %rax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    xorl %eax, %eax
+; ATHLON-NEXT:    orl {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    setne %al
+; ATHLON-NEXT:    negl %eax
+; ATHLON-NEXT:    movl %eax, %edx
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test16:
 ; MCU:       # %bb.0: # %entry
@@ -956,10 +1041,11 @@ define i16 @test17(i16 %x) nounwind {
 ;
 ; ATHLON-LABEL: test17:
 ; ATHLON:       ## %bb.0: ## %entry
-; ATHLON-NEXT:    negw %di
+; ATHLON-NEXT:    xorl %eax, %eax
+; ATHLON-NEXT:    cmpw {{[0-9]+}}(%esp), %ax
 ; ATHLON-NEXT:    sbbl %eax, %eax
 ; ATHLON-NEXT:    ## kill: def $ax killed $ax killed $eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test17:
 ; MCU:       # %bb.0: # %entry
@@ -992,10 +1078,12 @@ define i8 @test18(i32 %x, i8 zeroext %a, i8 zeroext %b) nounwind {
 ;
 ; ATHLON-LABEL: test18:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    cmpl $15, %edi
-; ATHLON-NEXT:    cmovgel %edx, %esi
-; ATHLON-NEXT:    movl %esi, %eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    cmpl $15, {{[0-9]+}}(%esp)
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    leal {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    cmovll %eax, %ecx
+; ATHLON-NEXT:    movb (%ecx), %al
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test18:
 ; MCU:       # %bb.0:
@@ -1022,11 +1110,11 @@ define i32 @trunc_select_miscompile(i32 %a, i1 zeroext %cc) {
 ;
 ; ATHLON-LABEL: trunc_select_miscompile:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    orb $2, %sil
-; ATHLON-NEXT:    movl %esi, %ecx
-; ATHLON-NEXT:    shll %cl, %edi
-; ATHLON-NEXT:    movl %edi, %eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    movb {{[0-9]+}}(%esp), %cl
+; ATHLON-NEXT:    orb $2, %cl
+; ATHLON-NEXT:    shll %cl, %eax
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: trunc_select_miscompile:
 ; MCU:       # %bb.0:
@@ -1071,17 +1159,19 @@ define void @clamp_i8(i32 %src, i8* %dst) {
 ;
 ; ATHLON-LABEL: clamp_i8:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    cmpl $127, %edi
-; ATHLON-NEXT:    movl $127, %eax
-; ATHLON-NEXT:    cmovlel %edi, %eax
-; ATHLON-NEXT:    cmpl $-128, %eax
-; ATHLON-NEXT:    movb $-128, %cl
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %edx
+; ATHLON-NEXT:    cmpl $127, %edx
+; ATHLON-NEXT:    movl $127, %ecx
+; ATHLON-NEXT:    cmovlel %edx, %ecx
+; ATHLON-NEXT:    cmpl $-128, %ecx
+; ATHLON-NEXT:    movb $-128, %dl
 ; ATHLON-NEXT:    jl LBB21_2
 ; ATHLON-NEXT:  ## %bb.1:
-; ATHLON-NEXT:    movl %eax, %ecx
+; ATHLON-NEXT:    movl %ecx, %edx
 ; ATHLON-NEXT:  LBB21_2:
-; ATHLON-NEXT:    movb %cl, (%rsi)
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movb %dl, (%eax)
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: clamp_i8:
 ; MCU:       # %bb.0:
@@ -1134,14 +1224,16 @@ define void @clamp(i32 %src, i16* %dst) {
 ;
 ; ATHLON-LABEL: clamp:
 ; ATHLON:       ## %bb.0:
-; ATHLON-NEXT:    cmpl $32767, %edi ## imm = 0x7FFF
-; ATHLON-NEXT:    movl $32767, %eax ## imm = 0x7FFF
-; ATHLON-NEXT:    cmovlel %edi, %eax
-; ATHLON-NEXT:    cmpl $-32768, %eax ## imm = 0x8000
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    cmpl $32767, %ecx ## imm = 0x7FFF
+; ATHLON-NEXT:    movl $32767, %edx ## imm = 0x7FFF
+; ATHLON-NEXT:    cmovlel %ecx, %edx
+; ATHLON-NEXT:    cmpl $-32768, %edx ## imm = 0x8000
 ; ATHLON-NEXT:    movl $32768, %ecx ## imm = 0x8000
-; ATHLON-NEXT:    cmovgel %eax, %ecx
-; ATHLON-NEXT:    movw %cx, (%rsi)
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    cmovgel %edx, %ecx
+; ATHLON-NEXT:    movw %cx, (%eax)
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: clamp:
 ; MCU:       # %bb.0:
@@ -1198,24 +1290,25 @@ define void @test19() {
 ;
 ; ATHLON-LABEL: test19:
 ; ATHLON:       ## %bb.0: ## %BB
-; ATHLON-NEXT:    movl $-1, %eax
-; ATHLON-NEXT:    movb $1, %cl
+; ATHLON-NEXT:    movb $1, %al
 ; ATHLON-NEXT:    .p2align 4, 0x90
 ; ATHLON-NEXT:  LBB23_1: ## %CF
 ; ATHLON-NEXT:    ## =>This Inner Loop Header: Depth=1
-; ATHLON-NEXT:    testb %cl, %cl
+; ATHLON-NEXT:    testb %al, %al
 ; ATHLON-NEXT:    jne LBB23_1
 ; ATHLON-NEXT:  ## %bb.2: ## %CF250
 ; ATHLON-NEXT:    ## in Loop: Header=BB23_1 Depth=1
 ; ATHLON-NEXT:    jne LBB23_1
+; ATHLON-NEXT:  ## %bb.3: ## %CF242.preheader
+; ATHLON-NEXT:    fldz
 ; ATHLON-NEXT:    .p2align 4, 0x90
-; ATHLON-NEXT:  LBB23_3: ## %CF242
+; ATHLON-NEXT:  LBB23_4: ## %CF242
 ; ATHLON-NEXT:    ## =>This Inner Loop Header: Depth=1
-; ATHLON-NEXT:    cmpl %eax, %eax
-; ATHLON-NEXT:    ucomiss %xmm0, %xmm0
-; ATHLON-NEXT:    jp LBB23_3
-; ATHLON-NEXT:  ## %bb.4: ## %CF244
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    fucomi %st(0)
+; ATHLON-NEXT:    jp LBB23_4
+; ATHLON-NEXT:  ## %bb.5: ## %CF244
+; ATHLON-NEXT:    fstp %st(0)
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: test19:
 ; MCU:       # %bb.0: # %BB
@@ -1279,12 +1372,13 @@ define i16 @select_xor_1(i16 %A, i8 %cond) {
 ;
 ; ATHLON-LABEL: select_xor_1:
 ; ATHLON:       ## %bb.0: ## %entry
-; ATHLON-NEXT:    movl %edi, %eax
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    movl %ecx, %eax
 ; ATHLON-NEXT:    xorl $43, %eax
-; ATHLON-NEXT:    testb $1, %sil
-; ATHLON-NEXT:    cmovel %edi, %eax
+; ATHLON-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; ATHLON-NEXT:    cmovel %ecx, %eax
 ; ATHLON-NEXT:    ## kill: def $ax killed $ax killed $eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: select_xor_1:
 ; MCU:       # %bb.0: # %entry
@@ -1316,12 +1410,13 @@ define i16 @select_xor_1b(i16 %A, i8 %cond) {
 ;
 ; ATHLON-LABEL: select_xor_1b:
 ; ATHLON:       ## %bb.0: ## %entry
-; ATHLON-NEXT:    movl %edi, %eax
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    movl %ecx, %eax
 ; ATHLON-NEXT:    xorl $43, %eax
-; ATHLON-NEXT:    testb $1, %sil
-; ATHLON-NEXT:    cmovel %edi, %eax
+; ATHLON-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; ATHLON-NEXT:    cmovel %ecx, %eax
 ; ATHLON-NEXT:    ## kill: def $ax killed $ax killed $eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: select_xor_1b:
 ; MCU:       # %bb.0: # %entry
@@ -1351,11 +1446,12 @@ define i32 @select_xor_2(i32 %A, i32 %B, i8 %cond) {
 ;
 ; ATHLON-LABEL: select_xor_2:
 ; ATHLON:       ## %bb.0: ## %entry
-; ATHLON-NEXT:    xorl %edi, %esi
-; ATHLON-NEXT:    testb $1, %dl
-; ATHLON-NEXT:    cmovel %edi, %esi
-; ATHLON-NEXT:    movl %esi, %eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    xorl %ecx, %eax
+; ATHLON-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; ATHLON-NEXT:    cmovel %ecx, %eax
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: select_xor_2:
 ; MCU:       # %bb.0: # %entry
@@ -1385,11 +1481,12 @@ define i32 @select_xor_2b(i32 %A, i32 %B, i8 %cond) {
 ;
 ; ATHLON-LABEL: select_xor_2b:
 ; ATHLON:       ## %bb.0: ## %entry
-; ATHLON-NEXT:    xorl %edi, %esi
-; ATHLON-NEXT:    testb $1, %dl
-; ATHLON-NEXT:    cmovel %edi, %esi
-; ATHLON-NEXT:    movl %esi, %eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    xorl %ecx, %eax
+; ATHLON-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; ATHLON-NEXT:    cmovel %ecx, %eax
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: select_xor_2b:
 ; MCU:       # %bb.0: # %entry
@@ -1418,11 +1515,12 @@ define i32 @select_or(i32 %A, i32 %B, i8 %cond) {
 ;
 ; ATHLON-LABEL: select_or:
 ; ATHLON:       ## %bb.0: ## %entry
-; ATHLON-NEXT:    orl %edi, %esi
-; ATHLON-NEXT:    testb $1, %dl
-; ATHLON-NEXT:    cmovel %edi, %esi
-; ATHLON-NEXT:    movl %esi, %eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    orl %ecx, %eax
+; ATHLON-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; ATHLON-NEXT:    cmovel %ecx, %eax
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: select_or:
 ; MCU:       # %bb.0: # %entry
@@ -1452,11 +1550,12 @@ define i32 @select_or_b(i32 %A, i32 %B, i8 %cond) {
 ;
 ; ATHLON-LABEL: select_or_b:
 ; ATHLON:       ## %bb.0: ## %entry
-; ATHLON-NEXT:    orl %edi, %esi
-; ATHLON-NEXT:    testb $1, %dl
-; ATHLON-NEXT:    cmovel %edi, %esi
-; ATHLON-NEXT:    movl %esi, %eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    orl %ecx, %eax
+; ATHLON-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; ATHLON-NEXT:    cmovel %ecx, %eax
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: select_or_b:
 ; MCU:       # %bb.0: # %entry
@@ -1485,11 +1584,12 @@ define i32 @select_or_1(i32 %A, i32 %B, i32 %cond) {
 ;
 ; ATHLON-LABEL: select_or_1:
 ; ATHLON:       ## %bb.0: ## %entry
-; ATHLON-NEXT:    orl %edi, %esi
-; ATHLON-NEXT:    testb $1, %dl
-; ATHLON-NEXT:    cmovel %edi, %esi
-; ATHLON-NEXT:    movl %esi, %eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    orl %ecx, %eax
+; ATHLON-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; ATHLON-NEXT:    cmovel %ecx, %eax
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: select_or_1:
 ; MCU:       # %bb.0: # %entry
@@ -1519,11 +1619,12 @@ define i32 @select_or_1b(i32 %A, i32 %B, i32 %cond) {
 ;
 ; ATHLON-LABEL: select_or_1b:
 ; ATHLON:       ## %bb.0: ## %entry
-; ATHLON-NEXT:    orl %edi, %esi
-; ATHLON-NEXT:    testb $1, %dl
-; ATHLON-NEXT:    cmovel %edi, %esi
-; ATHLON-NEXT:    movl %esi, %eax
-; ATHLON-NEXT:    retq
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; ATHLON-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; ATHLON-NEXT:    orl %ecx, %eax
+; ATHLON-NEXT:    testb $1, {{[0-9]+}}(%esp)
+; ATHLON-NEXT:    cmovel %ecx, %eax
+; ATHLON-NEXT:    retl
 ;
 ; MCU-LABEL: select_or_1b:
 ; MCU:       # %bb.0: # %entry