Skip to content

Commit 97b4e80

Browse files
romanovvladromanovvlad
committed
Address comments
1 parent 03f0e79 commit 97b4e80

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

‎sycl/doc/PreprocessorMacros.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This file describes macros that have effect on SYCL compiler and run-time.
3434
Disables all deprecation warnings in SYCL runtime headers, including SYCL
3535
1.2.1 deprecations.
3636

37-
-`**SYCL_DISABLE_CPP_VERSION_CHECK_MESSAGE`**
37+
-`**SYCL_DISABLE_CPP_VERSION_CHECK_WARNING**
3838

3939
Disables a message which warns about unsupported C++ version.
4040

‎sycl/include/CL/sycl/detail/cg_types.hpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,31 +179,29 @@ struct KernelLambdaHasKernelHandlerArgT {
179179
// Helpers for running kernel lambda on the host device
180180

181181
template <typename KernelType>
182-
typename detail::enable_if_t<
183-
KernelLambdaHasKernelHandlerArgT<KernelType>::value, void>
182+
typename std::enable_if_t<KernelLambdaHasKernelHandlerArgT<KernelType>::value>
184183
runKernelWithoutArg(KernelType KernelName) {
185184
kernel_handler KH;
186185
KernelName(KH);
187186
}
188187

189188
template <typename KernelType>
190-
typename detail::enable_if_t<
191-
!KernelLambdaHasKernelHandlerArgT<KernelType>::value, void>
189+
typename std::enable_if_t<!KernelLambdaHasKernelHandlerArgT<KernelType>::value>
192190
runKernelWithoutArg(KernelType KernelName) {
193191
KernelName();
194192
}
195193

196194
template <typename ArgType, typename KernelType>
197-
typename detail::enable_if_t<
198-
KernelLambdaHasKernelHandlerArgT<KernelType, ArgType>::value, void>
195+
typename std::enable_if_t<
196+
KernelLambdaHasKernelHandlerArgT<KernelType, ArgType>::value>
199197
runKernelWithArg(KernelType KernelName, ArgType Arg) {
200198
kernel_handler KH;
201199
KernelName(Arg, KH);
202200
}
203201

204202
template <typename ArgType, typename KernelType>
205-
typename detail::enable_if_t<
206-
!KernelLambdaHasKernelHandlerArgT<KernelType, ArgType>::value, void>
203+
typename std::enable_if_t<
204+
!KernelLambdaHasKernelHandlerArgT<KernelType, ArgType>::value>
207205
runKernelWithArg(KernelType KernelName, ArgType Arg) {
208206
KernelName(Arg);
209207
}

‎sycl/include/CL/sycl/detail/defines_elementary.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,15 @@
121121
#endif // compiler switch
122122
#endif // __SYCL_UNROLL
123123

124-
#if !defined(SYCL_DISABLE_CPP_VERSION_CHECK_MESSAGE) && __cplusplus < 201703L
124+
#if !defined(SYCL_DISABLE_CPP_VERSION_CHECK_WARNING) && __cplusplus < 201703L
125125

126126
#if defined(_MSC_VER) && !defined(__clang__)
127127
__SYCL_WARNING("DPCPP does not support C++ version earlier than C++17. Some "
128128
"features might not be available.")
129129
#else
130+
// This is the only way to emit a warning from system headers using clang, it
131+
// cannot be wrapped by a macro(__pragma warning doesn't work in system
132+
// headers). The solution is borrowed from libcxx.
130133
#warning: DPCPP does not support C++ version earlier than C++17. Some features might not be available.
131134
#endif
132135

‎sycl/include/CL/sycl/handler.hpp

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,8 +1028,7 @@ class __SYCL_EXPORT handler {
10281028
// Wrappers for kernel_single_task(...)
10291029

10301030
template <typename KernelName, typename KernelType>
1031-
detail::enable_if_t<
1032-
detail::KernelLambdaHasKernelHandlerArgT<KernelType>::value>
1031+
std::enable_if_t<detail::KernelLambdaHasKernelHandlerArgT<KernelType>::value>
10331032
#ifdef __SYCL_NONCONST_FUNCTOR__
10341033
kernel_single_task_wrapper(KernelType KernelFunc) {
10351034
#else
@@ -1043,8 +1042,7 @@ class __SYCL_EXPORT handler {
10431042
}
10441043

10451044
template <typename KernelName, typename KernelType>
1046-
detail::enable_if_t<
1047-
!detail::KernelLambdaHasKernelHandlerArgT<KernelType>::value>
1045+
std::enable_if_t<!detail::KernelLambdaHasKernelHandlerArgT<KernelType>::value>
10481046
#ifdef __SYCL_NONCONST_FUNCTOR__
10491047
kernel_single_task_wrapper(KernelType KernelFunc) {
10501048
#else
@@ -1059,7 +1057,7 @@ class __SYCL_EXPORT handler {
10591057
// Wrappers for kernel_parallel_for(...)
10601058

10611059
template <typename KernelName, typename ElementType, typename KernelType>
1062-
detail::enable_if_t<
1060+
std::enable_if_t<
10631061
detail::KernelLambdaHasKernelHandlerArgT<KernelType, ElementType>::value>
10641062
#ifdef __SYCL_NONCONST_FUNCTOR__
10651063
kernel_parallel_for_wrapper(KernelType KernelFunc) {
@@ -1074,7 +1072,7 @@ class __SYCL_EXPORT handler {
10741072
}
10751073

10761074
template <typename KernelName, typename ElementType, typename KernelType>
1077-
detail::enable_if_t<
1075+
std::enable_if_t<
10781076
!detail::KernelLambdaHasKernelHandlerArgT<KernelType, ElementType>::value>
10791077
#ifdef __SYCL_NONCONST_FUNCTOR__
10801078
kernel_parallel_for_wrapper(KernelType KernelFunc) {
@@ -1090,7 +1088,7 @@ class __SYCL_EXPORT handler {
10901088
// Wrappers for kernel_parallel_for_work_group(...)
10911089

10921090
template <typename KernelName, typename ElementType, typename KernelType>
1093-
detail::enable_if_t<
1091+
std::enable_if_t<
10941092
detail::KernelLambdaHasKernelHandlerArgT<KernelType, ElementType>::value>
10951093
#ifdef __SYCL_NONCONST_FUNCTOR__
10961094
kernel_parallel_for_work_group_wrapper(KernelType KernelFunc) {
@@ -1105,7 +1103,7 @@ class __SYCL_EXPORT handler {
11051103
}
11061104

11071105
template <typename KernelName, typename ElementType, typename KernelType>
1108-
detail::enable_if_t<
1106+
std::enable_if_t<
11091107
!detail::KernelLambdaHasKernelHandlerArgT<KernelType, ElementType>::value>
11101108
#ifdef __SYCL_NONCONST_FUNCTOR__
11111109
kernel_parallel_for_work_group_wrapper(KernelType KernelFunc) {
@@ -2518,7 +2516,7 @@ class __SYCL_EXPORT handler {
25182516

25192517
template <typename WrapperT, typename TransformedArgType, int Dims,
25202518
typename KernelType,
2521-
detail::enable_if_t<detail::KernelLambdaHasKernelHandlerArgT<
2519+
std::enable_if_t<detail::KernelLambdaHasKernelHandlerArgT<
25222520
KernelType, TransformedArgType>::value> * = nullptr>
25232521
auto getRangeRoundedKernelLambda(KernelType KernelFunc,
25242522
range<Dims> NumWorkItems) {
@@ -2529,7 +2527,7 @@ class __SYCL_EXPORT handler {
25292527

25302528
template <typename WrapperT, typename TransformedArgType, int Dims,
25312529
typename KernelType,
2532-
detail::enable_if_t<!detail::KernelLambdaHasKernelHandlerArgT<
2530+
std::enable_if_t<!detail::KernelLambdaHasKernelHandlerArgT<
25332531
KernelType, TransformedArgType>::value> * = nullptr>
25342532
auto getRangeRoundedKernelLambda(KernelType KernelFunc,
25352533
range<Dims> NumWorkItems) {

‎sycl/test/basic_tests/stdcpp_compat.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// RUN: %clangxx -std=c++14 -fsycl -Wall -pedantic -Wno-c99-extensions -Wno-deprecated -fsyntax-only -Xclang -verify=expected,cxx14 %s -c -o %t.out
2+
// RUN: %clangxx -std=c++14 -fsycl -Wall -pedantic -Wno-c99-extensions -Wno-deprecated -fsyntax-only -Xclang -verify %s -c -o %t.out -DSYCL_DISABLE_CPP_VERSION_CHECK_WARNING=1
23
// RUN: %clangxx -std=c++14 -fsycl --no-system-header-prefix=CL/sycl -Wall -pedantic -Wno-c99-extensions -Wno-deprecated -fsyntax-only -Xclang -verify=cxx14,warning_extension,expected %s -c -o %t.out
34
// RUN: %clangxx -std=c++17 -fsycl --no-system-header-prefix=CL/sycl -Wall -pedantic -Wno-c99-extensions -Wno-deprecated -fsyntax-only -Xclang -verify %s -c -o %t.out
45
// RUN: %clangxx -std=c++20 -fsycl --no-system-header-prefix=CL/sycl -Wall -pedantic -Wno-c99-extensions -Wno-deprecated -fsyntax-only -Xclang -verify %s -c -o %t.out

0 commit comments

Comments
 (0)