[MC][AMDGPU] Support .reloc BFD_RELOC_{NONE,32,64} #114617
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
Emitting BFD_RELOC_* reloc directives can cause internal errors on AMDGPU
EthanLuisMcDonough
requested review from
MaskRay,
jdoerfert,
jdenny-ornl and
jhuber6
|
@llvm/pr-subscribers-mc @llvm/pr-subscribers-backend-amdgpu Author: Ethan Luis McDonough (EthanLuisMcDonough) ChangesEmitting BFD_RELOC_* reloc directives can cause internal errors on AMDGPU. Full diff: https://github.com/llvm/llvm-project/pull/114617.diff 1 Files Affected:
diff --git a/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp
index c2d2ca0f90f930..3172a83e5a1fe0 100644
--- a/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp
+++ b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp
@@ -163,12 +163,17 @@ void AMDGPUAsmBackend::applyFixup(const MCAssembler &Asm, const MCFixup &Fixup,
std::optional<MCFixupKind>
AMDGPUAsmBackend::getFixupKind(StringRef Name) const {
- return StringSwitch<std::optional<MCFixupKind>>(Name)
-#define ELF_RELOC(Name, Value) \
- .Case(#Name, MCFixupKind(FirstLiteralRelocationKind + Value))
+ auto Type = StringSwitch<unsigned>(Name)
+#define ELF_RELOC(Name, Value) .Case(#Name, Value)
#include "llvm/BinaryFormat/ELFRelocs/AMDGPU.def"
#undef ELF_RELOC
- .Default(std::nullopt);
+ .Case("BFD_RELOC_NONE", ELF::R_AMDGPU_NONE)
+ .Case("BFD_RELOC_32", ELF::R_AMDGPU_ABS32)
+ .Case("BFD_RELOC_64", ELF::R_AMDGPU_ABS64)
+ .Default(-1u);
+ if (Type != -1u)
+ return static_cast<MCFixupKind>(FirstLiteralRelocationKind + Type);
+ return std::nullopt;
}
const MCFixupKindInfo &AMDGPUAsmBackend::getFixupKindInfo(
|
jhuber6
reviewed
Nov 1, 2024
jdoerfert
reviewed
Nov 5, 2024
| .Default(std::nullopt); | ||
| .Case("BFD_RELOC_NONE", ELF::R_AMDGPU_NONE) | ||
| .Case("BFD_RELOC_32", ELF::R_AMDGPU_ABS32) | ||
| .Case("BFD_RELOC_64", ELF::R_AMDGPU_ABS64) |
There was a problem hiding this comment.
Why are they not added to "llvm/BinaryFormat/ELFRelocs/AMDGPU.def" ?
There was a problem hiding this comment.
I have no idea why it's like this, why wouldn't these all be in the def? I guess it's fine to copy the pattern and clean them all later?
There was a problem hiding this comment.
We just need to decide which way we want to do it.
arsenm
approved these changes
Nov 13, 2024
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/30/builds/10188 Here is the relevant piece of the build log for the reference |
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.
Emitting BFD_RELOC_* reloc directives can cause internal errors on AMDGPU.