diff options
| -rw-r--r-- | llvm/lib/Target/AMDGPU/AMDGPUTargetTransformInfo.h | 3 | ||||
| -rw-r--r-- | llvm/test/Transforms/InferAddressSpaces/AMDGPU/no-flat-addrspace.ll | 13 |
2 files changed, 14 insertions, 2 deletions
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUTargetTransformInfo.h b/llvm/lib/Target/AMDGPU/AMDGPUTargetTransformInfo.h index d1ed6144e54..72882c83c01 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUTargetTransformInfo.h +++ b/llvm/lib/Target/AMDGPU/AMDGPUTargetTransformInfo.h @@ -180,8 +180,7 @@ public: // don't use flat addressing. if (IsGraphicsShader) return -1; - return ST->hasFlatAddressSpace() ? - AMDGPUAS::FLAT_ADDRESS : AMDGPUAS::UNKNOWN_ADDRESS_SPACE; + return AMDGPUAS::FLAT_ADDRESS; } unsigned getVectorSplitCost() { return 0; } diff --git a/llvm/test/Transforms/InferAddressSpaces/AMDGPU/no-flat-addrspace.ll b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/no-flat-addrspace.ll new file mode 100644 index 00000000000..8e04d3cf13b --- /dev/null +++ b/llvm/test/Transforms/InferAddressSpaces/AMDGPU/no-flat-addrspace.ll @@ -0,0 +1,13 @@ +; RUN: opt -S -mtriple=amdgcn-mesa-mesa3d -mcpu=tahiti -infer-address-spaces %s | FileCheck %s + +; Make sure addrspace(0) is still treated as flat on targets without +; flat instructions. It's still flat, it just doesn't work. + +; CHECK-LABEL: @load_flat_from_global( +; CHECK-NEXT: %tmp1 = load float, float addrspace(1)* %ptr +; CHECK-NEXT: ret float %tmp1 +define float @load_flat_from_global(float addrspace(1)*%ptr) #0 { + %tmp0 = addrspacecast float addrspace(1)* %ptr to float* + %tmp1 = load float, float* %tmp0 + ret float %tmp1 +} |
