Skip to content

Commit ca26fac

Browse files
committed
address review comments
Signed-off-by: Sergey V Maslov <sergey.v.maslov@intel.com>
1 parent 8c01408 commit ca26fac

File tree

12 files changed

+21
-21
lines changed

12 files changed

+21
-21
lines changed

sycl/include/CL/sycl/backend.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ make_context(
146146
}
147147

148148
template <backend Backend>
149-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::make_queue free function")
149+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_queue free function")
150150
typename std::enable_if<
151151
detail::InteropFeatureSupportMap<Backend>::MakeQueue == true, queue>::type
152152
make_queue(
@@ -179,7 +179,7 @@ make_event(const typename backend_traits<Backend>::template input_type<event>
179179
}
180180

181181
template <backend Backend>
182-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::make_event free function")
182+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_event free function")
183183
typename std::enable_if<
184184
detail::InteropFeatureSupportMap<Backend>::MakeEvent == true, event>::type
185185
make_event(

sycl/include/CL/sycl/backend/level_zero.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,15 @@ __SYCL_EXPORT event make_event(const context &Context,
141141
// Construction of SYCL platform.
142142
template <typename T, typename detail::enable_if_t<
143143
std::is_same<T, platform>::value> * = nullptr>
144-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::make_platform free function")
144+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_platform free function")
145145
T make(typename interop<backend::level_zero, T>::type Interop) {
146146
return make_platform(reinterpret_cast<pi_native_handle>(Interop));
147147
}
148148

149149
// Construction of SYCL device.
150150
template <typename T, typename detail::enable_if_t<
151151
std::is_same<T, device>::value> * = nullptr>
152-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::make_device free function")
152+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_device free function")
153153
T make(const platform &Platform,
154154
typename interop<backend::level_zero, T>::type Interop) {
155155
return make_device(Platform, reinterpret_cast<pi_native_handle>(Interop));
@@ -166,7 +166,7 @@ T make(const platform &Platform,
166166
///
167167
template <typename T, typename std::enable_if<
168168
std::is_same<T, context>::value>::type * = nullptr>
169-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::make_context free function")
169+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_context free function")
170170
T make(const std::vector<device> &DeviceList,
171171
typename interop<backend::level_zero, T>::type Interop,
172172
ownership Ownership = ownership::transfer) {
@@ -177,7 +177,7 @@ T make(const std::vector<device> &DeviceList,
177177
// Construction of SYCL program.
178178
template <typename T, typename detail::enable_if_t<
179179
std::is_same<T, program>::value> * = nullptr>
180-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::make_kernel_bundle free function")
180+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_kernel_bundle free function")
181181
T make(const context &Context,
182182
typename interop<backend::level_zero, T>::type Interop) {
183183
return make_program(Context, reinterpret_cast<pi_native_handle>(Interop));
@@ -186,7 +186,7 @@ T make(const context &Context,
186186
// Construction of SYCL queue.
187187
template <typename T, typename detail::enable_if_t<
188188
std::is_same<T, queue>::value> * = nullptr>
189-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::make_queue free function")
189+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_queue free function")
190190
T make(const context &Context,
191191
typename interop<backend::level_zero, T>::type Interop,
192192
ownership Ownership = ownership::transfer) {
@@ -197,7 +197,7 @@ T make(const context &Context,
197197
// Construction of SYCL event.
198198
template <typename T, typename detail::enable_if_t<
199199
std::is_same<T, event>::value> * = nullptr>
200-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::make_event free function")
200+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_event free function")
201201
T make(const context &Context,
202202
typename interop<backend::level_zero, T>::type Interop,
203203
ownership Ownership = ownership::transfer) {

sycl/include/CL/sycl/backend/opencl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ struct BackendInput<backend::opencl, kernel_bundle<State>> {
7575

7676
template <bundle_state State>
7777
struct BackendReturn<backend::opencl, kernel_bundle<State>> {
78-
// TODO: Per SYCL-2020 this should be std::vector<cl_program>
78+
// TODO: Per SYCL 2020 this should be std::vector<cl_program>
7979
using type = cl_program;
8080
};
8181

sycl/include/CL/sycl/context.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ class __SYCL_EXPORT context {
216216
///
217217
/// \return a native handle, the type of which defined by the backend.
218218
template <backend BackendName>
219-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::get_native free function")
219+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::get_native free function")
220220
auto get_native() const -> typename interop<BackendName, context>::type {
221221
return reinterpret_cast<typename interop<BackendName, context>::type>(
222222
getNative());

sycl/include/CL/sycl/device.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ class __SYCL_EXPORT device {
184184
///
185185
/// \return a native handle, the type of which defined by the backend.
186186
template <backend BackendName>
187-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::get_native free function")
187+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::get_native free function")
188188
auto get_native() const -> typename interop<BackendName, device>::type {
189189
return (typename interop<BackendName, device>::type)getNative();
190190
}

sycl/include/CL/sycl/event.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ class __SYCL_EXPORT event {
129129
///
130130
/// \return a native handle, the type of which defined by the backend.
131131
template <backend BackendName>
132-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::get_native free function")
132+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::get_native free function")
133133
auto get_native() const -> typename interop<BackendName, event>::type {
134134
return reinterpret_cast<typename interop<BackendName, event>::type>(
135135
getNative());

sycl/include/CL/sycl/interop_handle.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class interop_handle {
8686
template <backend Backend = backend::opencl>
8787
backend_return_t<Backend, queue> get_native_queue() const {
8888
#ifndef __SYCL_DEVICE_ONLY__
89-
// TODO: replace the exception thrown below with the SYCL-2020 exception
89+
// TODO: replace the exception thrown below with the SYCL 2020 exception
9090
// with the error code 'errc::backend_mismatch' when those new exceptions
9191
// are ready to be used.
9292
if (Backend != get_backend())
@@ -107,7 +107,7 @@ class interop_handle {
107107
template <backend Backend = backend::opencl>
108108
backend_return_t<Backend, device> get_native_device() const {
109109
#ifndef __SYCL_DEVICE_ONLY__
110-
// TODO: replace the exception thrown below with the SYCL-2020 exception
110+
// TODO: replace the exception thrown below with the SYCL 2020 exception
111111
// with the error code 'errc::backend_mismatch' when those new exceptions
112112
// are ready to be used.
113113
if (Backend != get_backend())
@@ -129,7 +129,7 @@ class interop_handle {
129129
template <backend Backend = backend::opencl>
130130
backend_return_t<Backend, context> get_native_context() const {
131131
#ifndef __SYCL_DEVICE_ONLY__
132-
// TODO: replace the exception thrown below with the SYCL-2020 exception
132+
// TODO: replace the exception thrown below with the SYCL 2020 exception
133133
// with the error code 'errc::backend_mismatch' when those new exceptions
134134
// are ready to be used.
135135
if (Backend != get_backend())

sycl/include/CL/sycl/kernel_bundle.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ class kernel_bundle : public detail::kernel_bundle_plain {
310310
}
311311

312312
template <backend Backend>
313-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::get_native free function")
313+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::get_native free function")
314314
std::vector<typename backend_traits<Backend>::template return_type<
315315
kernel_bundle<State>>> get_native() {
316316
std::vector<typename backend_traits<Backend>::template return_type<

sycl/include/CL/sycl/platform.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class __SYCL_EXPORT platform {
116116
///
117117
/// \return a native handle, the type of which defined by the backend.
118118
template <backend BackendName>
119-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::get_native free function")
119+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::get_native free function")
120120
auto get_native() const -> typename interop<BackendName, platform>::type {
121121
return reinterpret_cast<typename interop<BackendName, platform>::type>(
122122
getNative());

sycl/include/CL/sycl/program.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ class __SYCL_EXPORT __SYCL2020_DEPRECATED(
365365
///
366366
/// \return a native handle, the type of which defined by the backend.
367367
template <backend BackendName>
368-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::get_native free function")
368+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::get_native free function")
369369
auto get_native() const -> typename interop<BackendName, program>::type {
370370
return reinterpret_cast<typename interop<BackendName, program>::type>(
371371
getNative());

sycl/include/CL/sycl/queue.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@ class __SYCL_EXPORT queue {
10201020
///
10211021
/// \return a native handle, the type of which defined by the backend.
10221022
template <backend BackendName>
1023-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::get_native free function")
1023+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::get_native free function")
10241024
auto get_native() const -> typename interop<BackendName, queue>::type {
10251025
return reinterpret_cast<typename interop<BackendName, queue>::type>(
10261026
getNative());

sycl/test/basic_tests/interop-level-zero-2020.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,10 @@ int main() {
167167
=======
168168
auto C = level_zero::make<context>(std::vector<device>(1, D), ZeContext,
169169
level_zero::ownership::keep);
170-
// expected-warning@+1 {{'make<sycl::queue, nullptr>' is deprecated: Use SYCL-2020 sycl::make_queue free function}}
170+
// expected-warning@+2 {{'make<sycl::queue, nullptr>' is deprecated: Use SYCL-2020 sycl::make_queue free function}}
171171
auto Q =
172172
level_zero::make<queue>(Context, ZeQueue, level_zero::ownership::keep);
173-
// expected-warning@+1 {{'make<sycl::event, nullptr>' is deprecated: Use SYCL-2020 sycl::make_event free function}}
173+
// expected-warning@+2 {{'make<sycl::event, nullptr>' is deprecated: Use SYCL-2020 sycl::make_event free function}}
174174
auto E =
175175
level_zero::make<event>(Context, ZeEvent, level_zero::ownership::keep);
176176
// expected-warning@+2 {{'program' is deprecated: program class is deprecated, use kernel_bundle instead}}

0 commit comments

Comments
 (0)