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

[SYCL] Rename cuda, hip, level_zero backends to conform SYCL 2020 #521

Merged
merged 4 commits into from Nov 19, 2021
Merged

[SYCL] Rename cuda, hip, level_zero backends to conform SYCL 2020 #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b86cd09
[SYCL] Rename cuda, hip, level_zero backends to conform SYCL 2020
Oct 19, 2021
afa6a32
Merge branch 'intel' into rename-cuda-hip-level-zero-backends-sycl-2020
Nov 11, 2021
424df4d
[SYCL] Rename hip backend to conform SYCL 2020
Nov 11, 2021
bd932b8
[SYCL] Remove outdated header sycl/ext/oneapi/backend/cuda.hpp
Nov 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SYCL/Basic/diagnostics/non-uniform-wk-gp-test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ int main() {
for (const auto &plt : platform::get_platforms()) {
if (!plt.has(aspect::host)) {
std::cout << "Platform #" << pltCount++ << ":" << std::endl;
if (plt.get_backend() == backend::level_zero) {
if (plt.get_backend() == backend::ext_oneapi_level_zero) {
std::cout << "Backend: Level Zero" << std::endl;
ret = test();
}
Expand Down
4 changes: 2 additions & 2 deletions SYCL/Basic/get_backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ using namespace cl::sycl;
bool check(backend be) {
switch (be) {
case backend::opencl:
case backend::level_zero:
case backend::cuda:
case backend::ext_oneapi_level_zero:
case backend::ext_oneapi_cuda:
case backend::host:
return true;
default:
Expand Down
4 changes: 2 additions & 2 deletions SYCL/Basic/intel-ext-device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ int main(int argc, char **argv) {
<< dev.get_info<info::device::name>() << ":" << std::endl;

std::cout << "Backend: ";
if (plt.get_backend() == backend::level_zero) {
if (plt.get_backend() == backend::ext_oneapi_level_zero) {
std::cout << "Level Zero" << std::endl;
} else if (plt.get_backend() == backend::opencl) {
std::cout << "OpenCL" << std::endl;
} else if (plt.get_backend() == backend::cuda) {
} else if (plt.get_backend() == backend::ext_oneapi_cuda) {
std::cout << "CUDA" << std::endl;
} else {
std::cout << "Unknown" << std::endl;
Expand Down
4 changes: 2 additions & 2 deletions SYCL/Basic/interop/construction_ze.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

#include <level_zero/ze_api.h>

#include <CL/sycl/backend/level_zero.hpp>
#include <sycl/ext/oneapi/backend/level_zero.hpp>
#include <sycl/sycl.hpp>

constexpr auto BE = sycl::backend::level_zero;
constexpr auto BE = sycl::backend::ext_oneapi_level_zero;

int main() {
sycl::device Dev{sycl::default_selector{}};
Expand Down
4 changes: 2 additions & 2 deletions SYCL/Basic/interop/get_native_ze.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

#include <level_zero/ze_api.h>

#include <CL/sycl/backend/level_zero.hpp>
#include <sycl/ext/oneapi/backend/level_zero.hpp>
#include <sycl/sycl.hpp>

constexpr auto BE = sycl::backend::level_zero;
constexpr auto BE = sycl::backend::ext_oneapi_level_zero;

class TestKernel;

Expand Down
25 changes: 13 additions & 12 deletions SYCL/Config/select_device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@ int main() {
<< "}}" << std::endl;
passed = true;
break;
} else if ((plt.get_backend() == backend::level_zero) &&
} else if ((plt.get_backend() ==
backend::ext_oneapi_level_zero) &&
(sycl_be.find("level_zero") != std::string::npos)) {
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
<< "}}" << std::endl;
Expand Down Expand Up @@ -252,7 +253,7 @@ int main() {
std::string ver = plt.get_info<info::platform::version>();
if (((plt.get_backend() == backend::opencl) &&
(sycl_be.find("opencl") != std::string::npos)) ||
((plt.get_backend() == backend::level_zero) &&
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
(sycl_be.find("level_zero") != std::string::npos))) {
fs << "PlatformName:{{" << name << "}},PlatformVersion:{{" << ver
<< "}}" << std::endl;
Expand Down Expand Up @@ -308,7 +309,7 @@ int main() {
std::string ver("98.76.54321");
if (((plt.get_backend() == backend::opencl) &&
(sycl_be.find("opencl") != std::string::npos)) ||
((plt.get_backend() == backend::level_zero) &&
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
(sycl_be.find("level_zero") != std::string::npos))) {
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
<< "}}" << std::endl;
Expand Down Expand Up @@ -367,7 +368,7 @@ int main() {
<< "}}" << std::endl;
passed = true;
break;
} else if ((plt.get_backend() == backend::level_zero) &&
} else if ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
(sycl_be.find("level_zero") != std::string::npos)) {
std::string ver("12.34");
fs << "PlatformName:{{" << name << "}},PlatformVersion:{{" << ver
Expand Down Expand Up @@ -433,7 +434,7 @@ int main() {
ver.replace(start, pos - start, "*");
if (((plt.get_backend() == backend::opencl) &&
(sycl_be.find("opencl") != std::string::npos)) ||
((plt.get_backend() == backend::level_zero) &&
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
(sycl_be.find("level_zero") != std::string::npos))) {
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
<< "}}" << std::endl;
Expand Down Expand Up @@ -490,7 +491,7 @@ int main() {
addEscapeSymbolToSpecialCharacters(name);
if (((plt.get_backend() == backend::opencl) &&
(sycl_be.find("opencl") != std::string::npos)) ||
((plt.get_backend() == backend::level_zero) &&
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
(sycl_be.find("level_zero") != std::string::npos))) {
fs << "DeviceName:{{" << name << "}}" << std::endl;
passed = true;
Expand Down Expand Up @@ -539,7 +540,7 @@ int main() {
addEscapeSymbolToSpecialCharacters(name);
if (((plt.get_backend() == backend::opencl) &&
(sycl_be.find("opencl") != std::string::npos)) ||
((plt.get_backend() == backend::level_zero) &&
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
(sycl_be.find("level_zero") != std::string::npos))) {
fs << "PlatformName:{{" << name << "}}" << std::endl;
passed = true;
Expand Down Expand Up @@ -592,7 +593,7 @@ int main() {
std::string ver = dev.get_info<info::device::driver_version>();
if (((plt.get_backend() == backend::opencl) &&
(sycl_be.find("opencl") != std::string::npos)) ||
((plt.get_backend() == backend::level_zero) &&
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
(sycl_be.find("level_zero") != std::string::npos))) {
if (count > 0) {
ss << " | ";
Expand Down Expand Up @@ -654,7 +655,7 @@ int main() {
addEscapeSymbolToSpecialCharacters(name);
if (((plt.get_backend() == backend::opencl) &&
(sycl_be.find("opencl") != std::string::npos)) ||
((plt.get_backend() == backend::level_zero) &&
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
(sycl_be.find("level_zero") != std::string::npos))) {
fs << "DeviceName:HAHA{{" << name << "}}" << std::endl;
passed = true;
Expand Down Expand Up @@ -715,7 +716,7 @@ int main() {
addEscapeSymbolToSpecialCharacters(name);
if (((plt.get_backend() == backend::opencl) &&
(sycl_be.find("opencl") != std::string::npos)) ||
((plt.get_backend() == backend::level_zero) &&
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
(sycl_be.find("level_zero") != std::string::npos))) {
fs << "PlatformName:HAHA{{" << name << "}}" << std::endl;
passed = true;
Expand Down Expand Up @@ -777,7 +778,7 @@ int main() {
std::string ver = dev.get_info<info::device::driver_version>();
if (((plt.get_backend() == backend::opencl) &&
(sycl_be.find("opencl") != std::string::npos)) ||
((plt.get_backend() == backend::level_zero) &&
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
(sycl_be.find("level_zero") != std::string::npos))) {
fs << "DeviceName:{{" << name << "}},DriverVersion:HAHA{{"
<< ver << "}}" << std::endl;
Expand Down Expand Up @@ -840,7 +841,7 @@ int main() {
std::string ver = plt.get_info<info::platform::version>();
if (((plt.get_backend() == backend::opencl) &&
(sycl_be.find("opencl") != std::string::npos)) ||
((plt.get_backend() == backend::level_zero) &&
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
(sycl_be.find("level_zero") != std::string::npos))) {
fs << "PlatformName:{{" << name << "}},PlatformVersion:HAHA{{"
<< ver << "}}" << std::endl;
Expand Down
5 changes: 2 additions & 3 deletions SYCL/DeprecatedFeatures/cuda_program_interop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// REQUIRES: cuda

#include <CL/sycl.hpp>
#include <CL/sycl/backend/cuda.hpp>
#include <sycl/sycl.hpp>

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

auto NativeProgram = Prog.get_native<sycl::backend::cuda>();
auto NativeProgram = Prog.get_native<sycl::backend::ext_oneapi_cuda>();

assert(NativeProgram != 0);

Expand Down
6 changes: 3 additions & 3 deletions SYCL/DeprecatedFeatures/get_backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ using namespace cl::sycl;
bool check(backend be) {
switch (be) {
case backend::opencl:
case backend::level_zero:
case backend::cuda:
case backend::ext_oneapi_level_zero:
case backend::ext_oneapi_cuda:
case backend::ext_oneapi_hip:
case backend::host:
case backend::hip:
return true;
default:
return false;
Expand Down
26 changes: 15 additions & 11 deletions SYCL/FilterSelector/select.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,22 @@ int main() {

for (auto &Dev : Devs) {
auto Backend = Dev.get_platform().get_backend();
if (Backend == backend::level_zero) {
if (Backend == backend::ext_oneapi_level_zero) {
HasLevelZeroDevices = true;
} else if (Backend == backend::opencl) {
HasOpenCLDevices = true;
} else if (Backend == backend::cuda) {
} else if (Backend == backend::ext_oneapi_cuda) {
HasCUDADevices = true;
} else if (Backend == backend::hip) {
} else if (Backend == backend::ext_oneapi_hip) {
HasHIPDevices = true;
}
}

for (const auto &GPU : GPUs) {
if (GPU.get_platform().get_backend() == backend::opencl) {
HasOpenCLGPU = true;
} else if (GPU.get_platform().get_backend() == backend::level_zero) {
} else if (GPU.get_platform().get_backend() ==
backend::ext_oneapi_level_zero) {
HasLevelZeroGPU = true;
}
}
Expand Down Expand Up @@ -155,13 +156,13 @@ int main() {
if (HasLevelZeroDevices && HasLevelZeroGPU) {
std::cout << "Test 'level_zero'";
device d12(filter_selector("level_zero"));
assert(d12.get_platform().get_backend() == backend::level_zero);
assert(d12.get_platform().get_backend() == backend::ext_oneapi_level_zero);
std::cout << "...PASS" << std::endl;

std::cout << "Test 'level_zero:gpu'";
device d13(filter_selector("level_zero:gpu"));
assert(d13.is_gpu() &&
d13.get_platform().get_backend() == backend::level_zero);
d13.get_platform().get_backend() == backend::ext_oneapi_level_zero);
std::cout << "...PASS" << std::endl;

if (HasOpenCLDevices && !CPUs.empty()) {
Expand All @@ -170,7 +171,8 @@ int main() {
assert((d14.is_gpu() || d14.is_cpu()));
std::cout << "...PASS 1/2" << std::endl;
if (d14.is_gpu()) {
assert(d14.get_platform().get_backend() == backend::level_zero);
assert(d14.get_platform().get_backend() ==
backend::ext_oneapi_level_zero);
std::cout << "...PASS 2/2" << std::endl;
}
}
Expand All @@ -185,12 +187,13 @@ int main() {
if (HasCUDADevices) {
std::cout << "Test 'cuda'";
device d16(filter_selector("cuda"));
assert(d16.get_platform().get_backend() == backend::cuda);
assert(d16.get_platform().get_backend() == backend::ext_oneapi_cuda);
std::cout << "...PASS" << std::endl;

std::cout << "Test 'cuda:gpu'";
device d17(filter_selector("cuda:gpu"));
assert(d17.is_gpu() && d17.get_platform().get_backend() == backend::cuda);
assert(d17.is_gpu() &&
d17.get_platform().get_backend() == backend::ext_oneapi_cuda);
std::cout << "...PASS" << std::endl;
}

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

std::cout << "test 'hip:gpu'";
device d20(ext::oneapi::filter_selector("hip:gpu"));
assert(d20.is_gpu() && d19.get_platform().get_backend() == backend::hip);
assert(d20.is_gpu() &&
d20.get_platform().get_backend() == backend::ext_oneapi_hip);
std::cout << "...PASS" << std::endl;
}

Expand Down
6 changes: 3 additions & 3 deletions SYCL/OnlineCompiler/online_compiler_L0.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

// clang-format off
#include <level_zero/ze_api.h>
#include <CL/sycl/backend/level_zero.hpp>
#include <sycl/ext/oneapi/backend/level_zero.hpp>
// clang-format on

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

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

ze_module_build_log_handle_t ZeBuildLog;
ze_module_handle_t ZeModule;
Expand Down
9 changes: 5 additions & 4 deletions SYCL/Plugin/interop-level-zero-interop-task-mem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// SYCL
#include <CL/sycl.hpp>
#include <CL/sycl/backend/level_zero.hpp>
#include <sycl/ext/oneapi/backend/level_zero.hpp>

using namespace sycl;

Expand All @@ -24,21 +24,22 @@ int main() {
{SIZE, SIZE});

ze_context_handle_t ze_context =
queue.get_context().get_native<backend::level_zero>();
queue.get_context().get_native<backend::ext_oneapi_level_zero>();

queue
.submit([&](handler &cgh) {
auto buffer_acc = buffer.get_access<access::mode::write>(cgh);
auto image_acc = image.get_access<float4, access::mode::write>(cgh);
cgh.interop_task([=](const interop_handler &ih) {
void *device_ptr = ih.get_mem<backend::level_zero>(buffer_acc);
void *device_ptr =
ih.get_mem<backend::ext_oneapi_level_zero>(buffer_acc);
ze_memory_allocation_properties_t memAllocProperties{};
ze_result_t res = zeMemGetAllocProperties(
ze_context, device_ptr, &memAllocProperties, nullptr);
assert(res == ZE_RESULT_SUCCESS);

ze_image_handle_t ze_image =
ih.get_mem<backend::level_zero>(image_acc);
ih.get_mem<backend::ext_oneapi_level_zero>(image_acc);
assert(ze_image != nullptr);
});
})
Expand Down
6 changes: 3 additions & 3 deletions SYCL/Plugin/interop-level-zero-keep-ownership.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <CL/sycl.hpp>
// clang-format off
#include <level_zero/ze_api.h>
#include <CL/sycl/backend/level_zero.hpp>
#include <sycl/ext/oneapi/backend/level_zero.hpp>
// clang-format on

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

{ // Scope in which SYCL interop context object is live
Expand Down
8 changes: 5 additions & 3 deletions SYCL/Regression/cache_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
#include <stdio.h>

#include <CL/sycl.hpp>
#include <CL/sycl/backend/level_zero.hpp>
#include <sycl/ext/oneapi/backend/level_zero.hpp>

using namespace sycl::ext::oneapi;

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

// Create the platform and device objects using the native handle.
auto plt = cl::sycl::level_zero::make<cl::sycl::platform>(l0_drivers[0]);
auto dev = cl::sycl::level_zero::make<cl::sycl::device>(plt, l0_devices[0]);
auto plt = level_zero::make<cl::sycl::platform>(l0_drivers[0]);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

non-blocking comment: "cl::" here could be removed. I.e. "sycl::platform" instead of "cl::sycl::platform"

auto dev = level_zero::make<cl::sycl::device>(plt, l0_devices[0]);

// Check to see if this platform is in the platform list.
std::cout << "Platform created with native handle: "
Expand Down
2 changes: 1 addition & 1 deletion SYCL/SubGroup/sub_groups_sycl2020.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ int main() {
SG.get_local_linear_range();
};

if (Q.get_backend() != sycl::backend::cuda) {
if (Q.get_backend() != sycl::backend::ext_oneapi_cuda) {
sycl::kernel_id TestKernelID = sycl::get_kernel_id<TestKernel>();
sycl::kernel_bundle KernelBundle =
sycl::get_kernel_bundle<sycl::bundle_state::executable>(Q.get_context(),
Expand Down
Loading