Skip to content

Commit ba99338

Browse files
EwanCaarongreig
andauthored
[SYCL][Graph] Bump UR hash to command-buffer event sync API (#14459)
Test UR PR oneapi-src/unified-runtime#1823 --------- Co-authored-by: Aaron Greig <[email protected]>
1 parent f45ee77 commit ba99338

File tree

3 files changed

+26
-24
lines changed

3 files changed

+26
-24
lines changed

sycl/cmake/modules/FetchUnifiedRuntime.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ if(SYCL_UR_USE_FETCH_CONTENT)
117117
endfunction()
118118

119119
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
120-
# commit 22ef899035a85b70b5472416ad6db8021effb5c1
121-
# Merge: 4814e505 f5979a68
120+
# commit 5ade7fc44d453d86dc7440595dbea37c29ce54dc
121+
# Merge: 66ea35dc 0b5b89f0
122122
# Author: aarongreig <[email protected]>
123-
# Date: Mon Oct 14 10:03:13 2024 +0100
124-
# Merge pull request #1469 from RossBrunton/ross/specconst
125-
# [Spec Constants] Improved handling of invalid spec. constants
126-
set(UNIFIED_RUNTIME_TAG 22ef899035a85b70b5472416ad6db8021effb5c1)
123+
# Date: Mon Oct 14 12:17:07 2024 +0100
124+
# Merge pull request #1823 from Bensuo/ewan/ur_dyn_events
125+
# Add event update to command-buffers
126+
set(UNIFIED_RUNTIME_TAG 5ade7fc44d453d86dc7440595dbea37c29ce54dc)
127127

128128
set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
129129
# Due to the use of dependentloadflag and no installer for UMF and hwloc we need

sycl/source/detail/memory_manager.cpp

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,8 +1346,8 @@ void MemoryManager::ext_oneapi_copyD2D_cmd_buffer(
13461346
Adapter->call<UrApiKind::urCommandBufferAppendMemBufferCopyExp>(
13471347
CommandBuffer, sycl::detail::ur::cast<ur_mem_handle_t>(SrcMem),
13481348
sycl::detail::ur::cast<ur_mem_handle_t>(DstMem), SrcXOffBytes,
1349-
DstXOffBytes, SrcAccessRangeWidthBytes, Deps.size(), Deps.data(),
1350-
OutSyncPoint);
1349+
DstXOffBytes, SrcAccessRangeWidthBytes, Deps.size(), Deps.data(), 0,
1350+
nullptr, OutSyncPoint, nullptr, nullptr);
13511351
} else {
13521352
// passing 0 for pitches not allowed. Because clEnqueueCopyBufferRect will
13531353
// calculate both src and dest pitch using region[0], which is not correct
@@ -1373,7 +1373,7 @@ void MemoryManager::ext_oneapi_copyD2D_cmd_buffer(
13731373
CommandBuffer, sycl::detail::ur::cast<ur_mem_handle_t>(SrcMem),
13741374
sycl::detail::ur::cast<ur_mem_handle_t>(DstMem), SrcOrigin, DstOrigin,
13751375
Region, SrcRowPitch, SrcSlicePitch, DstRowPitch, DstSlicePitch,
1376-
Deps.size(), Deps.data(), OutSyncPoint);
1376+
Deps.size(), Deps.data(), 0, nullptr, OutSyncPoint, nullptr, nullptr);
13771377
}
13781378
}
13791379

@@ -1411,7 +1411,8 @@ void MemoryManager::ext_oneapi_copyD2H_cmd_buffer(
14111411
Adapter->call_nocheck<UrApiKind::urCommandBufferAppendMemBufferReadExp>(
14121412
CommandBuffer, sycl::detail::ur::cast<ur_mem_handle_t>(SrcMem),
14131413
SrcXOffBytes, SrcAccessRangeWidthBytes, DstMem + DstXOffBytes,
1414-
Deps.size(), Deps.data(), OutSyncPoint);
1414+
Deps.size(), Deps.data(), 0, nullptr, OutSyncPoint, nullptr,
1415+
nullptr);
14151416

