Skip to content

Commit

Permalink
[SYCL][Graph] Bump UR hash
Browse files Browse the repository at this point in the history
  • Loading branch information
EwanC committed Aug 22, 2024
1 parent 9daddae commit 218f8b3
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 23 deletions.
10 changes: 2 additions & 8 deletions sycl/cmake/modules/FetchUnifiedRuntime.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,8 @@ if(SYCL_UR_USE_FETCH_CONTENT)
CACHE PATH "Path to external '${name}' adapter source dir" FORCE)
endfunction()

set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
# commit 2184e803c2f34b35ef66b2a9d28529a17b1e5853
# Merge: 320f633e 85c2c04f
# Author: Omar Ahmed <omar.ahmed@codeplay.com>
# Date: Wed Aug 21 16:35:37 2024 +0100
# Merge pull request #1873 from PietroGhg/pietro/max_alloc
# [NATIVECPU] Support UR_DEVICE_INFO_MAX_MEM_ALLOC_SIZE
set(UNIFIED_RUNTIME_TAG 2184e803c2f34b35ef66b2a9d28529a17b1e5853)
set(UNIFIED_RUNTIME_REPO "https://github.com/Bensuo/unified-runtime.git")
set(UNIFIED_RUNTIME_TAG ewan/ur_dyn_events)

set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
# Due to the use of dependentloadflag and no installer for UMF and hwloc we need
Expand Down
31 changes: 18 additions & 13 deletions sycl/source/detail/memory_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1336,7 +1336,7 @@ void MemoryManager::ext_oneapi_copyD2D_cmd_buffer(
sycl::detail::ur::cast<ur_mem_handle_t>(SrcMem),
sycl::detail::ur::cast<ur_mem_handle_t>(DstMem), SrcXOffBytes,
DstXOffBytes, SrcAccessRangeWidthBytes, Deps.size(),
Deps.data(), OutSyncPoint);
Deps.data(), 0, nullptr, OutSyncPoint, nullptr, nullptr);
} else {
// passing 0 for pitches not allowed. Because clEnqueueCopyBufferRect will
// calculate both src and dest pitch using region[0], which is not correct
Expand All @@ -1362,7 +1362,8 @@ void MemoryManager::ext_oneapi_copyD2D_cmd_buffer(
sycl::detail::ur::cast<ur_mem_handle_t>(SrcMem),
sycl::detail::ur::cast<ur_mem_handle_t>(DstMem), SrcOrigin,
DstOrigin, Region, SrcRowPitch, SrcSlicePitch, DstRowPitch,
DstSlicePitch, Deps.size(), Deps.data(), OutSyncPoint);
DstSlicePitch, Deps.size(), Deps.data(), 0, nullptr,
OutSyncPoint, nullptr, nullptr);
}
}

Expand Down Expand Up @@ -1400,7 +1401,7 @@ void MemoryManager::ext_oneapi_copyD2H_cmd_buffer(
urCommandBufferAppendMemBufferReadExp, CommandBuffer,
sycl::detail::ur::cast<ur_mem_handle_t>(SrcMem), SrcXOffBytes,
SrcAccessRangeWidthBytes, DstMem + DstXOffBytes, Deps.size(),
Deps.data(), OutSyncPoint);
Deps.data(), 0, nullptr, OutSyncPoint, nullptr, nullptr);

