Skip to content

Commit 888b756

Browse files
nrspruitpbalcer
authored andcommitted
[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 <[email protected]> Co-authored-by: Piotr Balcer <[email protected]>
1 parent a95e800 commit 888b756

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

sycl/cmake/modules/FetchUnifiedRuntime.cmake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT)
117117
endfunction()
118118

119119
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
120-
# commit ad43e28add70e59dd0881043a7a2ab46947ba089
121-
# Merge: fa9ebe7b 53abe070
122-
# Author: Omar Ahmed <omar.ahmed@codeplay.com>
123-
# Date: Mon Sep 16 10:20:10 2024 +0100
124-
# Merge pull request #2060 from martygrant/martin/supressSystemErrorsOnWindows
125-
# [Loader] Suppress system errors when loading adapters on Windows
126-
set(UNIFIED_RUNTIME_TAG ad43e28add70e59dd0881043a7a2ab46947ba089)
120+
# commit 4d19115165b5497b647ae1b2e110488f84d1806a
121+
# Merge: fb6df497 3f128d09
122+
# Author: Piotr Balcer <piotr.balcer@intel.com>
123+
# Date: Tue Sep 17 10:31:44 2024 +0200
124+
# Merge pull request #2087 from nrspruit/fix_driver_inorder_event_wait
125+
# [L0] Fix urEnqueueEventsWaitWithBarrier for driver in order lists
126+
set(UNIFIED_RUNTIME_TAG 4d19115165b5497b647ae1b2e110488f84d1806a)
127127

128128
set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
129129
# Due to the use of dependentloadflag and no installer for UMF and hwloc we need

sycl/test-e2e/Plugin/level_zero_barrier_optimization.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ int main() {
3636
// CHECK: Test1
3737
// CHECK: ---> urEnqueueEventsWaitWithBarrier
3838
// CHECK: ZE ---> zeEventCreate
39-
// CHECK: ZE ---> zeCommandListAppendWaitOnEvents
39+
// CHECK-OPT: ZE ---> zeCommandListAppendWaitOnEvents
4040
// CHECK: ZE ---> zeCommandListAppendSignalEvent
4141
// CHECK: ) -> UR_RESULT_SUCCESS
4242
auto BarrierEvent = Q2.ext_oneapi_submit_barrier({EventA, EventB});
@@ -56,7 +56,7 @@ int main() {
5656
// CHECK: Test2
5757
// CHECK: ---> urEnqueueEventsWaitWithBarrier
5858
// CHECK-OPT: ZE ---> {{zeEventCreate|zeEventHostReset}}
59-
// CHECK: ZE ---> zeCommandListAppendWaitOnEvents
59+
// CHECK-OPT: ZE ---> zeCommandListAppendWaitOnEvents
6060
// CHECK: ZE ---> zeCommandListAppendSignalEvent
6161
// CHECK: ) -> UR_RESULT_SUCCESS
6262
auto BarrierEvent = Q1.ext_oneapi_submit_barrier({EventA, EventB});

0 commit comments

Comments
 (0)