Fix mixed output of adapter and regular traces #2101
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pbalcer
reviewed
Sep 18, 2024
There was a problem hiding this comment.
I'm not really a fan of this approach, I'd prefer to have indents like ltrace. But I guess it solves the immediate problem...
Also, please try to keep the first line of the commit message under 50 characters, and the rest of the message lines under ~70.
$ man git commit
...
Though not required, it’s a good idea to begin the commit message with a single short (less than 50 character)
line summarizing the change, followed by a blank line and then a more thorough description. The text up to the
first blank line in a commit message is treated as the commit title, and that title is used throughout Git.
| @@ -40,16 +40,18 @@ __urdlllocal ur_result_t UR_APICALL urAdapterGet( | |||
| uint64_t instance = getContext()->notify_begin(UR_FUNCTION_ADAPTER_GET, | |||
| "urAdapterGet", ¶ms); | |||
|
|
|||
| getContext()->logger.info("---> urAdapterGet"); | |||
| std::ostringstream args_str; | |||
| ur::extras::printFunctionParams(args_str, UR_FUNCTION_ADAPTER_GET, ¶ms); | |||
There was a problem hiding this comment.
not all the arguments can be accessed here, because some of them may be output arguments, with uninitialized content, which results in UB on access.
We either have to selectively access the parameters, adding an option to printFunctionParams to decide whether we are pre or post function execution, or, we can simply read those arguments after the execution. Which is what the original implementation did, for this exact reason.
lslusarczyk
changed the title
lslusarczyk
force-pushed
the
fix-interleaved-urtraces
branch
from
30f8e30 to
2d10f85
Compare
lslusarczyk
force-pushed
the
fix-interleaved-urtraces
branch
from
2b5d716 to
12e0cee
Compare
lslusarczyk
force-pushed
the
fix-interleaved-urtraces
branch
from
12e0cee to
cf835bf
Compare
lslusarczyk
force-pushed
the
fix-interleaved-urtraces
branch
from
cf835bf to
3785539
Compare
lslusarczyk
changed the title
lslusarczyk
force-pushed
the
fix-interleaved-urtraces
branch
from
3785539 to
1e4088f
Compare
lslusarczyk
force-pushed
the
fix-interleaved-urtraces
branch
from
1e4088f to
3a7b9f1
Compare
lslusarczyk
force-pushed
the
fix-interleaved-urtraces
branch
from
3a7b9f1 to
439c484
Compare
lslusarczyk
force-pushed
the
fix-interleaved-urtraces
branch
from
439c484 to
5e8592b
Compare
lslusarczyk
force-pushed
the
fix-interleaved-urtraces
branch
from
5e8592b to
cf5994a
Compare
Fixed oneapi-src#2002 issue. Regular UR tracing prints now calls in two separate lines like PI does.
|
@pbalcer , can you take a look again to this PR and merge this if all is OK?
E2E tests on llvm pass on my change and corresponding change in llvm is approved, see: intel/llvm#15439 |
pbalcer
approved these changes
Oct 3, 2024
lslusarczyk
added a commit
to lslusarczyk/llvm
that referenced
this pull request
Oct 3, 2024
) makes llvm work with this change: oneapi-src/unified-runtime#2101 fixes this bug: oneapi-src/unified-runtime#2002
steffenlarsen
pushed a commit
to intel/llvm
that referenced
this pull request
Oct 3, 2024
Issue with ugly interleaved Level0 adapter and Level0 Unified Runtime traces, that is oneapi-src/unified-runtime#2002 issue, has been fixed in oneapi-src/unified-runtime#2101. This PR adds necessary changes to e2e tests to make them pass with modified tracing in L0 Adapter. This PR also reverts #15167 which disabled some traces because of the bug which is now fixed, so traces can be restored. --------- Co-authored-by: Piotr Balcer <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #2002 issue.
When merged this PR will make regular UR calls tracing being printed calls in two separate lines like PI does.