Skip to content

[RISCV][NFC] Refactor Vendor Reloc Declarations #138226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+31 −22
Open

[RISCV][NFC] Refactor Vendor Reloc Declarations #138226

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e4923c
[RISCV][NFC] Refactor Vendor Relocs
lenary May 2, 2025
04a66e7
Undefine all macros at the end of the file
lenary May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions llvm/include/llvm/BinaryFormat/ELF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,9 +700,9 @@ enum : unsigned {
// ELF Relocation types for RISC-V
enum {
#include "ELFRelocs/RISCV.def"
#define ELF_RISCV_NONSTANDARD_RELOC(_vendor, name, value) name = value,
#define ELF_RISCV_NONSTANDARD_RELOC_ALL(name, value) name = value,
#include "ELFRelocs/RISCV_nonstandard.def"
#undef ELF_RISCV_NONSTANDARD_RELOC
#undef ELF_RISCV_NONSTANDARD_RELOC_ALL
};

enum {
Expand Down
45 changes: 28 additions & 17 deletions llvm/include/llvm/BinaryFormat/ELFRelocs/RISCV_nonstandard.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,34 @@
//
//===----------------------------------------------------------------------===//

#ifndef ELF_RISCV_NONSTANDARD_RELOC
#error "ELF_RISCV_NONSTANDARD_RELOC must be defined"
// This file defines information about RISC-V's nonstandard relocation codes.
// This can be used when parsing relocations, or when printing them, to provide
// better information.
//
// Unlike the mappings provided in RISCV.def via `ELF_RELOC`, these are not
// expected to be 1:1 mappings - multiple vendors may reuse relocation IDs.

// For ease of use, `ELF_RISCV_NONSTANDARD_RELOC_ALL` invokes the macros for
// each vendor.

#ifdef ELF_RISCV_NONSTANDARD_RELOC_ALL
#define ELF_RISCV_NONSTANDARD_RELOC_QUALCOMM(NAME, ID) ELF_RISCV_NONSTANDARD_RELOC_ALL(NAME, ID)
#endif

// ELF_RISCV_NONSTANDARD_RELOC(VENDOR, NAME, ID) defines information about
// nonstandard relocation codes. This can be used when parsing relocations, or
// when printing them, to provide better information.
//
// VENDOR should be the symbol name expected in the associated `R_RISCV_VENDOR`
// relocation. NAME and ID work like `ELF_RELOC` but the mapping is not expected
// to be 1:1.
//
// The mapping in RISCV.def is 1:1, and should be used when the only information
// available is the relocation enum value.
// For each Vendor identifier, VENDOR, as associated with an `R_RISCV_VENDOR`,
// the `ELF_RISCV_NONSTANDARD_RELOC_<VENDOR>(NAME, ID)` macro defines the
// relocations available for that vendor identifier.

// Qualcomm Nonstandard Relocations
ELF_RISCV_NONSTANDARD_RELOC(QUALCOMM, R_RISCV_QC_ABS20_U, 192)
ELF_RISCV_NONSTANDARD_RELOC(QUALCOMM, R_RISCV_QC_E_BRANCH, 193)
ELF_RISCV_NONSTANDARD_RELOC(QUALCOMM, R_RISCV_QC_E_32, 194)
ELF_RISCV_NONSTANDARD_RELOC(QUALCOMM, R_RISCV_QC_E_JUMP_PLT, 195)
// QUALCOMM Nonstandard Relocations
#ifndef ELF_RISCV_NONSTANDARD_RELOC_QUALCOMM
#define ELF_RISCV_NONSTANDARD_RELOC_QUALCOMM(_NAME, _ID)
#endif

ELF_RISCV_NONSTANDARD_RELOC_QUALCOMM(R_RISCV_QC_ABS20_U, 192)
ELF_RISCV_NONSTANDARD_RELOC_QUALCOMM(R_RISCV_QC_E_BRANCH, 193)
ELF_RISCV_NONSTANDARD_RELOC_QUALCOMM(R_RISCV_QC_E_32, 194)
ELF_RISCV_NONSTANDARD_RELOC_QUALCOMM(R_RISCV_QC_E_JUMP_PLT, 195)

#ifdef ELF_RISCV_NONSTANDARD_RELOC_ALL
#undef ELF_RISCV_NONSTANDARD_RELOC_QUALCOMM
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if it was defined by line 29? Should we undef it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked at what the relevant clang .def files do in similar circumstances and they unconditionally undef everything, so I just did that.

#endif
4 changes: 2 additions & 2 deletions llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ std::optional<MCFixupKind> RISCVAsmBackend::getFixupKind(StringRef Name) const {
#define ELF_RELOC(NAME, ID) .Case(#NAME, ID)
#include "llvm/BinaryFormat/ELFRelocs/RISCV.def"
#undef ELF_RELOC
#define ELF_RISCV_NONSTANDARD_RELOC(_VENDOR, NAME, ID) .Case(#NAME, ID)
#define ELF_RISCV_NONSTANDARD_RELOC_ALL(NAME, ID) .Case(#NAME, ID)
#include "llvm/BinaryFormat/ELFRelocs/RISCV_nonstandard.def"
#undef ELF_RISCV_NONSTANDARD_RELOC
#undef ELF_RISCV_NONSTANDARD_RELOC_ALL
.Case("BFD_RELOC_NONE", ELF::R_RISCV_NONE)
.Case("BFD_RELOC_32", ELF::R_RISCV_32)
.Case("BFD_RELOC_64", ELF::R_RISCV_64)
Expand Down