This is an archive of the discontinued LLVM Phabricator instance.

Differential D56197

[AMDGPU] Change section name with metadata access
ClosedPublic

Authored by piotr on Jan 2 2019, 2:11 AM.

Details

Reviewers
kzhuravl
Commits
rG3abef8f9ea52: [AMDGPU] Change section name with metadata access
rL350292: [AMDGPU] Change section name with metadata access
Summary

The commit rL348922 introduced a means to set Metadata
section kind for a global variable, if its explicit section
name was prefixed with ".AMDGPU.metadata.".

This patch changes that prefix to ".AMDGPU.comment.",
as "metadata" in the section name might lead to
ambiguity with metadata used by AMD PAL runtime.

Change-Id: Idd4748800d6fe801441d91595fc21e5a4171e668

Diff Detail

Event Timeline

piotr created this revision.Jan 2 2019, 2:11 AM
Herald added subscribers: llvm-commits, t-tye, tpr and 7 others. · View Herald TranscriptJan 2 2019, 2:11 AM
Harbormaster completed remote builds in B26316: Diff 179826.Jan 2 2019, 2:11 AM
piotr added a reviewer: kzhuravl.Jan 2 2019, 2:12 AM
kzhuravl accepted this revision.Jan 2 2019, 6:24 AM

LGTM

This revision is now accepted and ready to land.Jan 2 2019, 6:24 AM
Closed by commit rL350292: [AMDGPU] Change section name with metadata access (authored by piotr). · Explain WhyJan 3 2019, 3:26 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Target/
AMDGPU/
2 lines
test/
CodeGen/
AMDGPU/
24 lines

Diff 179826

lib/Target/AMDGPU/AMDGPUTargetObjectFile.cpp

Show All 28 LinesMCSection *AMDGPUTargetObjectFile::SelectSectionForGlobal(
return TargetLoweringObjectFileELF::SelectSectionForGlobal(GO, Kind, TM); return TargetLoweringObjectFileELF::SelectSectionForGlobal(GO, Kind, TM);
} }
MCSection *AMDGPUTargetObjectFile::getExplicitSectionGlobal( MCSection *AMDGPUTargetObjectFile::getExplicitSectionGlobal(
const GlobalObject *GO, SectionKind SK, const TargetMachine &TM) const { const GlobalObject *GO, SectionKind SK, const TargetMachine &TM) const {
// Set metadata access for the explicit section // Set metadata access for the explicit section
StringRef SectionName = GO->getSection(); StringRef SectionName = GO->getSection();
if (SectionName.startswith(".AMDGPU.metadata.")) if (SectionName.startswith(".AMDGPU.comment."))
SK = SectionKind::getMetadata(); SK = SectionKind::getMetadata();
return TargetLoweringObjectFileELF::getExplicitSectionGlobal(GO, SK, TM); return TargetLoweringObjectFileELF::getExplicitSectionGlobal(GO, SK, TM);
} }

test/CodeGen/AMDGPU/elf.metadata.ll

