[Mlir-commits] [mlir] da0c21b - [mlir][gpu] Fix bug with GPU hardware intrinsic global location (#144923)
llvmlistbot at llvm.org
llvmlistbot at llvm.org
Sun Jun 22 21:09:47 PDT 2025
Author: Adam Straw
Date: 2025-06-22T22:09:44-06:00
New Revision: da0c21bd4b62ee2a4a2709f49ea8b19538d1588a
URL: https://github.com/llvm/llvm-project/commit/da0c21bd4b62ee2a4a2709f49ea8b19538d1588a
DIFF: https://github.com/llvm/llvm-project/commit/da0c21bd4b62ee2a4a2709f49ea8b19538d1588a.diff
LOG: [mlir][gpu] Fix bug with GPU hardware intrinsic global location (#144923)
Bug description: Hardware intrinsic functions created during GPU
conversion to NVVM may contain debug info metadata from the original
function which cannot be used out of that function.
Added:
Modified:
mlir/lib/Conversion/GPUCommon/OpToFuncCallLowering.h
mlir/test/Conversion/GPUToNVVM/gpu-to-nvvm-debuginfo.mlir
Removed:
################################################################################
diff --git a/mlir/lib/Conversion/GPUCommon/OpToFuncCallLowering.h b/mlir/lib/Conversion/GPUCommon/OpToFuncCallLowering.h
index 34150c4d13085..64cf09e600b88 100644
--- a/mlir/lib/Conversion/GPUCommon/OpToFuncCallLowering.h
+++ b/mlir/lib/Conversion/GPUCommon/OpToFuncCallLowering.h
@@ -164,7 +164,12 @@ struct OpToFuncCallLowering : public ConvertOpToLLVMPattern<SourceOp> {
auto parentFunc = op->getParentOfType<FunctionOpInterface>();
assert(parentFunc && "expected there to be a parent function");
OpBuilder b(parentFunc);
- return b.create<LLVMFuncOp>(op->getLoc(), funcName, funcType);
+
+ // Create a valid global location removing any metadata attached to the
+ // location as debug info metadata inside of a function cannot be used
+ // outside of that function.
+ auto globalloc = op->getLoc()->findInstanceOfOrUnknown<FileLineColLoc>();
+ return b.create<LLVMFuncOp>(globalloc, funcName, funcType);
}
StringRef getFunctionName(Type type, SourceOp op) const {
diff --git a/mlir/test/Conversion/GPUToNVVM/gpu-to-nvvm-debuginfo.mlir b/mlir/test/Conversion/GPUToNVVM/gpu-to-nvvm-debuginfo.mlir
index 08c5800fe93b3..5304abfb09a1e 100644
--- a/mlir/test/Conversion/GPUToNVVM/gpu-to-nvvm-debuginfo.mlir
+++ b/mlir/test/Conversion/GPUToNVVM/gpu-to-nvvm-debuginfo.mlir
@@ -23,3 +23,12 @@ gpu.module @test_module_1 {
gpu.return
}
}
+
+// Check that debug info metadata from the function is removed from the global location.
+gpu.module @test_module_2 {
+ // CHECK-DAG: llvm.func @__nv_abs(i32) -> i32 loc([[LOC]])
+ func.func @gpu_abs_with_loc(%arg_i32 : i32) -> (i32) {
+ %result32 = math.absi %arg_i32 : i32 loc(fused<#di_subprogram>[#loc])
+ func.return %result32 : i32
+ }
+}
More information about the Mlir-commits
mailing list