diff options
| -rw-r--r-- | lib/Transforms/Scalar/CodeGenPrepare.cpp | 6 | ||||
| -rw-r--r-- | test/CodeGen/R600/address-space.ll | 30 |
2 files changed, 32 insertions, 4 deletions
diff --git a/lib/Transforms/Scalar/CodeGenPrepare.cpp b/lib/Transforms/Scalar/CodeGenPrepare.cpp index 44804a27aa..67bf1bbcbf 100644 --- a/lib/Transforms/Scalar/CodeGenPrepare.cpp +++ b/lib/Transforms/Scalar/CodeGenPrepare.cpp @@ -1035,7 +1035,7 @@ bool AddressingModeMatcher::MatchOperationAddr(User *AddrInst, unsigned Opcode, case Instruction::IntToPtr: // This inttoptr is a no-op if the integer type is pointer sized. if (TLI.getValueType(AddrInst->getOperand(0)->getType()) == - TLI.getPointerTy()) + TLI.getPointerTy(AddrInst->getType()->getPointerAddressSpace())) return MatchAddr(AddrInst->getOperand(0), Depth); return false; case Instruction::BitCast: @@ -1573,9 +1573,7 @@ bool CodeGenPrepare::OptimizeMemoryInst(Instruction *MemoryInst, Value *Addr, } else { DEBUG(dbgs() << "CGP: SINKING nonlocal addrmode: " << AddrMode << " for " << *MemoryInst); - Type *IntPtrTy = - TLI->getDataLayout()->getIntPtrType(AccessTy->getContext()); - + Type *IntPtrTy = TLI->getDataLayout()->getIntPtrType(Addr->getType()); Value *Result = 0; // Start with the base register. Do this first so that subsequent address diff --git a/test/CodeGen/R600/address-space.ll b/test/CodeGen/R600/address-space.ll new file mode 100644 index 0000000000..11289d22b9 --- /dev/null +++ b/test/CodeGen/R600/address-space.ll @@ -0,0 +1,30 @@ +; RUN: llc -march=r600 -mcpu=SI < %s | FileCheck %s + +; Test that codegenprepare understands address space sizes + +%struct.foo = type { [3 x float], [3 x float] } + +; CHECK-LABEL: @do_as_ptr_calcs: +; CHECK: V_ADD_I32_e64 {{VGPR[0-9]+}}, +; CHECK: V_ADD_I32_e64 [[REG1:VGPR[0-9]+]], +; CHECK: DS_READ_B32 [[REG1]], +define void @do_as_ptr_calcs(%struct.foo addrspace(3)* nocapture %ptr) nounwind { +entry: + %x = getelementptr inbounds %struct.foo addrspace(3)* %ptr, i32 0, i32 1, i32 0 + %y = getelementptr inbounds %struct.foo addrspace(3)* %ptr, i32 0, i32 1, i32 2 + br label %bb32 + +bb32: + %a = load float addrspace(3)* %x, align 4 + %b = load float addrspace(3)* %y, align 4 + %cmp = fcmp one float %a, %b + br i1 %cmp, label %bb34, label %bb33 + +bb33: + unreachable + +bb34: + unreachable +} + + |