[Offload][SYCL] Refactor OffloadKind implementation#135809
Merged
Conversation
Signed-off-by: Arvind Sudarsanam <arvind.sudarsanam@intel.com>
Member
|
@llvm/pr-subscribers-clang-driver @llvm/pr-subscribers-clang Author: Arvind Sudarsanam (asudarsa) ChangesFollowing are the changes:
Thanks Full diff: https://github.com/llvm/llvm-project/pull/135809.diff 2 Files Affected:
diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
index 52d922abbcaec..a76b6f1da1e1d 100644
--- a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
+++ b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
@@ -923,10 +923,9 @@ Expected<SmallVector<StringRef>> linkAndWrapDeviceFiles(
});
auto LinkerArgs = getLinkerArgs(Input, BaseArgs);
- DenseSet<OffloadKind> ActiveOffloadKinds;
+ uint16_t ActiveOffloadKindMask = 0u;
for (const auto &File : Input)
- if (File.getBinary()->getOffloadKind() != OFK_None)
- ActiveOffloadKinds.insert(File.getBinary()->getOffloadKind());
+ ActiveOffloadKindMask |= File.getBinary()->getOffloadKind();
// Write any remaining device inputs to an output file.
SmallVector<StringRef> InputFiles;
@@ -943,7 +942,10 @@ Expected<SmallVector<StringRef>> linkAndWrapDeviceFiles(
return OutputOrErr.takeError();
// Store the offloading image for each linked output file.
- for (OffloadKind Kind : ActiveOffloadKinds) {
+ for (OffloadKind Kind = OFK_FIRST; Kind != OFK_LAST;
+ Kind = static_cast<OffloadKind>((uint16_t)(Kind) << 1)) {
+ if ((ActiveOffloadKindMask & Kind) == 0)
+ continue;
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> FileOrErr =
llvm::MemoryBuffer::getFileOrSTDIN(*OutputOrErr);
if (std::error_code EC = FileOrErr.getError()) {
diff --git a/llvm/include/llvm/Object/OffloadBinary.h b/llvm/include/llvm/Object/OffloadBinary.h
index c02aec8d956ed..858c7a59bce4a 100644
--- a/llvm/include/llvm/Object/OffloadBinary.h
+++ b/llvm/include/llvm/Object/OffloadBinary.h
@@ -32,10 +32,12 @@ namespace object {
/// The producer of the associated offloading image.
enum OffloadKind : uint16_t {
OFK_None = 0,
- OFK_OpenMP,
- OFK_Cuda,
- OFK_HIP,
- OFK_LAST,
+ OFK_OpenMP = (1 << 1),
+ OFK_FIRST = OFK_OpenMP,
+ OFK_Cuda = (1 << 2),
+ OFK_HIP = (1 << 3),
+ OFK_SYCL = (1 << 4),
+ OFK_LAST = (1 << 5),
};
/// The type of contents the offloading image contains.
|
jhuber6
reviewed
Apr 15, 2025
| OFK_HIP, | ||
| OFK_LAST, | ||
| OFK_OpenMP = (1 << 1), | ||
| OFK_FIRST = OFK_OpenMP, |
Contributor
Author
There was a problem hiding this comment.
Good catch. I will update.
Thanks
| OFK_Cuda, | ||
| OFK_HIP, | ||
| OFK_LAST, | ||
| OFK_OpenMP = (1 << 1), |
| auto LinkerArgs = getLinkerArgs(Input, BaseArgs); | ||
|
|
||
| DenseSet<OffloadKind> ActiveOffloadKinds; | ||
| uint16_t ActiveOffloadKindMask = 0u; |
Contributor
There was a problem hiding this comment.
This code doesn't need to be modified, but I guess we could if we wanted to get rid of the set. I don't think it's necessary now though.
Contributor
Author
There was a problem hiding this comment.
I think it is a good optimization to have (16-bit mask instead of a Set). Also, it will be easier to pass the mask to callee function when introducing support for SYCL in my original PR.
Thanks
Signed-off-by: Arvind Sudarsanam <arvind.sudarsanam@intel.com>
jhuber6
approved these changes
Apr 15, 2025
…P from 3 to 4 Signed-off-by: Arvind Sudarsanam <arvind.sudarsanam@intel.com>
sarnex
approved these changes
Apr 16, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/174/builds/16286 Here is the relevant piece of the build log for the reference |
Contributor
Author
|
AddressSanitizer test is passing in subsequent runs. Mostly a flaky issue. Thanks |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Following are the changes:
Thanks