14161417
if (Result == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
14171418
throw sycl::exception(
@@ -1440,8 +1441,8 @@ void MemoryManager::ext_oneapi_copyD2H_cmd_buffer(
14401441
UrApiKind::urCommandBufferAppendMemBufferReadRectExp>(
14411442
CommandBuffer, sycl::detail::ur::cast<ur_mem_handle_t>(SrcMem),
14421443
BufferOffset, HostOffset, RectRegion, BufferRowPitch, BufferSlicePitch,
1443-
HostRowPitch, HostSlicePitch, DstMem, Deps.size(), Deps.data(),
1444-
OutSyncPoint);
1444+
HostRowPitch, HostSlicePitch, DstMem, Deps.size(), Deps.data(), 0,
1445+
nullptr, OutSyncPoint, nullptr, nullptr);
14451446
if (Result == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
14461447
throw sycl::exception(
14471448
sycl::make_error_code(sycl::errc::feature_not_supported),
@@ -1487,7 +1488,8 @@ void MemoryManager::ext_oneapi_copyH2D_cmd_buffer(
14871488
->call_nocheck<UrApiKind::urCommandBufferAppendMemBufferWriteExp>(
14881489
CommandBuffer, sycl::detail::ur::cast<ur_mem_handle_t>(DstMem),
14891490
DstXOffBytes, DstAccessRangeWidthBytes, SrcMem + SrcXOffBytes,
1490-
Deps.size(), Deps.data(), OutSyncPoint);
1491+
Deps.size(), Deps.data(), 0, nullptr, OutSyncPoint, nullptr,
1492+
nullptr);
14911493

14921494
if (Result == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
14931495
throw sycl::exception(
@@ -1516,8 +1518,8 @@ void MemoryManager::ext_oneapi_copyH2D_cmd_buffer(
15161518
UrApiKind::urCommandBufferAppendMemBufferWriteRectExp>(
15171519
CommandBuffer, sycl::detail::ur::cast<ur_mem_handle_t>(DstMem),
15181520
BufferOffset, HostOffset, RectRegion, BufferRowPitch, BufferSlicePitch,
1519-
HostRowPitch, HostSlicePitch, SrcMem, Deps.size(), Deps.data(),
1520-
OutSyncPoint);
1521+
HostRowPitch, HostSlicePitch, SrcMem, Deps.size(), Deps.data(), 0,
1522+
nullptr, OutSyncPoint, nullptr, nullptr);
15211523

15221524
if (Result == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
15231525
throw sycl::exception(
@@ -1541,8 +1543,8 @@ void MemoryManager::ext_oneapi_copy_usm_cmd_buffer(
15411543
const AdapterPtr &Adapter = Context->getAdapter();
15421544
ur_result_t Result =
15431545
Adapter->call_nocheck<UrApiKind::urCommandBufferAppendUSMMemcpyExp>(
1544-
CommandBuffer, DstMem, SrcMem, Len, Deps.size(), Deps.data(),
1545-
OutSyncPoint);
1546+
CommandBuffer, DstMem, SrcMem, Len, Deps.size(), Deps.data(), 0,
1547+
nullptr, OutSyncPoint, nullptr, nullptr);
15461548
if (Result == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
15471549
throw sycl::exception(
15481550
sycl::make_error_code(sycl::errc::feature_not_supported),
@@ -1566,7 +1568,7 @@ void MemoryManager::ext_oneapi_fill_usm_cmd_buffer(
15661568
const AdapterPtr &Adapter = Context->getAdapter();
15671569
Adapter->call<UrApiKind::urCommandBufferAppendUSMFillExp>(
15681570
CommandBuffer, DstMem, Pattern.data(), Pattern.size(), Len, Deps.size(),
1569-
Deps.data(), OutSyncPoint);
1571+
Deps.data(), 0, nullptr, OutSyncPoint, nullptr, nullptr);
15701572
}
15711573

15721574
void MemoryManager::ext_oneapi_fill_cmd_buffer(
@@ -1597,7 +1599,7 @@ void MemoryManager::ext_oneapi_fill_cmd_buffer(
15971599
Adapter->call<UrApiKind::urCommandBufferAppendMemBufferFillExp>(
15981600
CommandBuffer, ur::cast<ur_mem_handle_t>(Mem), Pattern, PatternSize,
15991601
AccessOffset[0] * ElementSize, RangeMultiplier * ElementSize,
1600-
Deps.size(), Deps.data(), OutSyncPoint);
1602+
Deps.size(), Deps.data(), 0, nullptr, OutSyncPoint, nullptr, nullptr);
16011603
return;
16021604
}
16031605
// The sycl::handler uses a parallel_for kernel in the case of unusable
@@ -1614,7 +1616,7 @@ void MemoryManager::ext_oneapi_prefetch_usm_cmd_buffer(
16141616
const AdapterPtr &Adapter = Context->getAdapter();
16151617
Adapter->call<UrApiKind::urCommandBufferAppendUSMPrefetchExp>(
16161618
CommandBuffer, Mem, Length, ur_usm_migration_flags_t(0), Deps.size(),
1617-
Deps.data(), OutSyncPoint);
1619+
Deps.data(), 0, nullptr, OutSyncPoint, nullptr, nullptr);
16181620
}
16191621

16201622
void MemoryManager::ext_oneapi_advise_usm_cmd_buffer(
@@ -1625,8 +1627,8 @@ void MemoryManager::ext_oneapi_advise_usm_cmd_buffer(
16251627
ur_exp_command_buffer_sync_point_t *OutSyncPoint) {
16261628
const AdapterPtr &Adapter = Context->getAdapter();
16271629
Adapter->call<UrApiKind::urCommandBufferAppendUSMAdviseExp>(
1628-
CommandBuffer, Mem, Length, Advice, Deps.size(), Deps.data(),
1629-
OutSyncPoint);
1630+
CommandBuffer, Mem, Length, Advice, Deps.size(), Deps.data(), 0, nullptr,
1631+
OutSyncPoint, nullptr, nullptr);
16301632
}
16311633

16321634
void MemoryManager::copy_image_bindless(

sycl/source/detail/scheduler/commands.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2562,8 +2562,8 @@ ur_result_t enqueueImpCommandBufferKernel(
25622562
Adapter->call_nocheck<UrApiKind::urCommandBufferAppendKernelLaunchExp>(
25632563
CommandBuffer, UrKernel, NDRDesc.Dims, &NDRDesc.GlobalOffset[0],
25642564
&NDRDesc.GlobalSize[0], LocalSize, 0, nullptr, SyncPoints.size(),
2565-
SyncPoints.size() ? SyncPoints.data() : nullptr, OutSyncPoint,
2566-
OutCommand);
2565+
SyncPoints.size() ? SyncPoints.data() : nullptr, 0, nullptr,
2566+
OutSyncPoint, nullptr, OutCommand);
25672567

25682568
if (!SyclKernelImpl && !Kernel) {
25692569
Adapter->call<UrApiKind::urKernelRelease>(UrKernel);

0 commit comments

Comments
 (0)