Skip to content

Commit 91a74ca

Browse files
veselypetamartygrant
authored andcommitted
[PI][UR][HIP][CUDA][L0][NCPU] Pull in latest UR fixes. (#11155)
Fetch the latest revision of unified runtime: Notable changes * Some command buffer entry-points have been renamed, also 2 additions of membufferFill and USMFill * UrInit/urTearDown have been removed - replaced with loader only versions.
1 parent 6009642 commit 91a74ca

File tree

3 files changed

+6
-17
lines changed

3 files changed

+6
-17
lines changed

sycl/plugins/unified_runtime/ur/adapters/native_cpu/adapter.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,6 @@ struct ur_adapter_handle_t_ {
1313
std::atomic<uint32_t> RefCount = 0;
1414
} Adapter;
1515

16-
UR_APIEXPORT ur_result_t UR_APICALL urInit(ur_device_init_flags_t,
17-
ur_loader_config_handle_t) {
18-
return UR_RESULT_SUCCESS;
19-
}
20-
21-
UR_APIEXPORT ur_result_t UR_APICALL urTearDown(void *) {
22-
return UR_RESULT_SUCCESS;
23-
}
24-
2516
UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet(
2617
uint32_t, ur_adapter_handle_t *phAdapters, uint32_t *pNumAdapters) {
2718
if (phAdapters) {

sycl/plugins/unified_runtime/ur/adapters/native_cpu/command_buffer.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
6161
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
6262
}
6363

64-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
64+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp(
6565
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_mem_handle_t, size_t,
6666
size_t, size_t, uint32_t, const ur_exp_command_buffer_sync_point_t *,
6767
ur_exp_command_buffer_sync_point_t *) {
@@ -70,7 +70,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
7070
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
7171
}
7272

73-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
73+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp(
7474
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_mem_handle_t,
7575
ur_rect_offset_t, ur_rect_offset_t, ur_rect_region_t, size_t, size_t,
7676
size_t, size_t, uint32_t, const ur_exp_command_buffer_sync_point_t *,
@@ -81,7 +81,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
8181
}
8282

8383
UR_APIEXPORT
84-
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
84+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp(
8585
ur_exp_command_buffer_handle_t, ur_mem_handle_t, size_t, size_t,
8686
const void *, uint32_t, const ur_exp_command_buffer_sync_point_t *,
8787
ur_exp_command_buffer_sync_point_t *) {
@@ -91,7 +91,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
9191
}
9292

9393
UR_APIEXPORT
94-
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
94+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp(
9595
ur_exp_command_buffer_handle_t, ur_mem_handle_t, size_t, size_t, void *,
9696
uint32_t, const ur_exp_command_buffer_sync_point_t *,
9797
ur_exp_command_buffer_sync_point_t *) {
@@ -101,7 +101,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
101101
}
102102

103103
UR_APIEXPORT
104-
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
104+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp(
105105
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_rect_offset_t,
106106
ur_rect_offset_t, ur_rect_region_t, size_t, size_t, size_t, size_t, void *,
107107
uint32_t, const ur_exp_command_buffer_sync_point_t *,
@@ -112,7 +112,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
112112
}
113113

114114
UR_APIEXPORT
115-
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp(
115+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp(
116116
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_rect_offset_t,
117117
ur_rect_offset_t, ur_rect_region_t, size_t, size_t, size_t, size_t, void *,
118118
uint32_t, const ur_exp_command_buffer_sync_point_t *,

sycl/plugins/unified_runtime/ur/adapters/native_cpu/ur_interface_loader.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,6 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetGlobalProcAddrTable(
198198
if (UR_RESULT_SUCCESS != result) {
199199
return result;
200200
}
201-
pDdiTable->pfnInit = urInit;
202-
pDdiTable->pfnTearDown = urTearDown;
203201
pDdiTable->pfnAdapterGet = urAdapterGet;
204202
pDdiTable->pfnAdapterGetInfo = urAdapterGetInfo;
205203
pDdiTable->pfnAdapterRelease = urAdapterRelease;

0 commit comments

Comments
 (0)