This is an archive of the discontinued LLVM Phabricator instance.

Differential D85683

[AMDGPU][test] Add dedicated llvm-readobj test.
ClosedPublic

Authored by rampitec on Aug 10 2020, 12:59 PM.

Details

Reviewers
scott.linder
kzhuravl
jhenderson
• espindola
Commits
rG839762b044d8: [AMDGPU][test] Add dedicated llvm-readobj test.

Diff Detail

Event Timeline

rampitec created this revision.Aug 10 2020, 12:59 PM
Herald added a reviewer: • espindola. · View Herald TranscriptAug 10 2020, 12:59 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: kerbowa, rupprecht, t-tye and 6 others. · View Herald Transcript
rampitec requested review of this revision.Aug 10 2020, 12:59 PM
Herald added subscribers: MaskRay, wdng. · View Herald TranscriptAug 10 2020, 12:59 PM
rampitec mentioned this in D85337: [AMDGPU] gfx1031 target.Aug 10 2020, 1:00 PM
MaskRay added a comment.Aug 10 2020, 5:03 PM

I seem to recall that for test only change, the tag can be [test] or test instead of NFC

llvm/test/tools/llvm-readobj/ELF/amdgpu-elf-headers.test
1

You can use yaml2obj -D FLAGS= to avoid replicate so many YAML inputs.

See file-header-machine-types.test for an example.

jhenderson added a comment.Aug 11 2020, 1:51 AM

Thanks for the test!

llvm/test/tools/llvm-readobj/ELF/amdgpu-elf-headers.test
5

It might be clearer to use FileCheck's -D option to sepcify the expected flag output, to avoid needing lots of different check lines:

# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DFLAG='EF_AMDGPU_MACH_AMDGCN_GFX600 (0x20)'
...
# CHECK-NEXT: Flags: [ {{.*}}
# CHECK-NEXT: [[FLAG]]
...

You can then change the value in each command, but share the same check everywhere. Note that I've also put the {{.*}} bit instead of the (0x...) bit for the total flags value, since that's not really important (the value is included on the next line anyway).

Up to you though.

rampitec updated this revision to Diff 284854.Aug 11 2020, 12:34 PM
rampitec marked 2 inline comments as done.

Reduced test size and used defines in run lines.

jhenderson accepted this revision.Aug 12 2020, 1:42 AM

LGTM, with a couple of suggested simplifications.

llvm/test/tools/llvm-readobj/ELF/amdgpu-elf-headers.test
2

There's only one file now, so you can get rid of --docnum from every yaml2obj invocation.

3

Since there's now only one check prefix, let's simplify to the default CHECK

This revision is now accepted and ready to land.Aug 12 2020, 1:42 AM
rampitec updated this revision to Diff 285095.Aug 12 2020, 8:58 AM
rampitec marked 2 inline comments as done.
rampitec retitled this revision from [AMDGPU] Add dedicated llvm-readobj test. NFC. to [AMDGPU][test] Add dedicated llvm-readobj test..
Closed by commit rG839762b044d8: [AMDGPU][test] Add dedicated llvm-readobj test. (authored by rampitec). · Explain WhyAug 12 2020, 9:11 AM
This revision was automatically updated to reflect the committed changes.
rampitec added a commit: rG839762b044d8: [AMDGPU][test] Add dedicated llvm-readobj test..

Revision Contents

PathSize
llvm/
test/
tools/
llvm-readobj/
ELF/
337 lines

Diff 284484

llvm/test/tools/llvm-readobj/ELF/amdgpu-elf-headers.test

  • This file was added.
# RUN: yaml2obj %s --docnum=1 -o %t
MaskRayUnsubmitted
Done
ReplyInline Actions

You can use yaml2obj -D FLAGS= to avoid replicate so many YAML inputs.

See file-header-machine-types.test for an example.

