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

Conversation

callumfare
Copy link
Contributor

@callumfare callumfare commented Jul 23, 2024

@callumfare callumfare force-pushed the callum/ur_printtrace_fix branch from 9766a9f to eb0b0d2 Compare July 24, 2024 08:51
@omarahmed1111 omarahmed1111 force-pushed the callum/ur_printtrace_fix branch from eb0b0d2 to 7aa3d88 Compare July 30, 2024 13:28
@omarahmed1111 omarahmed1111 marked this pull request as ready for review July 31, 2024 11:48
@omarahmed1111 omarahmed1111 requested review from a team as code owners July 31, 2024 11:48
@omarahmed1111
Copy link
Contributor

@intel/dpcpp-esimd-reviewers Could we have a review on this when available ASAP to merge it? Thanks!

# commit bc1a28ede0df7f837047b632e00437587672c134
# 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)
set(UNIFIED_RUNTIME_TAG a2a053de43b8488a571ec026512a98b178ca06e4)
Copy link
Contributor

Choose a reason for hiding this comment

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

This was merged, so could be updated to oneapi-src/unified-runtime@3e762e0. This PR would then include all the updates from #14848.

Copy link
Contributor

Choose a reason for hiding this comment

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

Updated

@omarahmed1111
Copy link
Contributor

The bump for this PR will be included as part of this PR, so we could remove the UR bump here.

@callumfare
Copy link
Contributor Author

The bump for this PR will be included as part of this PR, so we could remove the UR bump here.

The test changes (other than two Plugin tests) are all needed at the same time as the bump, because the UR changes cause the test output to be formatted differently on L0. So that PR would need to temporarily disable those tests on some configurations, and then reenable them here. It might be easier to merge this separately.

@pbalcer
Copy link
Contributor

pbalcer commented Jul 31, 2024

The bump for this PR will be included as part of this PR, so we could remove the UR bump here.

The test changes (other than two Plugin tests) are all needed at the same time as the bump, because the UR changes cause the test output to be formatted differently on L0. So that PR would need to temporarily disable those tests on some configurations, and then reenable them here. It might be easier to merge this separately.

Makes sense. This PR is nearly finished with CI anyway. I think this should be merged first, followed by #14701.

@intel/llvm-reviewers-runtime please review.

@pbalcer
Copy link
Contributor

pbalcer commented Aug 1, 2024

@intel/llvm-reviewers-runtime can you please approve? This PR only has test and UR related changes. The correct reviewer team should be @intel/unified-runtime-reviewers, but this PR was created before the CODEOWNERS file change.

Copy link
Contributor

@maarquitos14 maarquitos14 left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -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.

@pbalcer
Copy link
Contributor

pbalcer commented Aug 1, 2024

@intel/llvm-gatekeepers please merge

@@ -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).

@AlexeySachkov AlexeySachkov merged commit 8411a7b into intel:sycl Aug 1, 2024
14 checks passed
AlexeySachkov pushed a commit to AlexeySachkov/llvm that referenced this pull request Nov 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Plugin/level_zero_dynamic_batch_test.cpp Plugin/level_zero_batch_barrier.cpp
6 participants