Skip to content

Commit 0b56545

Browse files
authored
[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 e08d63b commit 0b56545

File tree

3 files changed

+38
-30
lines changed

3 files changed

+38
-30
lines changed

adapter.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,6 @@ struct ur_adapter_handle_t_ {
1818

1919
ur_adapter_handle_t_ adapter{};
2020

21-
UR_APIEXPORT ur_result_t UR_APICALL urInit(ur_device_init_flags_t,
22-
ur_loader_config_handle_t) {
23-
return UR_RESULT_SUCCESS;
24-
}
25-
26-
UR_APIEXPORT ur_result_t UR_APICALL urTearDown(void *) {
27-
return UR_RESULT_SUCCESS;
28-
}
29-
3021
UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet(
3122
uint32_t, ur_adapter_handle_t *phAdapters, uint32_t *pNumAdapters) {
3223
if (phAdapters) {

command_buffer.cpp

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
5050
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
5151
}
5252

53-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
53+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp(
5454
ur_exp_command_buffer_handle_t, void *, const void *, size_t, uint32_t,
5555
const ur_exp_command_buffer_sync_point_t *,
5656
ur_exp_command_buffer_sync_point_t *) {
@@ -59,7 +59,25 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
5959
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
6060
}
6161

62-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
62+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMFillExp(
63+
ur_exp_command_buffer_handle_t, void *, const void *, size_t, size_t,
64+
uint32_t, const ur_exp_command_buffer_sync_point_t *,
65+
ur_exp_command_buffer_sync_point_t *) {
66+
detail::ur::die("Experimental Command-buffer feature is not implemented for "
67+
"HIP adapter.");
68+
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
69+
}
70+
71+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferFillExp(
72+
ur_exp_command_buffer_handle_t, ur_mem_handle_t, const void *, size_t,
73+
size_t, size_t, uint32_t, const ur_exp_command_buffer_sync_point_t *,
74+
ur_exp_command_buffer_sync_point_t *) {
75+
detail::ur::die("Experimental Command-buffer feature is not implemented for "
76+
"HIP adapter.");
77+
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
78+
}
79+
80+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp(
6381
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_mem_handle_t, size_t,
6482
size_t, size_t, uint32_t, const ur_exp_command_buffer_sync_point_t *,
6583
ur_exp_command_buffer_sync_point_t *) {
@@ -68,7 +86,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
6886
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
6987
}
7088

71-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
89+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp(
7290
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_mem_handle_t,
7391
ur_rect_offset_t, ur_rect_offset_t, ur_rect_region_t, size_t, size_t,
7492
size_t, size_t, uint32_t, const ur_exp_command_buffer_sync_point_t *,
@@ -79,7 +97,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
7997
}
8098

8199
UR_APIEXPORT
82-
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
100+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp(
83101
ur_exp_command_buffer_handle_t, ur_mem_handle_t, size_t, size_t,
84102
const void *, uint32_t, const ur_exp_command_buffer_sync_point_t *,
85103
ur_exp_command_buffer_sync_point_t *) {
@@ -89,7 +107,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
89107
}
90108

91109
UR_APIEXPORT
92-
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
110+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp(
93111
ur_exp_command_buffer_handle_t, ur_mem_handle_t, size_t, size_t, void *,
94112
uint32_t, const ur_exp_command_buffer_sync_point_t *,
95113
ur_exp_command_buffer_sync_point_t *) {
@@ -99,7 +117,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
99117
}
100118

101119
UR_APIEXPORT
102-
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
120+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp(
103121
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_rect_offset_t,
104122
ur_rect_offset_t, ur_rect_region_t, size_t, size_t, size_t, size_t, void *,
105123
uint32_t, const ur_exp_command_buffer_sync_point_t *,
@@ -110,7 +128,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
110128
}
111129

112130
UR_APIEXPORT
113-
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp(
131+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp(
114132
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_rect_offset_t,
115133
ur_rect_offset_t, ur_rect_region_t, size_t, size_t, size_t, size_t, void *,
116134
uint32_t, const ur_exp_command_buffer_sync_point_t *,

ur_interface_loader.cpp

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,6 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetGlobalProcAddrTable(
200200
if (UR_RESULT_SUCCESS != result) {
201201
return result;
202202
}
203-
204-
pDdiTable->pfnInit = urInit;
205-
pDdiTable->pfnTearDown = urTearDown;
206203
pDdiTable->pfnAdapterGet = urAdapterGet;
207204
pDdiTable->pfnAdapterGetInfo = urAdapterGetInfo;
208205
pDdiTable->pfnAdapterGetLastError = urAdapterGetLastError;
@@ -276,17 +273,19 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetCommandBufferExpProcAddrTable(
276273
pDdiTable->pfnReleaseExp = urCommandBufferReleaseExp;
277274
pDdiTable->pfnFinalizeExp = urCommandBufferFinalizeExp;
278275
pDdiTable->pfnAppendKernelLaunchExp = urCommandBufferAppendKernelLaunchExp;
279-
pDdiTable->pfnAppendMemcpyUSMExp = urCommandBufferAppendMemcpyUSMExp;
280-
pDdiTable->pfnAppendMembufferCopyExp = urCommandBufferAppendMembufferCopyExp;
281-
pDdiTable->pfnAppendMembufferCopyRectExp =
282-
urCommandBufferAppendMembufferCopyRectExp;
283-
pDdiTable->pfnAppendMembufferReadExp = urCommandBufferAppendMembufferReadExp;
284-
pDdiTable->pfnAppendMembufferReadRectExp =
285-
urCommandBufferAppendMembufferReadRectExp;
286-
pDdiTable->pfnAppendMembufferWriteExp =
287-
urCommandBufferAppendMembufferWriteExp;
288-
pDdiTable->pfnAppendMembufferWriteRectExp =
289-
urCommandBufferAppendMembufferWriteRectExp;
276+
pDdiTable->pfnAppendUSMMemcpyExp = urCommandBufferAppendUSMMemcpyExp;
277+
pDdiTable->pfnAppendUSMFillExp = urCommandBufferAppendUSMFillExp;
278+
pDdiTable->pfnAppendMemBufferCopyExp = urCommandBufferAppendMemBufferCopyExp;
279+
pDdiTable->pfnAppendMemBufferCopyRectExp =
280+
urCommandBufferAppendMemBufferCopyRectExp;
281+
pDdiTable->pfnAppendMemBufferReadExp = urCommandBufferAppendMemBufferReadExp;
282+
pDdiTable->pfnAppendMemBufferReadRectExp =
283+
urCommandBufferAppendMemBufferReadRectExp;
284+
pDdiTable->pfnAppendMemBufferWriteExp =
285+
urCommandBufferAppendMemBufferWriteExp;
286+
pDdiTable->pfnAppendMemBufferWriteRectExp =
287+
urCommandBufferAppendMemBufferWriteRectExp;
288+
pDdiTable->pfnAppendMemBufferFillExp = urCommandBufferAppendMemBufferFillExp;
290289
pDdiTable->pfnEnqueueExp = urCommandBufferEnqueueExp;
291290

292291
return retVal;

0 commit comments

Comments
 (0)