commit 96651c5662d4b12250c59b84c912c2495c54ed91
author Jan Vesely <jan.vesely@rutgers.edu> Fri Aug 03 15:14:08 2018 +0000
committer Copybara-Service <copybara-worker@google.com> Sun Aug 30 16:13:20 2020 -0700
tree a15817b6685048dc025a6be40d95695fc03e2b56
parent 932d5dbd497419349f80e01e1e3db95513fbf133

amdgcn: Use __constant AS for amdgcn builtins.

Fixes build after clang r338707.
Reviewer: Matthew.Arsenault@amd.com
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>

llvm-svn: 338898
GitOrigin-RevId: faa1ff16c1716d92d907060f713a14fbca4a7ea7

amdgcn-amdhsa/lib/workitem/get_global_size.cl

diff --git a/amdgcn-amdhsa/lib/workitem/get_global_size.cl b/amdgcn-amdhsa/lib/workitem/get_global_size.cl
index 2289615..392cd08 100644
--- a/amdgcn-amdhsa/lib/workitem/get_global_size.cl
+++ b/amdgcn-amdhsa/lib/workitem/get_global_size.cl
@@ -1,6 +1,8 @@
 #include <clc/clc.h>
 
-#if __clang_major__ >= 7
+#if __clang_major__ >= 8
+#define CONST_AS __constant
+#elif __clang_major__ >= 7
 #define CONST_AS __attribute__((address_space(4)))
 #else
 #define CONST_AS __attribute__((address_space(2)))

amdgcn-amdhsa/lib/workitem/get_local_size.cl

diff --git a/amdgcn-amdhsa/lib/workitem/get_local_size.cl b/amdgcn-amdhsa/lib/workitem/get_local_size.cl
index 034c6d9..64d1cf4 100644
--- a/amdgcn-amdhsa/lib/workitem/get_local_size.cl
+++ b/amdgcn-amdhsa/lib/workitem/get_local_size.cl
@@ -1,6 +1,8 @@
 #include <clc/clc.h>
 
-#if __clang_major__ >= 7
+#if __clang_major__ >= 8
+#define CONST_AS __constant
+#elif __clang_major__ >= 7
 #define CONST_AS __attribute__((address_space(4)))
 #else
 #define CONST_AS __attribute__((address_space(2)))

amdgcn/lib/workitem/get_global_offset.cl

diff --git a/amdgcn/lib/workitem/get_global_offset.cl b/amdgcn/lib/workitem/get_global_offset.cl
index 0c2b948..0a87cd2 100644
--- a/amdgcn/lib/workitem/get_global_offset.cl
+++ b/amdgcn/lib/workitem/get_global_offset.cl
@@ -1,6 +1,8 @@
 #include <clc/clc.h>
 
-#if __clang_major__ >= 7
+#if __clang_major__ >= 8
+#define CONST_AS __constant
+#elif __clang_major__ >= 7
 #define CONST_AS __attribute__((address_space(4)))
 #else
 #define CONST_AS __attribute__((address_space(2)))

amdgcn/lib/workitem/get_work_dim.cl

diff --git a/amdgcn/lib/workitem/get_work_dim.cl b/amdgcn/lib/workitem/get_work_dim.cl
index 8eb81ba..3add9b6 100644
--- a/amdgcn/lib/workitem/get_work_dim.cl
+++ b/amdgcn/lib/workitem/get_work_dim.cl
@@ -1,6 +1,8 @@
 #include <clc/clc.h>
 
-#if __clang_major__ >= 7
+#if __clang_major__ >= 8
+#define CONST_AS __constant
+#elif __clang_major__ >= 7
 #define CONST_AS __attribute__((address_space(4)))
 #else
 #define CONST_AS __attribute__((address_space(2)))