r271413 - Fixup list of available extensions

Fri Jun 3 10:36:42 PDT 2016

No worries! Thanks!

Anastasia

-----Original Message-----
From: Jan Vesely [mailto:jv356 at scarletmail.rutgers.edu] On Behalf Of Jan Vesely
Sent: 03 June 2016 18:35
To: Anastasia Stulova; cfe-commits at lists.llvm.org
Cc: nd
Subject: Re: r271413 - Fixup list of available extensions

of course. sorry about that. I didn't realize the patches had different title from phabricator.

Jan

On Fri, 2016-06-03 at 17:14 +0000, Anastasia Stulova wrote:
> Hi Jan,
> 
> In the future could you please keep "[OpenCL]" prefix for all commit 
> messages related to OpenCL. :)
> 
> Thanks,
> Anastasia
>  
> -----Original Message-----
> From: cfe-commits [mailto:cfe-commits-bounces at lists.llvm.org] On 
> Behalf Of Jan Vesely via cfe-commits
> Sent: 01 June 2016 19:05
> To: cfe-commits at lists.llvm.org
> Subject: r271413 - Fixup list of available extensions
> 
> Author: jvesely
> Date: Wed Jun  1 13:04:50 2016
> New Revision: 271413
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=271413&view=rev
> Log:
> Fixup list of available extensions
> 
> Reviewers: Anastasia
> 
> Differential Revision: http://reviews.llvm.org/D20447
> 
> Added:
>     cfe/trunk/test/SemaOpenCL/extension-version.cl
> Modified:
>     cfe/trunk/include/clang/Basic/OpenCLExtensions.def
> 
> Modified: cfe/trunk/include/clang/Basic/OpenCLExtensions.def
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basi
> c/OpenCLExtensions.def?rev=271413&r1=271412&r2=271413&view=diff
> =====================================================================
> =========
> --- cfe/trunk/include/clang/Basic/OpenCLExtensions.def (original)
> +++ cfe/trunk/include/clang/Basic/OpenCLExtensions.def Wed Jun  1
> +++ 13:04:50 2016
> @@ -34,35 +34,39 @@
>  #endif // OPENCLEXT_INTERNAL
>  
>  // OpenCL 1.0.
> -OPENCLEXT_INTERNAL(cl_khr_3d_image_writes, 100, 120)
> +OPENCLEXT_INTERNAL(cl_khr_3d_image_writes, 100, 200) // fprounding
> mode
> +is special since it is not mentioned beyond 1.0 
> +OPENCLEXT_INTERNAL(cl_khr_select_fprounding_mode, 100, 110)
>  OPENCLEXT_INTERNAL(cl_khr_byte_addressable_store, 100,
> 110)  OPENCLEXT_INTERNAL(cl_khr_fp16, 100,
> ~0U)  OPENCLEXT_INTERNAL(cl_khr_fp64, 100,
> 120)  OPENCLEXT_INTERNAL(cl_khr_global_int32_base_atomics, 100,
> 110)  OPENCLEXT_INTERNAL(cl_khr_global_int32_extended_atomics, 100,
> 110) -OPENCLEXT_INTERNAL(cl_khr_gl_sharing, 100, ~0U) 
> -OPENCLEXT_INTERNAL(cl_khr_icd, 100,
> ~0U)  OPENCLEXT_INTERNAL(cl_khr_local_int32_base_atomics, 100,
> 110)  OPENCLEXT_INTERNAL(cl_khr_local_int32_extended_atomics, 100,
> 110)
> +OPENCLEXT_INTERNAL(cl_khr_int64_base_atomics, 100, ~0U) 
> +OPENCLEXT_INTERNAL(cl_khr_int64_extended_atomics, 100, ~0U) 
> +OPENCLEXT_INTERNAL(cl_khr_gl_sharing, 100, ~0U) 
> +OPENCLEXT_INTERNAL(cl_khr_icd, 100, ~0U)
>  
>  // OpenCL 1.1.
> -OPENCLEXT_INTERNAL(cl_khr_d3d10_sharing, 110,
> ~0U)  OPENCLEXT_INTERNAL(cl_khr_gl_event, 110, ~0U) 
> -OPENCLEXT_INTERNAL(cl_khr_int64_base_atomics, 110, ~0U) 
> -OPENCLEXT_INTERNAL(cl_khr_int64_extended_atomics, 110, ~0U)
> +OPENCLEXT_INTERNAL(cl_khr_d3d10_sharing, 110, ~0U)
>  
>  // OpenCL 1.2.
> +OPENCLEXT_INTERNAL(cl_khr_context_abort, 120, ~0U)
>  OPENCLEXT_INTERNAL(cl_khr_d3d11_sharing, 120,
> ~0U)  OPENCLEXT_INTERNAL(cl_khr_depth_images, 120,
> ~0U)  OPENCLEXT_INTERNAL(cl_khr_dx9_media_sharing, 120, ~0U)
> +OPENCLEXT_INTERNAL(cl_khr_image2d_from_buffer, 120, ~0U) 
> +OPENCLEXT_INTERNAL(cl_khr_initialize_memory, 120, ~0U)
>  OPENCLEXT_INTERNAL(cl_khr_gl_depth_images, 120, ~0U)
> +OPENCLEXT_INTERNAL(cl_khr_gl_msaa_sharing, 120, ~0U)
>  OPENCLEXT_INTERNAL(cl_khr_spir, 120, ~0U)
>  
>  // OpenCL 2.0.
>  OPENCLEXT_INTERNAL(cl_khr_egl_event, 200,
> ~0U)  OPENCLEXT_INTERNAL(cl_khr_egl_image, 200, ~0U) 
> -OPENCLEXT_INTERNAL(cl_khr_gl_msaa_sharing, 200, ~0U) 
> -OPENCLEXT_INTERNAL(cl_khr_initialize_memory, 200,
> ~0U)  OPENCLEXT_INTERNAL(cl_khr_srgb_image_writes, 200,
> ~0U)  OPENCLEXT_INTERNAL(cl_khr_subgroups, 200,
> ~0U)  OPENCLEXT_INTERNAL(cl_khr_terminate_context, 200, ~0U)
> 
> Added: cfe/trunk/test/SemaOpenCL/extension-version.cl
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/ex
> tension-version.cl?rev=271413&view=auto
> =====================================================================
> =========
> --- cfe/trunk/test/SemaOpenCL/extension-version.cl (added)
> +++ cfe/trunk/test/SemaOpenCL/extension-version.cl Wed Jun  1
> 13:04:50
> +++ 2016
> @@ -0,0 +1,225 @@
> +// RUN: %clang_cc1 -x cl -cl-std=CL %s -verify -triple 
> +spir-unknown-unknown // RUN: %clang_cc1 -x cl -cl-std=CL1.1 %s
> -verify
> +-triple spir-unknown-unknown // RUN: %clang_cc1 -x cl -cl-std=CL1.2
> %s
> +-verify -triple spir-unknown-unknown // RUN: %clang_cc1 -x cl
> +-cl-std=CL2.0 %s -verify -triple spir-unknown-unknown
> +
> +#if __OPENCL_C_VERSION__ >= 200
> +// expected-no-diagnostics
> +#endif
> +
> +// Extensions in all versions
> +#ifndef cl_clang_storage_class_specifiers #error "Missing 
> +cl_clang_storage_class_specifiers define"
> +#endif
> +#pragma OPENCL EXTENSION cl_clang_storage_class_specifiers: enable
> +
> +#ifndef cl_khr_fp16
> +#error "Missing cl_khr_fp16 define"
> +#endif
> +#pragma OPENCL EXTENSION cl_khr_fp16: enable
> +
> +#ifndef cl_khr_int64_base_atomics
> +#error "Missing cl_khr_int64_base_atomics define"
> +#endif
> +#pragma OPENCL EXTENSION cl_khr_int64_base_atomics: enable
> +
> +#ifndef cl_khr_int64_extended_atomics #error "Missing 
> +cl_khr_int64_extended_atomics define"
> +#endif
> +#pragma OPENCL EXTENSION cl_khr_int64_extended_atomics: enable
> +
> +#ifndef cl_khr_gl_sharing
> +#error "Missing cl_khr_gl_sharing define"
> +#endif
> +#pragma OPENCL EXTENSION cl_khr_gl_sharing: enable
> +
> +#ifndef cl_khr_icd
> +#error "Missing cl_khr_icd define"
> +#endif
> +#pragma OPENCL EXTENSION cl_khr_icd: enable
> +
> +// Core features in CL 1.1
> +#if (__OPENCL_C_VERSION__ < 110)
> +#ifndef cl_khr_byte_addressable_store #error "Missing 
> +cl_khr_byte_addressable_store define"
> +#endif
> +#pragma OPENCL EXTENSION cl_khr_byte_addressable_store: enable
> +
> +#ifndef cl_khr_global_int32_base_atomics #error "Missing 
> +cl_khr_global_int32_base_atomics define"
> +#endif
> +#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics: enable
> +
> +#ifndef cl_khr_global_int32_extended_atomics
> +#error "Missing cl_khr_global_int32_extended_atomics define"
> +#endif
> +#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics:
> enable
> +
> +#ifndef cl_khr_local_int32_base_atomics #error "Missing 
> +cl_khr_local_int32_base_atomics define"
> +#endif
> +#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics: enable
> +
> +#ifndef cl_khr_local_int32_extended_atomics
> +#error "Missing cl_khr_local_int32_extended_atomics define"
> +#endif
> +#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics: enable
> +
> +#ifndef cl_khr_select_fprounding_mode #error "Missing 
> +cl_khr_select_fp_rounding_mode define"
> +#endif
> +#pragma OPENCL EXTENSION cl_khr_select_fprounding_mode: enable
> +
> +#endif
> +
> +// Core feature in CL 1.2
> +#if (__OPENCL_C_VERSION__ < 120)
> +#ifndef cl_khr_fp64
> +#error "Missing cl_khr_fp64 define"
> +#endif
> +#pragma OPENCL EXTENSION cl_khr_fp64: enable #endif
> +
> +//Core feature in CL 2.0
> +#if (__OPENCL_C_VERSION__ < 200)
> +#ifndef cl_khr_3d_image_writes
> +#error "Missing cl_khr_3d_image_writes define"
> +#endif
> +#pragma OPENCL EXTENSION cl_khr_3d_image_writes: enable #endif
> +
> +
> +#if (__OPENCL_C_VERSION__ >= 110)
> +#ifndef cl_khr_gl_event
> +#error "Missing cl_khr_gl_event define"
> +#endif
> +#else
> +// expected-warning at +2{{unsupported OpenCL extension
> 'cl_khr_gl_event'
> +- ignoring}} #endif #pragma OPENCL EXTENSION cl_khr_gl_event: enable
> +
> +#if (__OPENCL_C_VERSION__ >= 110)
> +#ifndef cl_khr_d3d10_sharing
> +#error "Missing cl_khr_d3d10_sharing define"
> +#endif
> +#else
> +// expected-warning at +2{{unsupported OpenCL extension 
> +'cl_khr_d3d10_sharing' - ignoring}} #endif #pragma OPENCL EXTENSION
> +cl_khr_d3d10_sharing: enable
> +
> +#if (__OPENCL_C_VERSION__ >= 120)
> +#ifndef cl_khr_context_abort
> +#error "Missing cl_context_abort define"
> +#endif
> +#else
> +// expected-warning at +2{{unsupported OpenCL extension 
> +'cl_khr_context_abort' - ignoring}} #endif #pragma OPENCL EXTENSION
> +cl_khr_context_abort: enable
> +
> +#if (__OPENCL_C_VERSION__ >= 120)
> +#ifndef cl_khr_d3d11_sharing
> +#error "Missing cl_khr_d3d11_sharing define"
> +#endif
> +#else
> +// expected-warning at +2{{unsupported OpenCL extension 
> +'cl_khr_d3d11_sharing' - ignoring}} #endif #pragma OPENCL EXTENSION
> +cl_khr_d3d11_sharing: enable
> +
> +#if (__OPENCL_C_VERSION__ >= 120)
> +#ifndef cl_khr_dx9_media_sharing
> +#error "Missing cl_khr_dx9_media_sharing define"
> +#endif
> +#else
> +// expected-warning at +2{{unsupported OpenCL extension 
> +'cl_khr_dx9_media_sharing' - ignoring}} #endif #pragma OPENCL
> EXTENSION
> +cl_khr_dx9_media_sharing: enable
> +
> +#if (__OPENCL_C_VERSION__ >= 120)
> +#ifndef cl_khr_image2d_from_buffer
> +#error "Missing cl_khr_image2d_from_buffer define"
> +#endif
> +#else
> +// expected-warning at +2{{unsupported OpenCL extension 
> +'cl_khr_image2d_from_buffer' - ignoring}} #endif #pragma OPENCL 
> +EXTENSION cl_khr_image2d_from_buffer: enable
> +
> +#if (__OPENCL_C_VERSION__ >= 120)
> +#ifndef cl_khr_initialize_memory
> +#error "Missing cl_khr_initialize_memory define"
> +#endif
> +#else
> +// expected-warning at +2{{unsupported OpenCL extension 
> +'cl_khr_initialize_memory' - ignoring}} #endif #pragma OPENCL
> EXTENSION
> +cl_khr_initialize_memory: enable
> +
> +#if (__OPENCL_C_VERSION__ >= 120)
> +#ifndef cl_khr_gl_depth_images
> +#error "Missing cl_khr_gl_depth_images define"
> +#endif
> +#else
> +// expected-warning at +2{{unsupported OpenCL extension 
> +'cl_khr_gl_depth_images' - ignoring}} #endif #pragma OPENCL
> EXTENSION
> +cl_khr_gl_depth_images: enable
> +
> +#if (__OPENCL_C_VERSION__ >= 120)
> +#ifndef cl_khr_gl_msaa_sharing
> +#error "Missing cl_khr_gl_msaa_sharing define"
> +#endif
> +#else
> +// expected-warning at +2{{unsupported OpenCL extension 
> +'cl_khr_gl_msaa_sharing' - ignoring}} #endif #pragma OPENCL
> EXTENSION
> +cl_khr_gl_msaa_sharing: enable
> +
> +#if (__OPENCL_C_VERSION__ >= 120)
> +#ifndef cl_khr_spir
> +#error "Missing cl_khr_spir define"
> +#endif
> +#else
> +// expected-warning at +2{{unsupported OpenCL extension 'cl_khr_spir'
> -
> +ignoring}} #endif #pragma OPENCL EXTENSION cl_khr_spir: enable
> +
> +#if (__OPENCL_C_VERSION__ >= 200)
> +#ifndef cl_khr_egl_event
> +#error "Missing cl_khr_egl_event define"
> +#endif
> +#else
> +// expected-warning at +2{{unsupported OpenCL extension
> 'cl_khr_egl_event'
> +- ignoring}} #endif #pragma OPENCL EXTENSION cl_khr_egl_event:
> enable
> +
> +#if (__OPENCL_C_VERSION__ >= 200)
> +#ifndef cl_khr_egl_image
> +#error "Missing cl_khr_egl_image define"
> +#endif
> +#else
> +// expected-warning at +2{{unsupported OpenCL extension
> 'cl_khr_egl_image'
> +- ignoring}} #endif #pragma OPENCL EXTENSION cl_khr_egl_image:
> enable
> +
> +#if (__OPENCL_C_VERSION__ >= 200)
> +#ifndef cl_khr_srgb_image_writes
> +#error "Missing cl_khr_srgb_image_writes define"
> +#endif
> +#else
> +// expected-warning at +2{{unsupported OpenCL extension 
> +'cl_khr_srgb_image_writes' - ignoring}} #endif #pragma OPENCL
> EXTENSION
> +cl_khr_srgb_image_writes: enable
> +
> +#if (__OPENCL_C_VERSION__ >= 200)
> +#ifndef cl_khr_subgroups
> +#error "Missing cl_khr_subgroups define"
> +#endif
> +#else
> +// expected-warning at +2{{unsupported OpenCL extension
> 'cl_khr_subgroups'
> +- ignoring}} #endif #pragma OPENCL EXTENSION cl_khr_subgroups:
> enable
> +
> +#if (__OPENCL_C_VERSION__ >= 200)
> +#ifndef cl_khr_terminate_context
> +#error "Missing cl_khr_terminate_context define"
> +#endif
> +#else
> +// expected-warning at +2{{unsupported OpenCL extension 
> +'cl_khr_terminate_context' - ignoring}} #endif #pragma OPENCL
> EXTENSION
> +cl_khr_terminate_context: enable
> 
> 
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
--
Jan Vesely <jan.vesely at rutgers.edu>