Skip to content

[RISCV] Mark QC Relocations as Relaxable #142794

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

Merged
merged 2 commits into from
Jun 6, 2025
Merged

[RISCV] Mark QC Relocations as Relaxable #142794

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
b25d4cf
[RISCV] Mark QC Relocations as Relaxable
lenary May 28, 2025
403a439
Fix check line in test
lenary Jun 4, 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
3 changes: 3 additions & 0 deletions llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCCodeEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,7 @@ uint64_t RISCVMCCodeEmitter::getImmOpValue(const MCInst &MI, unsigned OpNo,
break;
case RISCVMCExpr::VK_QC_ABS20:
FixupKind = RISCV::fixup_riscv_qc_abs20_u;
RelaxCandidate = true;
break;
}
} else if (Kind == MCExpr::SymbolRef || Kind == MCExpr::Binary) {
Expand All @@ -642,8 +643,10 @@ uint64_t RISCVMCCodeEmitter::getImmOpValue(const MCInst &MI, unsigned OpNo,
FixupKind = RISCV::fixup_riscv_qc_e_branch;
} else if (MIFrm == RISCVII::InstFormatQC_EAI) {
FixupKind = RISCV::fixup_riscv_qc_e_32;
RelaxCandidate = true;
} else if (MIFrm == RISCVII::InstFormatQC_EJ) {
FixupKind = RISCV::fixup_riscv_qc_e_jump_plt;
RelaxCandidate = true;
}
}

Expand Down
11 changes: 11 additions & 0 deletions llvm/test/MC/RISCV/xqcibi-relocations.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,17 @@ same_section:
same_section_extern:
nop

.option relax

# ASM: qc.bnei t3, 14, same_section
# OBJ: qc.bnei t3, 0xe, 0x28 <same_section>
qc.bnei t3, 14, same_section

# ASM: qc.e.bgeui s2, 24, same_section
# OBJ-NEXT: qc.e.bgeui s2, 0x18, 0x28 <same_section>
qc.e.bgeui s2, 24, same_section

.option norelax

.section .text.second, "ax", @progbits

Expand Down
18 changes: 18 additions & 0 deletions llvm/test/MC/RISCV/xqcilb-relocations.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,24 @@ same_section:
same_section_extern:
nop

.option relax

# ASM: qc.e.j same_section
# OBJ: qc.e.j 0x38 <same_section_extern+0x4>
# OBJ-NEXT: R_RISCV_VENDOR QUALCOMM{{$}}
# OBJ-NEXT: R_RISCV_CUSTOM195 same_section{{$}}
# OBJ-NEXT: R_RISCV_RELAX
qc.e.j same_section

# ASM: qc.e.jal same_section
# OBJ-NEXT: qc.e.jal 0x3e <same_section_extern+0xa>
# OBJ-NEXT: R_RISCV_VENDOR QUALCOMM{{$}}
# OBJ-NEXT: R_RISCV_CUSTOM195 same_section{{$}}
# OBJ-NEXT: R_RISCV_RELAX
qc.e.jal same_section

.option norelax

.section .text.other, "ax", @progbits

# ASM-LABEL: other_section:
Expand Down
29 changes: 29 additions & 0 deletions llvm/test/MC/RISCV/xqcili-relocations.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,35 @@ qc.e.li s3, other_section
same_section:
nop

.option relax

# ASM: qc.li a1, %qc.abs20(0)
# OBJ: qc.li a1, 0x0
# OBJ-NEXT: R_RISCV_VENDOR QUALCOMM{{$}}
# OBJ-NEXT: R_RISCV_CUSTOM192 *ABS*{{$}}
# OBJ-NEXT: R_RISCV_RELAX
qc.li a1, %qc.abs20(abs_symbol)

# ASM: qc.e.li s1, 0
# OBJ-NEXT: qc.e.li s1, 0x0
qc.e.li s1, abs_symbol

# ASM: qc.li a1, %qc.abs20(undef)
# OBJ: qc.li a1, 0x0
Copy link
Member

@MaskRay MaskRay Jun 4, 2025

Choose a reason for hiding this comment

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

OBJ-NEXT to check that the previous qc.e.li s1, abs_symbol does not generate a relocation.

Copy link
Member Author

@lenary lenary Jun 4, 2025

Choose a reason for hiding this comment

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

well spotted, thanks.

# OBJ-NEXT: R_RISCV_VENDOR QUALCOMM{{$}}
# OBJ-NEXT: R_RISCV_CUSTOM192 undef{{$}}
# OBJ-NEXT: R_RISCV_RELAX
qc.li a1, %qc.abs20(undef)

# ASM: qc.e.li s1, undef
# OBJ-NEXT: qc.e.li s1, 0x0
# OBJ-NEXT: R_RISCV_VENDOR QUALCOMM{{$}}
# OBJ-NEXT: R_RISCV_CUSTOM194 undef{{$}}
# OBJ-NEXT: R_RISCV_RELAX
qc.e.li s1, undef

.option norelax

.section .text.other, "ax", @progbits

# ASM-LABEL: other_section:
Expand Down
Loading