Author: asavonic Date: Mon Jun 3 06:02:43 2019 New Revision: 362398 URL: http://llvm.org/viewvc/llvm-project?rev=362398&view=rev Log: [OpenCL] Undefine cl_intel_planar_yuv extension
Summary: Remove unnecessary definition (otherwise the extension will be defined where it's not supposed to be defined). Consider the code: #pragma OPENCL EXTENSION cl_intel_planar_yuv : begin // some declarations #pragma OPENCL EXTENSION cl_intel_planar_yuv : end is enough for extension to become known for clang. Patch by: Dmitry Sidorov <dmitry.sido...@intel.com> Reviewers: Anastasia, yaxunl Reviewed By: Anastasia Tags: #clang Differential Revision: https://reviews.llvm.org/D58666 Modified: cfe/trunk/lib/Headers/opencl-c.h cfe/trunk/test/Headers/opencl-c-header.cl cfe/trunk/test/SemaOpenCL/extension-begin.cl Modified: cfe/trunk/lib/Headers/opencl-c.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/opencl-c.h?rev=362398&r1=362397&r2=362398&view=diff ============================================================================== --- cfe/trunk/lib/Headers/opencl-c.h (original) +++ cfe/trunk/lib/Headers/opencl-c.h Mon Jun 3 06:02:43 2019 @@ -22,9 +22,6 @@ #endif //__OPENCL_C_VERSION__ < CL_VERSION_2_0 #if __OPENCL_C_VERSION__ >= CL_VERSION_1_2 -#ifndef cl_intel_planar_yuv -#define cl_intel_planar_yuv -#endif // cl_intel_planar_yuv #pragma OPENCL EXTENSION cl_intel_planar_yuv : begin #pragma OPENCL EXTENSION cl_intel_planar_yuv : end #endif // __OPENCL_C_VERSION__ >= CL_VERSION_1_2 Modified: cfe/trunk/test/Headers/opencl-c-header.cl URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Headers/opencl-c-header.cl?rev=362398&r1=362397&r2=362398&view=diff ============================================================================== --- cfe/trunk/test/Headers/opencl-c-header.cl (original) +++ cfe/trunk/test/Headers/opencl-c-header.cl Mon Jun 3 06:02:43 2019 @@ -77,9 +77,6 @@ void test_image3dwo(write_only image3d_t // OpenCL 1.2 onwards. #if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_1_2) // expected-no-diagnostics -#ifndef cl_intel_planar_yuv -#error "Missing cl_intel_planar_yuv define" -#endif #else //__OPENCL_C_VERSION__ // expected-warning@+2{{unknown OpenCL extension 'cl_intel_planar_yuv' - ignoring}} #endif //__OPENCL_C_VERSION__ Modified: cfe/trunk/test/SemaOpenCL/extension-begin.cl URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/extension-begin.cl?rev=362398&r1=362397&r2=362398&view=diff ============================================================================== --- cfe/trunk/test/SemaOpenCL/extension-begin.cl (original) +++ cfe/trunk/test/SemaOpenCL/extension-begin.cl Mon Jun 3 06:02:43 2019 @@ -16,6 +16,13 @@ // // RUN: %clang_cc1 -cl-std=CL2.0 -DIMPLICIT_INCLUDE -include %S/extension-begin.h -triple spir-unknown-unknown -O0 -emit-llvm -o - -fmodules -fimplicit-module-maps -fmodules-cache-path=%t.modules %s -verify -pedantic +#pragma OPENCL EXTENSION my_ext : enable +#ifndef IMPLICIT_INCLUDE +// expected-warning@-2 {{unknown OpenCL extension 'my_ext' - ignoring}} +// expected-warning@+2 {{unknown OpenCL extension 'my_ext' - ignoring}} +#endif // IMPLICIT_INCLUDE +#pragma OPENCL EXTENSION my_ext : disable + #ifndef IMPLICIT_INCLUDE #include "extension-begin.h" #endif // IMPLICIT_INCLUDE _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
