[SYCL][NATIVECPU] Avoid overwriting offload kind on Native CPU #12971
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
mdtoguchi
reviewed
Mar 11, 2024
clang/lib/Driver/Driver.cpp
Outdated
| @@ -9091,7 +9091,8 @@ InputInfoList Driver::BuildJobsForActionNoCache( | |||
| // in this instance | |||
| Action::OffloadKind DependentOffloadKind; | |||
| if (UI.DependentOffloadKind == Action::OFK_SYCL && | |||
| TargetDeviceOffloadKind == Action::OFK_None) | |||
| TargetDeviceOffloadKind == Action::OFK_None && | |||
| !isSYCLNativeCPU(C.getDefaultToolChain().getTriple(), TC->getTriple())) | |||
There was a problem hiding this comment.
Is there a test that can be updated to track the kind consistency?
There was a problem hiding this comment.
I don't think we have one, I'll add it to the PR
There was a problem hiding this comment.
@mdtoguchi I've updated the lit test for native cpu, I'm still looking into the CI failures in the driver lit tests
PietroGhg
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
PietroGhg
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
PietroGhg
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
PietroGhg
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
PietroGhg
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
uwedolinsky
approved these changes
Mar 14, 2024
mdtoguchi
approved these changes
Mar 14, 2024
|
Hello @intel/llvm-gatekeepers, this looks ready to be merged, thank you |
dm-vodopyanov
changed the title
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.
For Native CPU, the host and the device triples are the same. This means that the cache entries for
BuildJobsForActionare distinguished only by the offload kind (-hostor-sycl). Since the offload kind is being overwritten when processingOffloadUnbundlingJobAction, this lead to cache entries being overwritten on Native CPU, with corresponding build failures.