Skip to content

Commit bb5a475

Browse files
aarongreigaarongreig
authored
[UR] Consolidate platform and adapter backend enums into one. (#17605)
second attempt to land #16173
1 parent da101ee commit bb5a475

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

+317
-457
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_platform_backend_t UrBackend) {
51+
backend convertUrBackend(ur_backend_t UrBackend) {
5252
switch (UrBackend) {
53-
case UR_PLATFORM_BACKEND_UNKNOWN:
53+
case UR_BACKEND_UNKNOWN:
5454
return backend::all; // No specific backend
55-
case UR_PLATFORM_BACKEND_LEVEL_ZERO:
55+
case UR_BACKEND_LEVEL_ZERO:
5656
return backend::ext_oneapi_level_zero;
57-
case UR_PLATFORM_BACKEND_OPENCL:
57+
case UR_BACKEND_OPENCL:
5858
return backend::opencl;
59-
case UR_PLATFORM_BACKEND_CUDA:
59+
case UR_BACKEND_CUDA:
6060
return backend::ext_oneapi_cuda;
61-
case UR_PLATFORM_BACKEND_HIP:
61+
case UR_BACKEND_HIP:
6262
return backend::ext_oneapi_hip;
63-
case UR_PLATFORM_BACKEND_NATIVE_CPU:
63+
case UR_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
@@ -210,10 +210,10 @@ platform_impl::filterDeviceFilter(std::vector<ur_device_handle_t> &UrDevices,
210210
std::vector<int> original_indices;
211211

212212
// Find out backend of the platform
213-
ur_platform_backend_t UrBackend = UR_PLATFORM_BACKEND_UNKNOWN;
213+
ur_backend_t UrBackend = UR_BACKEND_UNKNOWN;
214214
MAdapter->call<UrApiKind::urPlatformGetInfo>(
215-
MPlatform, UR_PLATFORM_INFO_BACKEND, sizeof(ur_platform_backend_t),
216-
&UrBackend, nullptr);
215+
MPlatform, UR_PLATFORM_INFO_BACKEND, sizeof(ur_backend_t), &UrBackend,
216+
nullptr);
217217
backend Backend = convertUrBackend(UrBackend);
218218

219219
int InsertIDx = 0;

‎sycl/source/detail/platform_impl.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ class platform_impl : public std::enable_shared_from_this<platform_impl> {
4343
const std::shared_ptr<Adapter> &AAdapter)
4444
: MPlatform(APlatform), MAdapter(AAdapter) {
4545
// Find out backend of the platform
46-
ur_platform_backend_t UrBackend = UR_PLATFORM_BACKEND_UNKNOWN;
46+
ur_backend_t UrBackend = UR_BACKEND_UNKNOWN;
4747
AAdapter->call_nocheck<UrApiKind::urPlatformGetInfo>(
48-
APlatform, UR_PLATFORM_INFO_BACKEND, sizeof(ur_platform_backend_t),
49-
&UrBackend, nullptr);
48+
APlatform, UR_PLATFORM_INFO_BACKEND, sizeof(ur_backend_t), &UrBackend,
49+
nullptr);
5050
MBackend = convertUrBackend(UrBackend);
5151
}
5252

‎sycl/source/detail/ur.cpp

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

208-
auto UrToSyclBackend = [](ur_adapter_backend_t backend) -> sycl::backend {
208+
auto UrToSyclBackend = [](ur_backend_t backend) -> sycl::backend {
209209
switch (backend) {
210-
case UR_ADAPTER_BACKEND_LEVEL_ZERO:
210+
case UR_BACKEND_LEVEL_ZERO:
211211
return backend::ext_oneapi_level_zero;
212-
case UR_ADAPTER_BACKEND_OPENCL:
212+
case UR_BACKEND_OPENCL:
213213
return backend::opencl;
214-
case UR_ADAPTER_BACKEND_CUDA:
214+
case UR_BACKEND_CUDA:
215215
return backend::ext_oneapi_cuda;
216-
case UR_ADAPTER_BACKEND_HIP:
216+
case UR_BACKEND_HIP:
217217
return backend::ext_oneapi_hip;
218-
case UR_ADAPTER_BACKEND_NATIVE_CPU:
218+
case UR_BACKEND_NATIVE_CPU:
219219
return backend::ext_oneapi_native_cpu;
220220
default:
221221
// Throw an exception, this should be unreachable.
@@ -225,7 +225,7 @@ static void initializeAdapters(std::vector<AdapterPtr> &Adapters,
225225
};
226226

227227
for (const auto &UrAdapter : adapters) {
228-
ur_adapter_backend_t adapterBackend = UR_ADAPTER_BACKEND_UNKNOWN;
228+
ur_backend_t adapterBackend = UR_BACKEND_UNKNOWN;
229229
CHECK_UR_SUCCESS(adapterGetInfo(UrAdapter, UR_ADAPTER_INFO_BACKEND,
230230
sizeof(adapterBackend), &adapterBackend,
231231
nullptr));

‎sycl/source/detail/ur.hpp

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

4141
// Convert from UR backend to SYCL backend enum
42-
backend convertUrBackend(ur_platform_backend_t UrBackend);
42+
backend convertUrBackend(ur_backend_t UrBackend);
4343

4444
template <auto ApiKind, typename SyclImplTy, typename DescTy>
4545
std::string urGetInfoString(SyclImplTy &SyclImpl, DescTy Desc) {

‎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_PLATFORM_BACKEND_UNKNOWN;
38+
constexpr auto MockPlatformBackend = UR_BACKEND_UNKNOWN;
3939
if (*params.ppPropValue) {
4040
std::memcpy(*params.ppPropValue, &MockPlatformBackend,
4141
sizeof(MockPlatformBackend));

‎sycl/unittests/helpers/UrMock.hpp

Lines changed: 14 additions & 34 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_adapter_backend_t Backend>
86+
template <ur_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_platform_backend_t Backend>
103+
template <ur_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,16 +556,14 @@ 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(
560-
urAdapterGetInfo,
561-
mock_urAdapterGetInfo<convertToUrAdapterBackend(Backend)>)
559+
ADD_DEFAULT_OVERRIDE(urAdapterGetInfo,
560+
mock_urAdapterGetInfo<convertToUrBackend(Backend)>)
562561
ADD_DEFAULT_OVERRIDE(urPlatformGet, mock_urPlatformGet)
563562
ADD_DEFAULT_OVERRIDE(urDeviceGet, mock_urDeviceGet)
564563
ADD_DEFAULT_OVERRIDE(urDeviceRetain, mock_urDeviceRetain)
565564
ADD_DEFAULT_OVERRIDE(urDeviceRelease, mock_urDeviceRelease)
566-
ADD_DEFAULT_OVERRIDE(
567-
urPlatformGetInfo,
568-
mock_urPlatformGetInfo<convertToUrPlatformBackend(Backend)>)
565+
ADD_DEFAULT_OVERRIDE(urPlatformGetInfo,
566+
mock_urPlatformGetInfo<convertToUrBackend(Backend)>)
569567
ADD_DEFAULT_OVERRIDE(urDeviceGetInfo, mock_urDeviceGetInfo)
570568
ADD_DEFAULT_OVERRIDE(urProgramGetInfo, mock_urProgramGetInfo)
571569
ADD_DEFAULT_OVERRIDE(urContextGetInfo, mock_urContextGetInfo)
@@ -623,39 +621,21 @@ template <sycl::backend Backend = backend::opencl> class UrMock {
623621
private:
624622
// These two helpers are needed to enable arbitrary backend selection
625623
// at compile time.
626-
static constexpr ur_platform_backend_t
627-
convertToUrPlatformBackend(const sycl::backend SyclBackend) {
624+
static constexpr ur_backend_t
625+
convertToUrBackend(const sycl::backend SyclBackend) {
628626
switch (SyclBackend) {
629627
case sycl::backend::opencl:
630-
return UR_PLATFORM_BACKEND_OPENCL;
628+
return UR_BACKEND_OPENCL;
631629
case sycl::backend::ext_oneapi_level_zero:
632-
return UR_PLATFORM_BACKEND_LEVEL_ZERO;
630+
return UR_BACKEND_LEVEL_ZERO;
633631
case sycl::backend::ext_oneapi_cuda:
634-
return UR_PLATFORM_BACKEND_CUDA;
632+
return UR_BACKEND_CUDA;
635633
case sycl::backend::ext_oneapi_hip:
636-
return UR_PLATFORM_BACKEND_HIP;
634+
return UR_BACKEND_HIP;
637635
case sycl::backend::ext_oneapi_native_cpu:
638-
return UR_PLATFORM_BACKEND_NATIVE_CPU;
636+
return UR_BACKEND_NATIVE_CPU;
639637
default:
640-
return UR_PLATFORM_BACKEND_UNKNOWN;
641-
}
642-
}
643-
644-
static constexpr ur_adapter_backend_t
645-
convertToUrAdapterBackend(sycl::backend SyclBackend) {
646-
switch (SyclBackend) {
647-
case sycl::backend::opencl:
648-
return UR_ADAPTER_BACKEND_OPENCL;
649-
case sycl::backend::ext_oneapi_level_zero:
650-
return UR_ADAPTER_BACKEND_LEVEL_ZERO;
651-
case sycl::backend::ext_oneapi_cuda:
652-
return UR_ADAPTER_BACKEND_CUDA;
653-
case sycl::backend::ext_oneapi_hip:
654-
return UR_ADAPTER_BACKEND_HIP;
655-
case sycl::backend::ext_oneapi_native_cpu:
656-
return UR_ADAPTER_BACKEND_NATIVE_CPU;
657-
default:
658-
return UR_ADAPTER_BACKEND_UNKNOWN;
638+
return UR_BACKEND_UNKNOWN;
659639
}
660640
}
661641
};

‎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_adapter_backend_t backend;
52+
ur_backend_t backend;
5353
ur_check(urAdapterGetInfo(adapter, UR_ADAPTER_INFO_BACKEND,
54-
sizeof(ur_adapter_backend_t), &backend, nullptr));
54+
sizeof(ur_backend_t), &backend, nullptr));
5555

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

‎unified-runtime/include/ur_api.h

Lines changed: 25 additions & 46 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: 11 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)