This is an archive of the discontinued LLVM Phabricator instance.

Differential D76852

[lld test] Tighten ELF/pre_init_fini_array.s test
ClosedPublic

Authored by thopre on Mar 26 2020, 7:53 AM.

Details

Reviewers
khemant
compnerd
echristo
jhenderson
• espindola
MaskRay
Commits
rG6eb345af5a1b: [lld test] Tighten ELF/pre_init_fini_array.s test
Summary

Make use of FileCheck numeric variable to tighten symbol address checks
in ELF/pre_init_fini_array.s test.

Diff Detail

Event Timeline

thopre created this revision.Mar 26 2020, 7:53 AM
Herald added a reviewer: • espindola. · View Herald TranscriptMar 26 2020, 7:53 AM
Herald added subscribers: MaskRay, emaste. · View Herald Transcript
Harbormaster completed remote builds in B50544: Diff 252849.Mar 26 2020, 8:39 AM
thopre updated this revision to Diff 252877.Mar 26 2020, 9:16 AM

Incorporate DISASM improvements from D75631

thopre mentioned this in D75631: [llvm-objdump] Fix reliability of call target disassembling.Mar 26 2020, 9:17 AM
Harbormaster completed remote builds in B50559: Diff 252877.Mar 26 2020, 10:18 AM
MaskRay added a comment.Mar 26 2020, 11:27 AM

Thanks for the improvement. This is definitely more robust. llvm-readobj's section/symbol dump is known to be verbose. llvm-readelf -S -s is conciser/better. Can you check whether the new FileCheck feature (D60389 https://llvm.org/docs/CommandGuide/FileCheck.html#filecheck-numeric-substitution-blocks) help with llvm-readelf -S -s output?

jhenderson added a comment.Mar 27 2020, 4:37 AM

Looks good from my perspective. I'll leave it up to @MaskRay to approve once you've taken a look at his suggestion.

thopre updated this revision to Diff 253118.Mar 27 2020, 7:40 AM

Use readelf instead of readobj

Harbormaster completed remote builds in B50684: Diff 253118.Mar 27 2020, 8:30 AM
MaskRay accepted this revision.Mar 27 2020, 11:16 AM

Looks great!

lld/test/ELF/pre_init_fini_array.s
6–7

-S --dynamic -r -s (or -S -d -r -s) is better because the option order matches the output order.

30–34

Section Headers:

47

Value is misaligned.

This revision is now accepted and ready to land.Mar 27 2020, 11:16 AM
thopre updated this revision to Diff 253225.Mar 27 2020, 2:43 PM
thopre marked 3 inline comments as done.

Address last set of comments

Harbormaster failed remote builds in B50737: Diff 253225!Mar 27 2020, 2:54 PM
Closed by commit rG6eb345af5a1b: [lld test] Tighten ELF/pre_init_fini_array.s test (authored by thopre). · Explain WhyMar 27 2020, 2:54 PM
This revision was automatically updated to reflect the committed changes.
MaskRay mentioned this in D76915: [LLD][ELF] Allow empty (.init|.preinit|.fini)_array to be RELRO.Mar 28 2020, 9:44 AM

Revision Contents

PathSize
lld/
test/
ELF/
160 lines

Diff 253234

lld/test/ELF/pre_init_fini_array.s

// REQUIRES: x86 // REQUIRES: x86
// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2
// RUN: ld.lld %t2 -o %t2.so -shared -soname=so // RUN: ld.lld %t2 -o %t2.so -shared -soname=so
// RUN: ld.lld %t %t2.so -o %t2 // RUN: ld.lld %t %t2.so -o %t2
// RUN: llvm-readobj -r --symbols --sections --dynamic-table %t2 | FileCheck %s // RUN: llvm-readelf -S -d -r -s %t2 | FileCheck %s
// RUN: llvm-objdump -d %t2 | FileCheck --check-prefix=DISASM %s // RUN: llvm-objdump -d --syms %t2 | FileCheck --check-prefix=DISASM %s
MaskRayUnsubmitted
Done
ReplyInline Actions

-S --dynamic -r -s (or -S -d -r -s) is better because the option order matches the output order.

