diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index 01154c19b91c1..e7d8ab6faae6d 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1,7 @@ -# commit 9d6542bac16db69d907002cb0f8c724c7a50d2dc -# Merge: 0e6adfb6 04882ba3 +# commit cc60d0872f1ffe0656bc9ec25db5b5cbb3cbafd6 +# Merge: 0c11a742 ec5a3bd1 # Author: Kenneth Benzie (Benie) -# Date: Thu Feb 6 11:30:48 2025 +0000 -# Merge pull request #2655 from hvdijk/nativecpu-null-phevent -# [NativeCPU] Handle null phEvent. -set(UNIFIED_RUNTIME_TAG 9d6542bac16db69d907002cb0f8c724c7a50d2dc) +# Date: Thu Feb 6 17:59:43 2025 +0000 +# Merge pull request #2606 from Bensuo/cmd-buf_enqueue_refactor +# Rename urCommandBufferEnqueueExp to urEnqueueCommandBufferExp +set(UNIFIED_RUNTIME_TAG cc60d0872f1ffe0656bc9ec25db5b5cbb3cbafd6) 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)