Skip to content

Commit 4ce1ee9

Browse files
0x12CC0x12CC
committed
[SYCL][UR] Upgrade UR to 2023-09-15 release
Signed-off-by: Michael Aziz <michael.aziz@intel.com>
1 parent 37b904f commit 4ce1ee9

File tree

15 files changed

+71
-132
lines changed

15 files changed

+71
-132
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 12c831295cb1d2422961a90bab500888e6300e05)
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.
@@ -4349,7 +4342,7 @@ inline pi_result piextCommandBufferMemcpyUSM(
43494342
ur_exp_command_buffer_handle_t UrCommandBuffer =
43504343
reinterpret_cast<ur_exp_command_buffer_handle_t>(CommandBuffer);
43514344

4352-
HANDLE_ERRORS(urCommandBufferAppendMemcpyUSMExp(
4345+
HANDLE_ERRORS(urCommandBufferAppendUSMMemcpyExp(
43534346
UrCommandBuffer, DstPtr, SrcPtr, Size, NumSyncPointsInWaitList,
43544347
SyncPointWaitList, SyncPoint));
43554348

@@ -4367,7 +4360,7 @@ inline pi_result piextCommandBufferMemBufferCopy(
43674360
ur_mem_handle_t UrSrcMem = reinterpret_cast<ur_mem_handle_t>(SrcMem);
43684361
ur_mem_handle_t UrDstMem = reinterpret_cast<ur_mem_handle_t>(DstMem);
43694362

4370-
HANDLE_ERRORS(urCommandBufferAppendMembufferCopyExp(
4363+
HANDLE_ERRORS(urCommandBufferAppendMemBufferCopyExp(
43714364
UrCommandBuffer, UrSrcMem, UrDstMem, SrcOffset, DstOffset, Size,
43724365
NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint));
43734366

@@ -4395,7 +4388,7 @@ inline pi_result piextCommandBufferMemBufferCopyRect(
43954388
UrRegion.height = Region->height_scalar;
43964389
UrRegion.width = Region->width_bytes;
43974390

4398-
HANDLE_ERRORS(urCommandBufferAppendMembufferCopyRectExp(
4391+
HANDLE_ERRORS(urCommandBufferAppendMemBufferCopyRectExp(
43994392
UrCommandBuffer, UrSrcMem, UrDstMem, UrSrcOrigin, UrDstOrigin, UrRegion,
44004393
SrcRowPitch, SrcSlicePitch, DstRowPitch, DstSlicePitch,
44014394
NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint));
@@ -4425,7 +4418,7 @@ inline pi_result piextCommandBufferMemBufferReadRect(
44254418
UrRegion.height = Region->height_scalar;
44264419
UrRegion.width = Region->width_bytes;
44274420

4428-
HANDLE_ERRORS(urCommandBufferAppendMembufferReadRectExp(
4421+
HANDLE_ERRORS(urCommandBufferAppendMemBufferReadRectExp(
44294422
UrCommandBuffer, UrBuffer, UrBufferOffset, UrHostOffset, UrRegion,
44304423
BufferRowPitch, BufferSlicePitch, HostRowPitch, HostSlicePitch, Ptr,
44314424
NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint));
@@ -4443,7 +4436,7 @@ inline pi_result piextCommandBufferMemBufferRead(
44434436
reinterpret_cast<ur_exp_command_buffer_handle_t>(CommandBuffer);
44444437
ur_mem_handle_t UrBuffer = reinterpret_cast<ur_mem_handle_t>(Src);
44454438

4446-
HANDLE_ERRORS(urCommandBufferAppendMembufferReadExp(
4439+
HANDLE_ERRORS(urCommandBufferAppendMemBufferReadExp(
44474440
UrCommandBuffer, UrBuffer, Offset, Size, Dst, NumSyncPointsInWaitList,
44484441
SyncPointWaitList, SyncPoint));
44494442

@@ -4472,7 +4465,7 @@ inline pi_result piextCommandBufferMemBufferWriteRect(
44724465
UrRegion.height = Region->height_scalar;
44734466
UrRegion.width = Region->width_bytes;
44744467

4475-
HANDLE_ERRORS(urCommandBufferAppendMembufferWriteRectExp(
4468+
HANDLE_ERRORS(urCommandBufferAppendMemBufferWriteRectExp(
44764469
UrCommandBuffer, UrBuffer, UrBufferOffset, UrHostOffset, UrRegion,
44774470
BufferRowPitch, BufferSlicePitch, HostRowPitch, HostSlicePitch,
44784471
const_cast<void *>(Ptr), NumSyncPointsInWaitList, SyncPointWaitList,
@@ -4492,7 +4485,7 @@ inline pi_result piextCommandBufferMemBufferWrite(
44924485
reinterpret_cast<ur_exp_command_buffer_handle_t>(CommandBuffer);
44934486
ur_mem_handle_t UrBuffer = reinterpret_cast<ur_mem_handle_t>(Buffer);
44944487

4495-
HANDLE_ERRORS(urCommandBufferAppendMembufferWriteExp(
4488+
HANDLE_ERRORS(urCommandBufferAppendMemBufferWriteExp(
44964489
UrCommandBuffer, UrBuffer, Offset, Size, const_cast<void *>(Ptr),
44974490
NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint));
44984491

‎sycl/plugins/unified_runtime/pi_unified_runtime.cpp‎

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

@@ -1146,7 +1145,7 @@ __SYCL_EXPORT pi_result piextPeerAccessGetInfo(
11461145

11471146
__SYCL_EXPORT pi_result piTearDown(void *) {
11481147
releaseAdapters(Adapters.Vec);
1149-
urTearDown(nullptr);
1148+
urLoaderTearDown();
11501149
return PI_SUCCESS;
11511150
}
11521151

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

13051304
// Initialize UR and discover adapters
1306-
HANDLE_ERRORS(urInit(0, nullptr));
1305+
HANDLE_ERRORS(urLoaderInit(0, nullptr));
13071306
uint32_t NumAdapters;
13081307
HANDLE_ERRORS(urAdapterGet(0, nullptr, &NumAdapters));
13091308
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: 7 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,7 @@ 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 urCommandBufferAppendMemBufferCopyExp(
9595
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hSrcMem,
9696
ur_mem_handle_t hDstMem, size_t srcOffset, size_t dstOffset, size_t size,
9797
uint32_t numSyncPointsInWaitList,
@@ -112,7 +112,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
112112
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
113113
}
114114

115-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
115+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp(
116116
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hSrcMem,
117117
ur_mem_handle_t hDstMem, ur_rect_offset_t srcOrigin,
118118
ur_rect_offset_t dstOrigin, ur_rect_region_t region, size_t srcRowPitch,
@@ -140,7 +140,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
140140
}
141141

142142
UR_APIEXPORT
143-
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
143+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp(
144144
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
145145
size_t offset, size_t size, const void *pSrc,
146146
uint32_t numSyncPointsInWaitList,
@@ -161,7 +161,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
161161
}
162162

163163
UR_APIEXPORT
164-
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
164+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp(
165165
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
166166
size_t offset, size_t size, void *pDst, uint32_t numSyncPointsInWaitList,
167167
const ur_exp_command_buffer_sync_point_t *pSyncPointWaitList,
@@ -181,7 +181,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
181181
}
182182

183183
UR_APIEXPORT
184-
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
184+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp(
185185
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
186186
ur_rect_offset_t bufferOffset, ur_rect_offset_t hostOffset,
187187
ur_rect_region_t region, size_t bufferRowPitch, size_t bufferSlicePitch,
@@ -209,7 +209,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
209209
}
210210

211211
UR_APIEXPORT
212-
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp(
212+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp(
213213
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
214214
ur_rect_offset_t bufferOffset, ur_rect_offset_t hostOffset,
215215
ur_rect_region_t region, size_t bufferRowPitch, size_t bufferSlicePitch,

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

Lines changed: 11 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,17 @@ 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->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;
292290
pDdiTable->pfnEnqueueExp = urCommandBufferEnqueueExp;
293291

294292
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: 7 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,7 @@ 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 urCommandBufferAppendMemBufferCopyExp(
6363
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_mem_handle_t, size_t,
6464
size_t, size_t, uint32_t, const ur_exp_command_buffer_sync_point_t *,
6565
ur_exp_command_buffer_sync_point_t *) {
@@ -68,7 +68,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
6868
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
6969
}
7070

71-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
71+
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp(
7272
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_mem_handle_t,
7373
ur_rect_offset_t, ur_rect_offset_t, ur_rect_region_t, size_t, size_t,
7474
size_t, size_t, uint32_t, const ur_exp_command_buffer_sync_point_t *,
@@ -79,7 +79,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
7979
}
8080

8181
UR_APIEXPORT
82-
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
82+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp(
8383
ur_exp_command_buffer_handle_t, ur_mem_handle_t, size_t, size_t,
8484
const void *, uint32_t, const ur_exp_command_buffer_sync_point_t *,
8585
ur_exp_command_buffer_sync_point_t *) {
@@ -89,7 +89,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
8989
}
9090

9191
UR_APIEXPORT
92-
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
92+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp(
9393
ur_exp_command_buffer_handle_t, ur_mem_handle_t, size_t, size_t, void *,
9494
uint32_t, const ur_exp_command_buffer_sync_point_t *,
9595
ur_exp_command_buffer_sync_point_t *) {
@@ -99,7 +99,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
9999
}
100100

101101
UR_APIEXPORT
102-
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
102+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp(
103103
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_rect_offset_t,
104104
ur_rect_offset_t, ur_rect_region_t, size_t, size_t, size_t, size_t, void *,
105105
uint32_t, const ur_exp_command_buffer_sync_point_t *,
@@ -110,7 +110,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
110110
}
111111

112112
UR_APIEXPORT
113-
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp(
113+
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp(
114114
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_rect_offset_t,
115115
ur_rect_offset_t, ur_rect_region_t, size_t, size_t, size_t, size_t, void *,
116116
uint32_t, const ur_exp_command_buffer_sync_point_t *,

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

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,6 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetGlobalProcAddrTable(
201201
return result;
202202
}
203203

204-
pDdiTable->pfnInit = urInit;
205-
pDdiTable->pfnTearDown = urTearDown;
206204
pDdiTable->pfnAdapterGet = urAdapterGet;
207205
pDdiTable->pfnAdapterGetInfo = urAdapterGetInfo;
208206
pDdiTable->pfnAdapterGetLastError = urAdapterGetLastError;
@@ -276,17 +274,17 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetCommandBufferExpProcAddrTable(
276274
pDdiTable->pfnReleaseExp = urCommandBufferReleaseExp;
277275
pDdiTable->pfnFinalizeExp = urCommandBufferFinalizeExp;
278276
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;
277+
pDdiTable->pfnAppendUSMMemcpyExp = urCommandBufferAppendUSMMemcpyExp;
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;
290288
pDdiTable->pfnEnqueueExp = urCommandBufferEnqueueExp;
291289

292290
return retVal;

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,6 @@
1111

1212
ur_adapter_handle_t_ Adapter{};
1313

14-
UR_APIEXPORT ur_result_t UR_APICALL
15-
urInit(ur_device_init_flags_t
16-
DeviceFlags, ///< [in] device initialization flags.
17-
///< must be 0 (default) or a combination of
18-
///< ::ur_device_init_flag_t.
19-
ur_loader_config_handle_t) {
20-
std::ignore = DeviceFlags;
21-
22-
return UR_RESULT_SUCCESS;
23-
}
24-
2514
ur_result_t adapterStateTeardown() {
2615
// reclaim ur_platform_handle_t objects here since we don't have
2716
// urPlatformRelease.
@@ -120,13 +109,6 @@ ur_result_t adapterStateTeardown() {
120109
return UR_RESULT_SUCCESS;
121110
}
122111

123-
UR_APIEXPORT ur_result_t UR_APICALL urTearDown(
124-
void *Params ///< [in] pointer to tear down parameters
125-
) {
126-
std::ignore = Params;
127-
return UR_RESULT_SUCCESS;
128-
}
129-
130112
UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet(
131113
uint32_t NumEntries, ///< [in] the number of platforms to be added to
132114
///< phAdapters. If phAdapters is not NULL, then

0 commit comments

Comments
 (0)