[Driver] Allow for usage of old triple behavior in bundler #17557
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
Updates bundler behavior to allow for the older behavior of accepting triple formats that are 'incomplete'. Also performs some cleanup of tests of removed options and updating packager information to include 'arch=generic' as needed
asudarsa
reviewed
Mar 20, 2025
asudarsa
reviewed
Mar 20, 2025
asudarsa
reviewed
Mar 20, 2025
asudarsa
reviewed
Mar 20, 2025
asudarsa
reviewed
Mar 20, 2025
asudarsa
reviewed
Mar 20, 2025
asudarsa
reviewed
Mar 20, 2025
clang/lib/Driver/OffloadBundler.cpp
Outdated
| this->TargetID = TargetIdWithFeature; | ||
| else | ||
| this->TargetID = ""; | ||
| if (Components.size() == 5 || Components.size() == 6) { |
There was a problem hiding this comment.
One minor nit: May be we can reorg this code as follows (to avoid merge issues)
if (Components.size() < 5) {
...// Do our thing
return;
}
// Add community code as is.
There was a problem hiding this comment.
:) yes, that makes sense. I had an earlier revision that was similar to that - and it is easier for merging.
Chenyang-L
approved these changes
Mar 20, 2025
| // FIXME: The Intel Compiler does not currently adhere to the strict | ||
| // component size. Consider all checks valid. | ||
| // return Components.size() == 5 || Components.size() == 6; | ||
| return true; |
There was a problem hiding this comment.
I think we will get warnings for unused variables above.
There was a problem hiding this comment.
Thanks - I've updated to move all code into the comment.
hchilama
approved these changes
Mar 20, 2025
jsji
pushed a commit
that referenced
this pull request
Mar 30, 2025
Recent upstreamed changes force the triple usage with the bundler to use a 4-field triple value. The Intel compiler does not take well to these changes. We are not in a position to move our triple usage when bundling and unbundling (not in a breaking change period). Here, we are updating bundler behavior to allow for the older behavior of accepting triple formats that are 'incomplete'. We can move to using the forced triple value usage when we are ready or if we even need to when we move to the new offloading model.
jsji
pushed a commit
that referenced
this pull request
Apr 1, 2025
Recent upstreamed changes force the triple usage with the bundler to use a 4-field triple value. The Intel compiler does not take well to these changes. We are not in a position to move our triple usage when bundling and unbundling (not in a breaking change period). Here, we are updating bundler behavior to allow for the older behavior of accepting triple formats that are 'incomplete'. We can move to using the forced triple value usage when we are ready or if we even need to when we move to the new offloading model.
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.
Recent upstreamed changes force the triple usage with the bundler to use a 4-field triple value.
The Intel compiler does not take well to these changes. We are not in a position to move our triple usage when bundling and unbundling (not in a breaking change period).
Here, we are updating bundler behavior to allow for the older behavior of accepting triple formats that are 'incomplete'. We can move to using the forced triple value usage when we are ready or if we even need to when we move to the new offloading model.