MaskRay: -S --dynamic -r -s (or -S -d -r -s) is better because the option order matches the output order.
.globl _start .globl _start
_start: _start:
call __preinit_array_start call *__preinit_array_start
call __preinit_array_end call *__preinit_array_end
call __init_array_start call *__init_array_start
call __init_array_end call *__init_array_end
call __fini_array_start call *__fini_array_start
call __fini_array_end call *__fini_array_end
.section .init_array,"aw",@init_array .section .init_array,"aw",@init_array
.quad 0 .quad 0
.section .preinit_array,"aw",@preinit_array .section .preinit_array,"aw",@preinit_array
.quad 0 .quad 0
.byte 0 .byte 0
.section .fini_array,"aw",@fini_array .section .fini_array,"aw",@fini_array
.quad 0 .quad 0
.short 0 .short 0
// CHECK: Name: .init_array // CHECK-LABEL: Section Headers:
// CHECK-NEXT: Type: SHT_INIT_ARRAY // CHECK: Name Type Address Off Size ES Flg
// CHECK-NEXT: Flags [ // CHECK: .init_array INIT_ARRAY [[# %x, INIT_ADDR:]] [[# %x,]] [[# %x, INIT_SIZE:]] 00 WA
// CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: .preinit_array PREINIT_ARRAY [[# %x, PREINIT_ADDR:]] [[# %x,]] [[# %x, PREINIT_SIZE:]] 00 WA
// CHECK-NEXT: SHF_WRITE // CHECK-NEXT: .fini_array FINI_ARRAY [[# %x, FINI_ADDR:]] [[# %x,]] [[# %x, FINI_SIZE:]] 00 WA
MaskRayUnsubmitted
Done
ReplyInline Actions

Section Headers:

MaskRay: `Section Headers:`
// CHECK-NEXT: ]
// CHECK-NEXT: Address: [[INIT_ADDR:.*]] // CHECK-LABEL: Dynamic section
// CHECK-NEXT: Offset: // CHECK: (PREINIT_ARRAY) 0x[[# PREINIT_ADDR]]
// CHECK-NEXT: Size: [[INIT_SIZE:.*]] // CHECK: (PREINIT_ARRAYSZ) [[# %u, PREINIT_SIZE]] (bytes)
// CHECK: (INIT_ARRAY) 0x[[# INIT_ADDR]]
// CHECK: (INIT_ARRAYSZ) [[# %u, INIT_SIZE]] (bytes)
// CHECK: Name: .preinit_array // CHECK: (FINI_ARRAY) 0x[[# FINI_ADDR]]
// CHECK-NEXT: Type: SHT_PREINIT_ARRAY // CHECK: (FINI_ARRAYSZ) [[# %u, FINI_SIZE]] (bytes)
// CHECK-NEXT: Flags [
// CHECK-NEXT: SHF_ALLOC // CHECK-LABEL: There are no relocations in this file.
// CHECK-NEXT: SHF_WRITE
// CHECK-NEXT: ] // CHECK-LABEL: Symbol table '.symtab'
// CHECK-NEXT: Address: [[PREINIT_ADDR:.*]] // CHECK: Value Size Type Bind Vis Ndx Name
MaskRayUnsubmitted
Done
ReplyInline Actions

Value is misaligned.

