[OpenCL] Add extension cl_khr_mipmap_image to clang

[ashi1]

Summary

Adding extension cl_khr_mipmap_image to clang's OpenCL Extensions and initiated inside AMDGPU Target.

[yaxunl]

Need to add a test to Misc/amdgcn.languageOptsOpenCL.cl and SemaOpenCL/extension-version.cl

[yaxunl]

include/clang/Basic/OpenCLExtensions.def

73

Better to follow the alphabetical order.

[ashi1]

Revised based on Sam's comments. Added to tests Misc\amdgcn.languageOptsOpenCL.cl and SemaOpenCL\extension-version.cl

[yaxunl]

test/Misc/amdgcn.languageOptsOpenCL.cl

190

we also need to check the else case for __OPENCL_C_VERSION__ < 200 that cl_khr_mipmap_image is defined and no warning msg for #pragma OPENCL EXTENSION cl_khr_mipmap_image: enable

[ashi1]

Revised based on Sam's comments.

[yaxunl]

LGTM. Thanks!

[Anastasia]

test/Misc/amdgcn.languageOptsOpenCL.cl

188

Can you move this error message down instead of adding 6 lines offset.
Also the extension seems to be set by default although it's hard to see without the full diff. So why do you get this warning at all?

test/SemaOpenCL/extension-version.cl

228

Can you move this error message down instead of adding 6 lines offset.

[yaxunl]

test/Misc/amdgcn.languageOptsOpenCL.cl

188

This warning is only for opencl version < 200. The extension is supported by OpenCL 2.0 and above only.

[ashi1]

test/Misc/amdgcn.languageOptsOpenCL.cl

188

I've added this error message here because I am following the order inside include/clang/Basic/OpenCLExtensions.def. Seems it is alphabetical there and in same order here. What do you think?

test/SemaOpenCL/extension-version.cl

228

I've added this error message here because I am following the order inside include/clang/Basic/OpenCLExtensions.def. Seems it is alphabetical there and in same order here. What do you think?

[Anastasia]

test/Misc/amdgcn.languageOptsOpenCL.cl

188

This warning is to line 194 which is an else from:

#if (__OPENCL_C_VERSION__ < 200)

hence OpenCL >= 2.0. There should be no warning in this case?

test/SemaOpenCL/extension-version.cl

228

Sure that's great! I am just saying could you move the expected-warning line below to where it belongs i.e. line 234 where you are enabling the extension which results in a warning generated.

[Anastasia]

test/SemaOpenCL/extension-version.cl

228

My main problem here is that the check for the warning is too far away from the place that generates it and therefore difficult to understand. If we could restructure this somehow. I think it's also OK to move this line above:

#pragma OPENCL EXTENSION cl_khr_mipmap_image: enable

This test is already hard to read, let's try to simplify it a bit...

[ashi1]

Revised based on Anastasia's comments. Restructured the if statements in test cases.

[Anastasia]

test/Misc/amdgcn.languageOptsOpenCL.cl

188

Looks good! Could you just remove indentation please as it's not common for C macros?

The same for the test below!

[ashi1]

Removed indentation as per Anastasia's comments.

[Anastasia]

LGTM!

include/clang/Basic/OpenCLExtensions.def

 // OpenCL 2.0.
 OPENCLEXT_INTERNAL(cl_khr_egl_event, 200, ~0U)
 OPENCLEXT_INTERNAL(cl_khr_egl_image, 200, ~0U)
+OPENCLEXT_INTERNAL(cl_khr_mipmap_image, 200, ~0U)
 OPENCLEXT_INTERNAL(cl_khr_srgb_image_writes, 200, ~0U)
 OPENCLEXT_INTERNAL(cl_khr_subgroups, 200, ~0U)
 OPENCLEXT_INTERNAL(cl_khr_terminate_context, 200, ~0U)

lib/Basic/Targets.cpp

       Opts.cl_khr_fp16 = 1;
       Opts.cl_khr_int64_base_atomics = 1;
       Opts.cl_khr_int64_extended_atomics = 1;
+      Opts.cl_khr_mipmap_image = 1;
       Opts.cl_khr_3d_image_writes = 1;
     }
   }

test/Misc/amdgcn.languageOptsOpenCL.cl

 #pragma OPENCL EXTENSION cl_khr_egl_image: enable
 // expected-warning@-1{{unsupported OpenCL extension 'cl_khr_egl_image' - ignoring}}
 
+#if (__OPENCL_C_VERSION__ >= 200)
+  #ifndef cl_khr_mipmap_image
+    #error "Missing cl_khr_mipmap_image define"
+  #endif
+#else
+  #ifdef cl_khr_mipmap_image
+    #error "Incorrect cl_khr_mipmap_image define"
+  #endif
+  // expected-warning@+2{{unsupported OpenCL extension 'cl_khr_mipmap_image' - ignoring}}
+#endif
+#pragma OPENCL EXTENSION cl_khr_mipmap_image: enable
+
 #ifdef cl_khr_srgb_image_writes
 #error "Incorrect cl_khr_srgb_image_writes define"
 #endif

test/SemaOpenCL/extension-version.cl

 #pragma OPENCL EXTENSION cl_khr_egl_image: enable
 
 #if (__OPENCL_C_VERSION__ >= 200)
+  #ifndef cl_khr_mipmap_image
+    #error "Missing cl_khr_mipmap_image define"
+  #endif
+#else
+  #ifdef cl_khr_mipmap_image
+    #error "Incorrect cl_khr_mipmap_image define"
+  #endif
+  // expected-warning@+2{{unsupported OpenCL extension 'cl_khr_mipmap_image' - ignoring}}
+#endif
+#pragma OPENCL EXTENSION cl_khr_mipmap_image: enable
+
+#if (__OPENCL_C_VERSION__ >= 200)
 #ifndef cl_khr_srgb_image_writes
 #error "Missing cl_khr_srgb_image_writes define"
 #endif