[OpenCL] Fix builtins that require multiple extensions

[svenvh]

Summary

Builtins that require multiple extensions, such as certain
write_imagef forms, were not exposed because of the Sema check not
splitting the extension string.

This was found using the prototype of D97869.

[Anastasia]

clang/test/SemaOpenCL/fdeclare-opencl-builtins.cl

21

You don't seem to be using write_imagef for OpenCL versions <= 1.2. But should we be checking that the diagnostic is given?

184

Btw OpenCL 3.0 will be like OpenCL 1.2, although we could probably change this check later.

[svenvh]

You don't seem to be using write_imagef for OpenCL versions <= 1.2. But should we be checking that the diagnostic is given?

Good point, I have updated the test to check for the diagnostic.

[Anastasia]

LGTM! Thanks.

clang/test/SemaOpenCL/fdeclare-opencl-builtins.cl

188

if the format ok here?

[Anastasia]

This comment was removed by Anastasia.

clang/lib/Sema/SemaLookup.cpp

if (OpenCLVersion < OpenCLBuiltin.MinVersion)
       continue;
     if ((OpenCLBuiltin.MaxVersion != 0) &&
         (OpenCLVersion >= OpenCLBuiltin.MaxVersion))
       continue;
 
     // 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))
+    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;
 
     // Obtain QualType lists for the function signature.
     GetQualTypesForOpenCLBuiltin(S, OpenCLBuiltin, GenTypeMaxCnt, RetTypes,
                                  ArgTypes);
     if (GenTypeMaxCnt > 1) {

clang/test/SemaOpenCL/fdeclare-opencl-builtins.cl

 // this test should cover different functional aspects of the TableGen builtin
 // function machinery.
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable
 #if __OPENCL_C_VERSION__ < CL_VERSION_1_2
 #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() {
   barrier(0);
   // expected-note@-1 0+{{candidate function not viable}}
   // expected-error@-2 0+{{argument type 'void' is incomplete}}
   // expected-error@-3 0+{{no matching function for call to 'barrier'}}
   // expected-error@* {{typedef type cl_mem_fence_flags not found; include the base header with -finclude-default-header}}
kernel void basic_image_readwrite(read_write image3d_t image_read_write_image3d) {
   int4 i4;
 
   write_imageh(image_read_write_image3d, i4, h4);
 
   int imgDepth = get_image_depth(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) {
   out[0] = get_sub_group_size();
 #if __OPENCL_C_VERSION__ <= CL_VERSION_1_2 && !defined(__OPENCL_CPP_VERSION__)
   // expected-error@-2{{implicit declaration of function 'get_sub_group_size' is invalid in OpenCL}}
   // expected-error@-3{{implicit conversion changes signedness}}
 #endif