ab930ee7ca
It turns out that the notes section for corefiles (or really any elf
file with multiple notes) is set up in such a way for LLVM formatted
output that the JSON equivalent only has the last note since the notes
are held in a dictionary with every key being Note. This pr alters the
layout for the notes to a list of dictionaries to sidestep this issue
for JSON output. Prior to this pr a note section in the output looked
like (for LLVM output):
```
Notes [
NoteSection {
Name: <?>
Offset: 0x2148
Size: 0x1F864
Note {
Owner: CORE
Data size: 0x150
Type: NT_PRSTATUS (prstatus structure)
Description data (
0000: 06000000 00000000 00000000 06000000 |................|
...
)
}
Note {
Owner: CORE
Data size: 0x88
Type: NT_PRPSINFO (prpsinfo structure)
Description data (
0000: 02440000 00000000 04054040 00000000 |.D........@@....|
....
```
But is now:
```
NoteSections [
NoteSection {
Name: <?>
Offset: 0x2148
Size: 0x1F864
Notes [
{
Owner: CORE
Data size: 0x150
Type: NT_PRSTATUS (prstatus structure)
Description data (
0000: 06000000 00000000 00000000 06000000 |................|
...
)
}
{
Owner: CORE
Data size: 0x88
Type: NT_PRPSINFO (prpsinfo structure)
Description data (
0000: 02440000 00000000 04054040 00000000 |.D........@@....|
...
```
123 lines
4.3 KiB
Plaintext
123 lines
4.3 KiB
Plaintext
# RUN: yaml2obj %s -o %t.o
|
|
# RUN: llvm-readobj --notes %t.o | FileCheck %s --check-prefix=LLVM
|
|
# RUN: llvm-readelf --notes %t.o | FileCheck %s --check-prefix=GNU
|
|
|
|
# GNU: Displaying notes found in: .note.foo
|
|
# GNU-NEXT: Owner Data size Description
|
|
# GNU-NEXT: AMDGPU 0x000000fb NT_AMDGPU_METADATA (AMDGPU Metadata)
|
|
# GNU-NEXT: AMDGPU Metadata:
|
|
# GNU-NEXT: ---
|
|
# GNU-NEXT: amdhsa.kernels:
|
|
# GNU-NEXT: - .group_segment_fixed_size: 2
|
|
# GNU-NEXT: .kernarg_segment_align: 4
|
|
# GNU-NEXT: .kernarg_segment_size: 1
|
|
# GNU-NEXT: .max_flat_workgroup_size: 8
|
|
# GNU-NEXT: .name: foo
|
|
# GNU-NEXT: .private_segment_fixed_size: 3
|
|
# GNU-NEXT: .sgpr_count: 6
|
|
# GNU-NEXT: .symbol: foo
|
|
# GNU-NEXT: .uses_dynamic_stack: true
|
|
# GNU-NEXT: .vgpr_count: 7
|
|
# GNU-NEXT: .wavefront_size: 5
|
|
# GNU-NEXT: amdhsa.version:
|
|
# GNU-NEXT: - 1
|
|
# GNU-NEXT: - 0
|
|
# GNU-NEXT: ...
|
|
# GNU-EMPTY:
|
|
# GNU-EMPTY:
|
|
# GNU-NEXT: Displaying notes found in: .note.unknown
|
|
# GNU-NEXT: Owner Data size Description
|
|
# GNU-NEXT: AMDGPU 0x00000002 Unknown note type: (0x00000101)
|
|
# GNU-NEXT: description data: ab cd
|
|
# GNU-EMPTY:
|
|
|
|
# LLVM: NoteSections [
|
|
# LLVM-NEXT: NoteSection {
|
|
# LLVM-NEXT: Name: .note.foo
|
|
# LLVM-NEXT: Offset:
|
|
# LLVM-NEXT: Size:
|
|
# LLVM-NEXT: Notes [
|
|
# LLVM-NEXT: {
|
|
# LLVM-NEXT: Owner: AMDGPU
|
|
# LLVM-NEXT: Data size: 0xFB
|
|
# LLVM-NEXT: Type: NT_AMDGPU_METADATA (AMDGPU Metadata)
|
|
# LLVM-NEXT: AMDGPU Metadata: ---
|
|
# LLVM-NEXT: amdhsa.kernels:
|
|
# LLVM-NEXT: - .group_segment_fixed_size: 2
|
|
# LLVM-NEXT: .kernarg_segment_align: 4
|
|
# LLVM-NEXT: .kernarg_segment_size: 1
|
|
# LLVM-NEXT: .max_flat_workgroup_size: 8
|
|
# LLVM-NEXT: .name: foo
|
|
# LLVM-NEXT: .private_segment_fixed_size: 3
|
|
# LLVM-NEXT: .sgpr_count: 6
|
|
# LLVM-NEXT: .symbol: foo
|
|
# LLVM-NEXT: .uses_dynamic_stack: true
|
|
# LLVM-NEXT: .vgpr_count: 7
|
|
# LLVM-NEXT: .wavefront_size: 5
|
|
# LLVM-NEXT: amdhsa.version:
|
|
# LLVM-NEXT: - 1
|
|
# LLVM-NEXT: - 0
|
|
# LLVM-NEXT: ...
|
|
# LLVM-EMPTY:
|
|
# LLVM-NEXT: }
|
|
# LLVM-NEXT: ]
|
|
# LLVM-NEXT: }
|
|
# LLVM-NEXT: NoteSection {
|
|
# LLVM-NEXT: Name: .note.unknown
|
|
# LLVM-NEXT: Offset: 0x150
|
|
# LLVM-NEXT: Size: 0x18
|
|
# LLVM-NEXT: Notes [
|
|
# LLVM-NEXT: {
|
|
# LLVM-NEXT: Owner: AMDGPU
|
|
# LLVM-NEXT: Data size: 0x2
|
|
# LLVM-NEXT: Type: Unknown (0x00000101)
|
|
# LLVM-NEXT: Description data (
|
|
# LLVM-NEXT: 0000: ABCD |..|
|
|
# LLVM-NEXT: )
|
|
# LLVM-NEXT: }
|
|
# LLVM-NEXT: ]
|
|
# LLVM-NEXT: }
|
|
# LLVM-NEXT: ]
|
|
|
|
## Use yaml2obj instead of llvm-mc for more test portability. This was
|
|
## generated by grabbing section data from an object built via:
|
|
# $ llvm-mc -filetype=obj -triple amdgcn-amd-amdhsa %s -o %t.o
|
|
## On input:
|
|
# .amdgpu_metadata
|
|
# amdhsa.version:
|
|
# - 1
|
|
# - 0
|
|
# amdhsa.kernels:
|
|
# - .name: foo
|
|
# .symbol: foo
|
|
# .kernarg_segment_size: 1
|
|
# .group_segment_fixed_size: 2
|
|
# .private_segment_fixed_size: 3
|
|
# .uses_dynamic_stack: true
|
|
# .kernarg_segment_align: 4
|
|
# .wavefront_size: 5
|
|
# .sgpr_count: 6
|
|
# .vgpr_count: 7
|
|
# .max_flat_workgroup_size: 8
|
|
# .end_amdgpu_metadata
|
|
#
|
|
## Here's one way to get the contents of .note.foo in the test input from %t.o:
|
|
# $ llvm-objcopy -O binary --only-section=.note %t.o note.out
|
|
# $ xxd -p note.out | tr -d '\n' | tr a-z A-Z
|
|
|
|
--- !ELF
|
|
FileHeader:
|
|
Class: ELFCLASS64
|
|
Data: ELFDATA2LSB
|
|
Type: ET_REL
|
|
Sections:
|
|
- Name: .note.foo
|
|
Type: SHT_NOTE
|
|
Content: 07000000FB00000020000000414D44475055000082AE616D646873612E6B65726E656C73918BB92E67726F75705F7365676D656E745F66697865645F73697A6502B62E6B65726E6172675F7365676D656E745F616C69676E04B52E6B65726E6172675F7365676D656E745F73697A6501B82E6D61785F666C61745F776F726B67726F75705F73697A6508A52E6E616D65A3666F6FBB2E707269766174655F7365676D656E745F66697865645F73697A6503AB2E736770725F636F756E7406A72E73796D626F6CA3666F6FB32E757365735F64796E616D69635F737461636BC3AB2E766770725F636F756E7407AF2E7761766566726F6E745F73697A6505AE616D646873612E76657273696F6E92010000
|
|
- Name: .note.unknown
|
|
Type: SHT_NOTE
|
|
Notes:
|
|
- Name: AMDGPU
|
|
Type: NT_GNU_BUILD_ATTRIBUTE_FUNC
|
|
Desc: 'abcd'
|