[OpenCL] Allow optional __generic in __remove_address_space utility

[Topotuna]

Summary

Clang builtin utility __remove_address_space now works if generic
address space is not supported in C++ for OpenCL 2021.

[Anastasia]

LGTM! Thanks

[carlosgalvezp]

Hi! I believe this commit broke a number of CI jobs, would you be able to look into it?

https://lab.llvm.org/buildbot/#/builders/52/builds/12263

[Topotuna]

In D110155#3117786, @carlosgalvezp wrote:

Hi! I believe this commit broke a number of CI jobs, would you be able to look into it?

https://lab.llvm.org/buildbot/#/builders/52/builds/12263

Hi, I am aware it broke some of the builds. However, I cannot recreate the issue locally. Planning to revert the change shortly to investigate it further

[Topotuna]

Run line -triple is now set explicitly. Test moved from CodeGenOpenCLCXX directory to SemaOpenCLCXX

[Topotuna]

Run line argument reordering

[Anastasia]

LGTM! Thanks

[Topotuna]

Closed by commit: rGb5fef6dbfd6b4c84d61155fd2221064bcc1ecdcf

clang/lib/Headers/opencl-c-base.h

 #define as_size_t(x) __builtin_astype((x), size_t)
 #define as_ptrdiff_t(x) __builtin_astype((x), ptrdiff_t)
 #define as_intptr_t(x) __builtin_astype((x), intptr_t)
 #define as_uintptr_t(x) __builtin_astype((x), uintptr_t)
 
 // C++ for OpenCL - __remove_address_space
 #if defined(__OPENCL_CPP_VERSION__)
 template <typename _Tp> struct __remove_address_space { using type = _Tp; };
+#if defined(__opencl_c_generic_address_space)
 template <typename _Tp> struct __remove_address_space<__generic _Tp> {
   using type = _Tp;
 };
+#endif
 template <typename _Tp> struct __remove_address_space<__global _Tp> {
   using type = _Tp;
 };
 template <typename _Tp> struct __remove_address_space<__private _Tp> {
   using type = _Tp;
 };
 template <typename _Tp> struct __remove_address_space<__local _Tp> {
   using type = _Tp;

clang/test/SemaOpenCLCXX/remove-address-space.clcpp

-// RUN: %clang_cc1 %s -cl-std=clc++ -fdeclare-opencl-builtins -finclude-default-header
+// RUN: %clang_cc1 %s -cl-std=clc++1.0 -triple spir-unknown-unknown -fdeclare-opencl-builtins -finclude-default-header -verify
+// RUN: %clang_cc1 %s -cl-std=clc++2021 -triple spir-unknown-unknown -fdeclare-opencl-builtins -finclude-default-header -verify
+// RUN: %clang_cc1 %s -cl-std=clc++2021 -cl-ext=-__opencl_c_generic_address_space,-__opencl_c_pipes -triple spir-unknown-unknown -fdeclare-opencl-builtins -finclude-default-header -verify
+
+// expected-no-diagnostics
 
 template<typename T, typename U>
 struct is_same {
   static const bool value = false;
 };
 
 template<typename T>
 struct is_same<T, T> {
   static const bool value = true;
 };
 
 void test_is_same() {
   static_assert(is_same<int, int>::value);
   static_assert(!is_same<int, float>::value);
   static_assert(!is_same<__private int, int>::value);
 }
 
 void test_remove_address_space() {
   static_assert(is_same<__remove_address_space<int>::type, int>::value,
                 "type without an address space unexpectedly modified by __remove_address_space");
+#if defined(__opencl_c_generic_address_space)
   static_assert(is_same<__remove_address_space<__generic int>::type, int>::value,
                 "__generic address space not removed by __remove_address_space");
+#endif
   static_assert(is_same<__remove_address_space<__global char>::type, char>::value,
                 "__global address space not removed by __remove_address_space");
   static_assert(is_same<__remove_address_space<__private ulong>::type, ulong>::value,
                 "__private address space not removed by __remove_address_space");
   static_assert(is_same<__remove_address_space<__local short>::type, short>::value,
                 "__local address space not removed by __remove_address_space");
   static_assert(is_same<__remove_address_space<__constant int3>::type, int3>::value,
                 "__constant address space not removed by __remove_address_space");
   static_assert(is_same<__remove_address_space<const volatile __global int>::type, const volatile int>::value,
                 "non-address-space qualifiers inappropriately removed by __remove_address_space");
 }