From 2954dacd9c47a8ecc23ca23a88e2340d64bbaebc Mon Sep 17 00:00:00 2001 From: Ewan Crawford Date: Thu, 23 Jan 2025 11:29:41 +0000 Subject: [PATCH] [SYCL][Graph] Update to UR cmd-buf enqueue rename Reflects change in name of UR entry-point from `urCommandBufferEnqueueExp` to `urEnqueueCommandBufferExp` in https://github.com/oneapi-src/unified-runtime/pull/2606 --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 2 +- sycl/source/detail/graph_impl.cpp | 4 ++-- sycl/source/detail/scheduler/commands.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 72841724fa01d..202bfdcdc19e3 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,7 +116,7 @@ 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/Bensuo/unified-runtime.git") include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTag.cmake) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index cc523c89b5ad9..0df8801dc8a35 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -4,4 +4,4 @@ # Date: Fri Jan 31 10:15:03 2025 +0000 # Merge pull request #2575 from DBDuncan/duncan/extend-copies # [CUDA][Bindless] Add support for device to device pitched copies and host to host copies -set(UNIFIED_RUNTIME_TAG e2df8acd37c3c159364cfdf9dfdc1be35b71779e) +set(UNIFIED_RUNTIME_TAG "cmd-buf_enqueue_refactor") diff --git a/sycl/source/detail/graph_impl.cpp b/sycl/source/detail/graph_impl.cpp index 5f9f79d878d03..3a26dbedb3361 100644 --- a/sycl/source/detail/graph_impl.cpp +++ b/sycl/source/detail/graph_impl.cpp @@ -1049,8 +1049,8 @@ exec_graph_impl::enqueue(const std::shared_ptr &Queue, ur_result_t Res = Queue->getAdapter() ->call_nocheck< - sycl::detail::UrApiKind::urCommandBufferEnqueueExp>( - CommandBuffer, Queue->getHandleRef(), 0, nullptr, &UREvent); + sycl::detail::UrApiKind::urEnqueueCommandBufferExp>( + Queue->getHandleRef(), CommandBuffer, 0, nullptr, &UREvent); NewEvent->setHandle(UREvent); if (Res == UR_RESULT_ERROR_INVALID_QUEUE_PROPERTIES) { throw sycl::exception( diff --git a/sycl/source/detail/scheduler/commands.cpp b/sycl/source/detail/scheduler/commands.cpp index 005008a74ebd0..35ded3b4241ba 100644 --- a/sycl/source/detail/scheduler/commands.cpp +++ b/sycl/source/detail/scheduler/commands.cpp @@ -3601,8 +3601,8 @@ ur_result_t ExecCGCommand::enqueueImpQueue() { MEvent->setHostEnqueueTime(); if (auto Result = MQueue->getAdapter() - ->call_nocheck( - CmdBufferCG->MCommandBuffer, MQueue->getHandleRef(), + ->call_nocheck( + MQueue->getHandleRef(), CmdBufferCG->MCommandBuffer, RawEvents.size(), RawEvents.empty() ? nullptr : &RawEvents[0], Event); Result != UR_RESULT_SUCCESS)