[UR][L0] Fix urEnqueueEventsWaitWithBarrier for driver in order lists (…

…#15404) -pre-commit Pr for oneapi-src/unified-runtime#2087 --------- Signed-off-by: Neil R. Spruit <neil.r.spruit@intel.com> Co-authored-by: Piotr Balcer <piotr.balcer@intel.com>
intel · Sep 17, 2024 · 9eb93e0 · 9eb93e0
1 parent d6f8275
commit 9eb93e0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake
@@ -117,13 +117,13 @@ if(SYCL_UR_USE_FETCH_CONTENT)
   endfunction()
 
   set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
-  # commit ad43e28add70e59dd0881043a7a2ab46947ba089
-  # Merge: fa9ebe7b 53abe070
-  # Author: Omar Ahmed <omar.ahmed@codeplay.com>
-  # Date:   Mon Sep 16 10:20:10 2024 +0100
-  #     Merge pull request #2060 from martygrant/martin/supressSystemErrorsOnWindows
-  #     [Loader] Suppress system errors when loading adapters on Windows
-  set(UNIFIED_RUNTIME_TAG ad43e28add70e59dd0881043a7a2ab46947ba089)
+  # commit 4d19115165b5497b647ae1b2e110488f84d1806a
+  # Merge: fb6df497 3f128d09
+  # Author: Piotr Balcer <piotr.balcer@intel.com>
+  # Date:   Tue Sep 17 10:31:44 2024 +0200
+  #     Merge pull request #2087 from nrspruit/fix_driver_inorder_event_wait
+  #     [L0] Fix urEnqueueEventsWaitWithBarrier for driver in order lists
+  set(UNIFIED_RUNTIME_TAG 4d19115165b5497b647ae1b2e110488f84d1806a)
 
   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/test-e2e/Plugin/level_zero_barrier_optimization.cpp b/sycl/test-e2e/Plugin/level_zero_barrier_optimization.cpp
@@ -36,7 +36,7 @@ int main() {
     // CHECK: Test1
     // CHECK: ---> urEnqueueEventsWaitWithBarrier
     // CHECK: ZE ---> zeEventCreate
-    // CHECK: ZE ---> zeCommandListAppendWaitOnEvents
+    // CHECK-OPT: ZE ---> zeCommandListAppendWaitOnEvents
     // CHECK: ZE ---> zeCommandListAppendSignalEvent
     // CHECK: ) -> UR_RESULT_SUCCESS
     auto BarrierEvent = Q2.ext_oneapi_submit_barrier({EventA, EventB});
@@ -56,7 +56,7 @@ int main() {
     // CHECK: Test2
     // CHECK: ---> urEnqueueEventsWaitWithBarrier
     // CHECK-OPT: ZE ---> {{zeEventCreate|zeEventHostReset}}
-    // CHECK: ZE ---> zeCommandListAppendWaitOnEvents
+    // CHECK-OPT: ZE ---> zeCommandListAppendWaitOnEvents
     // CHECK: ZE ---> zeCommandListAppendSignalEvent
     // CHECK: ) -> UR_RESULT_SUCCESS
     auto BarrierEvent = Q1.ext_oneapi_submit_barrier({EventA, EventB});