Skip to content

Commit

Permalink
[X86] Fix bug in vectorcall calling convention
Browse files Browse the repository at this point in the history
Original implementation can't correctly handle __m256 and __m512 types
passed by reference through stack. This patch fixes it.

Patch by Wei Xiao!

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

llvm-svn: 354921
  • Loading branch information
rnk committed Feb 26, 2019
1 parent 6d6afb7 commit 8fda7e1
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 1 deletion.
5 changes: 4 additions & 1 deletion llvm/lib/Target/X86/X86CallingConv.cpp
Expand Up @@ -162,7 +162,10 @@ static bool CC_X86_64_VectorCall(unsigned &ValNo, MVT &ValVT, MVT &LocVT,
// created on top of the basic 32 bytes of win64.
// It can happen if the fifth or sixth argument is vector type or HVA.
// At that case for each argument a shadow stack of 8 bytes is allocated.
if (Reg == X86::XMM4 || Reg == X86::XMM5)
const TargetRegisterInfo *TRI =
State.getMachineFunction().getSubtarget().getRegisterInfo();
if (TRI->regsOverlap(Reg, X86::XMM4) ||
TRI->regsOverlap(Reg, X86::XMM5))
State.AllocateStack(8, 8);

if (!ArgFlags.isHva()) {
Expand Down
27 changes: 27 additions & 0 deletions llvm/test/CodeGen/X86/x86-64-veccallcc.ll
@@ -0,0 +1,27 @@
; RUN: llc -mtriple=x86_64-pc-windows-msvc < %s | FileCheck %s

; Test 1st and 2nd arguments passed in XMM0 and XMM1.
; Test 7nd argument passed by reference in stack: 56(%rsp).
define x86_vectorcallcc <4 x float> @test_m128_7(<4 x float> %a, <4 x float> %b, <4 x float> %c, <4 x float> %d, <4 x float> %e, <4 x float> %f, <4 x float> %g) #0 {
; CHECK-LABEL: test_m128_7@@112:
; CHECK: movq 56(%rsp), %rax
; CHECK: vaddps %xmm1, %xmm0, %xmm0
; CHECK: vsubps (%rax), %xmm0, %xmm0
%add.i = fadd <4 x float> %a, %b
%sub.i = fsub <4 x float> %add.i, %g
ret <4 x float> %sub.i
}

; Test 1st and 2nd arguments passed in YMM0 and YMM1.
; Test 7nd argument passed by reference in stack: 56(%rsp).
define x86_vectorcallcc <8 x float> @test_m256_7(<8 x float> %a, <8 x float> %b, <8 x float> %c, <8 x float> %d, <8 x float> %e, <8 x float> %f, <8 x float> %g) #0 {
; CHECK-LABEL: test_m256_7@@224:
; CHECK: movq 56(%rsp), %rax
; CHECK: vaddps %ymm1, %ymm0, %ymm0
; CHECK: vsubps (%rax), %ymm0, %ymm0
%add.i = fadd <8 x float> %a, %b
%sub.i = fsub <8 x float> %add.i, %g
ret <8 x float> %sub.i
}

attributes #0 = { nounwind "target-cpu"="core-avx2" }

0 comments on commit 8fda7e1

Please sign in to comment.