From 9ed325e463d5fd4a87284175cdb46af3d8cbb02a Mon Sep 17 00:00:00 2001 From: Andrew Savonichev Date: Mon, 3 Jun 2019 13:02:43 +0000 Subject: [PATCH] [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 Reviewers: Anastasia, yaxunl Reviewed By: Anastasia Tags: #clang Differential Revision: https://reviews.llvm.org/D58666 llvm-svn: 362398 --- clang/lib/Headers/opencl-c.h | 3 --- clang/test/Headers/opencl-c-header.cl | 3 --- clang/test/SemaOpenCL/extension-begin.cl | 7 +++++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/clang/lib/Headers/opencl-c.h b/clang/lib/Headers/opencl-c.h index ba98fa6eb6c6..009b1e934eb6 100644 --- a/clang/lib/Headers/opencl-c.h +++ b/clang/lib/Headers/opencl-c.h @@ -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 diff --git a/clang/test/Headers/opencl-c-header.cl b/clang/test/Headers/opencl-c-header.cl index 14c2e7844486..9faf7bfdd8d6 100644 --- a/clang/test/Headers/opencl-c-header.cl +++ b/clang/test/Headers/opencl-c-header.cl @@ -77,9 +77,6 @@ void test_image3dwo(write_only image3d_t img) { // 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__ diff --git a/clang/test/SemaOpenCL/extension-begin.cl b/clang/test/SemaOpenCL/extension-begin.cl index 276e6d7f10b0..367652ccdd22 100644 --- a/clang/test/SemaOpenCL/extension-begin.cl +++ b/clang/test/SemaOpenCL/extension-begin.cl @@ -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