Skip to content

Commit 20c49d8

Browse files
smaslov-intelsmaslov-intel
committed
rebase
Signed-off-by: Sergey V Maslov <sergey.v.maslov@intel.com>
1 parent ca26fac commit 20c49d8

File tree

2 files changed

+48
-68
lines changed

2 files changed

+48
-68
lines changed

‎sycl/include/sycl/ext/oneapi/backend/level_zero.hpp

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

148148
// Construction of SYCL device.
149149
template <typename T, typename detail::enable_if_t<
150150
std::is_same<T, device>::value> * = nullptr>
151-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::make_device free function")
151+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_device free function")
152152
T make(const platform &Platform,
153153
typename interop<backend::level_zero, T>::type Interop) {
154154
return make_device(Platform, reinterpret_cast<pi_native_handle>(Interop));
@@ -165,7 +165,7 @@ T make(const platform &Platform,
165165
///
166166
template <typename T, typename std::enable_if<
167167
std::is_same<T, context>::value>::type * = nullptr>
168-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::make_context free function")
168+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_context free function")
169169
T make(const std::vector<device> &DeviceList,
170170
typename interop<backend::level_zero, T>::type Interop,
171171
ownership Ownership = ownership::transfer) {
@@ -176,7 +176,7 @@ T make(const std::vector<device> &DeviceList,
176176
// Construction of SYCL program.
177177
template <typename T, typename detail::enable_if_t<
178178
std::is_same<T, program>::value> * = nullptr>
179-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::make_kernel_bundle free function")
179+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_kernel_bundle free function")
180180
T make(const context &Context,
181181
typename interop<backend::level_zero, T>::type Interop) {
182182
return make_program(Context, reinterpret_cast<pi_native_handle>(Interop));
@@ -185,7 +185,7 @@ T make(const context &Context,
185185
// Construction of SYCL queue.
186186
template <typename T, typename detail::enable_if_t<
187187
std::is_same<T, queue>::value> * = nullptr>
188-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::make_queue free function")
188+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_queue free function")
189189
T make(const context &Context,
190190
typename interop<backend::level_zero, T>::type Interop,
191191
ownership Ownership = ownership::transfer) {
@@ -196,7 +196,7 @@ T make(const context &Context,
196196
// Construction of SYCL event.
197197
template <typename T, typename detail::enable_if_t<
198198
std::is_same<T, event>::value> * = nullptr>
199-
__SYCL_DEPRECATED("Use SYCL-2020 sycl::make_event free function")
199+
__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_event free function")
200200
T make(const context &Context,
201201
typename interop<backend::level_zero, T>::type Interop,
202202
ownership Ownership = ownership::transfer) {

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

Lines changed: 42 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <sycl/sycl.hpp>
66
// clang-format off
77
#include <level_zero/ze_api.h>
8-
#include <CL/sycl/backend/level_zero.hpp>
8+
#include <sycl/ext/oneapi/backend/level_zero.hpp>
99
// clang-format on
1010

1111
using namespace sycl;
@@ -47,24 +47,19 @@ int main() {
4747
// return_type is used when retrieving the backend specific native object from
4848
// a SYCL object. See the relevant backend specification for details.
4949

50-
<<<<<<< HEAD
5150
backend_traits<backend::ext_oneapi_level_zero>::return_type<platform>
5251
ZeDriver;
5352
backend_traits<backend::ext_oneapi_level_zero>::return_type<device> ZeDevice;
5453
backend_traits<backend::ext_oneapi_level_zero>::return_type<context>
5554
ZeContext;
56-
=======
57-
backend_traits<backend::level_zero>::return_type<platform> ZeDriver;
58-
backend_traits<backend::level_zero>::return_type<device> ZeDevice;
59-
backend_traits<backend::level_zero>::return_type<context> ZeContext;
60-
backend_traits<backend::level_zero>::return_type<queue> ZeQueue;
61-
backend_traits<backend::level_zero>::return_type<event> ZeEvent;
55+
backend_traits<backend::ext_oneapi_level_zero>::return_type<queue> ZeQueue;
56+
backend_traits<backend::ext_oneapi_level_zero>::return_type<event> ZeEvent;
6257
// expected-warning@+1 {{'program' is deprecated: program class is deprecated, use kernel_bundle instead}}
63-
backend_traits<backend::level_zero>::return_type<program> ZeProgram;
64-
backend_traits<backend::level_zero>::return_type<
58+
backend_traits<backend::ext_oneapi_level_zero>::return_type<program>
59+
ZeProgram;
60+
backend_traits<backend::ext_oneapi_level_zero>::return_type<
6561
kernel_bundle<bundle_state::executable>>
6662
ZeKernelBundle;
67-
>>>>>>> 6c9a8addf701 ([SYCL] Make Level-Zero interop API SYCL-2020 compliant for queue, event, and kernel_bundle(was program).)
6863

6964
// 4.5.1.2 For each SYCL runtime class T which supports SYCL application
7065
// interoperability, a specialization of get_native must be defined, which
@@ -73,46 +68,36 @@ int main() {
7368
// application interoperability. The lifetime of the object returned are
7469
// backend-defined and specified in the backend specification.
7570

76-
<<<<<<< HEAD
7771
ZeDriver = get_native<backend::ext_oneapi_level_zero>(Platform);
7872
ZeDevice = get_native<backend::ext_oneapi_level_zero>(Device);
7973
ZeContext = get_native<backend::ext_oneapi_level_zero>(Context);
80-
=======
81-
ZeDriver = get_native<backend::level_zero>(Platform);
82-
ZeDevice = get_native<backend::level_zero>(Device);
83-
ZeContext = get_native<backend::level_zero>(Context);
84-
ZeQueue = get_native<backend::level_zero>(Queue);
85-
ZeEvent = get_native<backend::level_zero>(Event);
86-
ZeKernelBundle = get_native<backend::level_zero>(KernelBundle);
87-
>>>>>>> 6c9a8addf701 ([SYCL] Make Level-Zero interop API SYCL-2020 compliant for queue, event, and kernel_bundle(was program).)
74+
ZeQueue = get_native<backend::ext_oneapi_level_zero>(Queue);
75+
ZeEvent = get_native<backend::ext_oneapi_level_zero>(Event);
76+
ZeKernelBundle = get_native<backend::ext_oneapi_level_zero>(KernelBundle);
8877

8978
// Check deprecated
90-
// expected-warning@+2 {{'get_native' is deprecated: Use SYCL-2020 sycl::get_native free function}}
91-
// expected-warning@+1 {{'get_native<sycl::backend::ext_oneapi_level_zero>' is deprecated: Use SYCL-2020 sycl::get_native free function}}
79+
// expected-warning@+2 {{'get_native' is deprecated: Use SYCL 2020 sycl::get_native free function}}
80+
// expected-warning@+1 {{'get_native<sycl::backend::ext_oneapi_level_zero>' is deprecated: Use SYCL 2020 sycl::get_native free function}}
9281
ZeDriver = Platform.get_native<backend::ext_oneapi_level_zero>();
93-
// expected-warning@+2 {{'get_native' is deprecated: Use SYCL-2020 sycl::get_native free function}}
94-
// expected-warning@+1 {{'get_native<sycl::backend::ext_oneapi_level_zero>' is deprecated: Use SYCL-2020 sycl::get_native free function}}
82+
// expected-warning@+2 {{'get_native' is deprecated: Use SYCL 2020 sycl::get_native free function}}
83+
// expected-warning@+1 {{'get_native<sycl::backend::ext_oneapi_level_zero>' is deprecated: Use SYCL 2020 sycl::get_native free function}}
9584
ZeDevice = Device.get_native<backend::ext_oneapi_level_zero>();
96-
// expected-warning@+2 {{'get_native' is deprecated: Use SYCL-2020 sycl::get_native free function}}
97-
<<<<<<< HEAD
98-
// expected-warning@+1 {{'get_native<sycl::backend::ext_oneapi_level_zero>' is deprecated: Use SYCL-2020 sycl::get_native free function}}
85+
// expected-warning@+2 {{'get_native' is deprecated: Use SYCL 2020 sycl::get_native free function}}
86+
// expected-warning@+1 {{'get_native<sycl::backend::ext_oneapi_level_zero>' is deprecated: Use SYCL 2020 sycl::get_native free function}}
9987
ZeContext = Context.get_native<backend::ext_oneapi_level_zero>();
100-
=======
101-
// expected-warning@+1 {{'get_native<sycl::backend::level_zero>' is deprecated: Use SYCL-2020 sycl::get_native free function}}
102-
ZeContext = Context.get_native<backend::level_zero>();
103-
// expected-warning@+2 {{'get_native' is deprecated: Use SYCL-2020 sycl::get_native free function}}
104-
// expected-warning@+1 {{'get_native<sycl::backend::level_zero>' is deprecated: Use SYCL-2020 sycl::get_native free function}}
105-
ZeQueue = Queue.get_native<backend::level_zero>();
106-
// expected-warning@+2 {{'get_native' is deprecated: Use SYCL-2020 sycl::get_native free function}}
107-
// expected-warning@+1 {{'get_native<sycl::backend::level_zero>' is deprecated: Use SYCL-2020 sycl::get_native free function}}
108-
ZeEvent = Event.get_native<backend::level_zero>();
109-
// expected-warning@+2 {{'get_native' is deprecated: Use SYCL-2020 sycl::get_native free function}}
110-
// expected-warning@+1 {{'get_native<sycl::backend::level_zero>' is deprecated: Use SYCL-2020 sycl::get_native free function}}
111-
ZeProgram = Program.get_native<backend::level_zero>();
112-
// expected-warning@+2 {{'get_native' is deprecated: Use SYCL-2020 sycl::get_native free function}}
113-
// expected-warning@+1 {{'get_native<sycl::backend::level_zero>' is deprecated: Use SYCL-2020 sycl::get_native free function}}
114-
/*ZeKernelBundle*/ (void)KernelBundle.get_native<backend::level_zero>();
115-
>>>>>>> 6c9a8addf701 ([SYCL] Make Level-Zero interop API SYCL-2020 compliant for queue, event, and kernel_bundle(was program).)
88+
// expected-warning@+2 {{'get_native' is deprecated: Use SYCL 2020 sycl::get_native free function}}
89+
// expected-warning@+1 {{'get_native<sycl::backend::ext_oneapi_level_zero>' is deprecated: Use SYCL 2020 sycl::get_native free function}}
90+
ZeQueue = Queue.get_native<backend::ext_oneapi_level_zero>();
91+
// expected-warning@+2 {{'get_native' is deprecated: Use SYCL 2020 sycl::get_native free function}}
92+
// expected-warning@+1 {{'get_native<sycl::backend::ext_oneapi_level_zero>' is deprecated: Use SYCL 2020 sycl::get_native free function}}
93+
ZeEvent = Event.get_native<backend::ext_oneapi_level_zero>();
94+
// expected-warning@+2 {{'get_native' is deprecated: Use SYCL 2020 sycl::get_native free function}}
95+
// expected-warning@+1 {{'get_native<sycl::backend::ext_oneapi_level_zero>' is deprecated: Use SYCL 2020 sycl::get_native free function}}
96+
ZeProgram = Program.get_native<backend::ext_oneapi_level_zero>();
97+
// expected-warning@+2 {{'get_native' is deprecated: Use SYCL 2020 sycl::get_native free function}}
98+
// expected-warning@+1 {{'get_native<sycl::backend::ext_oneapi_level_zero>' is deprecated: Use SYCL 2020 sycl::get_native free function}}
99+
/*ZeKernelBundle*/ (
100+
void)KernelBundle.get_native<backend::ext_oneapi_level_zero>();
116101

117102
// 4.5.1.1 For each SYCL runtime class T which supports SYCL application
118103
// interoperability with the SYCL backend, a specialization of input_type must
@@ -142,41 +127,36 @@ int main() {
142127

143128
backend_input_t<backend::ext_oneapi_level_zero, context> InteropContextInput{
144129
ZeContext, std::vector<device>(1, InteropDevice),
145-
ext::oneapi::level_zero::ownership::keep};
130+
level_zero::ownership::keep};
146131
context InteropContext =
147132
make_context<backend::ext_oneapi_level_zero>(InteropContextInput);
148133

149-
queue InteropQueue = make_queue<backend::level_zero>(
134+
queue InteropQueue = make_queue<backend::ext_oneapi_level_zero>(
150135
{ZeQueue, level_zero::ownership::keep}, Context);
151-
event InteropEvent = make_event<backend::level_zero>(
136+
event InteropEvent = make_event<backend::ext_oneapi_level_zero>(
152137
{ZeEvent, level_zero::ownership::keep}, Context);
153138
kernel_bundle<bundle_state::executable> InteropKernelBundle =
154-
make_kernel_bundle<backend::level_zero, bundle_state::executable>(
155-
ZeKernelBundle.front(), Context);
139+
make_kernel_bundle<backend::ext_oneapi_level_zero,
140+
bundle_state::executable>(ZeKernelBundle.front(),
141+
Context);
156142

157143
// Check deprecated
158-
// expected-warning@+1 {{'make<sycl::platform, nullptr>' is deprecated: Use SYCL-2020 sycl::make_platform free function}}
159-
auto P = ext::oneapi::level_zero::make<platform>(ZeDriver);
160-
// expected-warning@+1 {{'make<sycl::device, nullptr>' is deprecated: Use SYCL-2020 sycl::make_device free function}}
161-
auto D = ext::oneapi::level_zero::make<device>(P, ZeDevice);
162-
// expected-warning@+1 {{'make<sycl::context, nullptr>' is deprecated: Use SYCL-2020 sycl::make_context free function}}
163-
<<<<<<< HEAD
164-
auto C = ext::oneapi::level_zero::make<context>(
165-
std::vector<device>(1, D), ZeContext,
166-
ext::oneapi::level_zero::ownership::keep);
167-
=======
144+
// expected-warning@+1 {{'make<sycl::platform, nullptr>' is deprecated: Use SYCL 2020 sycl::make_platform free function}}
145+
auto P = level_zero::make<platform>(ZeDriver);
146+
// expected-warning@+1 {{'make<sycl::device, nullptr>' is deprecated: Use SYCL 2020 sycl::make_device free function}}
147+
auto D = level_zero::make<device>(P, ZeDevice);
148+
// expected-warning@+1 {{'make<sycl::context, nullptr>' is deprecated: Use SYCL 2020 sycl::make_context free function}}
168149
auto C = level_zero::make<context>(std::vector<device>(1, D), ZeContext,
169150
level_zero::ownership::keep);
170-
// expected-warning@+2 {{'make<sycl::queue, nullptr>' is deprecated: Use SYCL-2020 sycl::make_queue free function}}
151+
// expected-warning@+2 {{'make<sycl::queue, nullptr>' is deprecated: Use SYCL 2020 sycl::make_queue free function}}
171152
auto Q =
172153
level_zero::make<queue>(Context, ZeQueue, level_zero::ownership::keep);
173-
// expected-warning@+2 {{'make<sycl::event, nullptr>' is deprecated: Use SYCL-2020 sycl::make_event free function}}
154+
// expected-warning@+2 {{'make<sycl::event, nullptr>' is deprecated: Use SYCL 2020 sycl::make_event free function}}
174155
auto E =
175156
level_zero::make<event>(Context, ZeEvent, level_zero::ownership::keep);
176157
// expected-warning@+2 {{'program' is deprecated: program class is deprecated, use kernel_bundle instead}}
177-
// expected-warning@+1 {{'make<sycl::program, nullptr>' is deprecated: Use SYCL-2020 sycl::make_kernel_bundle free function}}
158+
// expected-warning@+1 {{'make<sycl::program, nullptr>' is deprecated: Use SYCL 2020 sycl::make_kernel_bundle free function}}
178159
auto PR = level_zero::make<program>(Context, ZeProgram);
179-
>>>>>>> 6c9a8addf701 ([SYCL] Make Level-Zero interop API SYCL-2020 compliant for queue, event, and kernel_bundle(was program).)
180160

181161
return 0;
182162
}

0 commit comments

Comments
 (0)