diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2015-05-12 23:34:27 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2015-05-12 23:34:27 +0000 |
| commit | 942fba95e297dc0a7158589d4f1d5a3250e06b20 (patch) | |
| tree | b2f838c9ad26eb7e2dc3c0b39b0fc82ab9310603 /llvm/test | |
| parent | a6ae877aecfe5f5dce482374fad5d397dc6ca7e1 (diff) | |
| download | bcm5719-llvm-942fba95e297dc0a7158589d4f1d5a3250e06b20.tar.gz bcm5719-llvm-942fba95e297dc0a7158589d4f1d5a3250e06b20.zip | |
Revert r237175: [X86] Always return the sret parameter in eax/rax ...
This commit broke an x86 test and the bots have been broken for well
over an hour now so I'm just reverting.
llvm-svn: 237210
Diffstat (limited to 'llvm/test')
| -rw-r--r-- | llvm/test/CodeGen/X86/cmovcmov.ll | 18 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/sret-implicit.ll | 42 |
2 files changed, 19 insertions, 41 deletions
diff --git a/llvm/test/CodeGen/X86/cmovcmov.ll b/llvm/test/CodeGen/X86/cmovcmov.ll index d3d9748d653..982bc82c4c7 100644 --- a/llvm/test/CodeGen/X86/cmovcmov.ll +++ b/llvm/test/CodeGen/X86/cmovcmov.ll @@ -143,19 +143,19 @@ entry: ; NOCMOV-NEXT: jp [[TBB]] ; NOCMOV-NEXT: leal 24(%esp), %eax ; NOCMOV-NEXT: [[TBB]]: -; NOCMOV-NEXT: movl (%eax), %ecx -; NOCMOV-NEXT: leal 44(%esp), %edx +; NOCMOV-NEXT: movl (%eax), %eax +; NOCMOV-NEXT: leal 44(%esp), %ecx ; NOCMOV-NEXT: jne [[TBB:.LBB[0-9_]+]] ; NOCMOV-NEXT: jp [[TBB]] -; NOCMOV-NEXT: leal 28(%esp), %edx +; NOCMOV-NEXT: leal 28(%esp), %ecx ; NOCMOV-NEXT: [[TBB]]: -; NOCMOV-NEXT: movl 12(%esp), %eax -; NOCMOV-NEXT: movl (%edx), %edx +; NOCMOV-NEXT: movl (%ecx), %ecx ; NOCMOV-NEXT: leal 48(%esp), %esi ; NOCMOV-NEXT: jne [[TBB:.LBB[0-9_]+]] ; NOCMOV-NEXT: jp [[TBB]] ; NOCMOV-NEXT: leal 32(%esp), %esi ; NOCMOV-NEXT: [[TBB]]: +; NOCMOV-NEXT: movl 12(%esp), %edx ; NOCMOV-NEXT: movl (%esi), %esi ; NOCMOV-NEXT: leal 52(%esp), %edi ; NOCMOV-NEXT: jne [[TBB:.LBB[0-9_]+]] @@ -163,10 +163,10 @@ entry: ; NOCMOV-NEXT: leal 36(%esp), %edi ; NOCMOV-NEXT: [[TBB]]: ; NOCMOV-NEXT: movl (%edi), %edi -; NOCMOV-NEXT: movl %edi, 12(%eax) -; NOCMOV-NEXT: movl %esi, 8(%eax) -; NOCMOV-NEXT: movl %edx, 4(%eax) -; NOCMOV-NEXT: movl %ecx, (%eax) +; NOCMOV-NEXT: movl %edi, 12(%edx) +; NOCMOV-NEXT: movl %esi, 8(%edx) +; NOCMOV-NEXT: movl %ecx, 4(%edx) +; NOCMOV-NEXT: movl %eax, (%edx) ; NOCMOV-NEXT: popl %esi ; NOCMOV-NEXT: popl %edi ; NOCMOV-NEXT: retl $4 diff --git a/llvm/test/CodeGen/X86/sret-implicit.ll b/llvm/test/CodeGen/X86/sret-implicit.ll index 2a998fc6b6c..56809525407 100644 --- a/llvm/test/CodeGen/X86/sret-implicit.ll +++ b/llvm/test/CodeGen/X86/sret-implicit.ll @@ -1,34 +1,12 @@ -; RUN: llc -mtriple=x86_64-apple-darwin8 < %s | FileCheck %s --check-prefix=X64 -; RUN: llc -mtriple=x86_64-pc-linux < %s | FileCheck %s --check-prefix=X64 -; RUN: llc -mtriple=i686-pc-linux < %s | FileCheck %s --check-prefix=X86 -; RUN: llc -mtriple=x86_64-apple-darwin8 -terminal-rule < %s | FileCheck %s --check-prefix=X64 -; RUN: llc -mtriple=x86_64-pc-linux -terminal-rule < %s | FileCheck %s --check-prefix=X64 - -define void @sret_void(i32* sret %p) { - store i32 0, i32* %p - ret void -} - -; X64-LABEL: sret_void -; X64-DAG: movl $0, (%rdi) -; X64-DAG: movq %rdi, %rax -; X64: retq - -; X86-LABEL: sret_void -; X86: movl 4(%esp), %eax -; X86: movl $0, (%eax) -; X86: retl - -define i256 @sret_demoted() { +; RUN: llc -mtriple=x86_64-apple-darwin8 < %s | FileCheck %s +; RUN: llc -mtriple=x86_64-pc-linux < %s | FileCheck %s +; RUN: llc -mtriple=x86_64-apple-darwin8 -terminal-rule < %s | FileCheck %s +; RUN: llc -mtriple=x86_64-pc-linux -terminal-rule < %s | FileCheck %s + +; CHECK-LABEL: return32 +; CHECK-DAG: movq $0, (%rdi) +; CHECK-DAG: movq %rdi, %rax +; CHECK: retq +define i256 @return32() { ret i256 0 } - -; X64-LABEL: sret_demoted -; X64-DAG: movq $0, (%rdi) -; X64-DAG: movq %rdi, %rax -; X64: retq - -; X86-LABEL: sret_demoted -; X86: movl 4(%esp), %eax -; X86: movl $0, (%eax) -; X86: retl |

