<br><br><div class="gmail_quote"><div dir="ltr">On Thu, Jul 27, 2017, 11:26 AM Jan Vesely <<a href="mailto:jan.vesely@rutgers.edu">jan.vesely@rutgers.edu</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">also consolidate macros into one file, and rename to clcmacros.h<br>
<br>
Signed-off-by: Jan Vesely <<a href="mailto:jan.vesely@rutgers.edu" target="_blank">jan.vesely@rutgers.edu</a>><br>
---<br>
Hi Aaron,<br>
<br>
to complement you work on clover provided macros, I think this one is<br>
better done in libclc.<br>
<br>
thanks,<br>
Jan<br>
<br>
Passes newly posted kernel_exec piglit<br>
<br>
 generic/include/clc/clc.h        |  2 +-<br>
 generic/include/clc/clcmacros.h  | 18 ++++++++++++++++++<br>
 generic/include/clc/clctypes.h   |  2 --<br>
 generic/include/clc/clcversion.h |  8 --------<br>
 4 files changed, 19 insertions(+), 11 deletions(-)<br>
 create mode 100644 generic/include/clc/clcmacros.h<br>
 delete mode 100644 generic/include/clc/clcversion.h<br>
<br>
diff --git a/generic/include/clc/clc.h b/generic/include/clc/clc.h<br>
index 4c29214..5130632 100644<br>
--- a/generic/include/clc/clc.h<br>
+++ b/generic/include/clc/clc.h<br>
@@ -21,7 +21,7 @@<br>
 #include <clc/as_type.h><br>
<br>
 /* 6.9 Preprocessor Directives and Macros */<br>
-#include <clc/clcversion.h><br>
+#include <clc/clcmacros.h><br>
<br>
 /* 6.11.1 Work-Item Functions */<br>
 #include <clc/workitem/get_global_size.h><br>
diff --git a/generic/include/clc/clcmacros.h b/generic/include/clc/clcmacros.h<br>
new file mode 100644<br>
index 0000000..d821a36<br>
--- /dev/null<br>
+++ b/generic/include/clc/clcmacros.h<br>
@@ -0,0 +1,18 @@<br>
+/* 6.9 Preprocessor Directives and Macros<br>
+ * Some of these are handled by clang or passed by clover */<br>
+#if __OPENCL_VERSION__ >= 110<br>
+#define CLC_VERSION_1_0 100<br>
+#define CLC_VERSION_1_1 110<br>
+#endif<br>
+<br>
+#if __OPENCL_VERSION__ >= 120<br>
+#define CLC_VERSION_1_2 120<br>
+#endif<br>
+<br>
+#define NULL ((void*)NULL)<br>
+<br>
+#define __kernel_exec(X, typen) __kernel \<br>
+                                __attribute__((work_group_size_hint(X, 1, 1))) \<br>
+                                __attribute__((vec_type_hint(typen)))<br>
+<br>
+#define kernel_exec(X, typen) __kernel_exec(X, typen)</blockquote></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
diff --git a/generic/include/clc/clctypes.h b/generic/include/clc/clctypes.h<br>
index 2e3db60..8308bda 100644<br>
--- a/generic/include/clc/clctypes.h<br>
+++ b/generic/include/clc/clctypes.h<br>
@@ -85,5 +85,3 @@ typedef __attribute__((ext_vector_type(4))) double double4;<br>
 typedef __attribute__((ext_vector_type(8))) double double8;<br>
 typedef __attribute__((ext_vector_type(16))) double double16;<br>
 #endif<br>
-<br>
-#define NULL ((void *)0)<br>
diff --git a/generic/include/clc/clcversion.h b/generic/include/clc/clcversion.h<br>
deleted file mode 100644<br>
index 57c989e..0000000<br>
--- a/generic/include/clc/clcversion.h<br>
+++ /dev/null<br>
@@ -1,8 +0,0 @@<br>
-#if __OPENCL_VERSION__ >= 110<br>
-#define CLC_VERSION_1_0 100<br>
-#define CLC_VERSION_1_1 110<br>
-#endif<br>
-<br>
-#if __OPENCL_VERSION__ >= 120<br>
-#define CLC_VERSION_1_2 120<br>
-#endif<br>
--<br>
2.13.3<br>
<br>
</blockquote><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br></blockquote><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Reviewed-by: Aaron Watry <<a href="mailto:awatry@gmail.com">awatry@gmail.com</a>></blockquote></div>