diff options
| -rw-r--r-- | clang/lib/Basic/Targets.cpp | 8 | ||||
| -rw-r--r-- | clang/test/CodeGenOpenCL/address-space-constant-initializers.cl | 2 | ||||
| -rw-r--r-- | clang/test/CodeGenOpenCL/amdgpu-env-amdgiz.cl | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index d80a8d5efee..2970f76c5b1 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -2042,10 +2042,10 @@ static const LangAS::Map AMDGPUPrivateIsZeroMap = { static const LangAS::Map AMDGPUGenericIsZeroMap = { 1, // opencl_global 3, // opencl_local - 4, // opencl_constant + 2, // opencl_constant 0, // opencl_generic 1, // cuda_device - 4, // cuda_constant + 2, // cuda_constant 3 // cuda_shared }; @@ -2062,7 +2062,7 @@ static const char *const DataLayoutStringSIPrivateIsZero = "-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64"; static const char *const DataLayoutStringSIGenericIsZero = - "e-p:64:64-p1:64:64-p2:64:64-p3:32:32-p4:64:64-p5:32:32" + "e-p:64:64-p1:64:64-p2:64:64-p3:32:32-p4:32:32-p5:32:32" "-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128" "-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64"; @@ -2077,7 +2077,7 @@ class AMDGPUTargetInfo final : public TargetInfo { Generic = 0; Global = 1; Local = 3; - Constant = 4; + Constant = 2; Private = 5; } else { Generic = 4; diff --git a/clang/test/CodeGenOpenCL/address-space-constant-initializers.cl b/clang/test/CodeGenOpenCL/address-space-constant-initializers.cl index 45c64c2f716..a03d939fae5 100644 --- a/clang/test/CodeGenOpenCL/address-space-constant-initializers.cl +++ b/clang/test/CodeGenOpenCL/address-space-constant-initializers.cl @@ -1,4 +1,6 @@ // RUN: %clang_cc1 %s -ffake-address-space-map -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 %s -triple amdgcn-amd-amdhsa-opencl -emit-llvm -o - | FileCheck %s +// RUN: %clang_cc1 %s -triple amdgcn-amd-amdhsa-amdgizcl -emit-llvm -o - | FileCheck %s typedef struct { int i; diff --git a/clang/test/CodeGenOpenCL/amdgpu-env-amdgiz.cl b/clang/test/CodeGenOpenCL/amdgpu-env-amdgiz.cl index d4e6e2577fa..d52fd5dff01 100644 --- a/clang/test/CodeGenOpenCL/amdgpu-env-amdgiz.cl +++ b/clang/test/CodeGenOpenCL/amdgpu-env-amdgiz.cl @@ -4,6 +4,6 @@ // RUN: %clang_cc1 %s -O0 -triple amdgcn---amdgizcl -emit-llvm -o - | FileCheck -check-prefix=GIZ %s // CHECK: target datalayout = "e-p:32:32-p1:64:64-p2:64:64-p3:32:32-p4:64:64-p5:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64" -// GIZ: target datalayout = "e-p:64:64-p1:64:64-p2:64:64-p3:32:32-p4:64:64-p5:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64" +// GIZ: target datalayout = "e-p:64:64-p1:64:64-p2:64:64-p3:32:32-p4:32:32-p5:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64" void foo(void) {} |
