Bump UR tag to include PrintTrace fix (#14728)

Tests oneapi-src/unified-runtime#1884 Fixes #14704 Fixes #14721
intel · Aug 1, 2024 · 8411a7b · 8411a7b
1 parent 56b1410
commit 8411a7b
Show file tree

Hide file tree

Showing 12 changed files with 115 additions and 114 deletions.
diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake
@@ -116,13 +116,14 @@ if(SYCL_PI_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")
- # commit bc1a28ede0df7f837047b632e00437587672c134
+set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
+ # commit 3e762e00bcf13d158fb58e8e8c2eabcfc8934b4e
+ # Merge: c805a71a a2a053de
  # Author: Omar Ahmed <omar.ahmed@codeplay.com>
- # Date: Mon Jul 29 16:44:58 2024 +0100
- # Merge pull request #1819 from DBDuncan/sean/rename-interop-to-external
- # [Bindless][Exp] Rename interop related structs/funcs with "external"
- set(UNIFIED_RUNTIME_TAG bc1a28ede0df7f837047b632e00437587672c134)
+ # Date: Wed Jul 31 12:26:34 2024 +0100
+ # Merge pull request #1884 from callumfare/callum/fix_printtrace
+ #  Enable PrintTrace when SYCL UR tracing is enabled
+ set(UNIFIED_RUNTIME_TAG 3e762e00bcf13d158fb58e8e8c2eabcfc8934b4e)
 
  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/Basic/host-task-dependency.cpp b/sycl/test-e2e/Basic/host-task-dependency.cpp
@@ -178,15 +178,15 @@ int main() {
 }
 
 // launch of Gen kernel
-// CHECK:---> urKernelCreate(
+// CHECK:---> urKernelCreate
 // CHECK: NameGen
-// CHECK:---> urEnqueueKernelLaunch(
+// CHECK:---> urEnqueueKernelLaunch
 // prepare for host task
-// CHECK:---> urEnqueueMemBuffer{{Map|Read}}(
+// CHECK:---> urEnqueueMemBuffer{{Map|Read}}
 // launch of Copier kernel
-// CHECK:---> urKernelCreate(
+// CHECK:---> urKernelCreate
 // CHECK: Copier
-// CHECK:---> urEnqueueKernelLaunch(
+// CHECK:---> urEnqueueKernelLaunch
 
 // CHECK:Third buffer [ 0] = 0
 // CHECK:Third buffer [ 1] = 1

diff --git a/sycl/test-e2e/DiscardEvents/discard_events_accessors.cpp b/sycl/test-e2e/DiscardEvents/discard_events_accessors.cpp
@@ -6,12 +6,12 @@
 // urEnqueueKernelLaunch for USM kernel using local accessor, but
 // is not `nullptr` for kernel using buffer accessor.
 //
-// CHECK: ---> urEnqueueKernelLaunch(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueKernelLaunch
+// CHECK: .phEvent = nullptr
 //
 // CHECK-NOT: ---> urEnqueueKernelLaunch({{.*}}.phEvent = nullptr
-// CHECK: ---> urEnqueueKernelLaunch(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueKernelLaunch
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // CHECK: The test passed.
 

diff --git a/sycl/test-e2e/DiscardEvents/discard_events_using_assert.cpp b/sycl/test-e2e/DiscardEvents/discard_events_using_assert.cpp
@@ -10,8 +10,8 @@
 // urEnqueueKernelLaunch.
 //
 // CHECK-NOT: ---> urEnqueueKernelLaunch({{.*}}.phEvent = nullptr
-// CHECK: ---> urEnqueueKernelLaunch(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueKernelLaunch
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // CHECK: The test passed.
 

diff --git a/sycl/test-e2e/DiscardEvents/discard_events_using_assert_ndebug.cpp b/sycl/test-e2e/DiscardEvents/discard_events_using_assert_ndebug.cpp
@@ -5,8 +5,8 @@
 // The test checks that the last parameter is `nullptr` for
 // urEnqueueKernelLaunch.
 //
-// CHECK: ---> urEnqueueKernelLaunch(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueKernelLaunch
+// CHECK: .phEvent = nullptr
 //
 // CHECK: The test passed.
 

diff --git a/sycl/test-e2e/DiscardEvents/discard_events_usm.cpp b/sycl/test-e2e/DiscardEvents/discard_events_usm.cpp
@@ -16,76 +16,78 @@
 // Since it is a warning it is safe to ignore for this test.
 //
 // Everything that follows TestQueueOperations()
-// CHECK: ---> urEnqueueUSMFill(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueUSMFill
+// CHECK: .phEvent = nullptr
 //
-// CHECK: ---> urEnqueueUSMMemcpy(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueUSMMemcpy
+// CHECK: .phEvent = nullptr
 //
 // Level-zero backend doesn't use urEnqueueUSMFill
-// CHECK-L0: ---> urEnqueueKernelLaunch({{.*}} .phEvent = nullptr
+// CHECK-L0: ---> urEnqueueKernelLaunch
+// CHECK-L0: .phEvent = nullptr
 // CHECK-OTHER: ---> urEnqueueUSMFill({{.*}} .phEvent = nullptr
 //
 // ---> urEnqueueUSMMemcpy(
-// CHECK: ---> urEnqueueUSMMemcpy(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueUSMMemcpy
+// CHECK: .phEvent = nullptr
 //
-// CHECK: ---> urEnqueueUSMPrefetch(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueUSMPrefetch
+// CHECK: .phEvent = nullptr
 //
-// CHECK: ---> urEnqueueUSMAdvise(
-// CHECK-SAME: .phEvent = nullptr
-// CHECK-SAME: ) -> {{UR_RESULT_SUCCESS|UR_RESULT_ERROR_ADAPTER_SPECIFIC}}
+// CHECK: ---> urEnqueueUSMAdvise
+// CHECK: .phEvent = nullptr
+// CHECK: -> {{UR_RESULT_SUCCESS|UR_RESULT_ERROR_ADAPTER_SPECIFIC}}
 //
-// CHECK: ---> urEnqueueKernelLaunch(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueKernelLaunch
+// CHECK: .phEvent = nullptr
 //
-// CHECK: ---> urEnqueueKernelLaunch(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueKernelLaunch
+// CHECK: .phEvent = nullptr
 //
 // RegularQueue
 // CHECK-NOT: ---> urEnqueueUSMFill({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueUSMFill(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueUSMFill
+// CHECK: -> UR_RESULT_SUCCESS
 //
-// CHECK: ---> urEnqueueEventsWait(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueEventsWait
+// CHECK: .phEvent = nullptr
 //
 // Everything that follows TestQueueOperationsViaSubmit()
-// CHECK: ---> urEnqueueUSMFill(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueUSMFill
+// CHECK: .phEvent = nullptr
 //
-// CHECK: ---> urEnqueueUSMMemcpy(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueUSMMemcpy
+// CHECK: .phEvent = nullptr
 //
 // Level-zero backend doesn't use urEnqueueUSMFill
-// CHECK-L0: ---> urEnqueueKernelLaunch({{.*}} .phEvent = nullptr
+// CHECK-L0: ---> urEnqueueKernelLaunch
+// CHECK-L0: .phEvent = nullptr
 // CHECK-OTHER: ---> urEnqueueUSMFill({{.*}} .phEvent = nullptr
 //
 // ---> urEnqueueUSMMemcpy(
-// CHECK: ---> urEnqueueUSMMemcpy(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueUSMMemcpy
+// CHECK: .phEvent = nullptr
 //
-// CHECK: ---> urEnqueueUSMPrefetch(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueUSMPrefetch
+// CHECK: .phEvent = nullptr
 //
-// CHECK: ---> urEnqueueUSMAdvise(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueUSMAdvise
+// CHECK: .phEvent = nullptr
 // CHECK-SAME: ) -> {{UR_RESULT_SUCCESS|UR_RESULT_ERROR_ADAPTER_SPECIFIC}}
 //
-// CHECK: ---> urEnqueueKernelLaunch(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueKernelLaunch
+// CHECK: .phEvent = nullptr
 //
-// CHECK: ---> urEnqueueKernelLaunch(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueKernelLaunch
+// CHECK: .phEvent = nullptr
 //
 // RegularQueue
 // CHECK-NOT: ---> urEnqueueUSMFill({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueUSMFill(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueUSMFill
+// CHECK: -> UR_RESULT_SUCCESS
 //
-// CHECK: ---> urEnqueueEventsWait(
-// CHECK-SAME: .phEvent = nullptr
+// CHECK: ---> urEnqueueEventsWait
+// CHECK: .phEvent = nullptr
 //
 // CHECK: The test passed.
 

diff --git a/sycl/test-e2e/DiscardEvents/discard_events_usm_ooo_queue.cpp b/sycl/test-e2e/DiscardEvents/discard_events_usm_ooo_queue.cpp
@@ -17,99 +17,101 @@
 //
 // Everything that follows TestQueueOperations()
 // CHECK-NOT: ---> urEnqueueUSMFill({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueUSMFill(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueUSMFill
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // CHECK-NOT: ---> urEnqueueUSMMemcpy({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueUSMMemcpy(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueUSMMemcpy
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // Level-zero backend doesn't use urEnqueueUSMFill
-// CHECK-L0: ---> urEnqueueKernelLaunch({{.*}} .phEvent = {{[0-9a-f]+}}
+// CHECK-L0: ---> urEnqueueKernelLaunch
+// CHECK-L0: .phEvent = {{[0-9a-f]+}}
 // CHECK-OTHER: ---> urEnqueueUSMFill({{.*}} .phEvent = {{[0-9a-f]+}}
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // ---> urEnqueueUSMMemcpy(
 // CHECK-NOT: ---> urEnqueueUSMMemcpy({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueUSMMemcpy(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueUSMMemcpy
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // CHECK-NOT: ---> urEnqueueUSMPrefetch({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueUSMPrefetch(
-// CHECK-SAME: ) -> {{UR_RESULT_SUCCESS|UR_RESULT_ERROR_ADAPTER_SPECIFIC}}
+// CHECK: ---> urEnqueueUSMPrefetch
+// CHECK: -> {{UR_RESULT_SUCCESS|UR_RESULT_ERROR_ADAPTER_SPECIFIC}}
 //
 // CHECK-NOT: ---> urEnqueueUSMAdvise({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueUSMAdvise(
-// CHECK-SAME: ) -> {{UR_RESULT_SUCCESS|UR_RESULT_ERROR_ADAPTER_SPECIFIC}}
+// CHECK: ---> urEnqueueUSMAdvise
+// CHECK: -> {{UR_RESULT_SUCCESS|UR_RESULT_ERROR_ADAPTER_SPECIFIC}}
 //
 // CHECK-NOT: ---> urEnqueueEventsWaitWithBarrier({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueEventsWaitWithBarrier(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueEventsWaitWithBarrier
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // CHECK-NOT: ---> urEnqueueKernelLaunch({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueKernelLaunch(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueKernelLaunch
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // CHECK-NOT: ---> urEnqueueKernelLaunch({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueKernelLaunch(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueKernelLaunch
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // RegularQueue
 // CHECK-NOT: ---> urEnqueueUSMFill({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueUSMFill(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueUSMFill
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // CHECK-NOT: ---> urEnqueueEventsWait({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueEventsWait(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueEventsWait
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // Everything that follows TestQueueOperationsViaSubmit()
 // CHECK-NOT: ---> urEnqueueUSMFill({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueUSMFill(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueUSMFill
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // CHECK-NOT: ---> urEnqueueUSMMemcpy({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueUSMMemcpy(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueUSMMemcpy
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // Level-zero backend doesn't use urEnqueueUSMFill
-// CHECK-L0: ---> urEnqueueKernelLaunch({{.*}} .phEvent = {{[0-9a-f]+}}
+// CHECK-L0: ---> urEnqueueKernelLaunch
+// CHECK-L0: .phEvent = {{[0-9a-f]+}}
 // CHECK-OTHER: ---> urEnqueueUSMFill({{.*}} .phEvent = {{[0-9a-f]+}}
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // ---> urEnqueueUSMMemcpy(
 // CHECK-NOT: ---> urEnqueueUSMMemcpy({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueUSMMemcpy(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueUSMMemcpy
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // CHECK-NOT: ---> urEnqueueUSMPrefetch({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueUSMPrefetch(
-// CHECK-SAME: ) -> {{UR_RESULT_SUCCESS|UR_RESULT_ERROR_ADAPTER_SPECIFIC}}
+// CHECK: ---> urEnqueueUSMPrefetch
+// CHECK: ) -> {{UR_RESULT_SUCCESS|UR_RESULT_ERROR_ADAPTER_SPECIFIC}}
 //
 // CHECK-NOT: ---> urEnqueueUSMAdvise({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueUSMAdvise(
-// CHECK-SAME: ) -> {{UR_RESULT_SUCCESS|UR_RESULT_ERROR_ADAPTER_SPECIFIC}}
+// CHECK: ---> urEnqueueUSMAdvise
+// CHECK: ) -> {{UR_RESULT_SUCCESS|UR_RESULT_ERROR_ADAPTER_SPECIFIC}}
 //
 // CHECK-NOT: ---> urEnqueueEventsWaitWithBarrier({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueEventsWaitWithBarrier(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueEventsWaitWithBarrier
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // CHECK-NOT: ---> urEnqueueKernelLaunch({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueKernelLaunch(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueKernelLaunch
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // CHECK-NOT: ---> urEnqueueKernelLaunch({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueKernelLaunch(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueKernelLaunch
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // RegularQueue
 // CHECK-NOT: ---> urEnqueueUSMFill({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueUSMFill(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueUSMFill
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // CHECK-NOT: ---> urEnqueueEventsWait({{.*}} .phEvent = nullptr
-// CHECK: ---> urEnqueueEventsWait(
-// CHECK-SAME: -> UR_RESULT_SUCCESS
+// CHECK: ---> urEnqueueEventsWait
+// CHECK: -> UR_RESULT_SUCCESS
 //
 // CHECK: The test passed.
 

diff --git a/sycl/test-e2e/ESIMD/sycl_esimd_mix.cpp b/sycl/test-e2e/ESIMD/sycl_esimd_mix.cpp
@@ -122,22 +122,22 @@ int main(void) {
 // Some backends will call urProgramBuild and some will call 
 // urProgramBuildExp depending on urProgramBuildExp support.
 
-// CHECK-LABEL: ---> urProgramBuild{{(Exp)?}}(
+// CHECK-LABEL: ---> urProgramBuild{{(Exp)?}}
 // CHECK-NOT: -vc-codegen
 // CHECK-WITH-VAR: -g
 // CHECK-NOT: -vc-codegen
 // CHECK: {{.*}}-> UR_RESULT_SUCCESS
-// CHECK-LABEL: ---> urKernelCreate(
+// CHECK-LABEL: ---> urKernelCreate
 // CHECK: {{.*}}SyclKernel
 // CHECK: {{.*}}-> UR_RESULT_SUCCESS
 
 // For ESIMD kernels, -vc-codegen option is always preserved,
 // regardless of SYCL_PROGRAM_COMPILE_OPTIONS value.
 
-// CHECK-LABEL: ---> urProgramBuild{{(Exp)?}}(
+// CHECK-LABEL: ---> urProgramBuild{{(Exp)?}}
 // CHECK-NO-VAR: -vc-codegen
 // CHECK-WITH-VAR: -g -vc-codegen
 // CHECK: {{.*}}-> UR_RESULT_SUCCESS
-// CHECK-LABEL: ---> urKernelCreate(
+// CHECK-LABEL: ---> urKernelCreate
 // CHECK: {{.*}}EsimdKernel
 // CHECK: {{.*}}-> UR_RESULT_SUCCESS
diff --git a/sycl/test-e2e/Plugin/level_zero_batch_barrier.cpp b/sycl/test-e2e/Plugin/level_zero_batch_barrier.cpp
@@ -1,8 +1,5 @@
 // REQUIRES: gpu, level_zero, level_zero_dev_kit
 
-// TODO: Reenable, see https://github.com/intel/llvm/issues/14704
-// UNSUPPORTED: windows, linux
-
 // RUN: %{build} %level_zero_options -o %t.out
 // RUN: env SYCL_UR_TRACE=1 UR_L0_DEBUG=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.out 2>&1 | FileCheck %s
 

diff --git a/sycl/test-e2e/Plugin/level_zero_dynamic_batch_test.cpp b/sycl/test-e2e/Plugin/level_zero_dynamic_batch_test.cpp
@@ -1,6 +1,5 @@
 // REQUIRES: gpu, level_zero
-// TODO: Reenable, see https://github.com/intel/llvm/issues/14721
-// UNSUPPORTED: ze_debug, windows, linux
+// UNSUPPORTED: ze_debug
 
 // RUN: %{build} -o %t.ooo.out
 // RUN: %{build} -DUSING_INORDER -o %t.ino.out

diff --git a/sycl/test-e2e/Scheduler/HostAccDestruction.cpp b/sycl/test-e2e/Scheduler/HostAccDestruction.cpp
@@ -35,5 +35,5 @@ int main() {
 }
 
 // CHECK:host acc destructor call
-// CHECK:---> urEnqueueKernelLaunch(
+// CHECK:---> urEnqueueKernelLaunch
 // CHECK:end of scope