VITIS-13806 Fix helper scripts and return codes for xrt-smi #8716
Conversation
This file contains 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
Signed-off-by: Ryan Chane <[email protected]>
rchane
requested review from
rozumx,
chvamshi-xilinx and
AShivangi
as code owners
stsoe
reviewed
Jan 24, 2025
| @@ -35,7 +35,7 @@ XRT_LOADER_DIR="`dirname \"$0\"`" | |||
|
|
|||
| # For edge platforms loader is not required as tools are in standard location(/usr). | |||
| # So calling unwrapped tool from this script itself. | |||
| if [[ $XRT_LOADER_DIR =~ "/usr" || $XRT_LOADER_DIR =~ "/bin" ]]; then | |||
| if [[ $XRT_LOADER_DIR =~ "/usr" ]]; then | |||
There was a problem hiding this comment.
Hmm, doesn't this break what was fixed in #8426 ?
There was a problem hiding this comment.
Thank you; fixing the regex...
Signed-off-by: Ryan Chane <[email protected]>
AShivangi
approved these changes
Jan 24, 2025
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.
Problem solved by the commit
https://jira.xilinx.com/browse/VITIS-13806
Bug / issue (if any) fixed, which PR introduced the bug, how it was discovered
The xrt-smi helper script wasn't trying to get the loader and returned 0 due to a faulty if check.
(e.g.
binis still in the path on Windows MCDM and Linux amdxdna, so we should still be finding the loader)How problem was solved, alternative solutions (if any) and why they were rejected
Removed the faulty part of the if check. This should also preserve the original return behavior for edge platforms. Also removed xbutil helper script for Linux to deprecate xbutil usage
Risks (if any) associated the changes in the commit
N/A
What has been tested and how, request additional testing if necessary
Tested/built on amdxdna and MCDM.
Documentation impact (if any)
N/A