MaskRay: You can use `yaml2obj -D FLAGS=` to avoid replicate so many YAML inputs. See `file-header…
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX600
jhendersonUnsubmitted
Done
ReplyInline Actions
- # RUN: yaml2obj %s --docnum=1 -o %t -DCPU=GFX600
+ # RUN: yaml2obj %s -o %t -DCPU=GFX600
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DCPU=GFX600 -DFLAGS=0x20 --check-prefix=GCN

There's only one file now, so you can get rid of --docnum from every yaml2obj invocation.

jhenderson: There's only one file now, so you can get rid of --docnum from every yaml2obj invocation.
jhendersonUnsubmitted
Done
ReplyInline Actions
# RUN: yaml2obj %s --docnum=1 -o %t -DCPU=GFX600
- # RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DCPU=GFX600 -DFLAGS=0x20 --check-prefix=GCN
+ # RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DCPU=GFX600 -DFLAGS=0x20
# RUN: yaml2obj %s --docnum=1 -o %t -DCPU=GFX601

Since there's now only one check prefix, let's simplify to the default CHECK

jhenderson: Since there's now only one check prefix, let's simplify to the default `CHECK`
# RUN: yaml2obj %s --docnum=2 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX601
jhendersonUnsubmitted
Done
ReplyInline Actions

It might be clearer to use FileCheck's -D option to sepcify the expected flag output, to avoid needing lots of different check lines:

# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DFLAG='EF_AMDGPU_MACH_AMDGCN_GFX600 (0x20)'
...
# CHECK-NEXT: Flags: [ {{.*}}
# CHECK-NEXT: [[FLAG]]
...

You can then change the value in each command, but share the same check everywhere. Note that I've also put the {{.*}} bit instead of the (0x...) bit for the total flags value, since that's not really important (the value is included on the next line anyway).

Up to you though.

jhenderson: It might be clearer to use FileCheck's `-D` option to sepcify the expected flag output, to…
# RUN: yaml2obj %s --docnum=3 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX700
# RUN: yaml2obj %s --docnum=4 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX701
# RUN: yaml2obj %s --docnum=5 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX702
# RUN: yaml2obj %s --docnum=6 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX703
# RUN: yaml2obj %s --docnum=7 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX704
# RUN: yaml2obj %s --docnum=8 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX801
# RUN: yaml2obj %s --docnum=9 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX802
# RUN: yaml2obj %s --docnum=10 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX803
# RUN: yaml2obj %s --docnum=11 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX810
# RUN: yaml2obj %s --docnum=12 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX900
# RUN: yaml2obj %s --docnum=13 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX902
# RUN: yaml2obj %s --docnum=14 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX904
# RUN: yaml2obj %s --docnum=15 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX906
# RUN: yaml2obj %s --docnum=16 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX908
# RUN: yaml2obj %s --docnum=17 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX909
# RUN: yaml2obj %s --docnum=18 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX1010
# RUN: yaml2obj %s --docnum=19 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX1011
# RUN: yaml2obj %s --docnum=20 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX1012
# RUN: yaml2obj %s --docnum=21 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX1030
# RUN: yaml2obj %s --docnum=22 -o %t
# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t --check-prefixes=GCN,GFX1031
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX600 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX601 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX700 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX701 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX702 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX703 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX704 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX801 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX802 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX803 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX810 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX900 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX902 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX904 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX906 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX908 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX909 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX1010 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX1011 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX1012 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX1030 ]
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_AMDGPU_HSA
Type: ET_REL
Machine: EM_AMDGPU
Flags: [ EF_AMDGPU_MACH_AMDGCN_GFX1031 ]
# GCN: File: [[FILE]]
# GCN-NEXT: Format: elf64-amdgpu
# GCN-NEXT: Arch: amdgcn
# GCN-NEXT: AddressSize: 64bit
# GCN-NEXT: LoadName: <Not found>
# GCN-NEXT: ElfHeader {
# GCN-NEXT: Ident {
# GCN-NEXT: Magic: (7F 45 4C 46)
# GCN-NEXT: Class: 64-bit (0x2)
# GCN-NEXT: DataEncoding: LittleEndian (0x1)
# GCN-NEXT: FileVersion: 1
# GCN-NEXT: OS/ABI: AMDGPU_HSA (0x40)
# GCN-NEXT: ABIVersion: 0
# GCN-NEXT: Unused: (00 00 00 00 00 00 00)
# GCN-NEXT: }
# GCN-NEXT: Type: Relocatable (0x1)
# GCN-NEXT: Machine: EM_AMDGPU (0xE0)
# GCN-NEXT: Version: 1
# GCN-NEXT: Entry: 0x0
# GCN-NEXT: ProgramHeaderOffset: 0x0
# GCN-NEXT: SectionHeaderOffset: 0x58
# GFX600-NEXT: Flags [ (0x20)
# GFX600-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX600 (0x20)
# GFX601-NEXT: Flags [ (0x21)
# GFX601-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX601 (0x21)
# GFX700-NEXT: Flags [ (0x22)
# GFX700-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX700 (0x22)
# GFX701-NEXT: Flags [ (0x23)
# GFX701-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX701 (0x23)
# GFX702-NEXT: Flags [ (0x24)
# GFX702-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX702 (0x24)
# GFX703-NEXT: Flags [ (0x25)
# GFX703-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX703 (0x25)
# GFX704-NEXT: Flags [ (0x26)
# GFX704-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX704 (0x26)
# GFX801-NEXT: Flags [ (0x28)
# GFX801-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX801 (0x28)
# GFX802-NEXT: Flags [ (0x29)
# GFX802-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX802 (0x29)
# GFX803-NEXT: Flags [ (0x2A)
# GFX803-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX803 (0x2A)
# GFX810-NEXT: Flags [ (0x2B)
# GFX810-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX810 (0x2B)
# GFX900-NEXT: Flags [ (0x2C)
# GFX900-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX900 (0x2C)
# GFX902-NEXT: Flags [ (0x2D)
# GFX902-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX902 (0x2D)
# GFX904-NEXT: Flags [ (0x2E)
# GFX904-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX904 (0x2E)
# GFX906-NEXT: Flags [ (0x2F)
# GFX906-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX906 (0x2F)
# GFX908-NEXT: Flags [ (0x30)
# GFX908-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX908 (0x30)
# GFX909-NEXT: Flags [ (0x31)
# GFX909-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX909 (0x31)
# GFX1010-NEXT: Flags [ (0x33)
# GFX1010-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX1010 (0x33)
# GFX1011-NEXT: Flags [ (0x34)
# GFX1011-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX1011 (0x34)
# GFX1012-NEXT: Flags [ (0x35)
# GFX1012-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX1012 (0x35)
# GFX1030-NEXT: Flags [ (0x36)
# GFX1030-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX1030 (0x36)
# GFX1031-NEXT: Flags [ (0x37)
# GFX1031-NEXT: EF_AMDGPU_MACH_AMDGCN_GFX1031 (0x37)
# GCN-NEXT: ]
# GCN-NEXT: HeaderSize: 64
# GCN-NEXT: ProgramHeaderEntrySize: 0
# GCN-NEXT: ProgramHeaderCount: 0
# GCN-NEXT: SectionHeaderEntrySize: 64
# GCN-NEXT: SectionHeaderCount: 3
# GCN-NEXT: StringTableSectionIndex: 2
# GCN-NEXT: }