https://github.com/slinder1 updated
https://github.com/llvm/llvm-project/pull/126147
>From de86a2987ca66eafe5767e149ebc561c0c70158d Mon Sep 17 00:00:00 2001
From: Scott Linder <scott.lin...@amd.com>
Date: Wed, 5 Feb 2025 22:56:55 +0000
Subject: [PATCH 1/2] [AMDGPU] Remove dead function metadata after
amdgpu-lower-kernel-arguments
The verifier ensures function !dbg metadata is unique across the module,
so ensure the old nameless function we leave behind doesn't violate
this invariant.
Removing the function via e.g. eraseFromParent seems like a better
option, but doesn't seem to be legal from a FunctionPass.
---
llvm/lib/Target/AMDGPU/AMDGPULowerKernelArguments.cpp | 1 +
.../CodeGen/AMDGPU/preload-implicit-kernargs-debug-info.ll | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/llvm/lib/Target/AMDGPU/AMDGPULowerKernelArguments.cpp
b/llvm/lib/Target/AMDGPU/AMDGPULowerKernelArguments.cpp
index e9d009baa20af29..09412d1b0f1cc96 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPULowerKernelArguments.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPULowerKernelArguments.cpp
@@ -132,6 +132,7 @@ class PreloadKernelArgInfo {
NF->setAttributes(AL);
F.replaceAllUsesWith(NF);
F.setCallingConv(CallingConv::C);
+ F.clearMetadata();
return NF;
}
diff --git a/llvm/test/CodeGen/AMDGPU/preload-implicit-kernargs-debug-info.ll
b/llvm/test/CodeGen/AMDGPU/preload-implicit-kernargs-debug-info.ll
index a6a0b88dce125eb..8b75c383ae76496 100644
--- a/llvm/test/CodeGen/AMDGPU/preload-implicit-kernargs-debug-info.ll
+++ b/llvm/test/CodeGen/AMDGPU/preload-implicit-kernargs-debug-info.ll
@@ -1,7 +1,7 @@
-; RUN: not --crash opt -mtriple=amdgcn-amd-amdhsa -mcpu=gfx940
-passes='amdgpu-attributor,function(amdgpu-lower-kernel-arguments)'
-amdgpu-kernarg-preload-count=16 -S < %s 2>&1 | FileCheck %s
+; RUN: opt -mtriple=amdgcn-amd-amdhsa -mcpu=gfx940
-passes='amdgpu-attributor,function(amdgpu-lower-kernel-arguments)'
-amdgpu-kernarg-preload-count=16 -S < %s 2>&1 | FileCheck %s
-; CHECK: function declaration may only have a unique !dbg attachment
-; CHECK-NEXT: ptr @0
+; CHECK: define amdgpu_kernel void @preload_block_count_x{{.*}} !dbg ![[#]]
+; CHECK-NOT: declare void @0{{.*}} !dbg ![[#]]
define amdgpu_kernel void @preload_block_count_x(ptr addrspace(1) %out) !dbg
!4 !max_work_group_size !7 {
%imp_arg_ptr = call ptr addrspace(4) @llvm.amdgcn.implicitarg.ptr()
>From 2fe5d5c4e140d989b4643610e3846d122098fdb9 Mon Sep 17 00:00:00 2001
From: Scott Linder <scott.lin...@amd.com>
Date: Mon, 10 Feb 2025 22:47:15 +0000
Subject: [PATCH 2/2] Replace fragile CHECK-NOT with -implicit-check-not
---
.../CodeGen/AMDGPU/preload-implicit-kernargs-debug-info.ll | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/llvm/test/CodeGen/AMDGPU/preload-implicit-kernargs-debug-info.ll
b/llvm/test/CodeGen/AMDGPU/preload-implicit-kernargs-debug-info.ll
index 8b75c383ae76496..5727e2eaefa3896 100644
--- a/llvm/test/CodeGen/AMDGPU/preload-implicit-kernargs-debug-info.ll
+++ b/llvm/test/CodeGen/AMDGPU/preload-implicit-kernargs-debug-info.ll
@@ -1,7 +1,10 @@
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -mcpu=gfx940
-passes='amdgpu-attributor,function(amdgpu-lower-kernel-arguments)'
-amdgpu-kernarg-preload-count=16 -S < %s 2>&1 | FileCheck %s
+; RUN: opt -mtriple=amdgcn-amd-amdhsa -mcpu=gfx940
-passes='amdgpu-attributor,function(amdgpu-lower-kernel-arguments)'
-amdgpu-kernarg-preload-count=16 -S < %s 2>&1 \
+; RUN: | FileCheck -implicit-check-not='declare {{.*}} !dbg' %s
+
+; The real test is via the -implicit-check-not, which confirms we do not
+; leave behind a declaration which references the same DISubprogram metadata.
; CHECK: define amdgpu_kernel void @preload_block_count_x{{.*}} !dbg ![[#]]
-; CHECK-NOT: declare void @0{{.*}} !dbg ![[#]]
define amdgpu_kernel void @preload_block_count_x(ptr addrspace(1) %out) !dbg
!4 !max_work_group_size !7 {
%imp_arg_ptr = call ptr addrspace(4) @llvm.amdgcn.implicitarg.ptr()
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
