Skip to content

[MC][RISCV] Check hasEmitNops before call shouldInsertExtraNopBytesForCodeAlign #77236

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 3 commits into from
Jan 9, 2024
Merged

[MC][RISCV] Check hasEmitNops before call shouldInsertExtraNopBytesForCodeAlign #77236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ae28f8
[MC][RISCV] Check hasEmitNops before call shouldInsertExtraNopBytesFo…
MQ-mengqing Jan 7, 2024
02e670d
Address @MaskRay's comments.
MQ-mengqing Jan 8, 2024
4e0e394
Improve comment
MQ-mengqing Jan 8, 2024
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
2 changes: 1 addition & 1 deletion llvm/lib/MC/MCExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ static void AttemptToFoldSymbolOffsetDifference(
if (DF) {
Displacement += DF->getContents().size();
} else if (auto *AF = dyn_cast<MCAlignFragment>(FI);
AF && Layout &&
AF && Layout && AF->hasEmitNops() &&
!Asm->getBackend().shouldInsertExtraNopBytesForCodeAlign(
*AF, Count)) {
Displacement += Asm->computeFragmentSize(*Layout, *AF);
Expand Down
25 changes: 25 additions & 0 deletions llvm/test/MC/RISCV/align-non-executable.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
## A label difference separated by an alignment directive, when the
## referenced symbols are in a non-executable section with instructions,
## should generate ADD/SUB relocations.
## https://github.com/llvm/llvm-project/pull/76552

# RUN: llvm-mc --filetype=obj --triple=riscv64 --mattr=+relax %s \
# RUN: | llvm-readobj -r - | FileCheck --check-prefixes=CHECK,RELAX %s
# RUN: llvm-mc --filetype=obj --triple=riscv64 --mattr=-relax %s \
# RUN: | llvm-readobj -r - | FileCheck %s

.section ".dummy", "a"
.L1:
call func
.p2align 3
.L2:
.dword .L2 - .L1

# CHECK: Relocations [
# CHECK-NEXT: Section ({{.*}}) .rela.dummy {
# CHECK-NEXT: 0x0 R_RISCV_CALL_PLT func 0x0
# RELAX-NEXT: 0x0 R_RISCV_RELAX - 0x0
# CHECK-NEXT: 0x8 R_RISCV_ADD64 .L2 0x0
# CHECK-NEXT: 0x8 R_RISCV_SUB64 .L1 0x0
# CHECK-NEXT: }
# CHECK-NEXT: ]