<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Exchange Server">
<!-- converted from text --><style><!-- .EmailQuote { margin-left: 1pt; padding-left: 4pt; border-left: #800000 2px solid; } --></style>
</head>
<body>
<div>
<div id="x_compose-container" itemscope="" itemtype="https://schema.org/EmailMessage" style="direction:ltr">
<span itemprop="creator" itemscope="" itemtype="https://schema.org/Organization"><span itemprop="name"></span></span>
<div>
<div>
<div style="direction:ltr">LGTM</div>
</div>
<div><br>
</div>
<div class="x_acompli_signature"></div>
</div>
</div>
<hr tabindex="-1" style="display:inline-block; width:98%">
<div id="x_divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" color="#000000" style="font-size:11pt"><b>From:</b> Libclc-dev <libclc-dev-bounces@lists.llvm.org> on behalf of Jan Vesely via Libclc-dev <libclc-dev@lists.llvm.org><br>
<b>Sent:</b> Thursday, August 2, 2018 10:30:56 PM<br>
<b>To:</b> libclc-dev@lists.llvm.org<br>
<b>Subject:</b> [Libclc-dev] [PATCH] amdgcn: Use __constant AS for amdgcn builtins.</font>
<div> </div>
</div>
</div>
<font size="2"><span style="font-size:11pt;">
<div class="PlainText">Fixes build after clang r338707<br>
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu><br>
---<br>
amdgcn-amdhsa/lib/workitem/get_global_size.cl | 4 +++-<br>
amdgcn-amdhsa/lib/workitem/get_local_size.cl | 4 +++-<br>
amdgcn/lib/workitem/get_global_offset.cl | 4 +++-<br>
amdgcn/lib/workitem/get_work_dim.cl | 4 +++-<br>
4 files changed, 12 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/amdgcn-amdhsa/lib/workitem/get_global_size.cl b/amdgcn-amdhsa/lib/workitem/get_global_size.cl<br>
index 2289615..392cd08 100644<br>
--- a/amdgcn-amdhsa/lib/workitem/get_global_size.cl<br>
+++ b/amdgcn-amdhsa/lib/workitem/get_global_size.cl<br>
@@ -1,6 +1,8 @@<br>
#include <clc/clc.h><br>
<br>
-#if __clang_major__ >= 7<br>
+#if __clang_major__ >= 8<br>
+#define CONST_AS __constant<br>
+#elif __clang_major__ >= 7<br>
#define CONST_AS __attribute__((address_space(4)))<br>
#else<br>
#define CONST_AS __attribute__((address_space(2)))<br>
diff --git a/amdgcn-amdhsa/lib/workitem/get_local_size.cl b/amdgcn-amdhsa/lib/workitem/get_local_size.cl<br>
index 034c6d9..64d1cf4 100644<br>
--- a/amdgcn-amdhsa/lib/workitem/get_local_size.cl<br>
+++ b/amdgcn-amdhsa/lib/workitem/get_local_size.cl<br>
@@ -1,6 +1,8 @@<br>
#include <clc/clc.h><br>
<br>
-#if __clang_major__ >= 7<br>
+#if __clang_major__ >= 8<br>
+#define CONST_AS __constant<br>
+#elif __clang_major__ >= 7<br>
#define CONST_AS __attribute__((address_space(4)))<br>
#else<br>
#define CONST_AS __attribute__((address_space(2)))<br>
diff --git a/amdgcn/lib/workitem/get_global_offset.cl b/amdgcn/lib/workitem/get_global_offset.cl<br>
index 0c2b948..0a87cd2 100644<br>
--- a/amdgcn/lib/workitem/get_global_offset.cl<br>
+++ b/amdgcn/lib/workitem/get_global_offset.cl<br>
@@ -1,6 +1,8 @@<br>
#include <clc/clc.h><br>
<br>
-#if __clang_major__ >= 7<br>
+#if __clang_major__ >= 8<br>
+#define CONST_AS __constant<br>
+#elif __clang_major__ >= 7<br>
#define CONST_AS __attribute__((address_space(4)))<br>
#else<br>
#define CONST_AS __attribute__((address_space(2)))<br>
diff --git a/amdgcn/lib/workitem/get_work_dim.cl b/amdgcn/lib/workitem/get_work_dim.cl<br>
index 8eb81ba..3add9b6 100644<br>
--- a/amdgcn/lib/workitem/get_work_dim.cl<br>
+++ b/amdgcn/lib/workitem/get_work_dim.cl<br>
@@ -1,6 +1,8 @@<br>
#include <clc/clc.h><br>
<br>
-#if __clang_major__ >= 7<br>
+#if __clang_major__ >= 8<br>
+#define CONST_AS __constant<br>
+#elif __clang_major__ >= 7<br>
#define CONST_AS __attribute__((address_space(4)))<br>
#else<br>
#define CONST_AS __attribute__((address_space(2)))<br>
-- <br>
2.16.4<br>
<br>
_______________________________________________<br>
Libclc-dev mailing list<br>
Libclc-dev@lists.llvm.org<br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/libclc-dev">http://lists.llvm.org/cgi-bin/mailman/listinfo/libclc-dev</a><br>
</div>
</span></font>
</body>
</html>