This is an archive of the discontinued LLVM Phabricator instance.

Differential D116680

[4/4][llvm-objdump][RISCV] Support --symbolize-operands for RISC-V
AcceptedPublic

Authored by asb on Jan 5 2022, 10:36 AM.

Details

Reviewers
jhenderson
MaskRay
craig.topper
luismarques

Diff Detail

Event Timeline

asb created this revision.Jan 5 2022, 10:36 AM
Herald added a reviewer: jhenderson. · View Herald TranscriptJan 5 2022, 10:36 AM
Herald added a reviewer: MaskRay. · View Herald Transcript
Herald added subscribers: VincentWu, luke957, achieveartificialintelligence and 27 others. · View Herald Transcript
asb requested review of this revision.Jan 5 2022, 10:36 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 5 2022, 10:36 AM
Herald added a subscriber: StephenFan. · View Herald Transcript
asb added a parent revision: D116678: [3/4][RISCV][MC] Teach MCInstrAnalysis::evaluateBranch to determine the target of an auipc+jalr.Jan 5 2022, 10:37 AM
asb added reviewers: craig.topper, luismarques.Jan 5 2022, 10:40 AM
Harbormaster completed remote builds in B141718: Diff 397637.Jan 5 2022, 12:02 PM
jhenderson added inline comments.Jan 6 2022, 12:17 AM
llvm/docs/CommandGuide/llvm-objdump.rst
229

I'd probably add a comma after "objects".

asb updated this revision to Diff 397820.Jan 6 2022, 2:11 AM

Address review comment.

asb marked an inline comment as done.Jan 6 2022, 2:11 AM
Harbormaster completed remote builds in B141854: Diff 397820.Jan 6 2022, 2:47 AM
MaskRay accepted this revision.Jan 6 2022, 6:49 PM

LGTM.

This revision is now accepted and ready to land.Jan 6 2022, 6:49 PM
asb updated this revision to Diff 398430.Jan 9 2022, 5:20 AM

Rebase.

Harbormaster completed remote builds in B142302: Diff 398430.Jan 9 2022, 6:52 AM
jhenderson accepted this revision.Jan 10 2022, 1:03 AM
dtcxzyw added a subscriber: dtcxzyw.Mar 10 2023, 4:07 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 10 2023, 4:07 AM
Herald added subscribers: luke, wingo, pmatos and 4 others. · View Herald Transcript

Revision Contents

PathSize
llvm/
docs/
CommandGuide/
2 lines
test/
tools/
llvm-objdump/
ELF/
RISCV/
82 lines
tools/
llvm-objdump/
5 lines

Diff 398430

llvm/docs/CommandGuide/llvm-objdump.rst

Context not available.
When printing a PC-relative global symbol reference, print it as an offset from the leading symbol. When printing a PC-relative global symbol reference, print it as an offset from the leading symbol.
Only works with PowerPC objects or X86 linked images. Only works with PowerPC or RISC-V objects, or X86 linked images.
jhendersonUnsubmitted
Done
ReplyInline Actions

I'd probably add a comma after "objects".

jhenderson: I'd probably add a comma after "objects".
Example: Example:
A non-symbolized branch instruction with a local target and pc-relative memory access like A non-symbolized branch instruction with a local target and pc-relative memory access like
Context not available.

llvm/test/tools/llvm-objdump/ELF/RISCV/branches.s

# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c < %s | \ # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c < %s -o %t
# RUN: llvm-objdump -d -M no-aliases --no-show-raw-insn - | \ # RUN: llvm-objdump %t -d -M no-aliases --no-show-raw-insn | \
# RUN: FileCheck %s # RUN: FileCheck -check-prefixes=CHECK-NOSYMBOLIZE,CHECK-COMMON %s
# RUN: llvm-objdump %t -d -M no-aliases --no-show-raw-insn --symbolize-operands | \
# RUN: FileCheck -check-prefixes=CHECK-SYMBOLIZE,CHECK-COMMON %s
# CHECK-LABEL: <foo>: # CHECK-LABEL: <foo>:
foo: foo:
# CHECK: beq t0, t1, 0x58 <foo+0x58> # CHECK-NOSYMBOLIZE: beq t0, t1, 0x58 <foo+0x58>
# CHECK-SYMBOLIZE: beq t0, t1, 0x58 <L0>
beq t0, t1, .Llocal beq t0, t1, .Llocal
# CHECK: bne t0, t1, 0x58 <foo+0x58> # CHECK-NOSYMBOLIZE: bne t0, t1, 0x58 <foo+0x58>
# CHECK-SYMBOLIZE: bne t0, t1, 0x58 <L0>
bne t0, t1, .Llocal bne t0, t1, .Llocal
# CHECK: blt t0, t1, 0x58 <foo+0x58> # CHECK-NOSYMBOLIZE: blt t0, t1, 0x58 <foo+0x58>
# CHECK-SYMBOLIZE: blt t0, t1, 0x58 <L0>
blt t0, t1, .Llocal blt t0, t1, .Llocal
# CHECK: bge t0, t1, 0x58 <foo+0x58> # CHECK-NOSYMBOLIZE: bge t0, t1, 0x58 <foo+0x58>
# CHECK-SYMBOLIZE: bge t0, t1, 0x58 <L0>
bge t0, t1, .Llocal bge t0, t1, .Llocal
# CHECK: bltu t0, t1, 0x58 <foo+0x58> # CHECK-NOSYMBOLIZE: bltu t0, t1, 0x58 <foo+0x58>
# CHECK-SYMBOLIZE: bltu t0, t1, 0x58 <L0>
bltu t0, t1, .Llocal bltu t0, t1, .Llocal
# CHECK: bgeu t0, t1, 0x58 <foo+0x58> # CHECK-NOSYMBOLIZE: bgeu t0, t1, 0x58 <foo+0x58>
# CHECK-SYMBOLIZE: bgeu t0, t1, 0x58 <L0>
bgeu t0, t1, .Llocal bgeu t0, t1, .Llocal
# CHECK: c.beqz a0, 0x58 <foo+0x58> # CHECK-NOSYMBOLIZE: c.beqz a0, 0x58 <foo+0x58>
# CHECK-SYMBOLIZE: c.beqz a0, 0x58 <L0>
beq a0, zero, .Llocal beq a0, zero, .Llocal
# CHECK: c.bnez a0, 0x58 <foo+0x58> # CHECK-NOSYMBOLIZE: c.bnez a0, 0x58 <foo+0x58>
# CHECK-SYMBOLIZE: c.bnez a0, 0x58 <L0>
bne a0, zero, .Llocal bne a0, zero, .Llocal
# CHECK: beq t0, t1, 0x60 <bar> # CHECK-COMMON: beq t0, t1, 0x60 <bar>
beq t0, t1, bar beq t0, t1, bar
# CHECK: bne t0, t1, 0x60 <bar> # CHECK-COMMON: bne t0, t1, 0x60 <bar>
bne t0, t1, bar bne t0, t1, bar
# CHECK: blt t0, t1, 0x60 <bar> # CHECK-COMMON: blt t0, t1, 0x60 <bar>
blt t0, t1, bar blt t0, t1, bar
# CHECK: bge t0, t1, 0x60 <bar> # CHECK-COMMON: bge t0, t1, 0x60 <bar>
bge t0, t1, bar bge t0, t1, bar
# CHECK: bltu t0, t1, 0x60 <bar> # CHECK-COMMON: bltu t0, t1, 0x60 <bar>
bltu t0, t1, bar bltu t0, t1, bar
# CHECK: bgeu t0, t1, 0x60 <bar> # CHECK-COMMON: bgeu t0, t1, 0x60 <bar>
bgeu t0, t1, bar bgeu t0, t1, bar
# CHECK: c.beqz a0, 0x60 <bar> # CHECK-COMMON: c.beqz a0, 0x60 <bar>
beq a0, zero, bar beq a0, zero, bar
# CHECK: c.bnez a0, 0x60 <bar> # CHECK-COMMON: c.bnez a0, 0x60 <bar>
bne a0, zero, bar bne a0, zero, bar
# CHECK: jal t0, 0x58 <foo+0x58> # CHECK-NOSYMBOLIZE: jal t0, 0x58 <foo+0x58>
# CHECK-SYMBOLIZE: jal t0, 0x58 <L0>
jal t0, .Llocal jal t0, .Llocal
# CHECK: c.jal 0x58 <foo+0x58> # CHECK-NOSYMBOLIZE: c.jal 0x58 <foo+0x58>
# CHECK-SYMBOLIZE: c.jal 0x58 <L0>
c.jal .Llocal c.jal .Llocal
# CHECK: c.j 0x58 <foo+0x58> # CHECK-NOSYMBOLIZE: c.j 0x58 <foo+0x58>
# CHECK-SYMBOLIZE: c.j 0x58 <L0>
c.j .Llocal c.j .Llocal
# CHECK: jal t0, 0x60 <bar> # CHECK-COMMON: jal t0, 0x60 <bar>
jal t0, bar jal t0, bar
# CHECK: c.jal 0x60 <bar> # CHECK-COMMON: c.jal 0x60 <bar>
c.jal bar c.jal bar
# CHECK: c.j 0x60 <bar> # CHECK-COMMON: c.j 0x60 <bar>
c.j bar c.j bar
# CHECK: auipc ra, 0 # CHECK-COMMON: auipc ra, 0
# CHECK: jalr ra, 16(ra) <foo+0x58> # CHECK-NOSYMBOLIZE: jalr ra, 16(ra) <foo+0x58>
# CHECK-SYMBOLIZE: jalr ra, 16(ra) <L0>
call .Llocal call .Llocal
# CHECK: auipc ra, 0 # CHECK-COMMON: auipc ra, 0
# CHECK: jalr ra, 16(ra) <bar> # CHECK-COMMON: jalr ra, 16(ra) <bar>
call bar call bar
.Llocal: .Llocal:
# CHECK: 58: c.nop # CHECK-COMMON: 58: c.nop
# CHECK: c.nop # CHECK-COMMON: c.nop
# CHECK: c.nop # CHECK-COMMON: c.nop
# CHECK: c.nop # CHECK-COMMON: c.nop
nop nop
nop nop
nop nop
Context not available.
# CHECK-LABEL: <bar>: # CHECK-LABEL: <bar>:
bar: bar:
# CHECK: 60: c.nop # CHECK-COMMON: 60: c.nop
nop nop
Context not available.

llvm/tools/llvm-objdump/llvm-objdump.cpp

Context not available.
const MCSubtargetInfo *STI, uint64_t SectionAddr, const MCSubtargetInfo *STI, uint64_t SectionAddr,
uint64_t Start, uint64_t End, uint64_t Start, uint64_t End,
std::unordered_map<uint64_t, std::string> &Labels) { std::unordered_map<uint64_t, std::string> &Labels) {
// So far only supports PowerPC and X86. // So far only supports PowerPC, RISC-V, and X86.
if (!STI->getTargetTriple().isPPC() && !STI->getTargetTriple().isX86()) if (!STI->getTargetTriple().isPPC() && !STI->getTargetTriple().isRISCV() &&
!STI->getTargetTriple().isX86())
return; return;
Labels.clear(); Labels.clear();
Context not available.