This is an archive of the discontinued LLVM Phabricator instance.

Differential D71874

[llvm-readobj][test] - Cleanup SHT_RELR sections testing.
ClosedPublic

Authored by grimar on Dec 25 2019, 3:49 AM.

Details

Reviewers
jhenderson
MaskRay
• espindola
Commits
rG66a35d330b3d: [llvm-readobj][test] - Cleanup SHT_RELR sections testing.
Summary

After recent changes (D71872) in yaml2obj, it is possible so cleanup
testing of the SHT_RELR sections.

Diff Detail

Event Timeline

grimar created this revision.Dec 25 2019, 3:49 AM
Herald added a reviewer: • espindola. · View Herald TranscriptDec 25 2019, 3:49 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: rupprecht, emaste. · View Herald Transcript
grimar added a parent revision: D71872: [yaml2obj/obj2yaml] - Add support for SHT_RELR sections..Dec 25 2019, 4:11 AM
MaskRay accepted this revision.Dec 26 2019, 9:59 PM
This revision is now accepted and ready to land.Dec 26 2019, 9:59 PM
jhenderson added a comment.Jan 2 2020, 5:34 AM

Looks good to me, aside from the need to rebase.

llvm/test/tools/llvm-readobj/ELF/relr-relocs.test
87

This needs rebasing, right?

grimar updated this revision to Diff 238224.Jan 15 2020, 5:19 AM
grimar marked 2 inline comments as done.
  • Rebased.
llvm/test/tools/llvm-readobj/ELF/relr-relocs.test
87

I guess the dependency was needed to be landed first. Now it is.

jhenderson accepted this revision.Jan 15 2020, 5:34 AM
grimar marked 2 inline comments as done.Jan 15 2020, 7:43 AM
grimar added inline comments.
llvm/test/tools/llvm-readobj/ELF/relr-relocs.test
87

This needs rebasing, right?

Right. Sorry, I've missed it because had a strange git error during rebasing today and finally decided to recreate this patch for reposting.
This hide this issue from me: "OffsetsAndBitmaps" should have been renamed to "Entries". I've found it during pre-commit check-llvm run and fixed.

Closed by commit rG66a35d330b3d: [llvm-readobj][test] - Cleanup SHT_RELR sections testing. (authored by grimar). · Explain WhyJan 15 2020, 7:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
test/
tools/
llvm-readobj/
ELF/
Inputs/
51 lines

Diff 235272

llvm/test/tools/llvm-readobj/ELF/Inputs/elf-relr-relocs1.s

  • This file was deleted.
.quad 0x0000000000010d60 // Initial offset
.quad 0x0000000000000103 // Continuation bitmap
.quad 0x0000000000020000 // New offset
.quad 0x00000000000f0501 // Continuation bitmap
.quad 0x000a700550400009 // Continuation bitmap

llvm/test/tools/llvm-readobj/ELF/Inputs/elf-relr-relocs2.s

  • This file was deleted.
.long 0x00010d60 // Initial offset
.long 0x00000103 // Continuation bitmap
.long 0x00020000 // New offset
.long 0x000f0501 // Continuation bitmap
.long 0x50400009 // Continuation bitmap

llvm/test/tools/llvm-readobj/ELF/relr-relocs.test