MaskRay: `Value` is misaligned.
// CHECK-NEXT: Offset: // CHECK: [[# FINI_ADDR + FINI_SIZE]] 0 NOTYPE LOCAL HIDDEN [[#]] __fini_array_end
// CHECK-NEXT: Size: [[PREINIT_SIZE:.*]] // CHECK-NEXT: [[# FINI_ADDR]] 0 NOTYPE LOCAL HIDDEN [[#]] __fini_array_start
// CHECK-NEXT: [[# INIT_ADDR + INIT_SIZE]] 0 NOTYPE LOCAL HIDDEN [[#]] __init_array_end
// CHECK-NEXT: [[# INIT_ADDR]] 0 NOTYPE LOCAL HIDDEN [[#]] __init_array_start
// CHECK: Name: .fini_array // CHECK-NEXT: [[# PREINIT_ADDR + PREINIT_SIZE]] 0 NOTYPE LOCAL HIDDEN [[#]] __preinit_array_end
// CHECK-NEXT: Type: SHT_FINI_ARRAY // CHECK-NEXT: [[# PREINIT_ADDR]] 0 NOTYPE LOCAL HIDDEN [[#]] __preinit_array_start
// CHECK-NEXT: Flags [
// CHECK-NEXT: SHF_ALLOC // DISASM: SYMBOL TABLE:
// CHECK-NEXT: SHF_WRITE // DISASM-DAG: {{0*}}[[# %x, PREINIT_ARRAY_START:]] l .preinit_array {{0+}} .hidden __preinit_array_start
// CHECK-NEXT: ] // DISASM-DAG: {{0*}}[[# %x, PREINIT_ARRAY_END:]] l .preinit_array {{0+}} .hidden __preinit_array_end
// CHECK-NEXT: Address: [[FINI_ADDR:.*]] // DISASM-DAG: {{0*}}[[# %x, INIT_ARRAY_START:]] l .init_array {{0+}} .hidden __init_array_start
// CHECK-NEXT: Offset: // DISASM-DAG: {{0*}}[[# %x, INIT_ARRAY_END:]] l .init_array {{0+}} .hidden __init_array_end
// CHECK-NEXT: Size: [[FINI_SIZE:.*]] // DISASM-DAG: {{0*}}[[# %x, FINI_ARRAY_START:]] l .fini_array {{0+}} .hidden __fini_array_start
// DISASM-DAG: {{0*}}[[# %x, FINI_ARRAY_END:]] l .fini_array {{0+}} .hidden __fini_array_end
// CHECK: DynamicSection
// CHECK: PREINIT_ARRAY [[PREINIT_ADDR]]
// CHECK: PREINIT_ARRAYSZ [[PREINIT_SIZE]] (bytes)
// CHECK: INIT_ARRAY [[INIT_ADDR]]
// CHECK: INIT_ARRAYSZ [[INIT_SIZE]] (bytes)
// CHECK: FINI_ARRAY [[FINI_ADDR]]
// CHECK: FINI_ARRAYSZ [[FINI_SIZE]] (bytes)
// CHECK: Relocations [
// CHECK-NEXT: ]
// CHECK: Name: __fini_array_end
// CHECK-NEXT: Value:
// CHECK-NEXT: Size: 0
// CHECK-NEXT: Binding: Local
// CHECK-NEXT: Type: None
// CHECK-NEXT: Other [
// CHECK-NEXT: STV_HIDDEN
// CHECK-NEXT: ]
// CHECK-NEXT: Section: .fini_array
// CHECK-NEXT: }
// CHECK-NEXT: Symbol {
// CHECK-NEXT: Name: __fini_array_start
// CHECK-NEXT: Value: [[FINI_ADDR]]
// CHECK-NEXT: Size: 0
// CHECK-NEXT: Binding: Local
// CHECK-NEXT: Type: None
// CHECK-NEXT: Other [
// CHECK-NEXT: STV_HIDDEN
// CHECK-NEXT: ]
// CHECK-NEXT: Section: .fini_array
// CHECK-NEXT: }
// CHECK-NEXT: Symbol {
// CHECK-NEXT: Name: __init_array_end
// CHECK-NEXT: Value:
// CHECK-NEXT: Size: 0
// CHECK-NEXT: Binding: Local
// CHECK-NEXT: Type: None
// CHECK-NEXT: Other [
// CHECK-NEXT: STV_HIDDEN
// CHECK-NEXT: ]
// CHECK-NEXT: Section: .init_array
// CHECK-NEXT: }
// CHECK-NEXT: Symbol {
// CHECK-NEXT: Name: __init_array_start
// CHECK-NEXT: Value: [[INIT_ADDR]]
// CHECK-NEXT: Size: 0
// CHECK-NEXT: Binding: Local
// CHECK-NEXT: Type: None
// CHECK-NEXT: Other [
// CHECK-NEXT: STV_HIDDEN
// CHECK-NEXT: ]
// CHECK-NEXT: Section: .init_array
// CHECK-NEXT: }
// CHECK-NEXT: Symbol {
// CHECK-NEXT: Name: __preinit_array_end
// CHECK-NEXT: Value:
// CHECK-NEXT: Size: 0
// CHECK-NEXT: Binding: Local
// CHECK-NEXT: Type: None
// CHECK-NEXT: Other [
// CHECK-NEXT: STV_HIDDEN
// CHECK-NEXT: ]
// CHECK-NEXT: Section: .preinit_array
// CHECK-NEXT: }
// CHECK-NEXT: Symbol {
// CHECK-NEXT: Name: __preinit_array_start
// CHECK-NEXT: Value: [[PREINIT_ADDR]]
// CHECK-NEXT: Size: 0
// CHECK-NEXT: Binding: Local
// CHECK-NEXT: Type: None
// CHECK-NEXT: Other [
// CHECK-NEXT: STV_HIDDEN
// CHECK-NEXT: ]
// CHECK-NEXT: Section: .preinit_array
// CHECK-NEXT: }
// DISASM: <_start>: // DISASM: <_start>:
// DISASM-NEXT: callq {{.*}} <__preinit_array_start> // DISASM-NEXT: callq *[[# %u, PREINIT_ARRAY_START]]
// DISASM-NEXT: callq {{.*}} <__fini_array_start> // DISASM-NEXT: callq *[[# %u, PREINIT_ARRAY_END]]
// DISASM-NEXT: callq {{.*}} <__init_array_start> // DISASM-NEXT: callq *[[# %u, INIT_ARRAY_START]]
// DISASM-NEXT: callq {{.*}} <__preinit_array_start> // DISASM-NEXT: callq *[[# %u, INIT_ARRAY_END]]
// DISASM-NEXT: callq {{.*}} <__fini_array_start> // DISASM-NEXT: callq *[[# %u, FINI_ARRAY_START]]
// DISASM-NEXT: callq {{.*}} <__fini_array_end> // DISASM-NEXT: callq *[[# %u, FINI_ARRAY_END]]