AMDGPU: Fix AMDGPUPromoteAlloca breaking addrspacecasts

The users of the addrspacecast were having their types incorrectly
changed, producing invalid bitcasts between address spaces.

llvm-svn: 289307
This commit is contained in:
Matt Arsenault 2016-12-10 00:52:50 +00:00
parent 4bd7236193
commit 2402b95db0
2 changed files with 29 additions and 1 deletions

View File

@ -579,6 +579,12 @@ bool AMDGPUPromoteAlloca::collectUsesWithPtrTypes(
WorkList.push_back(ICmp);
}
if (UseInst->getOpcode() == Instruction::AddrSpaceCast) {
// Don't collect the users of this.
WorkList.push_back(User);
continue;
}
if (!User->getType()->isPointerTy())
continue;
@ -739,7 +745,8 @@ void AMDGPUPromoteAlloca::handleAlloca(AllocaInst &I) {
continue;
}
// The operand's value should be corrected on its own.
// The operand's value should be corrected on its own and we don't want to
// touch the users.
if (isa<AddrSpaceCastInst>(V))
continue;

View File

@ -0,0 +1,21 @@
; RUN: opt -S -mtriple=amdgcn-unknown-amdhsa -mcpu=kaveri -amdgpu-promote-alloca < %s | FileCheck %s
; The types of the users of the addrspacecast should not be changed.
; CHECK-LABEL: @invalid_bitcast_addrspace(
; CHECK: getelementptr inbounds [256 x [1 x i32]], [256 x [1 x i32]] addrspace(3)* @invalid_bitcast_addrspace.data, i32 0, i32 %14
; CHECK: bitcast [1 x i32] addrspace(3)* %{{[0-9]+}} to half addrspace(3)*
; CHECK: addrspacecast half addrspace(3)* %tmp to half addrspace(4)*
; CHECK: bitcast half addrspace(4)* %tmp1 to <2 x i16> addrspace(4)*
define amdgpu_kernel void @invalid_bitcast_addrspace() #0 {
entry:
%data = alloca [1 x i32], align 4
%tmp = bitcast [1 x i32]* %data to half*
%tmp1 = addrspacecast half* %tmp to half addrspace(4)*
%tmp2 = bitcast half addrspace(4)* %tmp1 to <2 x i16> addrspace(4)*
%tmp3 = load <2 x i16>, <2 x i16> addrspace(4)* %tmp2, align 2
%tmp4 = bitcast <2 x i16> %tmp3 to <2 x half>
ret void
}
attributes #0 = { nounwind }