From a152ab62bfad6fcff435ff5a79e231d37560392c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 6 Oct 2015 21:16:34 +0000 Subject: [PATCH] AMDGPU/SI: Remove calling convention assertion from LowerFormalArguments() Summary: We currently ignore the calling convention, so there is no real reason to assert on the calling convention of functions. Reviewers: arsenm Subscribers: arsenm, llvm-commits Differential Revision: http://reviews.llvm.org/D13367 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@249468 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/AMDGPU/SIISelLowering.cpp | 2 +- test/CodeGen/AMDGPU/calling-conventions.ll | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 test/CodeGen/AMDGPU/calling-conventions.ll diff --git a/lib/Target/AMDGPU/SIISelLowering.cpp b/lib/Target/AMDGPU/SIISelLowering.cpp index b4b439c2a96..804b5e6075e 100644 --- a/lib/Target/AMDGPU/SIISelLowering.cpp +++ b/lib/Target/AMDGPU/SIISelLowering.cpp @@ -510,7 +510,7 @@ SDValue SITargetLowering::LowerFormalArguments( FunctionType *FType = MF.getFunction()->getFunctionType(); SIMachineFunctionInfo *Info = MF.getInfo(); - assert(CallConv == CallingConv::C); + // FIXME: We currently assume all calling conventions are kernels. SmallVector Splits; BitVector Skipped(Ins.size()); diff --git a/test/CodeGen/AMDGPU/calling-conventions.ll b/test/CodeGen/AMDGPU/calling-conventions.ll new file mode 100644 index 00000000000..57adc8be6a9 --- /dev/null +++ b/test/CodeGen/AMDGPU/calling-conventions.ll @@ -0,0 +1,20 @@ +; RUN: llc < %s -march=amdgcn -mcpu=SI -verify-machineinstrs | FileCheck --check-prefix=SI %s + +; Make sure we don't crash or assert on spir_kernel calling convention. + +; SI-LABEL: {{^}}kernel: +; SI: s_endpgm +define spir_kernel void @kernel(i32 addrspace(1)* %out) { +entry: + store i32 0, i32 addrspace(1)* %out + ret void +} + +; FIXME: This is treated like a kernel +; SI-LABEL: {{^}}func: +; SI: s_endpgm +define spir_func void @func(i32 addrspace(1)* %out) { +entry: + store i32 0, i32 addrspace(1)* %out + ret void +} -- 2.34.1