; RUN: llc < %s -march=amdgcn -mcpu=fiji -filetype=obj | llvm-readobj -symbols -s -sd - | FileCheck %s ; RUN: llc < %s -march=amdgcn -mcpu=fiji -filetype=obj | llvm-readobj -symbols -s -sd - | FileCheck %s
; CHECK: Section { ; CHECK: Section {
; CHECK: Name: .AMDGPU.metadata.info_1 ; CHECK: Name: .AMDGPU.comment.info_1
; CHECK: Type: SHT_PROGBITS (0x1) ; CHECK: Type: SHT_PROGBITS (0x1)
; CHECK: Flags [ (0x0) ; CHECK: Flags [ (0x0)
; CHECK: Size: 16 ; CHECK: Size: 16
; CHECK: SectionData ( ; CHECK: SectionData (
; CHECK: 0000: 414D4431 414D4431 414D4431 414D4431 |AMD1AMD1AMD1AMD1| ; CHECK: 0000: 414D4431 414D4431 414D4431 414D4431 |AMD1AMD1AMD1AMD1|
; CHECK: ) ; CHECK: )
; CHECK: } ; CHECK: }
; CHECK: Section { ; CHECK: Section {
; CHECK: Name: .AMDGPU.metadata.info_2 ; CHECK: Name: .AMDGPU.comment.info_2
; CHECK: Type: SHT_PROGBITS (0x1) ; CHECK: Type: SHT_PROGBITS (0x1)
; CHECK: Flags [ (0x0) ; CHECK: Flags [ (0x0)
; CHECK: Size: 16 ; CHECK: Size: 16
; CHECK: SectionData ( ; CHECK: SectionData (
; CHECK: 0000: 414D4432 414D4432 414D4432 414D4432 |AMD2AMD2AMD2AMD2| ; CHECK: 0000: 414D4432 414D4432 414D4432 414D4432 |AMD2AMD2AMD2AMD2|
; CHECK: ) ; CHECK: )
; CHECK: } ; CHECK: }
; CHECK: Section { ; CHECK: Section {
; CHECK: Name: .AMDGPU.metadata.info_3 ; CHECK: Name: .AMDGPU.comment.info_3
; CHECK: Type: SHT_PROGBITS (0x1) ; CHECK: Type: SHT_PROGBITS (0x1)
; CHECK: Flags [ (0x0) ; CHECK: Flags [ (0x0)
; CHECK: Size: 16 ; CHECK: Size: 16
; CHECK: SectionData ( ; CHECK: SectionData (
; CHECK: 0000: 414D4433 414D4433 414D4433 414D4433 |AMD3AMD3AMD3AMD3| ; CHECK: 0000: 414D4433 414D4433 414D4433 414D4433 |AMD3AMD3AMD3AMD3|
; CHECK: ) ; CHECK: )
; CHECK: } ; CHECK: }
; CHECK: Symbol { ; CHECK: Symbol {
; CHECK: Name: metadata_info_var_1 ; CHECK: Name: comment_info_var_1
; CHECK: Size: 16 ; CHECK: Size: 16
; CHECK: Binding: Local ; CHECK: Binding: Local
; CHECK: Section: .AMDGPU.metadata.info_1 ; CHECK: Section: .AMDGPU.comment.info_1
; CHECK: } ; CHECK: }
; CHECK: Symbol { ; CHECK: Symbol {
; CHECK: Name: metadata_info_var_2 ; CHECK: Name: comment_info_var_2
; CHECK: Size: 16 ; CHECK: Size: 16
; CHECK: Binding: Global ; CHECK: Binding: Global
; CHECK: Section: .AMDGPU.metadata.info_2 ; CHECK: Section: .AMDGPU.comment.info_2
; CHECK: } ; CHECK: }
; CHECK: Symbol { ; CHECK: Symbol {
; CHECK: Name: metadata_info_var_3 ; CHECK: Name: comment_info_var_3
; CHECK: Size: 16 ; CHECK: Size: 16
; CHECK: Binding: Global ; CHECK: Binding: Global
; CHECK: Section: .AMDGPU.metadata.info_3 ; CHECK: Section: .AMDGPU.comment.info_3
; CHECK: } ; CHECK: }
@metadata_info_var_1 = internal global [4 x i32][i32 826559809, i32 826559809, i32 826559809, i32 826559809], align 1, section ".AMDGPU.metadata.info_1" @comment_info_var_1 = internal global [4 x i32][i32 826559809, i32 826559809, i32 826559809, i32 826559809], align 1, section ".AMDGPU.comment.info_1"
@metadata_info_var_2 = constant [4 x i32][i32 843337025, i32 843337025, i32 843337025, i32 843337025], align 1, section ".AMDGPU.metadata.info_2" @comment_info_var_2 = constant [4 x i32][i32 843337025, i32 843337025, i32 843337025, i32 843337025], align 1, section ".AMDGPU.comment.info_2"
@metadata_info_var_3 = global [4 x i32][i32 860114241, i32 860114241, i32 860114241, i32 860114241], align 1, section ".AMDGPU.metadata.info_3" @comment_info_var_3 = global [4 x i32][i32 860114241, i32 860114241, i32 860114241, i32 860114241], align 1, section ".AMDGPU.comment.info_3"