if (Result == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
throw sycl::exception(
Expand Down Expand Up @@ -1429,7 +1430,8 @@ void MemoryManager::ext_oneapi_copyD2H_cmd_buffer(
urCommandBufferAppendMemBufferReadRectExp, CommandBuffer,
sycl::detail::ur::cast<ur_mem_handle_t>(SrcMem), BufferOffset,
HostOffset, RectRegion, BufferRowPitch, BufferSlicePitch, HostRowPitch,
HostSlicePitch, DstMem, Deps.size(), Deps.data(), OutSyncPoint);
HostSlicePitch, DstMem, Deps.size(), Deps.data(), 0, nullptr,
OutSyncPoint, nullptr, nullptr);
if (Result == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
throw sycl::exception(
sycl::make_error_code(sycl::errc::feature_not_supported),
Expand Down Expand Up @@ -1474,7 +1476,7 @@ void MemoryManager::ext_oneapi_copyH2D_cmd_buffer(
urCommandBufferAppendMemBufferWriteExp, CommandBuffer,
sycl::detail::ur::cast<ur_mem_handle_t>(DstMem), DstXOffBytes,
DstAccessRangeWidthBytes, SrcMem + SrcXOffBytes, Deps.size(),
Deps.data(), OutSyncPoint);
Deps.data(), 0, nullptr, OutSyncPoint, nullptr, nullptr);

if (Result == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
throw sycl::exception(
Expand Down Expand Up @@ -1503,7 +1505,8 @@ void MemoryManager::ext_oneapi_copyH2D_cmd_buffer(
urCommandBufferAppendMemBufferWriteRectExp, CommandBuffer,
sycl::detail::ur::cast<ur_mem_handle_t>(DstMem), BufferOffset,
HostOffset, RectRegion, BufferRowPitch, BufferSlicePitch, HostRowPitch,
HostSlicePitch, SrcMem, Deps.size(), Deps.data(), OutSyncPoint);
HostSlicePitch, SrcMem, Deps.size(), Deps.data(), 0, nullptr,
OutSyncPoint, nullptr, nullptr);

if (Result == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
throw sycl::exception(
Expand All @@ -1527,7 +1530,7 @@ void MemoryManager::ext_oneapi_copy_usm_cmd_buffer(
const PluginPtr &Plugin = Context->getPlugin();
ur_result_t Result = Plugin->call_nocheck(
urCommandBufferAppendUSMMemcpyExp, CommandBuffer, DstMem, SrcMem, Len,
Deps.size(), Deps.data(), OutSyncPoint);
Deps.size(), Deps.data(), 0, nullptr, OutSyncPoint, nullptr, nullptr);
if (Result == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
throw sycl::exception(
sycl::make_error_code(sycl::errc::feature_not_supported),
Expand All @@ -1550,8 +1553,8 @@ void MemoryManager::ext_oneapi_fill_usm_cmd_buffer(

const PluginPtr &Plugin = Context->getPlugin();
Plugin->call(urCommandBufferAppendUSMFillExp, CommandBuffer, DstMem,
Pattern.data(), Pattern.size(), Len, Deps.size(), Deps.data(),
OutSyncPoint);
Pattern.data(), Pattern.size(), Len, Deps.size(), Deps.data(), 0,
nullptr, OutSyncPoint, nullptr, nullptr);
}

void MemoryManager::ext_oneapi_fill_cmd_buffer(
Expand Down Expand Up @@ -1582,7 +1585,8 @@ void MemoryManager::ext_oneapi_fill_cmd_buffer(
Plugin->call(urCommandBufferAppendMemBufferFillExp, CommandBuffer,
ur::cast<ur_mem_handle_t>(Mem), Pattern, PatternSize,
AccessOffset[0] * ElementSize, RangeMultiplier * ElementSize,
Deps.size(), Deps.data(), OutSyncPoint);
Deps.size(), Deps.data(), 0, nullptr, OutSyncPoint, nullptr,
nullptr);
return;
}
// The sycl::handler uses a parallel_for kernel in the case of unusable
Expand All @@ -1598,8 +1602,8 @@ void MemoryManager::ext_oneapi_prefetch_usm_cmd_buffer(
ur_exp_command_buffer_sync_point_t *OutSyncPoint) {
const PluginPtr &Plugin = Context->getPlugin();
Plugin->call(urCommandBufferAppendUSMPrefetchExp, CommandBuffer, Mem, Length,
ur_usm_migration_flags_t(0), Deps.size(), Deps.data(),
OutSyncPoint);
ur_usm_migration_flags_t(0), Deps.size(), Deps.data(), 0,
nullptr, OutSyncPoint, nullptr, nullptr);
}

void MemoryManager::ext_oneapi_advise_usm_cmd_buffer(
Expand All @@ -1610,7 +1614,8 @@ void MemoryManager::ext_oneapi_advise_usm_cmd_buffer(
ur_exp_command_buffer_sync_point_t *OutSyncPoint) {
const PluginPtr &Plugin = Context->getPlugin();
Plugin->call(urCommandBufferAppendUSMAdviseExp, CommandBuffer, Mem, Length,
Advice, Deps.size(), Deps.data(), OutSyncPoint);
Advice, Deps.size(), Deps.data(), 0, nullptr, OutSyncPoint,
nullptr, nullptr);
}

void MemoryManager::copy_image_bindless(
Expand Down
4 changes: 2 additions & 2 deletions sycl/source/detail/scheduler/commands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2540,8 +2540,8 @@ ur_result_t enqueueImpCommandBufferKernel(
ur_result_t Res = Plugin->call_nocheck(
urCommandBufferAppendKernelLaunchExp, CommandBuffer, UrKernel,
NDRDesc.Dims, &NDRDesc.GlobalOffset[0], &NDRDesc.GlobalSize[0], LocalSize,
SyncPoints.size(), SyncPoints.size() ? SyncPoints.data() : nullptr,
OutSyncPoint, OutCommand);
SyncPoints.size(), SyncPoints.size() ? SyncPoints.data() : nullptr, 0,
nullptr, OutSyncPoint, nullptr, OutCommand);

if (!SyclKernelImpl && !Kernel) {
Plugin->call(urKernelRelease, UrKernel);
Expand Down

0 comments on commit 218f8b3

Please sign in to comment.