Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit 18c2f11

Browse files
author
Pavel Samolysov
authored
[SYCL] Rename cuda, hip, level_zero backends to conform SYCL 2020 (#521)
* [SYCL] Rename cuda, hip, level_zero backends to conform SYCL 2020 According to SYCL spec, backend::cuda is renamed to backend::ext_oneapi_cuda, backend::hip is renamed to backend::ext_oneapi_hip, and backend::level_zero is renamed to backend::ext_oneapi_level_zero. The backend interop APIs is available through separate header files "sycl/ext/oneapi/backend/<backendname>.hpp". * [SYCL] Rename hip backend to conform SYCL 2020 Signed-off-by: Pavel Samolysov <[email protected]> * [SYCL] Remove outdated header sycl/ext/oneapi/backend/cuda.hpp Signed-off-by: Pavel Samolysov <[email protected]>
1 parent de6fcf8 commit 18c2f11

15 files changed

+61
-53
lines changed

‎SYCL/Basic/diagnostics/non-uniform-wk-gp-test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ int main() {
5555
for (const auto &plt : platform::get_platforms()) {
5656
if (!plt.has(aspect::host)) {
5757
std::cout << "Platform #" << pltCount++ << ":" << std::endl;
58-
if (plt.get_backend() == backend::level_zero) {
58+
if (plt.get_backend() == backend::ext_oneapi_level_zero) {
5959
std::cout << "Backend: Level Zero" << std::endl;
6060
ret = test();
6161
}

‎SYCL/Basic/get_backend.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ using namespace cl::sycl;
1919
bool check(backend be) {
2020
switch (be) {
2121
case backend::opencl:
22-
case backend::level_zero:
23-
case backend::cuda:
22+
case backend::ext_oneapi_level_zero:
23+
case backend::ext_oneapi_cuda:
2424
case backend::host:
2525
return true;
2626
default:

‎SYCL/Basic/intel-ext-device.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ int main(int argc, char **argv) {
4848
<< dev.get_info<info::device::name>() << ":" << std::endl;
4949

5050
std::cout << "Backend: ";
51-
if (plt.get_backend() == backend::level_zero) {
51+
if (plt.get_backend() == backend::ext_oneapi_level_zero) {
5252
std::cout << "Level Zero" << std::endl;
5353
} else if (plt.get_backend() == backend::opencl) {
5454
std::cout << "OpenCL" << std::endl;
55-
} else if (plt.get_backend() == backend::cuda) {
55+
} else if (plt.get_backend() == backend::ext_oneapi_cuda) {
5656
std::cout << "CUDA" << std::endl;
5757
} else {
5858
std::cout << "Unknown" << std::endl;

‎SYCL/Basic/interop/construction_ze.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
#include <level_zero/ze_api.h>
66

7-
#include <CL/sycl/backend/level_zero.hpp>
7+
#include <sycl/ext/oneapi/backend/level_zero.hpp>
88
#include <sycl/sycl.hpp>
99

10-
constexpr auto BE = sycl::backend::level_zero;
10+
constexpr auto BE = sycl::backend::ext_oneapi_level_zero;
1111

1212
int main() {
1313
sycl::device Dev{sycl::default_selector{}};

‎SYCL/Basic/interop/get_native_ze.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
#include <level_zero/ze_api.h>
66

7-
#include <CL/sycl/backend/level_zero.hpp>
7+
#include <sycl/ext/oneapi/backend/level_zero.hpp>
88
#include <sycl/sycl.hpp>
99

10-
constexpr auto BE = sycl::backend::level_zero;
10+
constexpr auto BE = sycl::backend::ext_oneapi_level_zero;
1111

1212
class TestKernel;
1313

‎SYCL/Config/select_device.cpp

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ int main() {
196196
<< "}}" << std::endl;
197197
passed = true;
198198
break;
199-
} else if ((plt.get_backend() == backend::level_zero) &&
199+
} else if ((plt.get_backend() ==
200+
backend::ext_oneapi_level_zero) &&
200201
(sycl_be.find("level_zero") != std::string::npos)) {
201202
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
202203
<< "}}" << std::endl;
@@ -252,7 +253,7 @@ int main() {
252253
std::string ver = plt.get_info<info::platform::version>();
253254
if (((plt.get_backend() == backend::opencl) &&
254255
(sycl_be.find("opencl") != std::string::npos)) ||
255-
((plt.get_backend() == backend::level_zero) &&
256+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
256257
(sycl_be.find("level_zero") != std::string::npos))) {
257258
fs << "PlatformName:{{" << name << "}},PlatformVersion:{{" << ver
258259
<< "}}" << std::endl;
@@ -308,7 +309,7 @@ int main() {
308309
std::string ver("98.76.54321");
309310
if (((plt.get_backend() == backend::opencl) &&
310311
(sycl_be.find("opencl") != std::string::npos)) ||
311-
((plt.get_backend() == backend::level_zero) &&
312+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
312313
(sycl_be.find("level_zero") != std::string::npos))) {
313314
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
314315
<< "}}" << std::endl;
@@ -367,7 +368,7 @@ int main() {
367368
<< "}}" << std::endl;
368369
passed = true;
369370
break;
370-
} else if ((plt.get_backend() == backend::level_zero) &&
371+
} else if ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
371372
(sycl_be.find("level_zero") != std::string::npos)) {
372373
std::string ver("12.34");
373374
fs << "PlatformName:{{" << name << "}},PlatformVersion:{{" << ver
@@ -433,7 +434,7 @@ int main() {
433434
ver.replace(start, pos - start, "*");
434435
if (((plt.get_backend() == backend::opencl) &&
435436
(sycl_be.find("opencl") != std::string::npos)) ||
436-
((plt.get_backend() == backend::level_zero) &&
437+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
437438
(sycl_be.find("level_zero") != std::string::npos))) {
438439
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
439440
<< "}}" << std::endl;
@@ -490,7 +491,7 @@ int main() {
490491
addEscapeSymbolToSpecialCharacters(name);
491492
if (((plt.get_backend() == backend::opencl) &&
492493
(sycl_be.find("opencl") != std::string::npos)) ||
493-
((plt.get_backend() == backend::level_zero) &&
494+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
494495
(sycl_be.find("level_zero") != std::string::npos))) {
495496
fs << "DeviceName:{{" << name << "}}" << std::endl;
496497
passed = true;
@@ -539,7 +540,7 @@ int main() {
539540
addEscapeSymbolToSpecialCharacters(name);
540541
if (((plt.get_backend() == backend::opencl) &&
541542
(sycl_be.find("opencl") != std::string::npos)) ||
542-
((plt.get_backend() == backend::level_zero) &&
543+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
543544
(sycl_be.find("level_zero") != std::string::npos))) {
544545
fs << "PlatformName:{{" << name << "}}" << std::endl;
545546
passed = true;
@@ -592,7 +593,7 @@ int main() {
592593
std::string ver = dev.get_info<info::device::driver_version>();
593594
if (((plt.get_backend() == backend::opencl) &&
594595
(sycl_be.find("opencl") != std::string::npos)) ||
595-
((plt.get_backend() == backend::level_zero) &&
596+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
596597
(sycl_be.find("level_zero") != std::string::npos))) {
597598
if (count > 0) {
598599
ss << " | ";
@@ -654,7 +655,7 @@ int main() {
654655
addEscapeSymbolToSpecialCharacters(name);
655656
if (((plt.get_backend() == backend::opencl) &&
656657
(sycl_be.find("opencl") != std::string::npos)) ||
657-
((plt.get_backend() == backend::level_zero) &&
658+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
658659
(sycl_be.find("level_zero") != std::string::npos))) {
659660
fs << "DeviceName:HAHA{{" << name << "}}" << std::endl;
660661
passed = true;
@@ -715,7 +716,7 @@ int main() {
715716
addEscapeSymbolToSpecialCharacters(name);
716717
if (((plt.get_backend() == backend::opencl) &&
717718
(sycl_be.find("opencl") != std::string::npos)) ||
718-
((plt.get_backend() == backend::level_zero) &&
719+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
719720
(sycl_be.find("level_zero") != std::string::npos))) {
720721
fs << "PlatformName:HAHA{{" << name << "}}" << std::endl;
721722
passed = true;
@@ -777,7 +778,7 @@ int main() {
777778
std::string ver = dev.get_info<info::device::driver_version>();
778779
if (((plt.get_backend() == backend::opencl) &&
779780
(sycl_be.find("opencl") != std::string::npos)) ||
780-
((plt.get_backend() == backend::level_zero) &&
781+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
781782
(sycl_be.find("level_zero") != std::string::npos))) {
782783
fs << "DeviceName:{{" << name << "}},DriverVersion:HAHA{{"
783784
<< ver << "}}" << std::endl;
@@ -840,7 +841,7 @@ int main() {
840841
std::string ver = plt.get_info<info::platform::version>();
841842
if (((plt.get_backend() == backend::opencl) &&
842843
(sycl_be.find("opencl") != std::string::npos)) ||
843-
((plt.get_backend() == backend::level_zero) &&
844+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
844845
(sycl_be.find("level_zero") != std::string::npos))) {
845846
fs << "PlatformName:{{" << name << "}},PlatformVersion:HAHA{{"
846847
<< ver << "}}" << std::endl;

‎SYCL/DeprecatedFeatures/cuda_program_interop.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
// RUN: %GPU_RUN_PLACEHOLDER %t.out
33
// REQUIRES: cuda
44

5-
#include <CL/sycl.hpp>
6-
#include <CL/sycl/backend/cuda.hpp>
5+
#include <sycl/sycl.hpp>
76

87
int main() {
98
sycl::queue Queue{sycl::default_selector{}};
@@ -13,7 +12,7 @@ int main() {
1312
sycl::program Prog{Queue.get_context()};
1413
Prog.build_with_kernel_type<class TestKernel>();
1514

16-
auto NativeProgram = Prog.get_native<sycl::backend::cuda>();
15+
auto NativeProgram = Prog.get_native<sycl::backend::ext_oneapi_cuda>();
1716

1817
assert(NativeProgram != 0);
1918

‎SYCL/DeprecatedFeatures/get_backend.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ using namespace cl::sycl;
1616
bool check(backend be) {
1717
switch (be) {
1818
case backend::opencl:
19-
case backend::level_zero:
20-
case backend::cuda:
19+
case backend::ext_oneapi_level_zero:
20+
case backend::ext_oneapi_cuda:
21+
case backend::ext_oneapi_hip:
2122
case backend::host:
22-
case backend::hip:
2323
return true;
2424
default:
2525
return false;

‎SYCL/FilterSelector/select.cpp

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,22 @@ int main() {
4646

4747
for (auto &Dev : Devs) {
4848
auto Backend = Dev.get_platform().get_backend();
49-
if (Backend == backend::level_zero) {
49+
if (Backend == backend::ext_oneapi_level_zero) {
5050
HasLevelZeroDevices = true;
5151
} else if (Backend == backend::opencl) {
5252
HasOpenCLDevices = true;
53-
} else if (Backend == backend::cuda) {
53+
} else if (Backend == backend::ext_oneapi_cuda) {
5454
HasCUDADevices = true;
55-
} else if (Backend == backend::hip) {
55+
} else if (Backend == backend::ext_oneapi_hip) {
5656
HasHIPDevices = true;
5757
}
5858
}
5959

6060
for (const auto &GPU : GPUs) {
6161
if (GPU.get_platform().get_backend() == backend::opencl) {
6262
HasOpenCLGPU = true;
63-
} else if (GPU.get_platform().get_backend() == backend::level_zero) {
63+
} else if (GPU.get_platform().get_backend() ==
64+
backend::ext_oneapi_level_zero) {
6465
HasLevelZeroGPU = true;
6566
}
6667
}
@@ -155,13 +156,13 @@ int main() {
155156
if (HasLevelZeroDevices && HasLevelZeroGPU) {
156157
std::cout << "Test 'level_zero'";
157158
device d12(filter_selector("level_zero"));
158-
assert(d12.get_platform().get_backend() == backend::level_zero);
159+
assert(d12.get_platform().get_backend() == backend::ext_oneapi_level_zero);
159160
std::cout << "...PASS" << std::endl;
160161

161162
std::cout << "Test 'level_zero:gpu'";
162163
device d13(filter_selector("level_zero:gpu"));
163164
assert(d13.is_gpu() &&
164-
d13.get_platform().get_backend() == backend::level_zero);
165+
d13.get_platform().get_backend() == backend::ext_oneapi_level_zero);
165166
std::cout << "...PASS" << std::endl;
166167

167168
if (HasOpenCLDevices && !CPUs.empty()) {
@@ -170,7 +171,8 @@ int main() {
170171
assert((d14.is_gpu() || d14.is_cpu()));
171172
std::cout << "...PASS 1/2" << std::endl;
172173
if (d14.is_gpu()) {
173-
assert(d14.get_platform().get_backend() == backend::level_zero);
174+
assert(d14.get_platform().get_backend() ==
175+
backend::ext_oneapi_level_zero);
174176
std::cout << "...PASS 2/2" << std::endl;
175177
}
176178
}
@@ -185,12 +187,13 @@ int main() {
185187
if (HasCUDADevices) {
186188
std::cout << "Test 'cuda'";
187189
device d16(filter_selector("cuda"));
188-
assert(d16.get_platform().get_backend() == backend::cuda);
190+
assert(d16.get_platform().get_backend() == backend::ext_oneapi_cuda);
189191
std::cout << "...PASS" << std::endl;
190192

191193
std::cout << "Test 'cuda:gpu'";
192194
device d17(filter_selector("cuda:gpu"));
193-
assert(d17.is_gpu() && d17.get_platform().get_backend() == backend::cuda);
195+
assert(d17.is_gpu() &&
196+
d17.get_platform().get_backend() == backend::ext_oneapi_cuda);
194197
std::cout << "...PASS" << std::endl;
195198
}
196199

@@ -204,12 +207,13 @@ int main() {
204207
if (HasHIPDevices) {
205208
std::cout << "Test 'hip'";
206209
device d19(ext::oneapi::filter_selector("hip"));
207-
assert(d19.get_platform().get_backend() == backend::hip);
210+
assert(d19.get_platform().get_backend() == backend::ext_oneapi_hip);
208211
std::cout << "...PASS" << std::endl;
209212

210213
std::cout << "test 'hip:gpu'";
211214
device d20(ext::oneapi::filter_selector("hip:gpu"));
212-
assert(d20.is_gpu() && d19.get_platform().get_backend() == backend::hip);
215+
assert(d20.is_gpu() &&
216+
d20.get_platform().get_backend() == backend::ext_oneapi_hip);
213217
std::cout << "...PASS" << std::endl;
214218
}
215219

‎SYCL/OnlineCompiler/online_compiler_L0.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
// clang-format off
1919
#include <level_zero/ze_api.h>
20-
#include <CL/sycl/backend/level_zero.hpp>
20+
#include <sycl/ext/oneapi/backend/level_zero.hpp>
2121
// clang-format on
2222

2323
using byte = unsigned char;
@@ -35,8 +35,8 @@ sycl::kernel getSYCLKernelWithIL(sycl::context &Context,
3535

3636
assert(Context.get_devices().size() == 1 && "Expected to have only 1 device");
3737
sycl::device Device = Context.get_devices()[0];
38-
auto ZeDevice = Device.get_native<sycl::backend::level_zero>();
39-
auto ZeContext = Context.get_native<sycl::backend::level_zero>();
38+
auto ZeDevice = Device.get_native<sycl::backend::ext_oneapi_level_zero>();
39+
auto ZeContext = Context.get_native<sycl::backend::ext_oneapi_level_zero>();
4040

4141
ze_module_build_log_handle_t ZeBuildLog;
4242
ze_module_handle_t ZeModule;

‎SYCL/Plugin/interop-level-zero-interop-task-mem.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
// SYCL
1111
#include <CL/sycl.hpp>
12-
#include <CL/sycl/backend/level_zero.hpp>
12+
#include <sycl/ext/oneapi/backend/level_zero.hpp>
1313

1414
using namespace sycl;
1515

@@ -24,21 +24,22 @@ int main() {
2424
{SIZE, SIZE});
2525

2626
ze_context_handle_t ze_context =
27-
queue.get_context().get_native<backend::level_zero>();
27+
queue.get_context().get_native<backend::ext_oneapi_level_zero>();
2828

2929
queue
3030
.submit([&](handler &cgh) {
3131
auto buffer_acc = buffer.get_access<access::mode::write>(cgh);
3232
auto image_acc = image.get_access<float4, access::mode::write>(cgh);
3333
cgh.interop_task([=](const interop_handler &ih) {
34-
void *device_ptr = ih.get_mem<backend::level_zero>(buffer_acc);
34+
void *device_ptr =
35+
ih.get_mem<backend::ext_oneapi_level_zero>(buffer_acc);
3536
ze_memory_allocation_properties_t memAllocProperties{};
3637
ze_result_t res = zeMemGetAllocProperties(
3738
ze_context, device_ptr, &memAllocProperties, nullptr);
3839
assert(res == ZE_RESULT_SUCCESS);
3940

4041
ze_image_handle_t ze_image =
41-
ih.get_mem<backend::level_zero>(image_acc);
42+
ih.get_mem<backend::ext_oneapi_level_zero>(image_acc);
4243
assert(ze_image != nullptr);
4344
});
4445
})

‎SYCL/Plugin/interop-level-zero-keep-ownership.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <CL/sycl.hpp>
88
// clang-format off
99
#include <level_zero/ze_api.h>
10-
#include <CL/sycl/backend/level_zero.hpp>
10+
#include <sycl/ext/oneapi/backend/level_zero.hpp>
1111
// clang-format on
1212

1313
using namespace cl::sycl;
@@ -22,8 +22,8 @@ int main() {
2222
ze_context_handle_t ZeContext;
2323
ze_context_desc_t ZeContextDesc = {ZE_STRUCTURE_TYPE_CONTEXT_DESC, nullptr,
2424
0};
25-
auto ZeDriver = Platform.get_native<backend::level_zero>();
26-
auto ZeDevice = Device.get_native<backend::level_zero>();
25+
auto ZeDriver = Platform.get_native<backend::ext_oneapi_level_zero>();
26+
auto ZeDevice = Device.get_native<backend::ext_oneapi_level_zero>();
2727
zeContextCreate(ZeDriver, &ZeContextDesc, &ZeContext);
2828

2929
{ // Scope in which SYCL interop context object is live

‎SYCL/Regression/cache_test.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
#include <stdio.h>
99

1010
#include <CL/sycl.hpp>
11-
#include <CL/sycl/backend/level_zero.hpp>
11+
#include <sycl/ext/oneapi/backend/level_zero.hpp>
12+
13+
using namespace sycl::ext::oneapi;
1214

1315
/*
1416
The purpose of this test is to verify the expected behvior for
@@ -91,8 +93,8 @@ int queryFromNativeHandle(std::vector<cl::sycl::platform> *platform_list,
9193
zeDeviceGet(l0_drivers[0], &l0_device_count, l0_devices.data());
9294

9395
// Create the platform and device objects using the native handle.
94-
auto plt = cl::sycl::level_zero::make<cl::sycl::platform>(l0_drivers[0]);
95-
auto dev = cl::sycl::level_zero::make<cl::sycl::device>(plt, l0_devices[0]);
96+
auto plt = level_zero::make<cl::sycl::platform>(l0_drivers[0]);
97+
auto dev = level_zero::make<cl::sycl::device>(plt, l0_devices[0]);
9698

9799
// Check to see if this platform is in the platform list.
98100
std::cout << "Platform created with native handle: "

‎SYCL/SubGroup/sub_groups_sycl2020.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ int main() {
2828
SG.get_local_linear_range();
2929
};
3030

31-
if (Q.get_backend() != sycl::backend::cuda) {
31+
if (Q.get_backend() != sycl::backend::ext_oneapi_cuda) {
3232
sycl::kernel_id TestKernelID = sycl::get_kernel_id<TestKernel>();
3333
sycl::kernel_bundle KernelBundle =
3434
sycl::get_kernel_bundle<sycl::bundle_state::executable>(Q.get_context(),

0 commit comments

Comments
 (0)