[PATCH] D89042: LLD/AMDGPU: Infer os abi based on input llvm bitcode

[Konstantin Zhuravlyov via Phabricator via llvm-commits]

kzhuravl updated this revision to Diff 297111.
kzhuravl marked an inline comment as done.
kzhuravl added a comment.

Address review feedback:

- Merge tests into one test file


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D89042/new/

https://reviews.llvm.org/D89042

Files:
  lld/ELF/InputFiles.cpp
  lld/test/ELF/lto/amdgcn-oses.ll


Index: lld/test/ELF/lto/amdgcn-oses.ll
===================================================================
--- /dev/null
+++ lld/test/ELF/lto/amdgcn-oses.ll
@@ -0,0 +1,44 @@
+; REQUIRES: amdgpu
+
+; RUN: split-file %s %t
+
+; RUN: llvm-as %t/amdhsa.ll -o %t/amdhsa.o
+; RUN: ld.lld %t/amdhsa.o -o %t/amdhsa.so
+; RUN: llvm-readobj --file-headers %t/amdhsa.so | FileCheck %s --check-prefixes=GCN,AMDHSA
+
+; RUN: llvm-as %t/amdpal.ll -o %t/amdpal.o
+; RUN: ld.lld %t/amdpal.o -o %t/amdpal.so
+; RUN: llvm-readobj --file-headers %t/amdpal.so | FileCheck %s --check-prefixes=GCN,AMDPAL
+
+; RUN: llvm-as %t/mesa3d.ll -o %t/mesa3d.o
+; RUN: ld.lld %t/mesa3d.o -o %t/mesa3d.so
+; RUN: llvm-readobj --file-headers %t/mesa3d.so | FileCheck %s --check-prefixes=GCN,MESA3D
+
+; AMDHSA: OS/ABI: AMDGPU_HSA (0x40)
+; AMDPAL: OS/ABI: AMDGPU_PAL (0x41)
+; MESA3D: OS/ABI: AMDGPU_MESA3D (0x42)
+; GCN: ABIVersion: 0
+
+;--- amdhsa.ll
+target triple = "amdgcn-amd-amdhsa"
+target datalayout = "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5"
+
+define void @_start() {
+  ret void
+}
+
+;--- amdpal.ll
+target triple = "amdgcn-amd-amdpal"
+target datalayout = "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5"
+
+define void @_start() {
+  ret void
+}
+
+;--- mesa3d.ll
+target triple = "amdgcn-amd-mesa3d"
+target datalayout = "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5"
+
+define void @_start() {
+  ret void
+}
Index: lld/ELF/InputFiles.cpp
===================================================================
--- lld/ELF/InputFiles.cpp
+++ lld/ELF/InputFiles.cpp
@@ -1555,6 +1555,19 @@
   }
 }
 
+static uint8_t getOsAbi(const Triple &t) {
+  switch (t.getOS()) {
+  case Triple::AMDHSA:
+    return ELF::ELFOSABI_AMDGPU_HSA;
+  case Triple::AMDPAL:
+    return ELF::ELFOSABI_AMDGPU_PAL;
+  case Triple::Mesa3D:
+    return ELF::ELFOSABI_AMDGPU_MESA3D;
+  default:
+    return ELF::ELFOSABI_NONE;
+  }
+}
+
 BitcodeFile::BitcodeFile(MemoryBufferRef mb, StringRef archiveName,
                          uint64_t offsetInArchive)
     : InputFile(BitcodeKind, mb) {
@@ -1582,6 +1595,7 @@
   Triple t(obj->getTargetTriple());
   ekind = getBitcodeELFKind(t);
   emachine = getBitcodeMachineKind(mb.getBufferIdentifier(), t);
+  osabi = getOsAbi(t);
 }
 
 static uint8_t mapVisibility(GlobalValue::VisibilityTypes gvVisibility) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D89042.297111.patch
Type: text/x-patch
Size: 2687 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201009/6a0aa75d/attachment.bin>