[libclc] Remove catch-all opencl/clc.h (#147490)

This commit finishes the work started in #146840 and #147276. It makes
each OpenCL header self-contained and each implementation file include
only the headers it needs. It removes the need for a catch-all include
file of all OpenCL builtin declarations.

Author: frasercrmck

libclc/opencl/include/clc/opencl/as_type.h

@@ -6,6 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef __CLC_OPENCL_AS_TYPE_H__
+#define __CLC_OPENCL_AS_TYPE_H__
+
+#include <clc/opencl/opencl-base.h>
+
 #define as_char(x) __builtin_astype(x, char)
 #define as_uchar(x) __builtin_astype(x, uchar)
 #define as_short(x) __builtin_astype(x, short)
@@ -83,3 +88,5 @@
 #define as_half8(x) __builtin_astype(x, half8)
 #define as_half16(x) __builtin_astype(x, half16)
 #endif
+
+#endif // __CLC_OPENCL_AS_TYPE_H__

libclc/opencl/include/clc/opencl/async/async_work_group_copy.h

@@ -6,6 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef __CLC_OPENCL_ASYNC_ASYNC_WORK_GROUP_COPY_H__
+#define __CLC_OPENCL_ASYNC_ASYNC_WORK_GROUP_COPY_H__
+
 #define __CLC_DST_ADDR_SPACE local
 #define __CLC_SRC_ADDR_SPACE global
 #define __CLC_BODY <clc/opencl/async/async_work_group_copy.inc>
@@ -23,3 +26,5 @@
 #include <clc/math/gentype.inc>
 #undef __CLC_DST_ADDR_SPACE
 #undef __CLC_SRC_ADDR_SPACE
+
+#endif // __CLC_OPENCL_ASYNC_ASYNC_WORK_GROUP_COPY_H__

libclc/opencl/include/clc/opencl/async/async_work_group_strided_copy.h

@@ -6,6 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef __CLC_OPENCL_ASYNC_ASYNC_WORK_GROUP_STRIDED_COPY_H__
+#define __CLC_OPENCL_ASYNC_ASYNC_WORK_GROUP_STRIDED_COPY_H__
+
 #define __CLC_DST_ADDR_SPACE local
 #define __CLC_SRC_ADDR_SPACE global
 #define __CLC_BODY <clc/opencl/async/async_work_group_strided_copy.inc>
@@ -23,3 +26,5 @@
 #include <clc/math/gentype.inc>
 #undef __CLC_DST_ADDR_SPACE
 #undef __CLC_SRC_ADDR_SPACE
+
+#endif // __CLC_OPENCL_ASYNC_ASYNC_WORK_GROUP_STRIDED_COPY_H__

libclc/opencl/include/clc/opencl/async/prefetch.h

@@ -6,8 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef __CLC_OPENCL_ASYNC_PREFETCH_H__
+#define __CLC_OPENCL_ASYNC_PREFETCH_H__
+
 #define __CLC_BODY <clc/opencl/async/prefetch.inc>
 #include <clc/integer/gentype.inc>
 
 #define __CLC_BODY <clc/opencl/async/prefetch.inc>
 #include <clc/math/gentype.inc>
+
+#endif // __CLC_OPENCL_ASYNC_PREFETCH_H__

libclc/opencl/include/clc/opencl/async/wait_group_events.h

@@ -6,5 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef __CLC_OPENCL_ASYNC_WAIT_GROUP_EVENTS_H__
+#define __CLC_OPENCL_ASYNC_WAIT_GROUP_EVENTS_H__
+
+#include <clc/opencl/opencl-base.h>
+
 _CLC_DECL _CLC_OVERLOAD void wait_group_events(int num_events,
                                                event_t *event_list);
+
+#endif // __CLC_OPENCL_ASYNC_WAIT_GROUP_EVENTS_H__

libclc/opencl/include/clc/opencl/atomic/atom_add.h

@@ -6,6 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef __CLC_OPENCL_ATOMIC_ATOM_ADD_H__
+#define __CLC_OPENCL_ATOMIC_ATOM_ADD_H__
+
+#include <clc/opencl/opencl-base.h>
+
 #ifdef cl_khr_global_int32_base_atomics
 #define FUNCTION atom_add
 #define __CLC_ADDRESS_SPACE global
@@ -22,3 +27,5 @@
 #define FUNCTION atom_add
 #include <clc/opencl/atomic/atom_decl_int64.inc>
 #endif // cl_khr_int64_base_atomics
+
+#endif // __CLC_OPENCL_ATOMIC_ATOM_ADD_H__

libclc/opencl/include/clc/opencl/atomic/atom_and.h

@@ -6,6 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef __CLC_OPENCL_ATOMIC_ATOM_AND_H__
+#define __CLC_OPENCL_ATOMIC_ATOM_AND_H__
+
+#include <clc/opencl/opencl-base.h>
+
 #ifdef cl_khr_global_int32_extended_atomics
 #define FUNCTION atom_and
 #define __CLC_ADDRESS_SPACE global
@@ -22,3 +27,5 @@
 #define FUNCTION atom_and
 #include <clc/opencl/atomic/atom_decl_int64.inc>
 #endif // cl_khr_int64_extended_atomics
+
+#endif // __CLC_OPENCL_ATOMIC_ATOM_AND_H__

libclc/opencl/include/clc/opencl/atomic/atom_cmpxchg.h

@@ -6,6 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef __CLC_OPENCL_ATOMIC_ATOM_CMPXCHG_H__
+#define __CLC_OPENCL_ATOMIC_ATOM_CMPXCHG_H__
+
+#include <clc/opencl/opencl-base.h>
+
 #include <clc/clcfunc.h>
 #include <clc/clctypes.h>
 
@@ -37,3 +42,5 @@ _CLC_OVERLOAD _CLC_DECL unsigned long
 atom_cmpxchg(volatile local unsigned long *p, unsigned long cmp,
              unsigned long val);
 #endif // cl_khr_int64_base_atomics
+
+#endif // __CLC_OPENCL_ATOMIC_ATOM_CMPXCHG_H__

libclc/opencl/include/clc/opencl/atomic/atom_dec.h

@@ -6,6 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef __CLC_OPENCL_ATOMIC_ATOM_DEC_H__
+#define __CLC_OPENCL_ATOMIC_ATOM_DEC_H__
+
+#include <clc/opencl/opencl-base.h>
+
 #include <clc/clcfunc.h>
 #include <clc/clctypes.h>
 
@@ -26,3 +31,5 @@ atom_dec(volatile global unsigned long *p);
 _CLC_OVERLOAD _CLC_DECL long atom_dec(volatile local long *p);
 _CLC_OVERLOAD _CLC_DECL unsigned long atom_dec(volatile local unsigned long *p);
 #endif // cl_khr_int64_base_atomics
+
+#endif // __CLC_OPENCL_ATOMIC_ATOM_DEC_H__

libclc/opencl/include/clc/opencl/atomic/atom_inc.h

@@ -6,6 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef __CLC_OPENCL_ATOMIC_ATOM_INC_H__
+#define __CLC_OPENCL_ATOMIC_ATOM_INC_H__
+
+#include <clc/opencl/opencl-base.h>
+
 #include <clc/clcfunc.h>
 #include <clc/clctypes.h>
 
@@ -26,3 +31,5 @@ atom_inc(volatile global unsigned long *p);
 _CLC_OVERLOAD _CLC_DECL long atom_inc(volatile local long *p);
 _CLC_OVERLOAD _CLC_DECL unsigned long atom_inc(volatile local unsigned long *p);
 #endif // cl_khr_int64_base_atomics
+
+#endif // __CLC_OPENCL_ATOMIC_ATOM_INC_H__