From aa7bfef5d3cebe84e12497eca3556d81273d57a7 Mon Sep 17 00:00:00 2001 From: Pablo Reble Date: Fri, 22 Aug 2025 13:38:50 -0500 Subject: [PATCH 1/4] Update command_buffer.cpp --- .../adapters/level_zero/command_buffer.cpp | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/unified-runtime/source/adapters/level_zero/command_buffer.cpp b/unified-runtime/source/adapters/level_zero/command_buffer.cpp index 687c905417d8b..e8def5424c3e7 100644 --- a/unified-runtime/source/adapters/level_zero/command_buffer.cpp +++ b/unified-runtime/source/adapters/level_zero/command_buffer.cpp @@ -1897,18 +1897,22 @@ ur_result_t urCommandBufferAppendNativeCommandExp( numSyncPointsInWaitList, pSyncPointWaitList, true, pSyncPoint, ZeEventList, ZeLaunchEvent)); - // Barrier on all commands before user defined commands. - ZE2UR_CALL(zeCommandListAppendBarrier, - (ZeCommandList, nullptr, ZeEventList.size(), - getPointerFromVector(ZeEventList))); - + if (!CommandBuffer->IsInOrderCmdList) { + // Barrier on all commands before user defined commands. + ZE2UR_CALL(zeCommandListAppendBarrier, + (ZeCommandList, nullptr, ZeEventList.size(), + getPointerFromVector(ZeEventList))); + } + // Call user-defined function immediately pfnNativeCommand(pData); - - // Barrier on all commands after user defined commands. - ZE2UR_CALL(zeCommandListAppendBarrier, - (ZeCommandList, ZeLaunchEvent, 0, nullptr)); - + + if (!CommandBuffer->IsInOrderCmdList) { + // Barrier on all commands after user defined commands. + ZE2UR_CALL(zeCommandListAppendBarrier, + (ZeCommandList, ZeLaunchEvent, 0, nullptr)); + } + return UR_RESULT_SUCCESS; } From 4b9a4172b8724282ad6aaeb9ffaa825f67164557 Mon Sep 17 00:00:00 2001 From: Pablo Reble Date: Fri, 22 Aug 2025 13:49:26 -0500 Subject: [PATCH 2/4] Update level-zero_usm.cpp --- sycl/test-e2e/Graph/NativeCommand/level-zero_usm.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sycl/test-e2e/Graph/NativeCommand/level-zero_usm.cpp b/sycl/test-e2e/Graph/NativeCommand/level-zero_usm.cpp index a941f2688286f..bf504002f427e 100644 --- a/sycl/test-e2e/Graph/NativeCommand/level-zero_usm.cpp +++ b/sycl/test-e2e/Graph/NativeCommand/level-zero_usm.cpp @@ -4,9 +4,6 @@ // RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %} // REQUIRES: level_zero, level_zero_dev_kit -// UNSUPPORTED: level_zero_v2_adapter -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/17847 - #include #include #include @@ -26,7 +23,7 @@ int main() { return 1; } - queue Queue; + queue Queue{{property::queue::in_order{}}}; const size_t Size = 128; int *PtrX = malloc_device(Size, Queue); From b7127b97de384e6afbb6656458db2f36b7d228f5 Mon Sep 17 00:00:00 2001 From: Pablo Reble Date: Fri, 22 Aug 2025 11:53:19 -0700 Subject: [PATCH 3/4] clang format --- .../source/adapters/level_zero/command_buffer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unified-runtime/source/adapters/level_zero/command_buffer.cpp b/unified-runtime/source/adapters/level_zero/command_buffer.cpp index e8def5424c3e7..753a75ba6611a 100644 --- a/unified-runtime/source/adapters/level_zero/command_buffer.cpp +++ b/unified-runtime/source/adapters/level_zero/command_buffer.cpp @@ -1903,16 +1903,16 @@ ur_result_t urCommandBufferAppendNativeCommandExp( (ZeCommandList, nullptr, ZeEventList.size(), getPointerFromVector(ZeEventList))); } - + // Call user-defined function immediately pfnNativeCommand(pData); - + if (!CommandBuffer->IsInOrderCmdList) { // Barrier on all commands after user defined commands. ZE2UR_CALL(zeCommandListAppendBarrier, (ZeCommandList, ZeLaunchEvent, 0, nullptr)); } - + return UR_RESULT_SUCCESS; } From 6fe18596385a176076810318938f29bc028a20f0 Mon Sep 17 00:00:00 2001 From: Pablo Reble Date: Mon, 25 Aug 2025 13:33:02 -0700 Subject: [PATCH 4/4] typo --- unified-runtime/source/adapters/level_zero/command_buffer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unified-runtime/source/adapters/level_zero/command_buffer.cpp b/unified-runtime/source/adapters/level_zero/command_buffer.cpp index 753a75ba6611a..f97f1573516c7 100644 --- a/unified-runtime/source/adapters/level_zero/command_buffer.cpp +++ b/unified-runtime/source/adapters/level_zero/command_buffer.cpp @@ -1897,7 +1897,7 @@ ur_result_t urCommandBufferAppendNativeCommandExp( numSyncPointsInWaitList, pSyncPointWaitList, true, pSyncPoint, ZeEventList, ZeLaunchEvent)); - if (!CommandBuffer->IsInOrderCmdList) { + if (!hCommandBuffer->IsInOrderCmdList) { // Barrier on all commands before user defined commands. ZE2UR_CALL(zeCommandListAppendBarrier, (ZeCommandList, nullptr, ZeEventList.size(), @@ -1907,7 +1907,7 @@ ur_result_t urCommandBufferAppendNativeCommandExp( // Call user-defined function immediately pfnNativeCommand(pData); - if (!CommandBuffer->IsInOrderCmdList) { + if (!hCommandBuffer->IsInOrderCmdList) { // Barrier on all commands after user defined commands. ZE2UR_CALL(zeCommandListAppendBarrier, (ZeCommandList, ZeLaunchEvent, 0, nullptr));