From f0c690018ad1fb4746da3aca26a443c0f96530fa Mon Sep 17 00:00:00 2001 From: Sven van Haastregt Date: Tue, 17 Nov 2020 12:07:40 +0000 Subject: [PATCH] [OpenCL] Stop opencl-c-base.h leaking extension enabling opencl-c.h disables all extensions at its end, but opencl-c-base.h does not, and that causes any inclusion of only opencl-c-base.h to leave some extensions (such as cl_khr_fp16) enabled. This affects the -fdeclare-opencl-builtins option for example. This violates the OpenCL Extension Specification which specifies that "The initial state of the compiler is as if the directive #pragma OPENCL EXTENSION all : disable was issued". Fix by disabling all extensions at the end of opencl-c-base.h and enable extensions inside opencl.h which relied on opencl-c-base.h enabling the cl_khr_fp16/64 extensions. Differential Revision: https://reviews.llvm.org/D91429 --- clang/lib/Headers/opencl-c-base.h | 3 +++ clang/lib/Headers/opencl-c.h | 2 ++ clang/test/SemaOpenCL/half.cl | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/clang/lib/Headers/opencl-c-base.h b/clang/lib/Headers/opencl-c-base.h index 430e07d..4c52ebe 100644 --- a/clang/lib/Headers/opencl-c-base.h +++ b/clang/lib/Headers/opencl-c-base.h @@ -568,4 +568,7 @@ typedef struct { #pragma OPENCL EXTENSION cl_intel_device_side_avc_motion_estimation : end #endif // cl_intel_device_side_avc_motion_estimation +// Disable any extensions we may have enabled previously. +#pragma OPENCL EXTENSION all : disable + #endif //_OPENCL_BASE_H_ diff --git a/clang/lib/Headers/opencl-c.h b/clang/lib/Headers/opencl-c.h index 66e18bd..ab66562 100644 --- a/clang/lib/Headers/opencl-c.h +++ b/clang/lib/Headers/opencl-c.h @@ -4633,6 +4633,7 @@ float16 __ovld __cnfn convert_float16(float16); // Conversions with double data type parameters or return value. #ifdef cl_khr_fp64 +#pragma OPENCL EXTENSION cl_khr_fp64 : enable char __ovld __cnfn convert_char(double); char __ovld __cnfn convert_char_rte(double); char __ovld __cnfn convert_char_rtn(double); @@ -5455,6 +5456,7 @@ double16 __ovld __cnfn convert_double16_rtz(ushort16); #endif //cl_khr_fp64 #ifdef cl_khr_fp16 +#pragma OPENCL EXTENSION cl_khr_fp16 : enable // Convert half types to non-double types. uchar __ovld __cnfn convert_uchar(half); uchar __ovld __cnfn convert_uchar_rte(half); diff --git a/clang/test/SemaOpenCL/half.cl b/clang/test/SemaOpenCL/half.cl index 2ea971c..50bbd74 100644 --- a/clang/test/SemaOpenCL/half.cl +++ b/clang/test/SemaOpenCL/half.cl @@ -1,6 +1,6 @@ // RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -Wno-unused-value -triple spir-unknown-unknown +// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -Wno-unused-value -triple spir-unknown-unknown -fdeclare-opencl-builtins -finclude-default-header -#pragma OPENCL EXTENSION cl_khr_fp16 : disable constant float f = 1.0h; // expected-error{{half precision constant requires cl_khr_fp16}} half half_disabled(half *p, // expected-error{{declaring function return value of type 'half' is not allowed}} -- 2.7.4