Skip to content

Commit 41eb8ab

Browse files
arsenmclaude
authored andcommitted
Automerge: AMDGPU: Migrate KernelInfo tests to new subarch triples (61) (#209867)
Co-authored-by: Claude (Opus 4.8) <noreply@anthropic.com>
2 parents 524b5c9 + 88acd42 commit 41eb8ab

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

llvm/test/Analysis/KernelInfo/enable-kernel-info/amdgpu.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
; REQUIRES: amdgpu-registered-target
44

55
; DEFINE: %{opt} = opt -disable-output %S/Inputs/test.ll \
6-
; DEFINE: -mtriple="amdgcn-amd-amdhsa" 2>&1
6+
; DEFINE: -mtriple="amdgpu-amd-amdhsa" 2>&1
77
; DEFINE: %{fcheck-on} = FileCheck -match-full-lines %S/Inputs/test.ll
88
; DEFINE: %{fcheck-off} = FileCheck -allow-empty -check-prefixes=NONE \
99
; DEFINE: %S/Inputs/test.ll

llvm/test/Analysis/KernelInfo/flat-addrspace/amdgpu.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
; REQUIRES: amdgpu-registered-target
77

88
; RUN: opt -pass-remarks=kernel-info -passes=kernel-info \
9-
; RUN: -mtriple="amdgcn-amd-amdhsa" \
9+
; RUN: -mtriple="amdgpu-amd-amdhsa" \
1010
; RUN: -disable-output %S/Inputs/test.ll 2>&1 | \
1111
; RUN: FileCheck -match-full-lines -implicit-check-not='flat address space' \
1212
; RUN: %S/Inputs/test.ll

llvm/test/Analysis/KernelInfo/launch-bounds/amdgpu.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
; RUN: -disable-output %s 2>&1 | \
77
; RUN: FileCheck -match-full-lines %s
88

9-
target triple = "amdgcn-amd-amdhsa"
9+
target triple = "amdgpu9-amd-amdhsa"
1010

1111
; CHECK: remark: test.c:10:0: in artificial function 'all', omp_target_num_teams = 100
1212
; CHECK: remark: test.c:10:0: in artificial function 'all', omp_target_thread_limit = 101

llvm/test/Analysis/KernelInfo/openmp/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ more exhaustively check KernelInfoPrinter features using reduced LLVM IR.
88
The LLVM IR in each test file `$TEST` can be regenerated as follows in the case
99
that Clang OpenMP codegen changes or it becomes desirable to adjust the source
1010
OpenMP program below. First, remove the existing LLVM IR from `$TEST`. Then,
11-
where `$TARGET` (e.g., `nvptx64-nvidia-cuda-sm_70` or `amdgcn-amd-amdhsa-gfx906`)
11+
where `$TARGET` (e.g., `nvptx64-nvidia-cuda-sm_70` or `amdgpu9.06-amd-amdhsa`)
1212
depends on `$TEST`:
1313

1414
```

llvm/test/Analysis/KernelInfo/openmp/amdgpu.ll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@
7979
; CHECK-NEXT: remark: test.c:3:0: in function 'g', FlatAddrspaceAccesses = 0
8080
; CHECK-NOT: {{.}}
8181

82-
; ModuleID = 'test-openmp-amdgcn-amd-amdhsa-gfx906.bc'
82+
; ModuleID = 'test-openmp-amdgpu9.06-amd-amdhsa-gfx906.bc'
8383
source_filename = "test.c"
84-
target triple = "amdgcn-amd-amdhsa"
84+
target triple = "amdgpu9.06-amd-amdhsa"
8585

8686
%struct.ident_t = type { i32, i32, i32, i32, ptr }
8787
%struct.DynamicEnvironmentTy = type { i16 }
@@ -156,10 +156,10 @@ define hidden void @g() #3 !dbg !43 {
156156
ret void, !dbg !52
157157
}
158158

159-
attributes #0 = { convergent noinline norecurse nounwind optnone "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="gfx906" "target-features"="+16-bit-insts,+ci-insts,+dl-insts,+dot1-insts,+dot10-insts,+dot2-insts,+dot7-insts,+dpp,+gfx8-insts,+gfx9-insts,+s-memrealtime,+s-memtime-inst,+wavefrontsize64" }
160-
attributes #1 = { convergent mustprogress noinline norecurse nounwind optnone "amdgpu-flat-work-group-size"="1,256" "frame-pointer"="all" "kernel" "no-trapping-math"="true" "omp_target_thread_limit"="256" "stack-protector-buffer-size"="8" "target-cpu"="gfx906" "target-features"="+16-bit-insts,+ci-insts,+dl-insts,+dot1-insts,+dot10-insts,+dot2-insts,+dot7-insts,+dpp,+gfx8-insts,+gfx9-insts,+s-memrealtime,+s-memtime-inst,+wavefrontsize64" "uniform-work-group-size" }
161-
attributes #2 = { convergent "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="gfx906" "target-features"="+16-bit-insts,+ci-insts,+dl-insts,+dot1-insts,+dot10-insts,+dot2-insts,+dot7-insts,+dpp,+gfx8-insts,+gfx9-insts,+s-memrealtime,+s-memtime-inst,+wavefrontsize64" }
162-
attributes #3 = { convergent noinline nounwind optnone "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="gfx906" "target-features"="+16-bit-insts,+ci-insts,+dl-insts,+dot1-insts,+dot10-insts,+dot2-insts,+dot7-insts,+dpp,+gfx8-insts,+gfx9-insts,+s-memrealtime,+s-memtime-inst,+wavefrontsize64" }
159+
attributes #0 = { convergent noinline norecurse nounwind optnone "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-features"="+16-bit-insts,+ci-insts,+dl-insts,+dot1-insts,+dot10-insts,+dot2-insts,+dot7-insts,+dpp,+gfx8-insts,+gfx9-insts,+s-memrealtime,+s-memtime-inst,+wavefrontsize64" }
160+
attributes #1 = { convergent mustprogress noinline norecurse nounwind optnone "amdgpu-flat-work-group-size"="1,256" "frame-pointer"="all" "kernel" "no-trapping-math"="true" "omp_target_thread_limit"="256" "stack-protector-buffer-size"="8" "target-features"="+16-bit-insts,+ci-insts,+dl-insts,+dot1-insts,+dot10-insts,+dot2-insts,+dot7-insts,+dpp,+gfx8-insts,+gfx9-insts,+s-memrealtime,+s-memtime-inst,+wavefrontsize64" "uniform-work-group-size" }
161+
attributes #2 = { convergent "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-features"="+16-bit-insts,+ci-insts,+dl-insts,+dot1-insts,+dot10-insts,+dot2-insts,+dot7-insts,+dpp,+gfx8-insts,+gfx9-insts,+s-memrealtime,+s-memtime-inst,+wavefrontsize64" }
162+
attributes #3 = { convergent noinline nounwind optnone "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-features"="+16-bit-insts,+ci-insts,+dl-insts,+dot1-insts,+dot10-insts,+dot2-insts,+dot7-insts,+dpp,+gfx8-insts,+gfx9-insts,+s-memrealtime,+s-memtime-inst,+wavefrontsize64" }
163163
attributes #4 = { convergent }
164164
attributes #5 = { nounwind }
165165

0 commit comments

Comments
 (0)