diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 18eb1b6cc1bcd..2cf90d334a45b 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,14 +116,14 @@ 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") + set(UNIFIED_RUNTIME_REPO "https://github.com/aarongreig/unified-runtime.git") # commit 22ef899035a85b70b5472416ad6db8021effb5c1 # Merge: 4814e505 f5979a68 # Author: aarongreig # Date: Mon Oct 14 10:03:13 2024 +0100 # Merge pull request #1469 from RossBrunton/ross/specconst # [Spec Constants] Improved handling of invalid spec. constants - set(UNIFIED_RUNTIME_TAG 22ef899035a85b70b5472416ad6db8021effb5c1) + set(UNIFIED_RUNTIME_TAG aaron/nativeCPUBatch) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need diff --git a/sycl/source/detail/memory_manager.cpp b/sycl/source/detail/memory_manager.cpp index 5c86e5e21d216..880def95eb314 100644 --- a/sycl/source/detail/memory_manager.cpp +++ b/sycl/source/detail/memory_manager.cpp @@ -1346,8 +1346,8 @@ void MemoryManager::ext_oneapi_copyD2D_cmd_buffer( Adapter->call( CommandBuffer, sycl::detail::ur::cast(SrcMem), sycl::detail::ur::cast(DstMem), SrcXOffBytes, - DstXOffBytes, SrcAccessRangeWidthBytes, Deps.size(), Deps.data(), - OutSyncPoint); + DstXOffBytes, SrcAccessRangeWidthBytes, Deps.size(), 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 @@ -1373,7 +1373,7 @@ void MemoryManager::ext_oneapi_copyD2D_cmd_buffer( CommandBuffer, sycl::detail::ur::cast(SrcMem), sycl::detail::ur::cast(DstMem), SrcOrigin, DstOrigin, Region, SrcRowPitch, SrcSlicePitch, DstRowPitch, DstSlicePitch, - Deps.size(), Deps.data(), OutSyncPoint); + Deps.size(), Deps.data(), 0, nullptr, OutSyncPoint, nullptr, nullptr); } } @@ -1411,7 +1411,8 @@ void MemoryManager::ext_oneapi_copyD2H_cmd_buffer( Adapter->call_nocheck( CommandBuffer, sycl::detail::ur::cast(SrcMem), SrcXOffBytes, SrcAccessRangeWidthBytes, DstMem + DstXOffBytes, - Deps.size(), Deps.data(), OutSyncPoint); + Deps.size(), Deps.data(), 0, nullptr, OutSyncPoint, nullptr, + nullptr); if (Result == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) { throw sycl::exception( @@ -1440,8 +1441,8 @@ void MemoryManager::ext_oneapi_copyD2H_cmd_buffer( UrApiKind::urCommandBufferAppendMemBufferReadRectExp>( CommandBuffer, sycl::detail::ur::cast(SrcMem), BufferOffset, HostOffset, RectRegion, BufferRowPitch, BufferSlicePitch, - HostRowPitch, HostSlicePitch, DstMem, Deps.size(), Deps.data(), - OutSyncPoint); + HostRowPitch, 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), @@ -1487,7 +1488,8 @@ void MemoryManager::ext_oneapi_copyH2D_cmd_buffer( ->call_nocheck( CommandBuffer, sycl::detail::ur::cast(DstMem), DstXOffBytes, DstAccessRangeWidthBytes, SrcMem + SrcXOffBytes, - Deps.size(), Deps.data(), OutSyncPoint); + Deps.size(), Deps.data(), 0, nullptr, OutSyncPoint, nullptr, + nullptr); if (Result == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) { throw sycl::exception( @@ -1516,8 +1518,8 @@ void MemoryManager::ext_oneapi_copyH2D_cmd_buffer( UrApiKind::urCommandBufferAppendMemBufferWriteRectExp>( CommandBuffer, sycl::detail::ur::cast(DstMem), BufferOffset, HostOffset, RectRegion, BufferRowPitch, BufferSlicePitch, - HostRowPitch, HostSlicePitch, SrcMem, Deps.size(), Deps.data(), - OutSyncPoint); + HostRowPitch, HostSlicePitch, SrcMem, Deps.size(), Deps.data(), 0, + nullptr, OutSyncPoint, nullptr, nullptr); if (Result == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) { throw sycl::exception( @@ -1541,8 +1543,8 @@ void MemoryManager::ext_oneapi_copy_usm_cmd_buffer( const AdapterPtr &Adapter = Context->getAdapter(); ur_result_t Result = Adapter->call_nocheck( - CommandBuffer, DstMem, SrcMem, Len, Deps.size(), Deps.data(), - OutSyncPoint); + CommandBuffer, DstMem, SrcMem, Len, 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), @@ -1566,7 +1568,7 @@ void MemoryManager::ext_oneapi_fill_usm_cmd_buffer( const AdapterPtr &Adapter = Context->getAdapter(); Adapter->call( CommandBuffer, DstMem, Pattern.data(), Pattern.size(), Len, Deps.size(), - Deps.data(), OutSyncPoint); + Deps.data(), 0, nullptr, OutSyncPoint, nullptr, nullptr); } void MemoryManager::ext_oneapi_fill_cmd_buffer( @@ -1597,7 +1599,7 @@ void MemoryManager::ext_oneapi_fill_cmd_buffer( Adapter->call( CommandBuffer, ur::cast(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 @@ -1614,7 +1616,7 @@ void MemoryManager::ext_oneapi_prefetch_usm_cmd_buffer( const AdapterPtr &Adapter = Context->getAdapter(); Adapter->call( CommandBuffer, Mem, Length, ur_usm_migration_flags_t(0), Deps.size(), - Deps.data(), OutSyncPoint); + Deps.data(), 0, nullptr, OutSyncPoint, nullptr, nullptr); } void MemoryManager::ext_oneapi_advise_usm_cmd_buffer( @@ -1625,8 +1627,8 @@ void MemoryManager::ext_oneapi_advise_usm_cmd_buffer( ur_exp_command_buffer_sync_point_t *OutSyncPoint) { const AdapterPtr &Adapter = Context->getAdapter(); Adapter->call( - CommandBuffer, Mem, Length, Advice, Deps.size(), Deps.data(), - OutSyncPoint); + CommandBuffer, Mem, Length, Advice, Deps.size(), Deps.data(), 0, nullptr, + OutSyncPoint, nullptr, nullptr); } void MemoryManager::copy_image_bindless( diff --git a/sycl/source/detail/scheduler/commands.cpp b/sycl/source/detail/scheduler/commands.cpp index 10d42792d87e8..6556b8008b30a 100644 --- a/sycl/source/detail/scheduler/commands.cpp +++ b/sycl/source/detail/scheduler/commands.cpp @@ -2562,8 +2562,8 @@ ur_result_t enqueueImpCommandBufferKernel( Adapter->call_nocheck( CommandBuffer, UrKernel, NDRDesc.Dims, &NDRDesc.GlobalOffset[0], &NDRDesc.GlobalSize[0], LocalSize, 0, nullptr, SyncPoints.size(), - SyncPoints.size() ? SyncPoints.data() : nullptr, OutSyncPoint, - OutCommand); + SyncPoints.size() ? SyncPoints.data() : nullptr, 0, nullptr, + OutSyncPoint, nullptr, OutCommand); if (!SyclKernelImpl && !Kernel) { Adapter->call(UrKernel);