This is an archive of the discontinued LLVM Phabricator instance.

Differential D14627

ELF: Ignore OS bits in sh_flag when assigning 'Data' ContentType for Atoms
AbandonedPublic

Authored by • tstellarAMD on Nov 12 2015, 2:42 PM.

Details

Reviewers
ruiu

Diff Detail

Event Timeline

• tstellarAMD updated this revision to Diff 40089.Nov 12 2015, 2:42 PM
• tstellarAMD retitled this revision from to ELF: Ignore OS bits in sh_flag when assigning 'Data' ContentType for Atoms.
• tstellarAMD updated this object.
• tstellarAMD added a reviewer: ruiu.
• tstellarAMD added a subscriber: llvm-commits.
• tstellarAMD added a parent revision: D14626: AMDGPU: Add support for global variable sections.Nov 12 2015, 2:44 PM
• tstellarAMD abandoned this revision.Jan 5 2016, 10:40 AM

Revision Contents

PathSize
lib/
ReaderWriter/
ELF/
1 line
test/
elf/
AMDGPU/
21 lines
6 lines

Diff 40089

lib/ReaderWriter/ELF/Atoms.cpp

Show First 20 Lines • Show All 86 Lines • ▼ Show 20 LinesDefinedAtom::ContentType ELFDefinedAtom<ELFT>::doContentType() const {
if (_symbol->getType() == STT_GNU_IFUNC) if (_symbol->getType() == STT_GNU_IFUNC)
return _contentType = typeResolver; return _contentType = typeResolver;
if (_symbol->st_shndx == SHN_COMMON) if (_symbol->st_shndx == SHN_COMMON)
return _contentType = typeZeroFill; return _contentType = typeZeroFill;
if (_section->sh_type == SHT_PROGBITS) { if (_section->sh_type == SHT_PROGBITS) {
flags &= ~SHF_ALLOC; flags &= ~SHF_ALLOC;
flags &= ~SHF_GROUP; flags &= ~SHF_GROUP;
flags &= ~SHF_MASKOS;
if ((flags & SHF_STRINGS) || (flags & SHF_MERGE)) if ((flags & SHF_STRINGS) || (flags & SHF_MERGE))
return typeConstant; return typeConstant;
if (flags == SHF_WRITE) if (flags == SHF_WRITE)
return typeData; return typeData;
return typeCode; return typeCode;
} }
if (_section->sh_type == SHT_NOTE) { if (_section->sh_type == SHT_NOTE) {
flags &= ~SHF_ALLOC; flags &= ~SHF_ALLOC;
▲ Show 20 Lines • Show All 195 Lines • Show Last 20 Lines

test/elf/AMDGPU/hsa-sections.test

# RUN: yaml2obj -format=elf %s > %t.obj # RUN: yaml2obj -format=elf %s > %t.obj
# RUN: lld -flavor gnu -target amdgcn--hsa %t.obj -o %t.exe --noinhibit-exec # RUN: lld -flavor gnu -target amdgcn--hsa %t.obj -o %t.exe --noinhibit-exec
# RUN: llvm-readobj -h -program-headers -s -symbols %t.exe | FileCheck %s # RUN: llvm-readobj -h -program-headers -s -symbols %t.exe | FileCheck %s
# CHECK: Section { # CHECK: Section {
# CHECK: Name: .hsarodata_readonly_agent
# CHECK: Type: SHT_PROGBITS
# CHECK: Flags [ (0xA00002
# CHECK: SHF_ALLOC (0x2)
# CHECK: SHF_AMDGPU_HSA_AGENT (0x800000)
# CHECK: SHF_AMDGPU_HSA_READONLY (0x200000)
# CHECK: ]
# CHECK: }
# CHECK: Section {
# CHECK: Name: .hsadata_global_agent # CHECK: Name: .hsadata_global_agent
# CHECK: Type: SHT_PROGBITS (0x1) # CHECK: Type: SHT_PROGBITS (0x1)
# CHECK: Flags [ (0x900003 # CHECK: Flags [ (0x900003
# CHECK: SHF_ALLOC (0x2) # CHECK: SHF_ALLOC (0x2)
# CHECK: SHF_AMDGPU_HSA_AGENT (0x800000) # CHECK: SHF_AMDGPU_HSA_AGENT (0x800000)
# CHECK: SHF_AMDGPU_HSA_GLOBAL (0x100000) # CHECK: SHF_AMDGPU_HSA_GLOBAL (0x100000)
# CHECK: SHF_WRITE (0x1) # CHECK: SHF_WRITE (0x1)
# CHECK: ] # CHECK: ]
# CHECK: } # CHECK: }
# CHECK: Section { # CHECK: Section {
# CHECK: Name: .hsadata_global_program # CHECK: Name: .hsadata_global_program
# CHECK: Type: SHT_PROGBITS (0x1) # CHECK: Type: SHT_PROGBITS (0x1)
# CHECK: Flags [ (0x100003 # CHECK: Flags [ (0x100003
# CHECK: SHF_ALLOC (0x2) # CHECK: SHF_ALLOC (0x2)
# CHECK: SHF_AMDGPU_HSA_GLOBAL (0x100000) # CHECK: SHF_AMDGPU_HSA_GLOBAL (0x100000)
# CHECK: SHF_WRITE (0x1) # CHECK: SHF_WRITE (0x1)
# CHECK: ] # CHECK: ]
# CHECK: } # CHECK: }
# CHECK: Section {
# CHECK: Name: .hsarodata_readonly_agent
# CHECK: Type: SHT_PROGBITS
# CHECK: Flags [ (0xA00002
# CHECK: SHF_ALLOC (0x2)
# CHECK: SHF_AMDGPU_HSA_AGENT (0x800000)
# CHECK: SHF_AMDGPU_HSA_READONLY (0x200000)
# CHECK: ]
# CHECK: }
# CHECK: ProgramHeader { # CHECK: ProgramHeader {
# CHECK: Type: PT_AMDGPU_HSA_LOAD_GLOBAL_PROGRAM (0x60000000) # CHECK: Type: PT_AMDGPU_HSA_LOAD_GLOBAL_PROGRAM (0x60000000)
# CHECK: } # CHECK: }
# CHECK: ProgramHeader { # CHECK: ProgramHeader {
# CHECK: Type: PT_AMDGPU_HSA_LOAD_GLOBAL_AGENT (0x60000001) # CHECK: Type: PT_AMDGPU_HSA_LOAD_GLOBAL_AGENT (0x60000001)
# CHECK: } # CHECK: }
Show All 24 Lines

test/elf/AMDGPU/hsa-symbols.test

# RUN: yaml2obj -format=elf %s > %t.obj # RUN: yaml2obj -format=elf %s > %t.obj
# RUN: lld -flavor gnu -target amdgcn--hsa %t.obj -o %t.exe --noinhibit-exec # RUN: lld -flavor gnu -target amdgcn--hsa %t.obj -o %t.exe --noinhibit-exec
# RUN: llvm-readobj -h -program-headers -s -symbols %t.exe | FileCheck %s # RUN: llvm-readobj -h -program-headers -s -symbols %t.exe | FileCheck %s
# CHECK: Symbol { # CHECK: Symbol {
# CHECK: Name: global_agent # CHECK: Name: global_agent
# CHECK: Binding: Local # CHECK: Binding: Local
# FIXME: Should be Type: Object # CHECK: Type: Object
# CHECK-NOT: Type: AMDGPU_HSA_KERNEL # CHECK: Section: .hsadata_global_agent
# CHECK: }
--- ---
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
OSABI: ELFOSABI_GNU OSABI: ELFOSABI_GNU
Type: ET_REL Type: ET_REL
Machine: EM_AMDGPU Machine: EM_AMDGPU
Sections: Sections:
Show All 12 Lines