Skip to content

Bump UR tag to include PrintTrace fix #14728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions sycl/cmake/modules/FetchUnifiedRuntime.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,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 <[email protected]>
# 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
Expand Down
10 changes: 5 additions & 5 deletions sycl/test-e2e/Basic/host-task-dependency.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,15 @@ int main() {
}

// launch of Gen kernel
// CHECK:---> urKernelCreate(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not to block the PR, but my opinion is that we shouldn't have tests relying on tracing in e2e tests. Those should instead be refactored to be unit-tests. I've highlighted this already in PI removal PR and I would be happy to contribute to such rewrite myself (if only I had some time for it, sigh).

// 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
Expand Down
8 changes: 4 additions & 4 deletions sycl/test-e2e/DiscardEvents/discard_events_accessors.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/DiscardEvents/discard_events_using_assert.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
80 changes: 41 additions & 39 deletions sycl/test-e2e/DiscardEvents/discard_events_usm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
90 changes: 46 additions & 44 deletions sycl/test-e2e/DiscardEvents/discard_events_usm_ooo_queue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
8 changes: 4 additions & 4 deletions sycl/test-e2e/ESIMD/sycl_esimd_mix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions sycl/test-e2e/Plugin/level_zero_batch_barrier.cpp
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/Plugin/level_zero_dynamic_batch_test.cpp
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not blocking the merge, but should this eventually be enabled? If so, please, create another issue for this.

Copy link
Contributor

@pbalcer pbalcer Aug 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it was always like that, even before PI removal.
See here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@steffenlarsen and/or @lbushi25 are working on an ongoing effort to review all XFAIL and UNSUPPORTED directives in our e2e tests to add an explicit comment that those are either expected to be there due to our implementation status/device capabilities, or that those should be fixed as part of this or that tracker.


// RUN: %{build} -o %t.ooo.out
// RUN: %{build} -DUSING_INORDER -o %t.ino.out
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Scheduler/HostAccDestruction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ int main() {
}

// CHECK:host acc destructor call
// CHECK:---> urEnqueueKernelLaunch(
// CHECK:---> urEnqueueKernelLaunch
// CHECK:end of scope
Loading
Loading