Skip to content

Commit 607b4bc

Browse files
authored
[AMDGPU] Add a missing COV6 case to getAMDHSACodeObjectVersion() (#87492)
1 parent a8425d2 commit 607b4bc

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ unsigned getAMDHSACodeObjectVersion(unsigned ABIVersion) {
182182
return 4;
183183
case ELF::ELFABIVERSION_AMDGPU_HSA_V5:
184184
return 5;
185+
case ELF::ELFABIVERSION_AMDGPU_HSA_V6:
186+
return 6;
185187
default:
186188
return getDefaultAMDHSACodeObjectVersion();
187189
}

llvm/test/tools/llvm-objdump/ELF/AMDGPU/kd-cov5.s

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
; RUN: | llvm-mc --triple=amdgcn-amd-amdhsa -mcpu=gfx1010 -mattr=-xnack,+wavefrontsize32,-wavefrontsize64 -filetype=obj > %t.o
77
; RUN: llvm-objdump --disassemble-symbols=kernel.kd %t.o | FileCheck %s --check-prefixes=COV4,CHECK
88

9+
;; Make sure we override the default COV in the disassembler on COV6 (there
10+
;; currently aren't any differences between 5 and 6, so set the default to 4 so
11+
;; we can verify that the default is at least overridden)
12+
; RUN: sed 's/CODE_OBJECT_VERSION/6/g' %s \
13+
; RUN: | llvm-mc --triple=amdgcn-amd-amdhsa -mcpu=gfx1010 -mattr=-xnack,+wavefrontsize32,-wavefrontsize64 -filetype=obj > %t.o
14+
; RUN: llvm-objdump -mllvm --amdhsa-code-object-version=4 --disassemble-symbols=kernel.kd %t.o | FileCheck %s --check-prefixes=COV5,CHECK
15+
916
;; Verify that .amdhsa_uses_dynamic_stack is only printed on COV5+.
1017

1118
; CHECK: .amdhsa_kernel kernel

0 commit comments

Comments
 (0)