[lld] r316483 - LLD/ELF/AMDGPU: Process AMDGPU-specific e_flags

[Konstantin Zhuravlyov via llvm-commits]

Author: kzhuravl
Date: Tue Oct 24 12:05:32 2017
New Revision: 316483

URL: http://llvm.org/viewvc/llvm-project?rev=316483&view=rev
Log:
LLD/ELF/AMDGPU: Process AMDGPU-specific e_flags

Differential Revision: https://reviews.llvm.org/D39140

Added:
    lld/trunk/test/ELF/Inputs/amdgpu-kernel-0.s
    lld/trunk/test/ELF/Inputs/amdgpu-kernel-1.s
    lld/trunk/test/ELF/Inputs/amdgpu-kernel-2.o   (with props)
    lld/trunk/test/ELF/amdgpu-elf-flags-err.s
    lld/trunk/test/ELF/amdgpu-elf-flags.s
Modified:
    lld/trunk/ELF/Arch/AMDGPU.cpp

Modified: lld/trunk/ELF/Arch/AMDGPU.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Arch/AMDGPU.cpp?rev=316483&r1=316482&r2=316483&view=diff
==============================================================================
--- lld/trunk/ELF/Arch/AMDGPU.cpp (original)
+++ lld/trunk/ELF/Arch/AMDGPU.cpp Tue Oct 24 12:05:32 2017
@@ -25,6 +25,7 @@ namespace {
 class AMDGPU final : public TargetInfo {
 public:
   AMDGPU();
+  uint32_t calcEFlags() const override;
   void relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const override;
   RelExpr getRelExpr(RelType Type, const SymbolBody &S,
                      const uint8_t *Loc) const override;
@@ -37,6 +38,24 @@ AMDGPU::AMDGPU() {
   GotEntrySize = 8;
 }
 
+uint32_t AMDGPU::calcEFlags() const {
+  if (ObjectFiles.empty())
+    return 0;
+
+  uint32_t Ret =
+    cast<ObjFile<ELF64LE>>(ObjectFiles.front())->getObj().getHeader()->e_flags;
+
+  // Verify that all input files have the same e_flags.
+  for (InputFile *F : ArrayRef<InputFile*>(ObjectFiles).slice(1)) {
+    if (Ret != cast<ObjFile<ELF64LE>>(F)->getObj().getHeader()->e_flags) {
+      error("incompatible e_flags: " + toString(F));
+      return 0;
+    }
+  }
+
+  return Ret;
+}
+
 void AMDGPU::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
   switch (Type) {
   case R_AMDGPU_ABS32:

Added: lld/trunk/test/ELF/Inputs/amdgpu-kernel-0.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/amdgpu-kernel-0.s?rev=316483&view=auto
==============================================================================
--- lld/trunk/test/ELF/Inputs/amdgpu-kernel-0.s (added)
+++ lld/trunk/test/ELF/Inputs/amdgpu-kernel-0.s Tue Oct 24 12:05:32 2017
@@ -0,0 +1,6 @@
+.text
+.globl kernel_0
+.align 64
+.amdgpu_hsa_kernel kernel_0
+kernel_0:
+  s_endpgm

Added: lld/trunk/test/ELF/Inputs/amdgpu-kernel-1.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/amdgpu-kernel-1.s?rev=316483&view=auto
==============================================================================
--- lld/trunk/test/ELF/Inputs/amdgpu-kernel-1.s (added)
+++ lld/trunk/test/ELF/Inputs/amdgpu-kernel-1.s Tue Oct 24 12:05:32 2017
@@ -0,0 +1,6 @@
+.text
+.globl kernel_1
+.align 64
+.amdgpu_hsa_kernel kernel_1
+kernel_1:
+  s_endpgm

Added: lld/trunk/test/ELF/Inputs/amdgpu-kernel-2.o
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/amdgpu-kernel-2.o?rev=316483&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lld/trunk/test/ELF/Inputs/amdgpu-kernel-2.o
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lld/trunk/test/ELF/amdgpu-elf-flags-err.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/amdgpu-elf-flags-err.s?rev=316483&view=auto
==============================================================================
--- lld/trunk/test/ELF/amdgpu-elf-flags-err.s (added)
+++ lld/trunk/test/ELF/amdgpu-elf-flags-err.s Tue Oct 24 12:05:32 2017
@@ -0,0 +1,7 @@
+# RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx803 -filetype=obj %S/Inputs/amdgpu-kernel-0.s -o %t-0.o
+# RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx803 -filetype=obj %S/Inputs/amdgpu-kernel-1.s -o %t-1.o
+# RUN: not ld.lld -shared %t-0.o %t-1.o %S/Inputs/amdgpu-kernel-2.o -o %t.so 2>&1 | FileCheck %s
+
+# REQUIRES: amdgpu
+
+# CHECK: error: incompatible e_flags: {{.*}}amdgpu-kernel-2.o

Added: lld/trunk/test/ELF/amdgpu-elf-flags.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/amdgpu-elf-flags.s?rev=316483&view=auto
==============================================================================
--- lld/trunk/test/ELF/amdgpu-elf-flags.s (added)
+++ lld/trunk/test/ELF/amdgpu-elf-flags.s Tue Oct 24 12:05:32 2017
@@ -0,0 +1,10 @@
+# RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx803 -filetype=obj %S/Inputs/amdgpu-kernel-0.s -o %t-0.o
+# RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx803 -filetype=obj %S/Inputs/amdgpu-kernel-1.s -o %t-1.o
+# RUN: ld.lld -shared %t-0.o %t-1.o -o %t.so
+# RUN: llvm-readobj -file-headers %t.so | FileCheck %s
+
+# REQUIRES: amdgpu
+
+# CHECK: Flags [ (0x2)
+# CHECK:   EF_AMDGPU_ARCH_GCN (0x2)
+# CHECK: ]