This is an archive of the discontinued LLVM Phabricator instance.

Differential D107555

[LLD][Test] Add thin archives to map file test
ClosedPublic

Authored by bd1976llvm on Aug 5 2021, 4:45 AM.

Details

Reviewers
MaskRay
grimar
peter.smith
Commits
rG8392e8c00736: [LLD][Test] Add thin archives to map file test
Summary

This adds thin archives to the map file test.

I noticed that we had this test-case in our downstream testsuite but it wasn't in the upstream testing.

Diff Detail

Event Timeline

bd1976llvm created this revision.Aug 5 2021, 4:45 AM
Herald added a subscriber: emaste. · View Herald TranscriptAug 5 2021, 4:45 AM
bd1976llvm requested review of this revision.Aug 5 2021, 4:45 AM
Harbormaster completed remote builds in B118130: Diff 364419.Aug 5 2021, 5:08 AM
peter.smith added a comment.Aug 5 2021, 10:11 AM

No objections from me. I think the tee in one of the Run commands might be superfluous but I could be missing something.

lld/test/ELF/map-file.s
14

Is the tee %t_fat.txt part of the test? I can't see any use of it in the remainder of the file.

bd1976llvm updated this revision to Diff 364743.Aug 6 2021, 3:33 AM

Remove debugging tee.

Harbormaster completed remote builds in B118344: Diff 364743.Aug 6 2021, 4:07 AM
peter.smith accepted this revision.Aug 6 2021, 5:43 AM

Thanks for update LGTM.

This revision is now accepted and ready to land.Aug 6 2021, 5:43 AM
MaskRay accepted this revision.Aug 6 2021, 9:42 AM

Thanks!

Closed by commit rG8392e8c00736: [LLD][Test] Add thin archives to map file test (authored by Ben Dunbobbin <Ben.Dunbobbin@sony.com>). · Explain WhyAug 10 2021, 2:25 AM
This revision was automatically updated to reflect the committed changes.
Ben Dunbobbin <Ben.Dunbobbin@sony.com> added a commit: rG8392e8c00736: [LLD][Test] Add thin archives to map file test.
Herald added a project: Restricted Project. · View Herald TranscriptAug 10 2021, 2:25 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
lld/
test/
ELF/
76 lines

Diff 365392

lld/test/ELF/map-file.s

# REQUIRES: x86 # REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t1.o # RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t1.o
# RUN: llvm-mc -filetype=obj -triple=x86_64 %p/Inputs/map-file2.s -o %t2.o # RUN: llvm-mc -filetype=obj -triple=x86_64 %p/Inputs/map-file2.s -o %t2.o
# RUN: echo '.global bah; bah:' | llvm-mc -filetype=obj -triple=x86_64 - -o %t3.o # RUN: echo '.global bah; bah:' | llvm-mc -filetype=obj -triple=x86_64 - -o %t3.o
# RUN: echo '.global baz; baz: ret' | llvm-mc -filetype=obj -triple=x86_64 - -o %t4.o # RUN: echo '.global baz; baz: ret' | llvm-mc -filetype=obj -triple=x86_64 - -o %t4.o
# RUN: llvm-mc -filetype=obj -triple=x86_64 %p/Inputs/map-file5.s -o %t5.o # RUN: llvm-mc -filetype=obj -triple=x86_64 %p/Inputs/map-file5.s -o %t5.o
# RUN: echo '.global hey; hey: ret' | llvm-mc -filetype=obj -triple=x86_64 - -o %t6.o
# RUN: ld.lld -shared %t5.o -o %t5.so -soname dso # RUN: ld.lld -shared %t5.o -o %t5.so -soname dso
# RUN: rm -f %t4.a # RUN: rm -f %t4.a
# RUN: llvm-ar rc %t4.a %t4.o # RUN: llvm-ar rc %t4.a %t4.o
# RUN: ld.lld %t1.o %t2.o %t3.o %t4.a %t5.so -o %t -M | FileCheck --match-full-lines --strict-whitespace %s # RUN: rm -f %t6.a
# RUN: ld.lld %t1.o %t2.o %t3.o %t4.a %t5.so -o %t --print-map | FileCheck --match-full-lines -strict-whitespace %s # RUN: llvm-ar rcT %t6.a %t6.o
# RUN: ld.lld %t1.o %t2.o %t3.o %t4.a %t5.so -o %t -Map=%t.map # RUN: ld.lld %t1.o %t2.o %t3.o %t4.a %t5.so %t6.a -o %t -M | FileCheck --match-full-lines --strict-whitespace %s
peter.smithUnsubmitted
Not Done
ReplyInline Actions

Is the tee %t_fat.txt part of the test? I can't see any use of it in the remainder of the file.

