maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[OpenCL] Allow optional __generic in __remove_address_space utility

This commit is contained in:
Justas Janickas 2021-11-30 09:17:09 +00:00
parent 7c3cf4c2c0
commit b5fef6dbfd
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Headers/opencl-c-base.h
View File

@ -600,9 +600,11 @@ typedef struct {
// 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;
};

8
clang/test/CodeGenOpenCLCXX/remove-address-space.clcpp → clang/test/SemaOpenCLCXX/remove-address-space.clcpp
View File

@ -1,4 +1,8 @@
// 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 {
@ -19,8 +23,10 @@ void test_is_same() {
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,