Skip to content

Commit 4897b98

Browse files
epilkepilk
authored
[AMDGPU] Make a few more tests default COV agnostic (#78926)
1 parent 2bb6d7b commit 4897b98

File tree

4 files changed

+24
-15
lines changed

4 files changed

+24
-15
lines changed

‎lld/test/ELF/lto/amdgcn-oses.ll

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
; RUN: llvm-readobj --file-headers %t/mesa3d.so | FileCheck %s --check-prefixes=GCN,NON-AMDHSA,MESA3D
1616

1717
; AMDHSA: OS/ABI: AMDGPU_HSA (0x40)
18-
; AMDHSA: ABIVersion: 2
18+
; AMDHSA: ABIVersion: 3
1919

2020
; AMDPAL: OS/ABI: AMDGPU_PAL (0x41)
2121
; MESA3D: OS/ABI: AMDGPU_MESA3D (0x42)
@@ -27,6 +27,9 @@
2727
target triple = "amdgcn-amd-amdhsa"
2828
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"
2929

30+
!llvm.module.flags = !{!0}
31+
!0 = !{i32 1, !"amdgpu_code_object_version", i32 500}
32+
3033
define void @_start() {
3134
ret void
3235
}

‎llvm/test/CodeGen/AMDGPU/GlobalISel/irtranslator-function-args.ll

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3234,3 +3234,6 @@ define void @void_func_v2p3_inreg(<2 x ptr addrspace(3)> inreg %arg0) #0 {
32343234
}
32353235

32363236
attributes #0 = { nounwind }
3237+
3238+
!llvm.module.flags = !{!0}
3239+
!0 = !{i32 1, !"amdgpu_code_object_version", i32 400}

‎llvm/test/CodeGen/AMDGPU/GlobalISel/legalize-addrspacecast.mir

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
2-
# RUN: llc -mtriple=amdgcn -mcpu=fiji -O0 -run-pass=legalizer -o - %s | FileCheck -check-prefixes=GCN,SIVI %s
3-
# RUN: llc -mtriple=amdgcn -mcpu=tahiti -O0 -run-pass=legalizer -o - %s | FileCheck -check-prefixes=GCN,SIVI %s
4-
# RUN: llc -mtriple=amdgcn -mcpu=gfx900 -O0 -run-pass=legalizer -o - %s | FileCheck -check-prefixes=GCN,GFX9 %s
5-
# RUN: llc -mtriple=amdgcn -mcpu=gfx1010 -O0 -run-pass=legalizer -o - %s | FileCheck -check-prefixes=GCN,GFX9 %s
6-
# RUN: llc -mtriple=amdgcn -mcpu=gfx1100 -O0 -run-pass=legalizer -o - %s | FileCheck -check-prefixes=GCN,GFX9 %s
2+
# RUN: llc -mtriple=amdgcn -mcpu=fiji -O0 -run-pass=legalizer --amdhsa-code-object-version=4 -o - %s | FileCheck -check-prefixes=GCN,SIVI %s
3+
# RUN: llc -mtriple=amdgcn -mcpu=tahiti -O0 -run-pass=legalizer --amdhsa-code-object-version=4 -o - %s | FileCheck -check-prefixes=GCN,SIVI %s
4+
# RUN: llc -mtriple=amdgcn -mcpu=gfx900 -O0 -run-pass=legalizer --amdhsa-code-object-version=4 -o - %s | FileCheck -check-prefixes=GCN,GFX9 %s
5+
# RUN: llc -mtriple=amdgcn -mcpu=gfx1010 -O0 -run-pass=legalizer --amdhsa-code-object-version=4 -o - %s | FileCheck -check-prefixes=GCN,GFX9 %s
6+
# RUN: llc -mtriple=amdgcn -mcpu=gfx1100 -O0 -run-pass=legalizer --amdhsa-code-object-version=4 -o - %s | FileCheck -check-prefixes=GCN,GFX9 %s
77

88
---
99
name: test_addrspacecast_p0_to_p1