peter.smith: Is the tee %t_fat.txt part of the test? I can't see any use of it in the remainder of the file.
# RUN: ld.lld %t1.o %t2.o %t3.o %t4.a %t5.so %t6.a -o %t --print-map | FileCheck --match-full-lines -strict-whitespace %s
# RUN: ld.lld %t1.o %t2.o %t3.o %t4.a %t5.so %t6.a -o %t -Map=%t.map
# RUN: FileCheck -match-full-lines -strict-whitespace %s < %t.map # RUN: FileCheck -match-full-lines -strict-whitespace %s < %t.map
.global _start .global _start
_start: _start:
.cfi_startproc .cfi_startproc
.cfi_endproc .cfi_endproc
.quad sharedFoo .quad sharedFoo
.quad sharedBar .quad sharedBar
.byte 0xe8 .byte 0xe8
.long sharedFunc1 - . .long sharedFunc1 - .
.byte 0xe8 .byte 0xe8
.long sharedFunc2 - . .long sharedFunc2 - .
.byte 0xe8 .byte 0xe8
.long baz - . .long baz - .
.long hey - .
.global _Z1fi .global _Z1fi
_Z1fi: _Z1fi:
.cfi_startproc .cfi_startproc
nop nop
.cfi_endproc .cfi_endproc
.weak bar .weak bar
bar: bar:
.long bar - . .long bar - .
Show All 17 Lines
# CHECK-NEXT: 200308 200308 30 8 .rela.dyn # CHECK-NEXT: 200308 200308 30 8 .rela.dyn
# CHECK-NEXT: 200308 200308 30 8 <internal>:(.rela.dyn) # CHECK-NEXT: 200308 200308 30 8 <internal>:(.rela.dyn)
# CHECK-NEXT: 200338 200338 30 8 .rela.plt # CHECK-NEXT: 200338 200338 30 8 .rela.plt
# CHECK-NEXT: 200338 200338 30 8 <internal>:(.rela.plt) # CHECK-NEXT: 200338 200338 30 8 <internal>:(.rela.plt)
# CHECK-NEXT: 200368 200368 64 8 .eh_frame # CHECK-NEXT: 200368 200368 64 8 .eh_frame
# CHECK-NEXT: 200368 200368 2c 1 {{.*}}{{/|\\}}map-file.s.tmp1.o:(.eh_frame+0x0) # CHECK-NEXT: 200368 200368 2c 1 {{.*}}{{/|\\}}map-file.s.tmp1.o:(.eh_frame+0x0)
# CHECK-NEXT: 200398 200398 14 1 {{.*}}{{/|\\}}map-file.s.tmp1.o:(.eh_frame+0x2c) # CHECK-NEXT: 200398 200398 14 1 {{.*}}{{/|\\}}map-file.s.tmp1.o:(.eh_frame+0x2c)
# CHECK-NEXT: 2003b0 2003b0 18 1 {{.*}}{{/|\\}}map-file.s.tmp2.o:(.eh_frame+0x18) # CHECK-NEXT: 2003b0 2003b0 18 1 {{.*}}{{/|\\}}map-file.s.tmp2.o:(.eh_frame+0x18)
# CHECK-NEXT: 2013cc 2013cc 2d 4 .text # CHECK-NEXT: 2013cc 2013cc 35 4 .text
# CHECK-NEXT: 2013cc 2013cc 28 4 {{.*}}{{/|\\}}map-file.s.tmp1.o:(.text) # CHECK-NEXT: 2013cc 2013cc 2c 4 {{.*}}{{/|\\}}map-file.s.tmp1.o:(.text)
# CHECK-NEXT: 2013cc 2013cc 0 1 _start # CHECK-NEXT: 2013cc 2013cc 0 1 _start
# CHECK-NEXT: 2013eb 2013eb 0 1 f(int) # CHECK-NEXT: 2013ef 2013ef 0 1 f(int)
# CHECK-NEXT: 2013f4 2013f4 0 1 local # CHECK-NEXT: 2013f8 2013f8 0 1 local
# CHECK-NEXT: 2013f4 2013f4 2 4 {{.*}}{{/|\\}}map-file.s.tmp2.o:(.text) # CHECK-NEXT: 2013f8 2013f8 2 4 {{.*}}{{/|\\}}map-file.s.tmp2.o:(.text)
# CHECK-NEXT: 2013f4 2013f4 0 1 foo # CHECK-NEXT: 2013f8 2013f8 0 1 foo
# CHECK-NEXT: 2013f5 2013f5 0 1 bar # CHECK-NEXT: 2013f9 2013f9 0 1 bar
# CHECK-NEXT: 2013f6 2013f6 0 1 {{.*}}{{/|\\}}map-file.s.tmp2.o:(.text.zed) # CHECK-NEXT: 2013fa 2013fa 0 1 {{.*}}{{/|\\}}map-file.s.tmp2.o:(.text.zed)
# CHECK-NEXT: 2013f6 2013f6 0 1 zed # CHECK-NEXT: 2013fa 2013fa 0 1 zed
# CHECK-NEXT: 2013f8 2013f8 0 4 {{.*}}{{/|\\}}map-file.s.tmp3.o:(.text) # CHECK-NEXT: 2013fc 2013fc 0 4 {{.*}}{{/|\\}}map-file.s.tmp3.o:(.text)
# CHECK-NEXT: 2013f8 2013f8 0 1 bah # CHECK-NEXT: 2013fc 2013fc 0 1 bah
# CHECK-NEXT: 2013f8 2013f8 1 4 {{.*}}{{/|\\}}map-file.s.tmp4.a(map-file.s.tmp4.o):(.text) # CHECK-NEXT: 2013fc 2013fc 1 4 {{.*}}{{/|\\}}map-file.s.tmp4.a(map-file.s.tmp4.o):(.text)
# CHECK-NEXT: 2013f8 2013f8 0 1 baz # CHECK-NEXT: 2013fc 2013fc 0 1 baz
# CHECK-NEXT: 201400 201400 30 16 .plt # CHECK-NEXT: 201400 201400 1 4 {{.*}}{{/|\\}}map-file.s.tmp6.a({{.*}}{{/|\\}}map-file.s.tmp6.o):(.text)
# CHECK-NEXT: 201400 201400 30 16 <internal>:(.plt) # CHECK-NEXT: 201400 201400 0 1 hey
# CHECK-NEXT: 201410 201410 0 1 sharedFunc1 # CHECK-NEXT: 201410 201410 30 16 .plt
# CHECK-NEXT: 201420 201420 0 1 sharedFunc2 # CHECK-NEXT: 201410 201410 30 16 <internal>:(.plt)
# CHECK-NEXT: 202430 202430 100 8 .dynamic # CHECK-NEXT: 201420 201420 0 1 sharedFunc1
# CHECK-NEXT: 202430 202430 100 8 <internal>:(.dynamic) # CHECK-NEXT: 201430 201430 0 1 sharedFunc2
# CHECK-NEXT: 203530 203530 28 8 .got.plt # CHECK-NEXT: 202440 202440 100 8 .dynamic
# CHECK-NEXT: 203530 203530 28 8 <internal>:(.got.plt) # CHECK-NEXT: 202440 202440 100 8 <internal>:(.dynamic)
# CHECK-NEXT: 203560 203560 10 16 .bss # CHECK-NEXT: 203540 203540 28 8 .got.plt
# CHECK-NEXT: 203560 203560 4 16 {{.*}}{{/|\\}}map-file.s.tmp1.o:(COMMON) # CHECK-NEXT: 203540 203540 28 8 <internal>:(.got.plt)
# CHECK-NEXT: 203560 203560 4 1 common # CHECK-NEXT: 203570 203570 10 16 .bss
# CHECK-NEXT: 203564 203564 4 1 <internal>:(.bss) # CHECK-NEXT: 203570 203570 4 16 {{.*}}{{/|\\}}map-file.s.tmp1.o:(COMMON)
# CHECK-NEXT: 203564 203564 4 1 sharedFoo # CHECK-NEXT: 203570 203570 4 1 common
# CHECK-NEXT: 203568 203568 8 1 <internal>:(.bss) # CHECK-NEXT: 203574 203574 4 1 <internal>:(.bss)
# CHECK-NEXT: 203568 203568 8 1 sharedBar # CHECK-NEXT: 203574 203574 4 1 sharedFoo
# CHECK-NEXT: 203578 203578 8 1 <internal>:(.bss)
# CHECK-NEXT: 203578 203578 8 1 sharedBar
# CHECK-NEXT: 0 0 8 1 .comment # CHECK-NEXT: 0 0 8 1 .comment
# CHECK-NEXT: 0 0 8 1 <internal>:(.comment) # CHECK-NEXT: 0 0 8 1 <internal>:(.comment)
# CHECK-NEXT: 0 0 198 8 .symtab # CHECK-NEXT: 0 0 1b0 8 .symtab
# CHECK-NEXT: 0 0 198 8 <internal>:(.symtab) # CHECK-NEXT: 0 0 1b0 8 <internal>:(.symtab)
# CHECK-NEXT: 0 0 84 1 .shstrtab # CHECK-NEXT: 0 0 84 1 .shstrtab
# CHECK-NEXT: 0 0 84 1 <internal>:(.shstrtab) # CHECK-NEXT: 0 0 84 1 <internal>:(.shstrtab)
# CHECK-NEXT: 0 0 6d 1 .strtab # CHECK-NEXT: 0 0 71 1 .strtab
# CHECK-NEXT: 0 0 6d 1 <internal>:(.strtab) # CHECK-NEXT: 0 0 71 1 <internal>:(.strtab)
# RUN: not ld.lld %t1.o %t2.o %t3.o %t4.a -o /dev/null -Map=/ 2>&1 \ # RUN: not ld.lld %t1.o %t2.o %t3.o %t4.a -o /dev/null -Map=/ 2>&1 \
# RUN: | FileCheck --check-prefix=FAIL %s # RUN: | FileCheck --check-prefix=FAIL %s
# FAIL: cannot open map file / # FAIL: cannot open map file /