This is an archive of the discontinued LLVM Phabricator instance.

Differential D60777

[llvm-objdump] Test tabs in disassemble-align.s with a more visible character
ClosedPublic

Authored by MaskRay on Apr 16 2019, 7:53 AM.

Details

Reviewers
rupprecht
Commits
rG29cca271405a: [llvm-objdump] Test tabs in disassemble-align.s with a more visible character
rL358504: [llvm-objdump] Test tabs in disassemble-align.s with a more visible character
Summary

Apply rupprecht's suggestion in D60376

Diff Detail

Event Timeline

MaskRay created this revision.Apr 16 2019, 7:53 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 16 2019, 7:53 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B30622: Diff 195384.Apr 16 2019, 7:54 AM
rupprecht accepted this revision.Apr 16 2019, 8:40 AM

Ok, this helps me see what's going on. Thanks!

test/tools/llvm-objdump/X86/disassemble-align.s
1–2

Can you add a comment (here, or maybe below near the actual CHECK lines) that | is to show where the tabs line up?

This revision is now accepted and ready to land.Apr 16 2019, 8:40 AM
MaskRay marked an inline comment as done.Apr 16 2019, 8:56 AM
MaskRay updated this revision to Diff 195396.Apr 16 2019, 8:56 AM

Address review comment

Harbormaster completed remote builds in B30626: Diff 195396.Apr 16 2019, 8:56 AM
Closed by commit rL358504: [llvm-objdump] Test tabs in disassemble-align.s with a more visible character (authored by MaskRay). · Explain WhyApr 16 2019, 8:56 AM
This revision was automatically updated to reflect the committed changes.
MaskRay mentioned this in D60376: [llvm-objdump] Align instructions to a tab stop in disassembly output.Apr 16 2019, 8:59 AM

Revision Contents

PathSize
test/
tools/
llvm-objdump/
X86/
30 lines

Diff 195396

test/tools/llvm-objdump/X86/disassemble-align.s

# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t # RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t
# RUN: llvm-objdump -d -print-imm-hex %t | tr '\t' ' ' | FileCheck -strict-whitespace %s
rupprechtUnsubmitted
Done
ReplyInline Actions

Can you add a comment (here, or maybe below near the actual CHECK lines) that | is to show where the tabs line up?

rupprecht: Can you add a comment (here, or maybe below near the actual CHECK lines) that `|` is to show…
# RUN: llvm-objdump -d -print-imm-hex -no-show-raw-insn %t | tr '\t' ' ' | \ # Use '|' to show where the tabs line up.
# RUN: llvm-objdump -d -print-imm-hex %t | tr '\t' '|' | FileCheck -strict-whitespace %s
# RUN: llvm-objdump -d -print-imm-hex -no-show-raw-insn %t | tr '\t' '|' | \
# RUN: FileCheck -check-prefix=NORAW -strict-whitespace %s # RUN: FileCheck -check-prefix=NORAW -strict-whitespace %s
# Instructions are expected to be aligned if the instruction in hex is not too long. # Instructions are expected to be aligned if the instruction in hex is not too long.
# CHECK: 0: c3 retq # CHECK: 0: c3 |retq
# CHECK-NEXT: 1: 48 8b 05 56 34 12 00 movq 0x123456(%rip), %rax # CHECK-NEXT: 1: 48 8b 05 56 34 12 00 |movq|0x123456(%rip), %rax
# CHECK-NEXT: 8: 48 b8 54 55 55 55 55 55 55 55 movabsq $0x5555555555555554, %rax # CHECK-NEXT: 8: 48 b8 54 55 55 55 55 55 55 55|movabsq|$0x5555555555555554, %rax
# CHECK-NEXT: 12: 8f ea 00 12 4c 02 40 00 00 00 00 lwpval $0x0, 0x40(%rdx,%rax), %r15d # CHECK-NEXT: 12: 8f ea 00 12 4c 02 40 00 00 00 00 |lwpval|$0x0, 0x40(%rdx,%rax), %r15d
# CHECK-NEXT: 1d: 8f ea 00 12 04 25 f0 1c f0 1c 00 00 00 00 lwpins $0x0, 0x1cf01cf0, %r15d # CHECK-NEXT: 1d: 8f ea 00 12 04 25 f0 1c f0 1c 00 00 00 00 |lwpins|$0x0, 0x1cf01cf0, %r15d
# CHECK-NEXT: 2b: ff ff <unknown> # CHECK-NEXT: 2b: ff ff |<unknown>
# NORAW: 0: retq # NORAW: 0: |retq
# NORAW-NEXT: 1: movq 0x123456(%rip), %rax # NORAW-NEXT: 1: |movq|0x123456(%rip), %rax
# NORAW-NEXT: 8: movabsq $0x5555555555555554, %rax # NORAW-NEXT: 8: |movabsq|$0x5555555555555554, %rax
# NORAW-NEXT: 12: lwpval $0x0, 0x40(%rdx,%rax), %r15d # NORAW-NEXT: 12: |lwpval|$0x0, 0x40(%rdx,%rax), %r15d
# NORAW-NEXT: 1d: lwpins $0x0, 0x1cf01cf0, %r15d # NORAW-NEXT: 1d: |lwpins|$0x0, 0x1cf01cf0, %r15d
# NORAW-NEXT: 2b: <unknown> # NORAW-NEXT: 2b: |<unknown>
.text .text
retq retq
movq 0x123456(%rip),%rax movq 0x123456(%rip),%rax
movabs $0x5555555555555554,%rax movabs $0x5555555555555554,%rax
lwpval $0x0, 0x40(%rdx,%rax), %r15d lwpval $0x0, 0x40(%rdx,%rax), %r15d
lwpins $0x0, 0x1cf01cf0, %r15d lwpins $0x0, 0x1cf01cf0, %r15d
.word 0xffff .word 0xffff