Author: Sven van Haastregt Date: 2021-03-09T11:37:26Z New Revision: 13c77f204671f403a30d29ec1c9145c556302f66
URL: https://github.com/llvm/llvm-project/commit/13c77f204671f403a30d29ec1c9145c556302f66 DIFF: https://github.com/llvm/llvm-project/commit/13c77f204671f403a30d29ec1c9145c556302f66.diff LOG: [OpenCL] Fix builtins that require multiple extensions Builtins that require multiple extensions, such as certain `write_imagef` forms, were not exposed because of the Sema check not splitting the extension string. Differential Revision: https://reviews.llvm.org/D97930 Added: Modified: clang/lib/Sema/SemaLookup.cpp clang/test/SemaOpenCL/fdeclare-opencl-builtins.cl Removed: ################################################################################ diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp index 404f24d8ce0a..4da81bb44d5b 100644 --- a/clang/lib/Sema/SemaLookup.cpp +++ b/clang/lib/Sema/SemaLookup.cpp @@ -815,9 +815,20 @@ static void InsertOCLBuiltinDeclarationsFromTable(Sema &S, LookupResult &LR, // Ignore this builtin function if it carries an extension macro that is // not defined. This indicates that the extension is not supported by the // target, so the builtin function should not be available. - StringRef Ext = FunctionExtensionTable[OpenCLBuiltin.Extension]; - if (!Ext.empty() && !S.getPreprocessor().isMacroDefined(Ext)) - continue; + StringRef Extensions = FunctionExtensionTable[OpenCLBuiltin.Extension]; + if (!Extensions.empty()) { + SmallVector<StringRef, 2> ExtVec; + Extensions.split(ExtVec, " "); + bool AllExtensionsDefined = true; + for (StringRef Ext : ExtVec) { + if (!S.getPreprocessor().isMacroDefined(Ext)) { + AllExtensionsDefined = false; + break; + } + } + if (!AllExtensionsDefined) + continue; + } SmallVector<QualType, 1> RetTypes; SmallVector<SmallVector<QualType, 1>, 5> ArgTypes; diff --git a/clang/test/SemaOpenCL/fdeclare-opencl-builtins.cl b/clang/test/SemaOpenCL/fdeclare-opencl-builtins.cl index 9a5ed77b1635..825dd3a935d0 100644 --- a/clang/test/SemaOpenCL/fdeclare-opencl-builtins.cl +++ b/clang/test/SemaOpenCL/fdeclare-opencl-builtins.cl @@ -17,6 +17,10 @@ #pragma OPENCL EXTENSION cl_khr_fp64 : enable #endif +#if __OPENCL_C_VERSION__ <= CL_VERSION_1_2 +#pragma OPENCL EXTENSION cl_khr_3d_image_writes : enable +#endif + // First, test that Clang gracefully handles missing types. #ifdef NO_HEADER void test_without_header() { @@ -169,13 +173,20 @@ kernel void basic_image_readwrite(read_write image3d_t image_read_write_image3d) } #endif // __OPENCL_C_VERSION__ >= CL_VERSION_2_0 -kernel void basic_image_writeonly(write_only image1d_buffer_t image_write_only_image1d_buffer) { +kernel void basic_image_writeonly(write_only image1d_buffer_t image_write_only_image1d_buffer, write_only image3d_t image3dwo) { half4 h4; float4 f4; int i; write_imagef(image_write_only_image1d_buffer, i, f4); write_imageh(image_write_only_image1d_buffer, i, h4); + + int4 i4; + write_imagef(image3dwo, i4, i, f4); +#if __OPENCL_C_VERSION__ <= CL_VERSION_1_2 && !defined(__OPENCL_CPP_VERSION__) + // expected-error@-2{{no matching function for call to 'write_imagef'}} + // expected-note@-3 + {{candidate function not viable}} +#endif } kernel void basic_subgroup(global uint *out) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