# The binary blobs in this file were created like this: ## This is a test to test how SHT_RELR sections are dumped.
# llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu Inputs/elf-relr-relocs1.s -o - | obj2yaml | grep Content:
# RUN: yaml2obj -docnum 1 %s \ # RUN: yaml2obj -docnum 1 %s \
# RUN: | llvm-readobj --relocations --raw-relr - \ # RUN: | llvm-readobj --relocations --raw-relr - \
# RUN: | FileCheck --check-prefix=RAW-LLVM1 %s # RUN: | FileCheck --check-prefix=RAW-LLVM1 %s
# RAW-LLVM1: Section (1) .relr.dyn { # RAW-LLVM1: Section (1) .relr.dyn {
# RAW-LLVM1-NEXT: 0x10D60 # RAW-LLVM1-NEXT: 0x10D60
# RAW-LLVM1-NEXT: 0x103 # RAW-LLVM1-NEXT: 0x103
# RAW-LLVM1-NEXT: 0x20000 # RAW-LLVM1-NEXT: 0x20000
▲ Show 20 Lines • Show All 59 Lines • ▼ Show 20 Lines
# GNU1-NEXT: 00000000000202f8 0000000000000008 R_X86_64_RELATIVE # GNU1-NEXT: 00000000000202f8 0000000000000008 R_X86_64_RELATIVE
# GNU1-NEXT: 0000000000020308 0000000000000008 R_X86_64_RELATIVE # GNU1-NEXT: 0000000000020308 0000000000000008 R_X86_64_RELATIVE
# GNU1-NEXT: 0000000000020358 0000000000000008 R_X86_64_RELATIVE # GNU1-NEXT: 0000000000020358 0000000000000008 R_X86_64_RELATIVE
# GNU1-NEXT: 0000000000020360 0000000000000008 R_X86_64_RELATIVE # GNU1-NEXT: 0000000000020360 0000000000000008 R_X86_64_RELATIVE
# GNU1-NEXT: 0000000000020368 0000000000000008 R_X86_64_RELATIVE # GNU1-NEXT: 0000000000020368 0000000000000008 R_X86_64_RELATIVE
# GNU1-NEXT: 0000000000020380 0000000000000008 R_X86_64_RELATIVE # GNU1-NEXT: 0000000000020380 0000000000000008 R_X86_64_RELATIVE
# GNU1-NEXT: 0000000000020390 0000000000000008 R_X86_64_RELATIVE # GNU1-NEXT: 0000000000020390 0000000000000008 R_X86_64_RELATIVE
# elf-relr-relocs1.s
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_DYN Type: ET_DYN
Machine: EM_X86_64 Machine: EM_X86_64
Entry: 0x0000000000001000
Sections: Sections:
- Name: .relr.dyn - Name: .relr.dyn
Type: SHT_RELR Type: SHT_RELR
Flags: [ SHF_ALLOC ] Flags: [ SHF_ALLOC ]
Address: 0x00000000000001C8 OffsetsAndBitmaps: [ 0x0000000000010D60, 0x0000000000000103, 0x0000000000020000,
jhendersonUnsubmitted
Done
ReplyInline Actions

This needs rebasing, right?

jhenderson: This needs rebasing, right?
grimarAuthorUnsubmitted
Done
ReplyInline Actions

I guess the dependency was needed to be landed first. Now it is.

grimar: I guess the dependency was needed to be landed first. Now it is.
grimarAuthorUnsubmitted
Done
ReplyInline Actions

This needs rebasing, right?

Right. Sorry, I've missed it because had a strange git error during rebasing today and finally decided to recreate this patch for reposting.
This hide this issue from me: "OffsetsAndBitmaps" should have been renamed to "Entries". I've found it during pre-commit check-llvm run and fixed.

grimar: > This needs rebasing, right? Right. Sorry, I've missed it because had a strange git error…
Link: .symtab 0x00000000000F0501, 0x000A700550400009 ]
AddressAlign: 0x0000000000000001
Content: 600D0100000000000301000000000000000002000000000001050F00000000000900405005700A00
Symbols: []
...
# RUN: yaml2obj -docnum 2 %s \ # RUN: yaml2obj -docnum 2 %s \
# RUN: | llvm-readobj --relocations --raw-relr - \ # RUN: | llvm-readobj --relocations --raw-relr - \
# RUN: | FileCheck --check-prefix=RAW-LLVM2 %s # RUN: | FileCheck --check-prefix=RAW-LLVM2 %s
# RAW-LLVM2: Section (1) .relr.dyn { # RAW-LLVM2: Section (1) .relr.dyn {
# RAW-LLVM2-NEXT: 0x10D60 # RAW-LLVM2-NEXT: 0x10D60
# RAW-LLVM2-NEXT: 0x103 # RAW-LLVM2-NEXT: 0x103
# RAW-LLVM2-NEXT: 0x20000 # RAW-LLVM2-NEXT: 0x20000
▲ Show 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
# GNU2-NEXT: 00020044 00000008 R_386_RELATIVE # GNU2-NEXT: 00020044 00000008 R_386_RELATIVE
# GNU2-NEXT: 00020048 00000008 R_386_RELATIVE # GNU2-NEXT: 00020048 00000008 R_386_RELATIVE
# GNU2-NEXT: 0002004c 00000008 R_386_RELATIVE # GNU2-NEXT: 0002004c 00000008 R_386_RELATIVE
# GNU2-NEXT: 00020088 00000008 R_386_RELATIVE # GNU2-NEXT: 00020088 00000008 R_386_RELATIVE
# GNU2-NEXT: 000200d4 00000008 R_386_RELATIVE # GNU2-NEXT: 000200d4 00000008 R_386_RELATIVE
# GNU2-NEXT: 000200ec 00000008 R_386_RELATIVE # GNU2-NEXT: 000200ec 00000008 R_386_RELATIVE
# GNU2-NEXT: 000200f4 00000008 R_386_RELATIVE # GNU2-NEXT: 000200f4 00000008 R_386_RELATIVE
# elf-relr-relocs2.s
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS32 Class: ELFCLASS32
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_DYN Type: ET_DYN
Machine: EM_386 Machine: EM_386
Entry: 0x00001000
Sections: Sections:
- Name: .relr.dyn - Name: .relr.dyn
Type: SHT_RELR Type: SHT_RELR
Flags: [ SHF_ALLOC ] Flags: [ SHF_ALLOC ]
Address: 0x000001C8 OffsetsAndBitmaps: [ 0x00010D60, 0x00000103, 0x00020000,
Link: .symtab 0x000F0501, 0x50400009 ]
AddressAlign: 0x00000001
Content: 600D0100030100000000020001050F0009004050
Symbols: []
...