Skip to content

Commit 925c004

Browse files
veselypetaveselypeta
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 9ea4f65 commit 925c004

File tree

15 files changed

+127
-133
lines changed

15 files changed

+127
-133
lines changed

‎sycl/plugins/unified_runtime/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if (NOT DEFINED UNIFIED_RUNTIME_LIBRARY OR NOT DEFINED UNIFIED_RUNTIME_INCLUDE_D
44
include(FetchContent)
55

66
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
7-
set(UNIFIED_RUNTIME_TAG b3cc9ae3f99ca7faff1ba765dd36652fef2cfddd)
7+
set(UNIFIED_RUNTIME_TAG a346a301d776bc72c228d26fbf54af99c6ade1bf)
88

99
set(UMF_ENABLE_POOL_TRACKING ON)
1010
message(STATUS "Will fetch Unified Runtime from ${UNIFIED_RUNTIME_REPO}")

‎sycl/plugins/unified_runtime/pi2ur.hpp‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -787,20 +787,13 @@ inline pi_result piTearDown(void *PluginParameter) {
787787
}
788788
});
789789
HANDLE_ERRORS(Ret);
790-
791-
// TODO: Dont check for errors in urTearDown, since
792-
// when using Level Zero plugin, the second urTearDown
793-
// will fail as ur_loader.so has already been unloaded,
794-
urTearDown(nullptr);
795790
return PI_SUCCESS;
796791
}
797792