‎llvm/test/CodeGen/AMDGPU/remove-no-kernel-id-attribute.ll

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ define internal void @f0_transitive() {
105105

106106
define amdgpu_kernel void @k0_f0() {
107107
; CHECK-LABEL: define amdgpu_kernel void @k0_f0(
108-
; CHECK-SAME: ) #[[ATTR2:[0-9]+]] !llvm.amdgcn.lds.kernel.id !1 {
108+
; CHECK-SAME: ) #[[ATTR2:[0-9]+]] !llvm.amdgcn.lds.kernel.id !2 {
109109
; CHECK-NEXT: call void @llvm.donothing() [ "ExplicitUse"(ptr addrspace(3) @llvm.amdgcn.kernel.k0_f0.lds) ]
110110
; CHECK-NEXT: call void @f0_transitive()
111111
; CHECK-NEXT: ret void
@@ -116,8 +116,8 @@ define amdgpu_kernel void @k0_f0() {
116116

117117
define amdgpu_kernel void @k1_f0() {
118118
; CHECK-LABEL: define amdgpu_kernel void @k1_f0(
119-
; CHECK-SAME: ) #[[ATTR3:[0-9]+]] !llvm.amdgcn.lds.kernel.id !2 {
120-
; CHECK-NEXT: call void @llvm.donothing() [ "ExplicitUse"(ptr addrspace(3) @llvm.amdgcn.kernel.k1_f0.lds) ], !alias.scope !3, !noalias !6
119+
; CHECK-SAME: ) #[[ATTR3:[0-9]+]] !llvm.amdgcn.lds.kernel.id !3 {
120+
; CHECK-NEXT: call void @llvm.donothing() [ "ExplicitUse"(ptr addrspace(3) @llvm.amdgcn.kernel.k1_f0.lds) ], !alias.scope !4, !noalias !7
121121
; CHECK-NEXT: call void @f0_transitive()
122122
; CHECK-NEXT: [[FPTR:%.*]] = load volatile ptr, ptr addrspace(1) null, align 8
123123
; CHECK-NEXT: call void [[FPTR]]()
@@ -178,7 +178,7 @@ define internal void @mutual_recursion_1(i16 %arg) {
178178

179179
define amdgpu_kernel void @kernel_lds_recursion() {
180180
; CHECK-LABEL: define amdgpu_kernel void @kernel_lds_recursion(
181-
; CHECK-SAME: ) #[[ATTR2]] !llvm.amdgcn.lds.kernel.id !8 {
181+
; CHECK-SAME: ) #[[ATTR2]] !llvm.amdgcn.lds.kernel.id !9 {
182182
; CHECK-NEXT: call void @llvm.donothing() [ "ExplicitUse"(ptr addrspace(3) @llvm.amdgcn.kernel.kernel_lds_recursion.lds) ]
183183
; CHECK-NEXT: call void @mutual_recursion_0(i16 0)
184184
; CHECK-NEXT: ret void
@@ -187,6 +187,9 @@ define amdgpu_kernel void @kernel_lds_recursion() {
187187
ret void
188188
}
189189

190+
!llvm.module.flags = !{!1}
191+
!1 = !{i32 1, !"amdgpu_code_object_version", i32 400}
192+
190193
;.
191194
; CHECK: attributes #[[ATTR0]] = { "amdgpu-no-completion-action" "amdgpu-no-default-queue" "amdgpu-no-dispatch-id" "amdgpu-no-dispatch-ptr" "amdgpu-no-heap-ptr" "amdgpu-no-hostcall-ptr" "amdgpu-no-implicitarg-ptr" "amdgpu-no-multigrid-sync-arg" "amdgpu-no-workgroup-id-x" "amdgpu-no-workgroup-id-y" "amdgpu-no-workgroup-id-z" "amdgpu-no-workitem-id-x" "amdgpu-no-workitem-id-y" "amdgpu-no-workitem-id-z" "amdgpu-waves-per-eu"="4,10" "uniform-work-group-size"="false" }
192195
; CHECK: attributes #[[ATTR1]] = { "amdgpu-no-completion-action" "amdgpu-no-default-queue" "amdgpu-no-dispatch-id" "amdgpu-no-dispatch-ptr" "amdgpu-no-heap-ptr" "amdgpu-no-hostcall-ptr" "amdgpu-no-implicitarg-ptr" "amdgpu-no-multigrid-sync-arg" "amdgpu-no-queue-ptr" "amdgpu-no-workgroup-id-x" "amdgpu-no-workgroup-id-y" "amdgpu-no-workgroup-id-z" "amdgpu-no-workitem-id-x" "amdgpu-no-workitem-id-y" "amdgpu-no-workitem-id-z" "amdgpu-waves-per-eu"="4,10" "uniform-work-group-size"="false" }
@@ -199,11 +202,11 @@ define amdgpu_kernel void @kernel_lds_recursion() {
199202
; CHECK: [[META0:![0-9]+]] = !{i32 0, i32 1}
200203
; CHECK: [[META1:![0-9]+]] = !{i32 0}
201204
; CHECK: [[META2:![0-9]+]] = !{i32 1}
202-
; CHECK: [[META3:![0-9]+]] = !{!4}
203-
; CHECK: [[META4:![0-9]+]] = distinct !{!4, !5}
204-
; CHECK: [[META5:![0-9]+]] = distinct !{!5}
205-
; CHECK: [[META6:![0-9]+]] = !{!7}
206-
; CHECK: [[META7:![0-9]+]] = distinct !{!7, !5}
205+
; CHECK: [[META3:![0-9]+]] = !{!5}
206+
; CHECK: [[META4:![0-9]+]] = distinct !{!5, !6}
207+
; CHECK: [[META5:![0-9]+]] = distinct !{!6}
208+
; CHECK: [[META6:![0-9]+]] = !{!8}
209+
; CHECK: [[META7:![0-9]+]] = distinct !{!8, !6}
207210
; CHECK: [[META8:![0-9]+]] = !{i32 2}
208211
;.
209212
;; NOTE: These prefixes are unused and the list is autogenerated. Do not add tests below this line:

0 commit comments

Comments
 (0)