commit abd69d5d08c2ce664b6c04edd3d6121bd8b7d1c2
author Konstantin Zhuravlyov <kzhuravl_dev@outlook.com> Wed Mar 24 11:52:10 2021 -0400
committer Copybara-Service <copybara-worker@google.com> Thu Mar 25 13:34:12 2021 -0700
tree 7e1ba339c553c5b6f3f3f127bd842f7e2f5e0a69
parent 1f886bd71b37ad4a39b9fb34ad261aa3e1cbb05d

AMDGPU: Add target id and code object v4 support

  - Add target id support (https://clang.llvm.org/docs/ClangOffloadBundler.html#target-id)
  - Add code object v4 support (https://llvm.org/docs/AMDGPUUsage.html#elf-code-object)
    - Add kernarg_size to kernel descriptor
    - Change trap handler ABI to no longer move queue pointer into s[0:1]
  - Cleanup ELF definitions
    - Add V2, V3, V4 suffixes to make a clear distinction for code object version
    - Consolidate note names

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

GitOrigin-RevId: f4ace6373747a661ebdae7a14f9e510c7adfea4e

test/ELF/amdgpu-abi-version.s

diff --git a/test/ELF/amdgpu-abi-version.s b/test/ELF/amdgpu-abi-version.s
index 6fc95f1..777a0c3 100644
--- a/test/ELF/amdgpu-abi-version.s
+++ b/test/ELF/amdgpu-abi-version.s
@@ -1,5 +1,5 @@
 # REQUIRES: amdgpu
-# RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx900 -filetype=obj %s -o %t.o
+# RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx900 --amdhsa-code-object-version=3 -filetype=obj %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %t.so
 # RUN: llvm-readobj --file-headers %t.so | FileCheck %s
 

test/ELF/lto/amdgcn-oses.ll

diff --git a/test/ELF/lto/amdgcn-oses.ll b/test/ELF/lto/amdgcn-oses.ll
index 714fa5a..a2f25cd 100644
--- a/test/ELF/lto/amdgcn-oses.ll
+++ b/test/ELF/lto/amdgcn-oses.ll
@@ -15,7 +15,7 @@
 ; RUN: llvm-readobj --file-headers %t/mesa3d.so | FileCheck %s --check-prefixes=GCN,NON-AMDHSA,MESA3D
 
 ; AMDHSA: OS/ABI: AMDGPU_HSA (0x40)
-; AMDHSA: ABIVersion: 1
+; AMDHSA: ABIVersion: 2
 
 ; AMDPAL: OS/ABI: AMDGPU_PAL (0x41)
 ; MESA3D: OS/ABI: AMDGPU_MESA3D (0x42)