Skip to content

Commit 0886791

Browse files
aelovikov-intelaelovikov-intel
authored
Revert "[UR] Consolidate platform and adapter backend enums into one." (#17604)
Reverts #16173
1 parent 7515943 commit 0886791

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+456
-319
lines changed

‎sycl/source/backend.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,19 @@ static const AdapterPtr &getAdapter(backend Backend) {
4848
}
4949
}
5050

51-
backend convertUrBackend(ur_backend_t UrBackend) {
51+
backend convertUrBackend(ur_platform_backend_t UrBackend) {
5252
switch (UrBackend) {
53-
case UR_BACKEND_UNKNOWN:
53+
case UR_PLATFORM_BACKEND_UNKNOWN:
5454
return backend::all; // No specific backend
55-
case UR_BACKEND_LEVEL_ZERO:
55+
case UR_PLATFORM_BACKEND_LEVEL_ZERO:
5656
return backend::ext_oneapi_level_zero;
57-
case UR_BACKEND_OPENCL:
57+
case UR_PLATFORM_BACKEND_OPENCL:
5858
return backend::opencl;
59-
case UR_BACKEND_CUDA:
59+
case UR_PLATFORM_BACKEND_CUDA:
6060
return backend::ext_oneapi_cuda;
61-
case UR_BACKEND_HIP:
61+
case UR_PLATFORM_BACKEND_HIP:
6262
return backend::ext_oneapi_hip;
63-
case UR_BACKEND_NATIVE_CPU:
63+
case UR_PLATFORM_BACKEND_NATIVE_CPU:
6464
return backend::ext_oneapi_native_cpu;
6565
default:
6666
throw exception(make_error_code(errc::runtime),

‎sycl/source/detail/platform_impl.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@ platform_impl::filterDeviceFilter(std::vector<ur_device_handle_t> &UrDevices,
208208
std::vector<int> original_indices;
209209

210210
// Find out backend of the platform
211-
ur_backend_t UrBackend = UR_BACKEND_UNKNOWN;
211+
ur_platform_backend_t UrBackend = UR_PLATFORM_BACKEND_UNKNOWN;
212212
MAdapter->call<UrApiKind::urPlatformGetInfo>(
213-
MPlatform, UR_PLATFORM_INFO_BACKEND, sizeof(ur_backend_t), &UrBackend,
214-
nullptr);
213+
MPlatform, UR_PLATFORM_INFO_BACKEND, sizeof(ur_platform_backend_t),
214+
&UrBackend, nullptr);
215215
backend Backend = convertUrBackend(UrBackend);
216216

217217
int InsertIDx = 0;

‎sycl/source/detail/platform_impl.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ class platform_impl {
4141
const std::shared_ptr<Adapter> &AAdapter)
4242
: MPlatform(APlatform), MAdapter(AAdapter) {
4343
// Find out backend of the platform
44-
ur_backend_t UrBackend = UR_BACKEND_UNKNOWN;
44+
ur_platform_backend_t UrBackend = UR_PLATFORM_BACKEND_UNKNOWN;
4545
AAdapter->call_nocheck<UrApiKind::urPlatformGetInfo>(
46-
APlatform, UR_PLATFORM_INFO_BACKEND, sizeof(ur_backend_t), &UrBackend,
47-
nullptr);
46+
APlatform, UR_PLATFORM_INFO_BACKEND, sizeof(ur_platform_backend_t),
47+
&UrBackend, nullptr);
4848
MBackend = convertUrBackend(UrBackend);
4949
}
5050

‎sycl/source/detail/ur.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,17 +193,17 @@ static void initializeAdapters(std::vector<AdapterPtr> &Adapters,
193193
std::vector<ur_adapter_handle_t> adapters(adapterCount);
194194
CHECK_UR_SUCCESS(adapterGet(adapterCount, adapters.data(), nullptr));
195195

196-
auto UrToSyclBackend = [](ur_backend_t backend) -> sycl::backend {
196+
auto UrToSyclBackend = [](ur_adapter_backend_t backend) -> sycl::backend {
197197
switch (backend) {
198-
case UR_BACKEND_LEVEL_ZERO:
198+
case UR_ADAPTER_BACKEND_LEVEL_ZERO:
199199
return backend::ext_oneapi_level_zero;
200-
case UR_BACKEND_OPENCL:
200+
case UR_ADAPTER_BACKEND_OPENCL:
201201
return backend::opencl;
202-
case UR_BACKEND_CUDA:
202+
case UR_ADAPTER_BACKEND_CUDA:
203203
return backend::ext_oneapi_cuda;
204-
case UR_BACKEND_HIP:
204+
case UR_ADAPTER_BACKEND_HIP:
205205
return backend::ext_oneapi_hip;
206-
case UR_BACKEND_NATIVE_CPU:
206+
case UR_ADAPTER_BACKEND_NATIVE_CPU:
207207
return backend::ext_oneapi_native_cpu;
208208
default:
209209
// Throw an exception, this should be unreachable.
@@ -213,7 +213,7 @@ static void initializeAdapters(std::vector<AdapterPtr> &Adapters,
213213
};
214214

215215
for (const auto &UrAdapter : adapters) {
216-
ur_backend_t adapterBackend = UR_BACKEND_UNKNOWN;
216+
ur_adapter_backend_t adapterBackend = UR_ADAPTER_BACKEND_UNKNOWN;
217217
CHECK_UR_SUCCESS(adapterGetInfo(UrAdapter, UR_ADAPTER_INFO_BACKEND,
218218
sizeof(adapterBackend), &adapterBackend,
219219
nullptr));

‎sycl/source/detail/ur.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ template <backend BE> const AdapterPtr &getAdapter();
3838
} // namespace ur
3939

4040
// Convert from UR backend to SYCL backend enum
41-
backend convertUrBackend(ur_backend_t UrBackend);
41+
backend convertUrBackend(ur_platform_backend_t UrBackend);
4242

4343
} // namespace detail
4444
} // namespace _V1

‎sycl/unittests/Extensions/FPGADeviceSelectors.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ template <const char PlatformName[]> struct RedefTemplatedWrapper {
3535
return UR_RESULT_SUCCESS;
3636
}
3737
case UR_PLATFORM_INFO_BACKEND: {
38-
constexpr auto MockPlatformBackend = UR_BACKEND_UNKNOWN;
38+
constexpr auto MockPlatformBackend = UR_PLATFORM_BACKEND_UNKNOWN;
3939
if (*params.ppPropValue) {
4040
std::memcpy(*params.ppPropValue, &MockPlatformBackend,
4141
sizeof(MockPlatformBackend));

‎sycl/unittests/helpers/UrMock.hpp

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ inline ur_result_t mock_urDeviceGet(void *pParams) {
8383
inline ur_result_t mock_urDeviceRetain(void *) { return UR_RESULT_SUCCESS; }
8484
inline ur_result_t mock_urDeviceRelease(void *) { return UR_RESULT_SUCCESS; }
8585

86-
template <ur_backend_t Backend>
86+
template <ur_adapter_backend_t Backend>
8787
inline ur_result_t mock_urAdapterGetInfo(void *pParams) {
8888
auto params = reinterpret_cast<ur_adapter_get_info_params_t *>(pParams);
8989

@@ -100,7 +100,7 @@ inline ur_result_t mock_urAdapterGetInfo(void *pParams) {
100100
return UR_RESULT_SUCCESS;
101101
}
102102

103-
template <ur_backend_t Backend>
103+
template <ur_platform_backend_t Backend>
104104
inline ur_result_t mock_urPlatformGetInfo(void *pParams) {
105105
auto params = reinterpret_cast<ur_platform_get_info_params_t *>(pParams);
106106
constexpr char MockPlatformName[] = "Mock platform";
@@ -556,14 +556,16 @@ template <sycl::backend Backend = backend::opencl> class UrMock {
556556
#define ADD_DEFAULT_OVERRIDE(func_name, func_override) \
557557
mock::getCallbacks().set_replace_callback(#func_name, \
558558
&MockAdapter::func_override);
559-
ADD_DEFAULT_OVERRIDE(urAdapterGetInfo,
560-
mock_urAdapterGetInfo<convertToUrBackend(Backend)>)
559+
ADD_DEFAULT_OVERRIDE(
560+
urAdapterGetInfo,
561+
mock_urAdapterGetInfo<convertToUrAdapterBackend(Backend)>)
561562
ADD_DEFAULT_OVERRIDE(urPlatformGet, mock_urPlatformGet)
562563
ADD_DEFAULT_OVERRIDE(urDeviceGet, mock_urDeviceGet)
563564
ADD_DEFAULT_OVERRIDE(urDeviceRetain, mock_urDeviceRetain)
564565
ADD_DEFAULT_OVERRIDE(urDeviceRelease, mock_urDeviceRelease)
565-
ADD_DEFAULT_OVERRIDE(urPlatformGetInfo,
566-
mock_urPlatformGetInfo<convertToUrBackend(Backend)>)
566+
ADD_DEFAULT_OVERRIDE(
567+
urPlatformGetInfo,
568+
mock_urPlatformGetInfo<convertToUrPlatformBackend(Backend)>)
567569
ADD_DEFAULT_OVERRIDE(urDeviceGetInfo, mock_urDeviceGetInfo)
568570
ADD_DEFAULT_OVERRIDE(urProgramGetInfo, mock_urProgramGetInfo)
569571
ADD_DEFAULT_OVERRIDE(urContextGetInfo, mock_urContextGetInfo)
@@ -617,21 +619,39 @@ template <sycl::backend Backend = backend::opencl> class UrMock {
617619
private:
618620
// These two helpers are needed to enable arbitrary backend selection
619621
// at compile time.
620-
static constexpr ur_backend_t
621-
convertToUrBackend(const sycl::backend SyclBackend) {
622+
static constexpr ur_platform_backend_t
623+
convertToUrPlatformBackend(const sycl::backend SyclBackend) {
622624
switch (SyclBackend) {
623625
case sycl::backend::opencl:
624-
return UR_BACKEND_OPENCL;
626+
return UR_PLATFORM_BACKEND_OPENCL;
625627
case sycl::backend::ext_oneapi_level_zero:
626-
return UR_BACKEND_LEVEL_ZERO;
628+
return UR_PLATFORM_BACKEND_LEVEL_ZERO;
627629
case sycl::backend::ext_oneapi_cuda:
628-
return UR_BACKEND_CUDA;
630+
return UR_PLATFORM_BACKEND_CUDA;
629631
case sycl::backend::ext_oneapi_hip:
630-
return UR_BACKEND_HIP;
632+
return UR_PLATFORM_BACKEND_HIP;
631633
case sycl::backend::ext_oneapi_native_cpu:
632-
return UR_BACKEND_NATIVE_CPU;
634+
return UR_PLATFORM_BACKEND_NATIVE_CPU;
633635
default:
634-
return UR_BACKEND_UNKNOWN;
636+
return UR_PLATFORM_BACKEND_UNKNOWN;
637+
}
638+
}
639+
640+
static constexpr ur_adapter_backend_t
641+
convertToUrAdapterBackend(sycl::backend SyclBackend) {
642+
switch (SyclBackend) {
643+
case sycl::backend::opencl:
644+
return UR_ADAPTER_BACKEND_OPENCL;
645+
case sycl::backend::ext_oneapi_level_zero:
646+
return UR_ADAPTER_BACKEND_LEVEL_ZERO;
647+
case sycl::backend::ext_oneapi_cuda:
648+
return UR_ADAPTER_BACKEND_CUDA;
649+
case sycl::backend::ext_oneapi_hip:
650+
return UR_ADAPTER_BACKEND_HIP;
651+
case sycl::backend::ext_oneapi_native_cpu:
652+
return UR_ADAPTER_BACKEND_NATIVE_CPU;
653+
default:
654+
return UR_ADAPTER_BACKEND_UNKNOWN;
635655
}
636656
}
637657
};

‎unified-runtime/examples/codegen/codegen.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ std::vector<ur_adapter_handle_t>
4949
get_supported_adapters(std::vector<ur_adapter_handle_t> &adapters) {
5050
std::vector<ur_adapter_handle_t> supported_adapters;
5151
for (auto adapter : adapters) {
52-
ur_backend_t backend;
52+
ur_adapter_backend_t backend;
5353
ur_check(urAdapterGetInfo(adapter, UR_ADAPTER_INFO_BACKEND,
54-
sizeof(ur_backend_t), &backend, nullptr));
54+
sizeof(ur_adapter_backend_t), &backend, nullptr));
5555

56-
if (backend == UR_BACKEND_LEVEL_ZERO) {
56+
if (backend == UR_ADAPTER_BACKEND_LEVEL_ZERO) {
5757
supported_adapters.push_back(adapter);
5858
}
5959
}

‎unified-runtime/include/ur_api.h

Lines changed: 46 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unified-runtime/include/ur_print.h

Lines changed: 20 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)