798793
///////////////////////////////////////////////////////////////////////////////
799794
// Platform
800795
inline pi_result piPlatformsGet(pi_uint32 NumEntries, pi_platform *Platforms,
801796
pi_uint32 *NumPlatforms) {
802-
803-
urInit(0, nullptr);
804797
// We're not going through the UR loader so we're guaranteed to have exactly
805798
// one adapter (whichever is statically linked). The PI plugin for UR has its
806799
// own implementation of piPlatformsGet.
@@ -4347,7 +4340,7 @@ inline pi_result piextCommandBufferMemcpyUSM(
43474340
ur_exp_command_buffer_handle_t UrCommandBuffer =
43484341
reinterpret_cast<ur_exp_command_buffer_handle_t>(CommandBuffer);
43494342

4350-
HANDLE_ERRORS(urCommandBufferAppendMemcpyUSMExp(
4343+
HANDLE_ERRORS(urCommandBufferAppendUSMMemcpyExp(
43514344
UrCommandBuffer, DstPtr, SrcPtr, Size, NumSyncPointsInWaitList,
43524345
SyncPointWaitList, SyncPoint));
43534346

@@ -4365,7 +4358,7 @@ inline pi_result piextCommandBufferMemBufferCopy(
43654358
ur_mem_handle_t UrSrcMem = reinterpret_cast<ur_mem_handle_t>(SrcMem);
43664359
ur_mem_handle_t UrDstMem = reinterpret_cast<ur_mem_handle_t>(DstMem);
43674360

4368-
HANDLE_ERRORS(urCommandBufferAppendMembufferCopyExp(
4361+
HANDLE_ERRORS(urCommandBufferAppendMemBufferCopyExp(
43694362
UrCommandBuffer, UrSrcMem, UrDstMem, SrcOffset, DstOffset, Size,
43704363
NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint));
43714364

@@ -4393,7 +4386,7 @@ inline pi_result piextCommandBufferMemBufferCopyRect(
43934386
UrRegion.height = Region->height_scalar;
43944387
UrRegion.width = Region->width_bytes;
43954388

4396-
HANDLE_ERRORS(urCommandBufferAppendMembufferCopyRectExp(
4389+
HANDLE_ERRORS(urCommandBufferAppendMemBufferCopyRectExp(
43974390
UrCommandBuffer, UrSrcMem, UrDstMem, UrSrcOrigin, UrDstOrigin, UrRegion,
43984391
SrcRowPitch, SrcSlicePitch, DstRowPitch, DstSlicePitch,
43994392
NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint));
@@ -4423,7 +4416,7 @@ inline pi_result piextCommandBufferMemBufferReadRect(
44234416
UrRegion.height = Region->height_scalar;
44244417
UrRegion.width = Region->width_bytes;
44254418

4426-
HANDLE_ERRORS(urCommandBufferAppendMembufferReadRectExp(
4419+
HANDLE_ERRORS(urCommandBufferAppendMemBufferReadRectExp(
44274420
UrCommandBuffer, UrBuffer, UrBufferOffset, UrHostOffset, UrRegion,
44284421
BufferRowPitch, BufferSlicePitch, HostRowPitch, HostSlicePitch, Ptr,
44294422
NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint));
@@ -4441,7 +4434,7 @@ inline pi_result piextCommandBufferMemBufferRead(
44414434
reinterpret_cast<ur_exp_command_buffer_handle_t>(CommandBuffer);
44424435
ur_mem_handle_t UrBuffer = reinterpret_cast<ur_mem_handle_t>(Src);
44434436

4444-
HANDLE_ERRORS(urCommandBufferAppendMembufferReadExp(
4437+
HANDLE_ERRORS(urCommandBufferAppendMemBufferReadExp(
44454438
UrCommandBuffer, UrBuffer, Offset, Size, Dst, NumSyncPointsInWaitList,
44464439
SyncPointWaitList, SyncPoint));
44474440

@@ -4470,7 +4463,7 @@ inline pi_result piextCommandBufferMemBufferWriteRect(
44704463
UrRegion.height = Region->height_scalar;
44714464
UrRegion.width = Region->width_bytes;
44724465

4473-
HANDLE_ERRORS(urCommandBufferAppendMembufferWriteRectExp(
4466+
HANDLE_ERRORS(urCommandBufferAppendMemBufferWriteRectExp(
44744467
UrCommandBuffer, UrBuffer, UrBufferOffset, UrHostOffset, UrRegion,
44754468
BufferRowPitch, BufferSlicePitch, HostRowPitch, HostSlicePitch,
44764469
const_cast<void *>(Ptr), NumSyncPointsInWaitList, SyncPointWaitList,
@@ -4490,7 +4483,7 @@ inline pi_result piextCommandBufferMemBufferWrite(
44904483
reinterpret_cast<ur_exp_command_buffer_handle_t>(CommandBuffer);
44914484
ur_mem_handle_t UrBuffer = reinterpret_cast<ur_mem_handle_t>(Buffer);
44924485

4493-
HANDLE_ERRORS(urCommandBufferAppendMembufferWriteExp(
4486+
HANDLE_ERRORS(urCommandBufferAppendMemBufferWriteExp(
44944487
UrCommandBuffer, UrBuffer, Offset, Size, const_cast<void *>(Ptr),
44954488
NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint));
44964489

‎sycl/plugins/unified_runtime/pi_unified_runtime.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ static void releaseAdapters(std::vector<ur_adapter_handle_t> &Vec) {
2525
for (auto Adapter : Vec) {
2626
urAdapterRelease(Adapter);
2727
}
28-
urTearDown(nullptr);
28+
urLoaderTearDown();
2929
});
3030
}
3131

@@ -1146,7 +1146,7 @@ __SYCL_EXPORT pi_result piextPeerAccessGetInfo(
11461146

11471147
__SYCL_EXPORT pi_result piTearDown(void *) {
11481148
releaseAdapters(Adapters.Vec);
1149-
urTearDown(nullptr);
1149+
urLoaderTearDown();
11501150
return PI_SUCCESS;
11511151
}
11521152

@@ -1303,7 +1303,7 @@ __SYCL_EXPORT pi_result piPluginInit(pi_plugin *PluginInit) {
13031303
strncpy(PluginInit->PluginVersion, SupportedVersion, PluginVersionSize);
13041304

13051305
// Initialize UR and discover adapters
1306-
HANDLE_ERRORS(urInit(0, nullptr));
1306+
HANDLE_ERRORS(urLoaderInit(0, nullptr));
13071307
uint32_t NumAdapters;
13081308
HANDLE_ERRORS(urAdapterGet(0, nullptr, &NumAdapters));
13091309
if (NumAdapters > 0) {

‎sycl/plugins/unified_runtime/ur/adapters/cuda/adapter.cpp‎

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

2121
ur_adapter_handle_t_ adapter{};
2222

23-
UR_APIEXPORT ur_result_t UR_APICALL urInit(ur_device_init_flags_t,
24-
ur_loader_config_handle_t) {
25-
return UR_RESULT_SUCCESS;
26-
}
27-
28-
UR_APIEXPORT ur_result_t UR_APICALL urTearDown(void *) {
29-
return UR_RESULT_SUCCESS;
30-
}
31-
3223
UR_APIEXPORT ur_result_t UR_APICALL
3324
urAdapterGet(uint32_t NumEntries, ur_adapter_handle_t *phAdapters,
3425
uint32_t *pNumAdapters) {

‎sycl/plugins/unified_runtime/ur/adapters/cuda/command_buffer.cpp‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
7373
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
7474
}
7575

76-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
76+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp(
7777
ur_exp_command_buffer_handle_t hCommandBuffer, void *pDst, const void *pSrc,
7878
size_t size, uint32_t numSyncPointsInWaitList,
7979
const ur_exp_command_buffer_sync_point_t *pSyncPointWaitList,
@@ -91,7 +91,16 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
9191
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
9292
}
9393

94-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
94+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMFillExp(
95+
ur_exp_command_buffer_handle_t, void *, const void *, size_t, size_t,
96+
uint32_t, const ur_exp_command_buffer_sync_point_t *,
97+
ur_exp_command_buffer_sync_point_t *) {
98+
detail::ur::die("Experimental Command-buffer feature is not "
99+
"implemented for CUDA adapter.");
100+
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
101+
}
102+
103+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp(
95104
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hSrcMem,
96105
ur_mem_handle_t hDstMem, size_t srcOffset, size_t dstOffset, size_t size,
97106
uint32_t numSyncPointsInWaitList,
@@ -112,7 +121,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
112121
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
113122
}
114123

115-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
124+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp(
116125
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hSrcMem,
117126
ur_mem_handle_t hDstMem, ur_rect_offset_t srcOrigin,
118127
ur_rect_offset_t dstOrigin, ur_rect_region_t region, size_t srcRowPitch,
@@ -140,7 +149,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
140149
}
141150

142151
UR_APIEXPORT
143-
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
152+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp(
144153
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
145154
size_t offset, size_t size, const void *pSrc,
146155
uint32_t numSyncPointsInWaitList,
@@ -161,7 +170,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
161170
}
162171

163172
UR_APIEXPORT
164-
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
173+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp(
165174
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
166175
size_t offset, size_t size, void *pDst, uint32_t numSyncPointsInWaitList,
167176
const ur_exp_command_buffer_sync_point_t *pSyncPointWaitList,
@@ -181,7 +190,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
181190
}
182191

183192
UR_APIEXPORT
184-
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
193+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp(
185194
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
186195
ur_rect_offset_t bufferOffset, ur_rect_offset_t hostOffset,
187196
ur_rect_region_t region, size_t bufferRowPitch, size_t bufferSlicePitch,
@@ -209,7 +218,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
209218
}
210219

211220
UR_APIEXPORT
212-
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp(
221+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp(
213222
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
214223
ur_rect_offset_t bufferOffset, ur_rect_offset_t hostOffset,
215224
ur_rect_region_t region, size_t bufferRowPitch, size_t bufferSlicePitch,
@@ -251,3 +260,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferEnqueueExp(
251260
"implemented for CUDA adapter.");
252261
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
253262
}
263+
264+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferFillExp(
265+
ur_exp_command_buffer_handle_t, ur_mem_handle_t, const void *, size_t,
266+
size_t, size_t, uint32_t, const ur_exp_command_buffer_sync_point_t *,
267+
ur_exp_command_buffer_sync_point_t *) {
268+
detail::ur::die("Experimental Command-buffer feature is not "
269+
"implemented for CUDA adapter.");
270+
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
271+
}

‎sycl/plugins/unified_runtime/ur/adapters/cuda/ur_interface_loader.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,6 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetGlobalProcAddrTable(
200200
if (UR_RESULT_SUCCESS != result) {
201201
return result;
202202
}
203-
pDdiTable->pfnInit = urInit;
204-
pDdiTable->pfnTearDown = urTearDown;
205203
pDdiTable->pfnAdapterGet = urAdapterGet;
206204
pDdiTable->pfnAdapterRelease = urAdapterRelease;
207205
pDdiTable->pfnAdapterRetain = urAdapterRetain;
@@ -278,17 +276,19 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetCommandBufferExpProcAddrTable(
278276
pDdiTable->pfnReleaseExp = urCommandBufferReleaseExp;
279277
pDdiTable->pfnFinalizeExp = urCommandBufferFinalizeExp;
280278
pDdiTable->pfnAppendKernelLaunchExp = urCommandBufferAppendKernelLaunchExp;
281-
pDdiTable->pfnAppendMemcpyUSMExp = urCommandBufferAppendMemcpyUSMExp;
282-
pDdiTable->pfnAppendMembufferCopyExp = urCommandBufferAppendMembufferCopyExp;
283-
pDdiTable->pfnAppendMembufferCopyRectExp =
284-
urCommandBufferAppendMembufferCopyRectExp;
285-
pDdiTable->pfnAppendMembufferReadExp = urCommandBufferAppendMembufferReadExp;
286-
pDdiTable->pfnAppendMembufferReadRectExp =
287-
urCommandBufferAppendMembufferReadRectExp;
288-
pDdiTable->pfnAppendMembufferWriteExp =
289-
urCommandBufferAppendMembufferWriteExp;
290-
pDdiTable->pfnAppendMembufferWriteRectExp =
291-
urCommandBufferAppendMembufferWriteRectExp;
279+
pDdiTable->pfnAppendUSMMemcpyExp = urCommandBufferAppendUSMMemcpyExp;
280+
pDdiTable->pfnAppendUSMFillExp = urCommandBufferAppendUSMFillExp;
281+
pDdiTable->pfnAppendMemBufferCopyExp = urCommandBufferAppendMemBufferCopyExp;
282+
pDdiTable->pfnAppendMemBufferCopyRectExp =
283+
urCommandBufferAppendMemBufferCopyRectExp;
284+
pDdiTable->pfnAppendMemBufferReadExp = urCommandBufferAppendMemBufferReadExp;
285+
pDdiTable->pfnAppendMemBufferReadRectExp =
286+
urCommandBufferAppendMemBufferReadRectExp;
287+
pDdiTable->pfnAppendMemBufferWriteExp =
288+
urCommandBufferAppendMemBufferWriteExp;
289+
pDdiTable->pfnAppendMemBufferWriteRectExp =
290+
urCommandBufferAppendMemBufferWriteRectExp;
291+
pDdiTable->pfnAppendMemBufferFillExp = urCommandBufferAppendMemBufferFillExp;
292292
pDdiTable->pfnEnqueueExp = urCommandBufferEnqueueExp;
293293

294294
return retVal;

‎sycl/plugins/unified_runtime/ur/adapters/hip/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) {

‎sycl/plugins/unified_runtime/ur/adapters/hip/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 *,

‎sycl/plugins/unified_runtime/ur/adapters/hip/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)