Skip to content

Commit d5a5af5

Browse files
veselypetaveselypeta
committed
[PI][UR] Fix linking UrLoader
1 parent 1762dc5 commit d5a5af5

File tree

7 files changed

+22
-18
lines changed

7 files changed

+22
-18
lines changed

‎sycl/plugins/cuda/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ add_sycl_plugin(cuda
101101
UnifiedRuntime-Headers
102102
UnifiedRuntimeCommon
103103
UnifiedMallocFramework
104+
UnifiedRuntimeLoader
104105
HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/features.hpp"
105106
)
106107

‎sycl/plugins/hip/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ add_sycl_plugin(hip
133133
UnifiedRuntime-Headers
134134
UnifiedRuntimeCommon
135135
UnifiedMallocFramework
136+
UnifiedRuntimeLoader
136137
HEADER
137138
${CMAKE_CURRENT_SOURCE_DIR}/include/features.hpp
138139
)

‎sycl/plugins/level_zero/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ add_sycl_plugin(level_zero
141141
UnifiedRuntime-Headers
142142
UnifiedRuntimeCommon
143143
UnifiedMallocFramework
144+
UnifiedRuntimeLoader
144145
LevelZeroLoader
145146
Threads::Threads
146147
${XPTI_LIBS}

‎sycl/plugins/native_cpu/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@ add_sycl_plugin(native_cpu
3535
LIBRARIES
3636
sycl
3737
UnifiedRuntime-Headers
38+
UnifiedRuntimeLoader
3839
)

‎sycl/plugins/unified_runtime/pi2ur.hpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ inline pi_result piTearDown(void *PluginParameter) {
791791
// TODO: Dont check for errors in urTearDown, since
792792
// when using Level Zero plugin, the second urTearDown
793793
// will fail as ur_loader.so has already been unloaded,
794-
urTearDown(nullptr);
794+
urLoaderTearDown();
795795
return PI_SUCCESS;
796796
}
797797

@@ -800,7 +800,7 @@ inline pi_result piTearDown(void *PluginParameter) {
800800
inline pi_result piPlatformsGet(pi_uint32 NumEntries, pi_platform *Platforms,
801801
pi_uint32 *NumPlatforms) {
802802

803-
urInit(0, nullptr);
803+
urLoaderInit(0, nullptr);
804804
// We're not going through the UR loader so we're guaranteed to have exactly
805805
// one adapter (whichever is statically linked). The PI plugin for UR has its
806806
// own implementation of piPlatformsGet.
@@ -4347,7 +4347,7 @@ inline pi_result piextCommandBufferMemcpyUSM(
43474347
ur_exp_command_buffer_handle_t UrCommandBuffer =
43484348
reinterpret_cast<ur_exp_command_buffer_handle_t>(CommandBuffer);
43494349

4350-
HANDLE_ERRORS(urCommandBufferAppendMemcpyUSMExp(
4350+
HANDLE_ERRORS(urCommandBufferAppendUSMMemcpyExp(
43514351
UrCommandBuffer, DstPtr, SrcPtr, Size, NumSyncPointsInWaitList,
43524352
SyncPointWaitList, SyncPoint));
43534353

@@ -4365,7 +4365,7 @@ inline pi_result piextCommandBufferMemBufferCopy(
43654365
ur_mem_handle_t UrSrcMem = reinterpret_cast<ur_mem_handle_t>(SrcMem);
43664366
ur_mem_handle_t UrDstMem = reinterpret_cast<ur_mem_handle_t>(DstMem);
43674367

4368-
HANDLE_ERRORS(urCommandBufferAppendMembufferCopyExp(
4368+
HANDLE_ERRORS(urCommandBufferAppendMemBufferCopyExp(
43694369
UrCommandBuffer, UrSrcMem, UrDstMem, SrcOffset, DstOffset, Size,
43704370
NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint));
43714371

@@ -4393,7 +4393,7 @@ inline pi_result piextCommandBufferMemBufferCopyRect(
43934393
UrRegion.height = Region->height_scalar;
43944394
UrRegion.width = Region->width_bytes;
43954395

4396-
HANDLE_ERRORS(urCommandBufferAppendMembufferCopyRectExp(
4396+
HANDLE_ERRORS(urCommandBufferAppendMemBufferCopyRectExp(
43974397
UrCommandBuffer, UrSrcMem, UrDstMem, UrSrcOrigin, UrDstOrigin, UrRegion,
43984398
SrcRowPitch, SrcSlicePitch, DstRowPitch, DstSlicePitch,
43994399
NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint));
@@ -4423,7 +4423,7 @@ inline pi_result piextCommandBufferMemBufferReadRect(
44234423
UrRegion.height = Region->height_scalar;
44244424
UrRegion.width = Region->width_bytes;
44254425

4426-
HANDLE_ERRORS(urCommandBufferAppendMembufferReadRectExp(
4426+
HANDLE_ERRORS(urCommandBufferAppendMemBufferReadRectExp(
44274427
UrCommandBuffer, UrBuffer, UrBufferOffset, UrHostOffset, UrRegion,
44284428
BufferRowPitch, BufferSlicePitch, HostRowPitch, HostSlicePitch, Ptr,
44294429
NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint));
@@ -4441,7 +4441,7 @@ inline pi_result piextCommandBufferMemBufferRead(
44414441
reinterpret_cast<ur_exp_command_buffer_handle_t>(CommandBuffer);
44424442
ur_mem_handle_t UrBuffer = reinterpret_cast<ur_mem_handle_t>(Src);
44434443

4444-
HANDLE_ERRORS(urCommandBufferAppendMembufferReadExp(
4444+
HANDLE_ERRORS(urCommandBufferAppendMemBufferReadExp(
44454445
UrCommandBuffer, UrBuffer, Offset, Size, Dst, NumSyncPointsInWaitList,
44464446
SyncPointWaitList, SyncPoint));
44474447

@@ -4470,7 +4470,7 @@ inline pi_result piextCommandBufferMemBufferWriteRect(
44704470
UrRegion.height = Region->height_scalar;
44714471
UrRegion.width = Region->width_bytes;
44724472

4473-
HANDLE_ERRORS(urCommandBufferAppendMembufferWriteRectExp(
4473+
HANDLE_ERRORS(urCommandBufferAppendMemBufferWriteRectExp(
44744474
UrCommandBuffer, UrBuffer, UrBufferOffset, UrHostOffset, UrRegion,
44754475
BufferRowPitch, BufferSlicePitch, HostRowPitch, HostSlicePitch,
44764476
const_cast<void *>(Ptr), NumSyncPointsInWaitList, SyncPointWaitList,
@@ -4490,7 +4490,7 @@ inline pi_result piextCommandBufferMemBufferWrite(
44904490
reinterpret_cast<ur_exp_command_buffer_handle_t>(CommandBuffer);
44914491
ur_mem_handle_t UrBuffer = reinterpret_cast<ur_mem_handle_t>(Buffer);
44924492

4493-
HANDLE_ERRORS(urCommandBufferAppendMembufferWriteExp(
4493+
HANDLE_ERRORS(urCommandBufferAppendMemBufferWriteExp(
44944494
UrCommandBuffer, UrBuffer, Offset, Size, const_cast<void *>(Ptr),
44954495
NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint));
44964496

‎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/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 *,

0 commit comments

Comments
 (0)