Merged in r368844. Thanks, Hans
On Tue, Aug 13, 2019 at 6:21 PM Anastasia Stulova <anastasia.stul...@arm.com> wrote: > > Hi Hans, > > > Can this be merged into the release 9.0 branch please? > > > Thank you! > Anastasia > > > ________________________________ > From: cfe-commits <cfe-commits-boun...@lists.llvm.org> on behalf of Anastasia > Stulova via cfe-commits <cfe-commits@lists.llvm.org> > Sent: 12 August 2019 11:44 > To: cfe-commits@lists.llvm.org <cfe-commits@lists.llvm.org> > Subject: r368552 - [OpenCL] Fix lang mode predefined macros for C++ mode. > > Author: stulova > Date: Mon Aug 12 03:44:07 2019 > New Revision: 368552 > > URL: http://llvm.org/viewvc/llvm-project?rev=368552&view=rev > Log: > [OpenCL] Fix lang mode predefined macros for C++ mode. > > In C++ mode we should only avoid adding __OPENCL_C_VERSION__, > all other predefined macros about the language mode are still > valid. > > This change also fixes the language version check in the > headers accordingly. > > Differential Revision: https://reviews.llvm.org/D65941 > > > Modified: > cfe/trunk/lib/Frontend/InitPreprocessor.cpp > cfe/trunk/lib/Headers/opencl-c-base.h > cfe/trunk/lib/Headers/opencl-c.h > > Modified: cfe/trunk/lib/Frontend/InitPreprocessor.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitPreprocessor.cpp?rev=368552&r1=368551&r2=368552&view=diff > ============================================================================== > --- cfe/trunk/lib/Frontend/InitPreprocessor.cpp (original) > +++ cfe/trunk/lib/Frontend/InitPreprocessor.cpp Mon Aug 12 03:44:07 2019 > @@ -437,17 +437,17 @@ static void InitializeStandardPredefined > default: > llvm_unreachable("Unsupported OpenCL version"); > } > - Builder.defineMacro("CL_VERSION_1_0", "100"); > - Builder.defineMacro("CL_VERSION_1_1", "110"); > - Builder.defineMacro("CL_VERSION_1_2", "120"); > - Builder.defineMacro("CL_VERSION_2_0", "200"); > + } > + Builder.defineMacro("CL_VERSION_1_0", "100"); > + Builder.defineMacro("CL_VERSION_1_1", "110"); > + Builder.defineMacro("CL_VERSION_1_2", "120"); > + Builder.defineMacro("CL_VERSION_2_0", "200"); > > - if (TI.isLittleEndian()) > - Builder.defineMacro("__ENDIAN_LITTLE__"); > + if (TI.isLittleEndian()) > + Builder.defineMacro("__ENDIAN_LITTLE__"); > > - if (LangOpts.FastRelaxedMath) > - Builder.defineMacro("__FAST_RELAXED_MATH__"); > - } > + if (LangOpts.FastRelaxedMath) > + Builder.defineMacro("__FAST_RELAXED_MATH__"); > } > // Not "standard" per se, but available even with the -undef flag. > if (LangOpts.AsmPreprocessor) > > Modified: cfe/trunk/lib/Headers/opencl-c-base.h > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/opencl-c-base.h?rev=368552&r1=368551&r2=368552&view=diff > ============================================================================== > --- cfe/trunk/lib/Headers/opencl-c-base.h (original) > +++ cfe/trunk/lib/Headers/opencl-c-base.h Mon Aug 12 03:44:07 2019 > @@ -126,7 +126,7 @@ typedef double double8 __attribute__((ex > typedef double double16 __attribute__((ext_vector_type(16))); > #endif > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > #define NULL ((void*)0) > #endif > > @@ -276,7 +276,7 @@ typedef uint cl_mem_fence_flags; > */ > #define CLK_GLOBAL_MEM_FENCE 0x02 > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > typedef enum memory_scope { > memory_scope_work_item = __OPENCL_MEMORY_SCOPE_WORK_ITEM, > @@ -288,9 +288,6 @@ typedef enum memory_scope { > #endif > } memory_scope; > > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > - > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > /** > * Queue a memory fence to ensure correct ordering of memory > * operations between work-items of a work-group to > @@ -313,7 +310,7 @@ typedef enum memory_order > memory_order_seq_cst = __ATOMIC_SEQ_CST > } memory_order; > > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > // OpenCL v1.1 s6.11.3, v1.2 s6.12.14, v2.0 s6.13.14 - Image Read and Write > Functions > > @@ -389,14 +386,10 @@ typedef enum memory_order > #endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > > // OpenCL v2.0 s6.13.16 - Pipe Functions > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > #define CLK_NULL_RESERVE_ID (__builtin_astype(((void*)(__SIZE_MAX__)), > reserve_id_t)) > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > - > > // OpenCL v2.0 s6.13.17 - Enqueue Kernels > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > - > #define CL_COMPLETE 0x0 > #define CL_RUNNING 0x1 > #define CL_SUBMITTED 0x2 > @@ -435,7 +428,7 @@ typedef struct { > size_t localWorkSize[MAX_WORK_DIM]; > } ndrange_t; > > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > #ifdef cl_intel_device_side_avc_motion_estimation > #pragma OPENCL EXTENSION cl_intel_device_side_avc_motion_estimation : begin > > Modified: cfe/trunk/lib/Headers/opencl-c.h > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/opencl-c.h?rev=368552&r1=368551&r2=368552&view=diff > ============================================================================== > --- cfe/trunk/lib/Headers/opencl-c.h (original) > +++ cfe/trunk/lib/Headers/opencl-c.h Mon Aug 12 03:44:07 2019 > @@ -11,11 +11,11 @@ > > #include "opencl-c-base.h" > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > #ifndef cl_khr_depth_images > #define cl_khr_depth_images > #endif //cl_khr_depth_images > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > #if __OPENCL_C_VERSION__ < CL_VERSION_2_0 > #ifdef cl_khr_3d_image_writes > @@ -23,10 +23,10 @@ > #endif //cl_khr_3d_image_writes > #endif //__OPENCL_C_VERSION__ < CL_VERSION_2_0 > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_1_2 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_1_2) > #pragma OPENCL EXTENSION cl_intel_planar_yuv : begin > #pragma OPENCL EXTENSION cl_intel_planar_yuv : end > -#endif // __OPENCL_C_VERSION__ >= CL_VERSION_1_2 > +#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_1_2) > > #define __ovld __attribute__((overloadable)) > #define __conv __attribute__((convergent)) > @@ -6517,11 +6517,11 @@ size_t __ovld __cnfn get_group_id(uint d > */ > size_t __ovld __cnfn get_global_offset(uint dimindx); > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > size_t __ovld get_enqueued_local_size(uint dimindx); > size_t __ovld get_global_linear_id(void); > size_t __ovld get_local_linear_id(void); > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > // OpenCL v1.1 s6.11.2, v1.2 s6.12.2, v2.0 s6.13.2 - Math functions > > @@ -7352,7 +7352,7 @@ half16 __ovld __cnfn fmod(half16 x, half > * Returns fmin(x - floor (x), 0x1.fffffep-1f ). > * floor(x) is returned in iptr. > */ > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > float __ovld fract(float x, float *iptr); > float2 __ovld fract(float2 x, float2 *iptr); > float3 __ovld fract(float3 x, float3 *iptr); > @@ -7434,7 +7434,7 @@ half4 __ovld fract(half4 x, __private ha > half8 __ovld fract(half8 x, __private half8 *iptr); > half16 __ovld fract(half16 x, __private half16 *iptr); > #endif //cl_khr_fp16 > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Extract mantissa and exponent from x. For each > @@ -7442,7 +7442,7 @@ half16 __ovld fract(half16 x, __private > * magnitude in the interval [1/2, 1) or 0. Each > * component of x equals mantissa returned * 2^exp. > */ > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > float __ovld frexp(float x, int *exp); > float2 __ovld frexp(float2 x, int2 *exp); > float3 __ovld frexp(float3 x, int3 *exp); > @@ -7524,7 +7524,7 @@ half4 __ovld frexp(half4 x, __private in > half8 __ovld frexp(half8 x, __private int8 *exp); > half16 __ovld frexp(half16 x, __private int16 *exp); > #endif //cl_khr_fp16 > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Compute the value of the square root of x^2 + y^2 > @@ -7649,7 +7649,7 @@ half8 __ovld __cnfn lgamma(half8 x); > half16 __ovld __cnfn lgamma(half16 x); > #endif //cl_khr_fp16 > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > float __ovld lgamma_r(float x, int *signp); > float2 __ovld lgamma_r(float2 x, int2 *signp); > float3 __ovld lgamma_r(float3 x, int3 *signp); > @@ -7731,7 +7731,7 @@ half4 __ovld lgamma_r(half4 x, __private > half8 __ovld lgamma_r(half8 x, __private int8 *signp); > half16 __ovld lgamma_r(half16 x, __private int16 *signp); > #endif //cl_khr_fp16 > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Compute natural logarithm. > @@ -7955,7 +7955,7 @@ half16 __ovld __cnfn minmag(half16 x, ha > * the argument. It stores the integral part in the object > * pointed to by iptr. > */ > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > float __ovld modf(float x, float *iptr); > float2 __ovld modf(float2 x, float2 *iptr); > float3 __ovld modf(float3 x, float3 *iptr); > @@ -8037,7 +8037,7 @@ half4 __ovld modf(half4 x, __private hal > half8 __ovld modf(half8 x, __private half8 *iptr); > half16 __ovld modf(half16 x, __private half16 *iptr); > #endif //cl_khr_fp16 > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Returns a quiet NaN. The nancode may be placed > @@ -8215,7 +8215,7 @@ half16 __ovld __cnfn remainder(half16 x, > * sign as x/y. It stores this signed value in the object > * pointed to by quo. > */ > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > float __ovld remquo(float x, float y, int *quo); > float2 __ovld remquo(float2 x, float2 y, int2 *quo); > float3 __ovld remquo(float3 x, float3 y, int3 *quo); > @@ -8298,7 +8298,7 @@ half4 __ovld remquo(half4 x, half4 y, __ > half8 __ovld remquo(half8 x, half8 y, __private int8 *quo); > half16 __ovld remquo(half16 x, half16 y, __private int16 *quo); > #endif //cl_khr_fp16 > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > /** > * Round to integral value (using round to nearest > * even rounding mode) in floating-point format. > @@ -8439,7 +8439,7 @@ half16 __ovld __cnfn sin(half16); > * is the return value and computed cosine is returned > * in cosval. > */ > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > float __ovld sincos(float x, float *cosval); > float2 __ovld sincos(float2 x, float2 *cosval); > float3 __ovld sincos(float3 x, float3 *cosval); > @@ -8521,7 +8521,7 @@ half4 __ovld sincos(half4 x, __private h > half8 __ovld sincos(half8 x, __private half8 *cosval); > half16 __ovld sincos(half16 x, __private half16 *cosval); > #endif //cl_khr_fp16 > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Compute hyperbolic sine. > @@ -9446,7 +9446,7 @@ ulong16 __ovld __cnfn clz(ulong16 x); > * returns the size in bits of the type of x or > * component type of x, if x is a vector. > */ > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > char __ovld ctz(char x); > uchar __ovld ctz(uchar x); > char2 __ovld ctz(char2 x); > @@ -9495,7 +9495,7 @@ long8 __ovld ctz(long8 x); > ulong8 __ovld ctz(ulong8 x); > long16 __ovld ctz(long16 x); > ulong16 __ovld ctz(ulong16 x); > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Returns mul_hi(a, b) + c. > @@ -11340,7 +11340,7 @@ half8 __ovld vload8(size_t offset, const > half16 __ovld vload16(size_t offset, const __constant half *p); > #endif //cl_khr_fp16 > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > char2 __ovld vload2(size_t offset, const char *p); > uchar2 __ovld vload2(size_t offset, const uchar *p); > short2 __ovld vload2(size_t offset, const short *p); > @@ -11578,9 +11578,9 @@ half4 __ovld vload4(size_t offset, const > half8 __ovld vload8(size_t offset, const __private half *p); > half16 __ovld vload16(size_t offset, const __private half *p); > #endif //cl_khr_fp16 > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > void __ovld vstore2(char2 data, size_t offset, char *p); > void __ovld vstore2(uchar2 data, size_t offset, uchar *p); > void __ovld vstore2(short2 data, size_t offset, short *p); > @@ -11814,7 +11814,7 @@ void __ovld vstore4(half4 data, size_t o > void __ovld vstore8(half8 data, size_t offset, __private half *p); > void __ovld vstore16(half16 data, size_t offset, __private half *p); > #endif //cl_khr_fp16 > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Read sizeof (half) bytes of data from address > @@ -11825,13 +11825,13 @@ void __ovld vstore16(half16 data, size_t > * must be 16-bit aligned. > */ > float __ovld vload_half(size_t offset, const __constant half *p); > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > float __ovld vload_half(size_t offset, const half *p); > #else > float __ovld vload_half(size_t offset, const __global half *p); > float __ovld vload_half(size_t offset, const __local half *p); > float __ovld vload_half(size_t offset, const __private half *p); > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Read sizeof (halfn) bytes of data from address > @@ -11846,7 +11846,7 @@ float3 __ovld vload_half3(size_t offset, > float4 __ovld vload_half4(size_t offset, const __constant half *p); > float8 __ovld vload_half8(size_t offset, const __constant half *p); > float16 __ovld vload_half16(size_t offset, const __constant half *p); > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > float2 __ovld vload_half2(size_t offset, const half *p); > float3 __ovld vload_half3(size_t offset, const half *p); > float4 __ovld vload_half4(size_t offset, const half *p); > @@ -11868,7 +11868,7 @@ float3 __ovld vload_half3(size_t offset, > float4 __ovld vload_half4(size_t offset, const __private half *p); > float8 __ovld vload_half8(size_t offset, const __private half *p); > float16 __ovld vload_half16(size_t offset, const __private half *p); > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * The float value given by data is first > @@ -11881,7 +11881,7 @@ float16 __ovld vload_half16(size_t offse > * The default current rounding mode is round to > * nearest even. > */ > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > void __ovld vstore_half(float data, size_t offset, half *p); > void __ovld vstore_half_rte(float data, size_t offset, half *p); > void __ovld vstore_half_rtz(float data, size_t offset, half *p); > @@ -11927,7 +11927,7 @@ void __ovld vstore_half_rtz(double data, > void __ovld vstore_half_rtp(double data, size_t offset, __private half *p); > void __ovld vstore_half_rtn(double data, size_t offset, __private half *p); > #endif //cl_khr_fp64 > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * The floatn value given by data is converted to > @@ -11940,7 +11940,7 @@ void __ovld vstore_half_rtn(double data, > * The default current rounding mode is round to > * nearest even. > */ > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > void __ovld vstore_half2(float2 data, size_t offset, half *p); > void __ovld vstore_half3(float3 data, size_t offset, half *p); > void __ovld vstore_half4(float4 data, size_t offset, half *p); > @@ -12146,7 +12146,7 @@ void __ovld vstore_half4_rtn(double4 dat > void __ovld vstore_half8_rtn(double8 data, size_t offset, __private half *p); > void __ovld vstore_half16_rtn(double16 data, size_t offset, __private half > *p); > #endif //cl_khr_fp64 > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * For n = 1, 2, 4, 8 and 16 read sizeof (halfn) > @@ -12167,7 +12167,7 @@ float3 __ovld vloada_half3(size_t offset > float4 __ovld vloada_half4(size_t offset, const __constant half *p); > float8 __ovld vloada_half8(size_t offset, const __constant half *p); > float16 __ovld vloada_half16(size_t offset, const __constant half *p); > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > float __ovld vloada_half(size_t offset, const half *p); > float2 __ovld vloada_half2(size_t offset, const half *p); > float3 __ovld vloada_half3(size_t offset, const half *p); > @@ -12193,7 +12193,7 @@ float3 __ovld vloada_half3(size_t offset > float4 __ovld vloada_half4(size_t offset, const __private half *p); > float8 __ovld vloada_half8(size_t offset, const __private half *p); > float16 __ovld vloada_half16(size_t offset, const __private half *p); > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * The floatn value given by data is converted to > @@ -12211,7 +12211,7 @@ float16 __ovld vloada_half16(size_t offs > * mode. The default current rounding mode is > * round to nearest even. > */ > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > void __ovld vstorea_half(float data, size_t offset, half *p); > void __ovld vstorea_half2(float2 data, size_t offset, half *p); > void __ovld vstorea_half3(float3 data, size_t offset, half *p); > @@ -12496,7 +12496,7 @@ void __ovld vstorea_half4_rtn(double4 da > void __ovld vstorea_half8_rtn(double8 data,size_t offset, __private half *p); > void __ovld vstorea_half16_rtn(double16 data,size_t offset, __private half > *p); > #endif //cl_khr_fp64 > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > // OpenCL v1.1 s6.11.8, v1.2 s6.12.8, v2.0 s6.13.8 - Synchronization > Functions > > @@ -12532,10 +12532,10 @@ void __ovld vstorea_half16_rtn(double16 > > void __ovld __conv barrier(cl_mem_fence_flags flags); > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > void __ovld __conv work_group_barrier(cl_mem_fence_flags flags, memory_scope > scope); > void __ovld __conv work_group_barrier(cl_mem_fence_flags flags); > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > // OpenCL v1.1 s6.11.9, v1.2 s6.12.9 - Explicit Memory Fence Functions > > @@ -12580,7 +12580,7 @@ void __ovld write_mem_fence(cl_mem_fence > > // OpenCL v2.0 s6.13.9 - Address Space Qualifier Functions > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > cl_mem_fence_flags __ovld get_fence(const void *ptr); > cl_mem_fence_flags __ovld get_fence(void *ptr); > > @@ -12591,7 +12591,7 @@ cl_mem_fence_flags __ovld get_fence(void > * where gentype is builtin type or user defined type. > */ > > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > // OpenCL v1.1 s6.11.10, v1.2 s6.12.10, v2.0 s6.13.10 - Async Copies from > Global to Local Memory, Local to Global Memory, and Prefetch > > @@ -13371,7 +13371,7 @@ unsigned long __ovld atom_xor(volatile _ > > // OpenCL v2.0 s6.13.11 - Atomics Functions > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > // double atomics support requires extensions cl_khr_int64_base_atomics and > cl_khr_int64_extended_atomics > #if defined(cl_khr_int64_base_atomics) && > defined(cl_khr_int64_extended_atomics) > @@ -13692,7 +13692,7 @@ void __ovld atomic_flag_clear(volatile a > void __ovld atomic_flag_clear_explicit(volatile atomic_flag *object, > memory_order order); > void __ovld atomic_flag_clear_explicit(volatile atomic_flag *object, > memory_order order, memory_scope scope); > > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > // OpenCL v1.1 s6.11.12, v1.2 s6.12.12, v2.0 s6.13.12 - Miscellaneous Vector > Functions > > @@ -14186,7 +14186,7 @@ half16 __ovld __cnfn shuffle2(half8 x, h > half16 __ovld __cnfn shuffle2(half16 x, half16 y, ushort16 mask); > #endif //cl_khr_fp16 > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_1_2 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_1_2) > // OpenCL v1.2 s6.12.13, v2.0 s6.13.13 - printf > > int printf(__constant const char* st, ...) __attribute__((format(printf, 1, > 2))); > @@ -14307,7 +14307,7 @@ int4 __purefn __ovld read_imagei(read_on > uint4 __purefn __ovld read_imageui(read_only image3d_t image, sampler_t > sampler, int4 coord); > uint4 __purefn __ovld read_imageui(read_only image3d_t image, sampler_t > sampler, float4 coord); > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_1_2 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_1_2) > float4 __purefn __ovld read_imagef(read_only image2d_array_t image_array, > sampler_t sampler, int4 coord); > float4 __purefn __ovld read_imagef(read_only image2d_array_t image_array, > sampler_t sampler, float4 coord); > > @@ -14315,7 +14315,7 @@ int4 __purefn __ovld read_imagei(read_on > int4 __purefn __ovld read_imagei(read_only image2d_array_t image_array, > sampler_t sampler, float4 coord); > uint4 __purefn __ovld read_imageui(read_only image2d_array_t image_array, > sampler_t sampler, int4 coord); > uint4 __purefn __ovld read_imageui(read_only image2d_array_t image_array, > sampler_t sampler, float4 coord); > -#endif // __OPENCL_C_VERSION__ >= CL_VERSION_1_2 > +#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_1_2) > > float4 __purefn __ovld read_imagef(read_only image1d_t image, sampler_t > sampler, int coord); > float4 __purefn __ovld read_imagef(read_only image1d_t image, sampler_t > sampler, float coord); > @@ -14325,7 +14325,7 @@ int4 __purefn __ovld read_imagei(read_on > uint4 __purefn __ovld read_imageui(read_only image1d_t image, sampler_t > sampler, int coord); > uint4 __purefn __ovld read_imageui(read_only image1d_t image, sampler_t > sampler, float coord); > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_1_2 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_1_2) > float4 __purefn __ovld read_imagef(read_only image1d_array_t image_array, > sampler_t sampler, int2 coord); > float4 __purefn __ovld read_imagef(read_only image1d_array_t image_array, > sampler_t sampler, float2 coord); > > @@ -14333,7 +14333,7 @@ int4 __purefn __ovld read_imagei(read_on > int4 __purefn __ovld read_imagei(read_only image1d_array_t image_array, > sampler_t sampler, float2 coord); > uint4 __purefn __ovld read_imageui(read_only image1d_array_t image_array, > sampler_t sampler, int2 coord); > uint4 __purefn __ovld read_imageui(read_only image1d_array_t image_array, > sampler_t sampler, float2 coord); > -#endif // __OPENCL_C_VERSION__ >= CL_VERSION_1_2 > +#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_1_2) > > #ifdef cl_khr_depth_images > float __purefn __ovld read_imagef(read_only image2d_depth_t image, sampler_t > sampler, float2 coord); > @@ -14358,7 +14358,7 @@ float __purefn __ovld read_imagef(read_o > #endif //cl_khr_gl_msaa_sharing > > // OpenCL Extension v2.0 s9.18 - Mipmaps > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > #ifdef cl_khr_mipmap_image > > float4 __purefn __ovld read_imagef(read_only image1d_t image, sampler_t > sampler, float coord, float lod); > @@ -14410,9 +14410,9 @@ int4 __purefn __ovld read_imagei(read_on > uint4 __purefn __ovld read_imageui(read_only image3d_t image, sampler_t > sampler, float4 coord, float4 gradientX, float4 gradientY); > > #endif //cl_khr_mipmap_image > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_1_2 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_1_2) > > /** > * Sampler-less Image Access > @@ -14447,7 +14447,7 @@ float4 __purefn __ovld read_imagef(read_ > int4 __purefn __ovld read_imagei(read_only image3d_t image, int4 coord); > uint4 __purefn __ovld read_imageui(read_only image3d_t image, int4 coord); > > -#endif // __OPENCL_C_VERSION__ >= CL_VERSION_1_2 > +#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_1_2) > > // Image read functions returning half4 type > #ifdef cl_khr_fp16 > @@ -14457,7 +14457,7 @@ half4 __purefn __ovld read_imageh(read_o > half4 __purefn __ovld read_imageh(read_only image2d_t image, sampler_t > sampler, float2 coord); > half4 __purefn __ovld read_imageh(read_only image3d_t image, sampler_t > sampler, int4 coord); > half4 __purefn __ovld read_imageh(read_only image3d_t image, sampler_t > sampler, float4 coord); > -#if __OPENCL_C_VERSION__ >= CL_VERSION_1_2 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_1_2) > half4 __purefn __ovld read_imageh(read_only image1d_array_t image, sampler_t > sampler, int2 coord); > half4 __purefn __ovld read_imageh(read_only image1d_array_t image, sampler_t > sampler, float2 coord); > half4 __purefn __ovld read_imageh(read_only image2d_array_t image, sampler_t > sampler, int4 coord); > @@ -14471,11 +14471,11 @@ half4 __purefn __ovld read_imageh(read_o > half4 __purefn __ovld read_imageh(read_only image1d_array_t image, int2 > coord); > half4 __purefn __ovld read_imageh(read_only image2d_array_t image, int4 > coord); > half4 __purefn __ovld read_imageh(read_only image1d_buffer_t image, int > coord); > -#endif // __OPENCL_C_VERSION__ >= CL_VERSION_1_2 > +#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_1_2) > #endif //cl_khr_fp16 > > // Image read functions for read_write images > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > float4 __purefn __ovld read_imagef(read_write image1d_t image, int coord); > int4 __purefn __ovld read_imagei(read_write image1d_t image, int coord); > uint4 __purefn __ovld read_imageui(read_write image1d_t image, int coord); > @@ -14518,7 +14518,7 @@ float __purefn __ovld read_imagef(read_w > float __purefn __ovld read_imagef(read_write image2d_array_msaa_depth_t > image, int4 coord, int sample); > #endif //cl_khr_gl_msaa_sharing > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > #ifdef cl_khr_mipmap_image > float4 __purefn __ovld read_imagef(read_write image1d_t image, sampler_t > sampler, float coord, float lod); > int4 __purefn __ovld read_imagei(read_write image1d_t image, sampler_t > sampler, float coord, float lod); > @@ -14569,7 +14569,7 @@ int4 __purefn __ovld read_imagei(read_wr > uint4 __purefn __ovld read_imageui(read_write image3d_t image, sampler_t > sampler, float4 coord, float4 gradientX, float4 gradientY); > > #endif //cl_khr_mipmap_image > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > // Image read functions returning half4 type > #ifdef cl_khr_fp16 > @@ -14580,7 +14580,7 @@ half4 __purefn __ovld read_imageh(read_w > half4 __purefn __ovld read_imageh(read_write image2d_array_t image, int4 > coord); > half4 __purefn __ovld read_imageh(read_write image1d_buffer_t image, int > coord); > #endif //cl_khr_fp16 > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Write color value to location specified by coordinate > @@ -14681,7 +14681,7 @@ void __ovld write_imagef(write_only imag > #endif //cl_khr_depth_images > > // OpenCL Extension v2.0 s9.18 - Mipmaps > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > #ifdef cl_khr_mipmap_image > void __ovld write_imagef(write_only image1d_t image, int coord, int lod, > float4 color); > void __ovld write_imagei(write_only image1d_t image, int coord, int lod, > int4 color); > @@ -14708,7 +14708,7 @@ void __ovld write_imagei(write_only imag > void __ovld write_imageui(write_only image3d_t image, int4 coord, int lod, > uint4 color); > #endif > #endif //cl_khr_mipmap_image > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > // Image write functions for half4 type > #ifdef cl_khr_fp16 > @@ -14723,7 +14723,7 @@ void __ovld write_imageh(write_only imag > #endif //cl_khr_fp16 > > // Image write functions for read_write images > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > void __ovld write_imagef(read_write image2d_t image, int2 coord, float4 > color); > void __ovld write_imagei(read_write image2d_t image, int2 coord, int4 color); > void __ovld write_imageui(read_write image2d_t image, int2 coord, uint4 > color); > @@ -14755,7 +14755,7 @@ void __ovld write_imagef(read_write imag > void __ovld write_imagef(read_write image2d_array_depth_t image, int4 coord, > float color); > #endif //cl_khr_depth_images > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > #ifdef cl_khr_mipmap_image > void __ovld write_imagef(read_write image1d_t image, int coord, int lod, > float4 color); > void __ovld write_imagei(read_write image1d_t image, int coord, int lod, > int4 color); > @@ -14782,7 +14782,7 @@ void __ovld write_imagei(read_write imag > void __ovld write_imageui(read_write image3d_t image, int4 coord, int lod, > uint4 color); > #endif > #endif //cl_khr_mipmap_image > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > // Image write functions for half4 type > #ifdef cl_khr_fp16 > @@ -14795,7 +14795,7 @@ void __ovld write_imageh(read_write imag > void __ovld write_imageh(read_write image2d_array_t image, int4 coord, half4 > color); > void __ovld write_imageh(read_write image1d_buffer_t image, int coord, half4 > color); > #endif //cl_khr_fp16 > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > // Note: In OpenCL v1.0/1.1/1.2, image argument of image query builtin > functions does not have > // access qualifier, which by default assume read_only access qualifier. > Image query builtin > @@ -14843,7 +14843,7 @@ int __ovld __cnfn get_image_width(write_ > int __ovld __cnfn get_image_width(write_only image2d_array_msaa_depth_t > image); > #endif //cl_khr_gl_msaa_sharing > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > int __ovld __cnfn get_image_width(read_write image1d_t image); > int __ovld __cnfn get_image_width(read_write image1d_buffer_t image); > int __ovld __cnfn get_image_width(read_write image2d_t image); > @@ -14860,7 +14860,7 @@ int __ovld __cnfn get_image_width(read_w > int __ovld __cnfn get_image_width(read_write image2d_array_msaa_t image); > int __ovld __cnfn get_image_width(read_write image2d_array_msaa_depth_t > image); > #endif //cl_khr_gl_msaa_sharing > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Return the image height in pixels. > @@ -14895,7 +14895,7 @@ int __ovld __cnfn get_image_height(write > int __ovld __cnfn get_image_height(write_only image2d_array_msaa_depth_t > image); > #endif //cl_khr_gl_msaa_sharing > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > int __ovld __cnfn get_image_height(read_write image2d_t image); > int __ovld __cnfn get_image_height(read_write image3d_t image); > int __ovld __cnfn get_image_height(read_write image2d_array_t image); > @@ -14909,7 +14909,7 @@ int __ovld __cnfn get_image_height(read_ > int __ovld __cnfn get_image_height(read_write image2d_array_msaa_t image); > int __ovld __cnfn get_image_height(read_write image2d_array_msaa_depth_t > image); > #endif //cl_khr_gl_msaa_sharing > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Return the image depth in pixels. > @@ -14920,12 +14920,12 @@ int __ovld __cnfn get_image_depth(read_o > int __ovld __cnfn get_image_depth(write_only image3d_t image); > #endif > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > int __ovld __cnfn get_image_depth(read_write image3d_t image); > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > // OpenCL Extension v2.0 s9.18 - Mipmaps > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > #ifdef cl_khr_mipmap_image > /** > * Return the image miplevels. > @@ -14961,7 +14961,7 @@ int __ovld get_image_num_mip_levels(read > int __ovld get_image_num_mip_levels(read_write image2d_depth_t image); > > #endif //cl_khr_mipmap_image > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Return the channel data type. Valid values are: > @@ -15018,7 +15018,7 @@ int __ovld __cnfn get_image_channel_data > int __ovld __cnfn get_image_channel_data_type(write_only > image2d_array_msaa_depth_t image); > #endif //cl_khr_gl_msaa_sharing > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > int __ovld __cnfn get_image_channel_data_type(read_write image1d_t image); > int __ovld __cnfn get_image_channel_data_type(read_write image1d_buffer_t > image); > int __ovld __cnfn get_image_channel_data_type(read_write image2d_t image); > @@ -15035,7 +15035,7 @@ int __ovld __cnfn get_image_channel_data > int __ovld __cnfn get_image_channel_data_type(read_write > image2d_array_msaa_t image); > int __ovld __cnfn get_image_channel_data_type(read_write > image2d_array_msaa_depth_t image); > #endif //cl_khr_gl_msaa_sharing > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Return the image channel order. Valid values are: > @@ -15090,7 +15090,7 @@ int __ovld __cnfn get_image_channel_orde > int __ovld __cnfn get_image_channel_order(write_only > image2d_array_msaa_depth_t image); > #endif //cl_khr_gl_msaa_sharing > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > int __ovld __cnfn get_image_channel_order(read_write image1d_t image); > int __ovld __cnfn get_image_channel_order(read_write image1d_buffer_t image); > int __ovld __cnfn get_image_channel_order(read_write image2d_t image); > @@ -15107,7 +15107,7 @@ int __ovld __cnfn get_image_channel_orde > int __ovld __cnfn get_image_channel_order(read_write image2d_array_msaa_t > image); > int __ovld __cnfn get_image_channel_order(read_write > image2d_array_msaa_depth_t image); > #endif //cl_khr_gl_msaa_sharing > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Return the 2D image width and height as an int2 > @@ -15140,7 +15140,7 @@ int2 __ovld __cnfn get_image_dim(write_o > int2 __ovld __cnfn get_image_dim(write_only image2d_array_msaa_depth_t > image); > #endif //cl_khr_gl_msaa_sharing > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > int2 __ovld __cnfn get_image_dim(read_write image2d_t image); > int2 __ovld __cnfn get_image_dim(read_write image2d_array_t image); > #ifdef cl_khr_depth_images > @@ -15153,7 +15153,7 @@ int2 __ovld __cnfn get_image_dim(read_wr > int2 __ovld __cnfn get_image_dim(read_write image2d_array_msaa_t image); > int2 __ovld __cnfn get_image_dim(read_write image2d_array_msaa_depth_t > image); > #endif //cl_khr_gl_msaa_sharing > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Return the 3D image width, height, and depth as an > @@ -15165,9 +15165,9 @@ int4 __ovld __cnfn get_image_dim(read_on > #ifdef cl_khr_3d_image_writes > int4 __ovld __cnfn get_image_dim(write_only image3d_t image); > #endif > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > int4 __ovld __cnfn get_image_dim(read_write image3d_t image); > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Return the image array size. > @@ -15193,7 +15193,7 @@ size_t __ovld __cnfn get_image_array_siz > size_t __ovld __cnfn get_image_array_size(write_only > image2d_array_msaa_depth_t image_array); > #endif //cl_khr_gl_msaa_sharing > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > size_t __ovld __cnfn get_image_array_size(read_write image1d_array_t > image_array); > size_t __ovld __cnfn get_image_array_size(read_write image2d_array_t > image_array); > #ifdef cl_khr_depth_images > @@ -15203,7 +15203,7 @@ size_t __ovld __cnfn get_image_array_siz > size_t __ovld __cnfn get_image_array_size(read_write image2d_array_msaa_t > image_array); > size_t __ovld __cnfn get_image_array_size(read_write > image2d_array_msaa_depth_t image_array); > #endif //cl_khr_gl_msaa_sharing > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > /** > * Return the number of samples associated with image > @@ -15219,17 +15219,17 @@ int __ovld get_image_num_samples(write_o > int __ovld get_image_num_samples(write_only image2d_array_msaa_t image); > int __ovld get_image_num_samples(write_only image2d_array_msaa_depth_t > image); > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > int __ovld get_image_num_samples(read_write image2d_msaa_t image); > int __ovld get_image_num_samples(read_write image2d_msaa_depth_t image); > int __ovld get_image_num_samples(read_write image2d_array_msaa_t image); > int __ovld get_image_num_samples(read_write image2d_array_msaa_depth_t > image); > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > #endif > > // OpenCL v2.0 s6.13.15 - Work-group Functions > > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > int __ovld __conv work_group_all(int predicate); > int __ovld __conv work_group_any(int predicate); > > @@ -15327,16 +15327,16 @@ double __ovld __conv work_group_scan_inc > double __ovld __conv work_group_scan_inclusive_max(double x); > #endif //cl_khr_fp64 > > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > // OpenCL v2.0 s6.13.16 - Pipe Functions > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > bool __ovld is_valid_reserve_id(reserve_id_t reserve_id); > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > > // OpenCL v2.0 s6.13.17 - Enqueue Kernels > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > ndrange_t __ovld ndrange_1D(size_t); > ndrange_t __ovld ndrange_1D(size_t, size_t); > @@ -15365,7 +15365,7 @@ bool __ovld is_valid_event (clk_event_t > void __ovld capture_event_profiling_info(clk_event_t, clk_profiling_info, > __global void* value); > > queue_t __ovld get_default_queue(void); > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > // OpenCL Extension v2.0 s9.17 - Sub-groups > > @@ -15374,16 +15374,16 @@ queue_t __ovld get_default_queue(void); > uint __ovld get_sub_group_size(void); > uint __ovld get_max_sub_group_size(void); > uint __ovld get_num_sub_groups(void); > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > uint __ovld get_enqueued_num_sub_groups(void); > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > uint __ovld get_sub_group_id(void); > uint __ovld get_sub_group_local_id(void); > > void __ovld __conv sub_group_barrier(cl_mem_fence_flags flags); > -#if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > void __ovld __conv sub_group_barrier(cl_mem_fence_flags flags, > memory_scope scope); > -#endif //__OPENCL_C_VERSION__ >= CL_VERSION_2_0 > +#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > int __ovld __conv sub_group_all(int predicate); > int __ovld __conv sub_group_any(int predicate); > @@ -15573,12 +15573,12 @@ uint2 __ovld __conv intel_sub_group_bl > uint4 __ovld __conv intel_sub_group_block_read4( read_only image2d_t > image, int2 coord ); > uint8 __ovld __conv intel_sub_group_block_read8( read_only image2d_t > image, int2 coord ); > > -#if (__OPENCL_C_VERSION__ >= CL_VERSION_2_0) > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > uint __ovld __conv intel_sub_group_block_read(read_write image2d_t image, > int2 coord); > uint2 __ovld __conv intel_sub_group_block_read2(read_write image2d_t > image, int2 coord); > uint4 __ovld __conv intel_sub_group_block_read4(read_write image2d_t > image, int2 coord); > uint8 __ovld __conv intel_sub_group_block_read8(read_write image2d_t > image, int2 coord); > -#endif // (__OPENCL_C_VERSION__ >= CL_VERSION_2_0) > +#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > uint __ovld __conv intel_sub_group_block_read( const __global uint* p ); > uint2 __ovld __conv intel_sub_group_block_read2( const __global uint* p ); > @@ -15590,12 +15590,12 @@ void __ovld __conv intel_sub_group_bl > void __ovld __conv intel_sub_group_block_write4(write_only image2d_t > image, int2 coord, uint4 data); > void __ovld __conv intel_sub_group_block_write8(write_only image2d_t > image, int2 coord, uint8 data); > > -#if (__OPENCL_C_VERSION__ >= CL_VERSION_2_0) > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > void __ovld __conv intel_sub_group_block_write(read_write image2d_t > image, int2 coord, uint data); > void __ovld __conv intel_sub_group_block_write2(read_write image2d_t > image, int2 coord, uint2 data); > void __ovld __conv intel_sub_group_block_write4(read_write image2d_t > image, int2 coord, uint4 data); > void __ovld __conv intel_sub_group_block_write8(read_write image2d_t > image, int2 coord, uint8 data); > -#endif // (__OPENCL_C_VERSION__ >= CL_VERSION_2_0) > +#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > void __ovld __conv intel_sub_group_block_write( __global uint* p, uint > data ); > void __ovld __conv intel_sub_group_block_write2( __global uint* p, uint2 > data ); > @@ -15713,12 +15713,12 @@ uint2 __ovld __conv intel_sub_group > uint4 __ovld __conv intel_sub_group_block_read_ui4( read_only image2d_t > image, int2 byte_coord ); > uint8 __ovld __conv intel_sub_group_block_read_ui8( read_only image2d_t > image, int2 byte_coord ); > > -#if (__OPENCL_C_VERSION__ >= CL_VERSION_2_0) > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > uint __ovld __conv intel_sub_group_block_read_ui( read_write image2d_t > image, int2 byte_coord ); > uint2 __ovld __conv intel_sub_group_block_read_ui2( read_write > image2d_t image, int2 byte_coord ); > uint4 __ovld __conv intel_sub_group_block_read_ui4( read_write > image2d_t image, int2 byte_coord ); > uint8 __ovld __conv intel_sub_group_block_read_ui8( read_write > image2d_t image, int2 byte_coord ); > -#endif // (__OPENCL_C_VERSION__ >= CL_VERSION_2_0) > +#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > uint __ovld __conv intel_sub_group_block_read_ui( const __global uint* > p ); > uint2 __ovld __conv intel_sub_group_block_read_ui2( const __global > uint* p ); > @@ -15730,12 +15730,12 @@ void __ovld __conv intel_sub_group > void __ovld __conv intel_sub_group_block_write_ui4( read_only > image2d_t image, int2 byte_coord, uint4 data ); > void __ovld __conv intel_sub_group_block_write_ui8( read_only > image2d_t image, int2 byte_coord, uint8 data ); > > -#if (__OPENCL_C_VERSION__ >= CL_VERSION_2_0) > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > void __ovld __conv intel_sub_group_block_write_ui( read_write > image2d_t image, int2 byte_coord, uint data ); > void __ovld __conv intel_sub_group_block_write_ui2( read_write > image2d_t image, int2 byte_coord, uint2 data ); > void __ovld __conv intel_sub_group_block_write_ui4( read_write > image2d_t image, int2 byte_coord, uint4 data ); > void __ovld __conv intel_sub_group_block_write_ui8( read_write > image2d_t image, int2 byte_coord, uint8 data ); > -#endif // (__OPENCL_C_VERSION__ >= CL_VERSION_2_0) > +#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > void __ovld __conv intel_sub_group_block_write_ui( __global uint* p, > uint data ); > void __ovld __conv intel_sub_group_block_write_ui2( __global uint* p, > uint2 data ); > @@ -15747,12 +15747,12 @@ ushort2 __ovld __conv intel_sub_grou > ushort4 __ovld __conv intel_sub_group_block_read_us4( read_only > image2d_t image, int2 coord ); > ushort8 __ovld __conv intel_sub_group_block_read_us8( read_only > image2d_t image, int2 coord ); > > -#if (__OPENCL_C_VERSION__ >= CL_VERSION_2_0) > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > ushort __ovld __conv intel_sub_group_block_read_us(read_write image2d_t > image, int2 coord); > ushort2 __ovld __conv intel_sub_group_block_read_us2(read_write > image2d_t image, int2 coord); > ushort4 __ovld __conv intel_sub_group_block_read_us4(read_write > image2d_t image, int2 coord); > ushort8 __ovld __conv intel_sub_group_block_read_us8(read_write > image2d_t image, int2 coord); > -#endif // (__OPENCL_C_VERSION__ >= CL_VERSION_2_0) > +#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > ushort __ovld __conv intel_sub_group_block_read_us( const __global > ushort* p ); > ushort2 __ovld __conv intel_sub_group_block_read_us2( const __global > ushort* p ); > @@ -15764,12 +15764,12 @@ void __ovld __conv intel_sub_grou > void __ovld __conv intel_sub_group_block_write_us4(write_only > image2d_t image, int2 coord, ushort4 data); > void __ovld __conv intel_sub_group_block_write_us8(write_only > image2d_t image, int2 coord, ushort8 data); > > -#if (__OPENCL_C_VERSION__ >= CL_VERSION_2_0) > +#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > void __ovld __conv intel_sub_group_block_write_us(read_write > image2d_t image, int2 coord, ushort data); > void __ovld __conv intel_sub_group_block_write_us2(read_write > image2d_t image, int2 coord, ushort2 data); > void __ovld __conv intel_sub_group_block_write_us4(read_write > image2d_t image, int2 coord, ushort4 data); > void __ovld __conv intel_sub_group_block_write_us8(read_write > image2d_t image, int2 coord, ushort8 data); > -#endif // (__OPENCL_C_VERSION__ >= CL_VERSION_2_0) > +#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= > CL_VERSION_2_0) > > void __ovld __conv intel_sub_group_block_write_us( __global ushort* > p, ushort data ); > void __ovld __conv intel_sub_group_block_write_us2( __global ushort* > p, ushort2 data ); > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
