[PATCH] D56197: [AMDGPU] Change section name with metadata access

[Piotr Sobczak via Phabricator via llvm-commits]

piotr created this revision.
Herald added subscribers: llvm-commits, t-tye, tpr, dstuttard, yaxunl, nhaehnle, wdng, jvesely, kzhuravl, arsenm.

The commit rL348922 <https://reviews.llvm.org/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


Repository:
  rL LLVM

https://reviews.llvm.org/D56197

Files:
  lib/Target/AMDGPU/AMDGPUTargetObjectFile.cpp
  test/CodeGen/AMDGPU/elf.metadata.ll


Index: test/CodeGen/AMDGPU/elf.metadata.ll
===================================================================
--- test/CodeGen/AMDGPU/elf.metadata.ll
+++ test/CodeGen/AMDGPU/elf.metadata.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -march=amdgcn -mcpu=fiji -filetype=obj | llvm-readobj -symbols -s -sd - | FileCheck %s
 
 ; CHECK: Section {
-; CHECK: Name: .AMDGPU.metadata.info_1
+; CHECK: Name: .AMDGPU.comment.info_1
 ; CHECK: Type: SHT_PROGBITS (0x1)
 ; CHECK: Flags [ (0x0)
 ; CHECK: Size: 16
@@ -11,7 +11,7 @@
 ; CHECK: }
 
 ; CHECK: Section {
-; CHECK: Name: .AMDGPU.metadata.info_2
+; CHECK: Name: .AMDGPU.comment.info_2
 ; CHECK: Type: SHT_PROGBITS (0x1)
 ; CHECK: Flags [ (0x0)
 ; CHECK: Size: 16
@@ -21,7 +21,7 @@
 ; CHECK: }
 
 ; CHECK: Section {
-; CHECK: Name: .AMDGPU.metadata.info_3
+; CHECK: Name: .AMDGPU.comment.info_3
 ; CHECK: Type: SHT_PROGBITS (0x1)
 ; CHECK: Flags [ (0x0)
 ; CHECK: Size: 16
@@ -31,26 +31,26 @@
 ; CHECK: }
 
 ; CHECK: Symbol {
-; CHECK: Name: metadata_info_var_1
+; CHECK: Name: comment_info_var_1
 ; CHECK: Size: 16
 ; CHECK: Binding: Local
-; CHECK: Section: .AMDGPU.metadata.info_1
+; CHECK: Section: .AMDGPU.comment.info_1
 ; CHECK: }
 
 ; CHECK: Symbol {
-; CHECK: Name: metadata_info_var_2
+; CHECK: Name: comment_info_var_2
 ; CHECK: Size: 16
 ; CHECK: Binding: Global
-; CHECK: Section: .AMDGPU.metadata.info_2
+; CHECK: Section: .AMDGPU.comment.info_2
 ; CHECK: }
 
 ; CHECK: Symbol {
-; CHECK: Name: metadata_info_var_3
+; CHECK: Name: comment_info_var_3
 ; CHECK: Size: 16
 ; CHECK: Binding: Global
-; CHECK: Section: .AMDGPU.metadata.info_3
+; CHECK: Section: .AMDGPU.comment.info_3
 ; CHECK: }
 
- at metadata_info_var_1 = internal global [4 x i32][i32 826559809, i32 826559809, i32 826559809, i32 826559809], align 1, section ".AMDGPU.metadata.info_1"
- at metadata_info_var_2 = constant [4 x i32][i32 843337025, i32 843337025, i32 843337025, i32 843337025], align 1, section ".AMDGPU.metadata.info_2"
- at metadata_info_var_3 = global [4 x i32][i32 860114241, i32 860114241, i32 860114241, i32 860114241], align 1, section ".AMDGPU.metadata.info_3"
+ at comment_info_var_1 = internal global [4 x i32][i32 826559809, i32 826559809, i32 826559809, i32 826559809], align 1, section ".AMDGPU.comment.info_1"
+ at comment_info_var_2 = constant [4 x i32][i32 843337025, i32 843337025, i32 843337025, i32 843337025], align 1, section ".AMDGPU.comment.info_2"
+ at comment_info_var_3 = global [4 x i32][i32 860114241, i32 860114241, i32 860114241, i32 860114241], align 1, section ".AMDGPU.comment.info_3"
Index: lib/Target/AMDGPU/AMDGPUTargetObjectFile.cpp
===================================================================
--- lib/Target/AMDGPU/AMDGPUTargetObjectFile.cpp
+++ lib/Target/AMDGPU/AMDGPUTargetObjectFile.cpp
@@ -34,7 +34,7 @@
     const GlobalObject *GO, SectionKind SK, const TargetMachine &TM) const {
   // Set metadata access for the explicit section
   StringRef SectionName = GO->getSection();
-  if (SectionName.startswith(".AMDGPU.metadata."))
+  if (SectionName.startswith(".AMDGPU.comment."))
     SK = SectionKind::getMetadata();
 
   return TargetLoweringObjectFileELF::getExplicitSectionGlobal(GO, SK, TM);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D56197.179826.patch
Type: text/x-patch
Size: 3159 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190102/afe33e52/attachment.bin>