[Mlir-commits] [mlir] Reland [mlir][OpenMP] Use correct debug location with link clause. (PR #145889)
Abid Qadeer
llvmlistbot at llvm.org
Thu Jun 26 06:14:15 PDT 2025
https://github.com/abidh created https://github.com/llvm/llvm-project/pull/145889
This was reverted because it failed a sanitizer test. I am fixing the sanitizer issue in https://github.com/llvm/llvm-project/pull/145883.
>From b863375425539ad67192381a2cee3badc132f115 Mon Sep 17 00:00:00 2001
From: Abid Qadeer <haqadeer at amd.com>
Date: Fri, 20 Jun 2025 12:17:00 +0100
Subject: [PATCH 1/2] [mlir][OpenMP] Use correct debug location with link
clause.
Please see the following program.
module test_0
INTEGER :: sp = 1
!$omp declare target link(sp)
end module test_0
program main
use test_0
integer :: new_len
!$omp target map(tofrom:new_len) map(tofrom:sp)
new_len = sp
!$omp end target
print *, new_len
print *, sp
end program
flang -g -O0 -fopenmp --offload-arch=gfx1100
will fail the compilation with the following error:
dbg attachment points at wrong subprogram for function
The reason is that with the link clause on !$omp declare target, an
extra load instruction is inserted. But the debug location was not
updated before insertion which cuased it to have an invalid debug
location.
---
.../OpenMP/OpenMPToLLVMIRTranslation.cpp | 2 +
.../LLVMIR/omptarget-debug-map-link-loc.mlir | 40 +++++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100644 mlir/test/Target/LLVMIR/omptarget-debug-map-link-loc.mlir
diff --git a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
index 23140f22555a5..3806db3ceab25 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
@@ -4831,6 +4831,7 @@ handleDeclareTargetMapVar(MapInfoData &mapData,
llvm::IRBuilderBase &builder, llvm::Function *func) {
assert(moduleTranslation.getOpenMPBuilder()->Config.isTargetDevice() &&
"function only supported for target device codegen");
+ llvm::IRBuilderBase::InsertPointGuard guard(builder);
for (size_t i = 0; i < mapData.MapClause.size(); ++i) {
// In the case of declare target mapped variables, the basePointer is
// the reference pointer generated by the convertDeclareTargetAttr
@@ -4865,6 +4866,7 @@ handleDeclareTargetMapVar(MapInfoData &mapData,
for (llvm::User *user : userVec) {
if (auto *insn = dyn_cast<llvm::Instruction>(user)) {
if (insn->getFunction() == func) {
+ builder.SetCurrentDebugLocation(insn->getDebugLoc());
auto *load = builder.CreateLoad(mapData.BasePointers[i]->getType(),
mapData.BasePointers[i]);
load->moveBefore(insn->getIterator());
diff --git a/mlir/test/Target/LLVMIR/omptarget-debug-map-link-loc.mlir b/mlir/test/Target/LLVMIR/omptarget-debug-map-link-loc.mlir
new file mode 100644
index 0000000000000..89fc1dde4b6cb
--- /dev/null
+++ b/mlir/test/Target/LLVMIR/omptarget-debug-map-link-loc.mlir
@@ -0,0 +1,40 @@
+// RUN: mlir-translate -mlir-to-llvmir %s
+
+module attributes {dlti.dl_spec = #dlti.dl_spec<#dlti.dl_entry<"dlti.alloca_memory_space", 5 : ui32>>, llvm.target_triple = "amdgcn-amd-amdhsa", omp.is_target_device = true} {
+ llvm.mlir.global external @_QMtest_0Esp() {addr_space = 1 : i32, omp.declare_target = #omp.declaretarget<device_type = (any), capture_clause = (link)>} : i32 {
+ %0 = llvm.mlir.constant(1 : i32) : i32 loc(#loc1)
+ llvm.return %0 : i32 loc(#loc1)
+ } loc(#loc1)
+ llvm.func @_QQmain() {
+ %0 = llvm.mlir.constant(1 : i64) : i64
+ %1 = llvm.alloca %0 x i32 : (i64) -> !llvm.ptr<5> loc(#loc2)
+ %2 = llvm.addrspacecast %1 : !llvm.ptr<5> to !llvm.ptr loc(#loc2)
+ %5 = llvm.mlir.addressof @_QMtest_0Esp : !llvm.ptr<1> loc(#loc1)
+ %6 = llvm.addrspacecast %5 : !llvm.ptr<1> to !llvm.ptr loc(#loc1)
+ %7 = omp.map.info var_ptr(%2 : !llvm.ptr, i32) map_clauses(tofrom) capture(ByRef) -> !llvm.ptr loc(#loc3)
+ %8 = omp.map.info var_ptr(%6 : !llvm.ptr, i32) map_clauses(tofrom) capture(ByRef) -> !llvm.ptr loc(#loc3)
+ omp.target map_entries(%7 -> %arg0, %8 -> %arg1 : !llvm.ptr, !llvm.ptr) {
+ %16 = llvm.load %arg1 : !llvm.ptr -> i32 loc(#loc5)
+ llvm.store %16, %arg0 : i32, !llvm.ptr loc(#loc5)
+ omp.terminator loc(#loc5)
+ } loc(#loc5)
+ llvm.return loc(#loc6)
+ } loc(#loc15)
+}
+#di_file = #llvm.di_file<"target7.f90" in "">
+#di_null_type = #llvm.di_null_type
+#di_compile_unit = #llvm.di_compile_unit<id = distinct[0]<>,
+ sourceLanguage = DW_LANG_Fortran95, file = #di_file, producer = "flang",
+ isOptimized = false, emissionKind = LineTablesOnly>
+#di_subroutine_type = #llvm.di_subroutine_type<
+ callingConvention = DW_CC_program, types = #di_null_type>
+#di_subprogram = #llvm.di_subprogram<id = distinct[1]<>,
+ compileUnit = #di_compile_unit, scope = #di_file, name = "main",
+ file = #di_file, subprogramFlags = "Definition|MainSubprogram",
+ type = #di_subroutine_type>
+#loc1 = loc("test.f90":3:18)
+#loc2 = loc("test.f90":7:7)
+#loc3 = loc("test.f90":9:18)
+#loc5 = loc("test.f90":11:7)
+#loc6 = loc("test.f90":12:7)
+#loc15 = loc(fused<#di_subprogram>[#loc2])
>From d901d586f4f6d2d64b5a3636c5f646331167bbf6 Mon Sep 17 00:00:00 2001
From: Abid Qadeer <haqadeer at amd.com>
Date: Thu, 26 Jun 2025 13:35:23 +0100
Subject: [PATCH 2/2] Adjust testcase to avoid sanitizer error.
The OpenMPIRBuilder::getTargetEntryUniqueInfo has a problem where a
variable could be used uninitialized. My testcase earlier exposed that
issue. That problem is being fixed in a separate PR. This adjusts the
testcase to pass.
---
.../Target/LLVMIR/omptarget-debug-map-link-loc.mlir | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/mlir/test/Target/LLVMIR/omptarget-debug-map-link-loc.mlir b/mlir/test/Target/LLVMIR/omptarget-debug-map-link-loc.mlir
index 89fc1dde4b6cb..a41766e9c1852 100644
--- a/mlir/test/Target/LLVMIR/omptarget-debug-map-link-loc.mlir
+++ b/mlir/test/Target/LLVMIR/omptarget-debug-map-link-loc.mlir
@@ -1,16 +1,15 @@
// RUN: mlir-translate -mlir-to-llvmir %s
module attributes {dlti.dl_spec = #dlti.dl_spec<#dlti.dl_entry<"dlti.alloca_memory_space", 5 : ui32>>, llvm.target_triple = "amdgcn-amd-amdhsa", omp.is_target_device = true} {
- llvm.mlir.global external @_QMtest_0Esp() {addr_space = 1 : i32, omp.declare_target = #omp.declaretarget<device_type = (any), capture_clause = (link)>} : i32 {
- %0 = llvm.mlir.constant(1 : i32) : i32 loc(#loc1)
- llvm.return %0 : i32 loc(#loc1)
- } loc(#loc1)
+ llvm.mlir.global external @_QMtest_0Esp() {addr_space = 0 : i32, omp.declare_target = #omp.declaretarget<device_type = (any), capture_clause = (link)>} : i32 {
+ %0 = llvm.mlir.constant(1 : i32) : i32
+ llvm.return %0 : i32
+ }
llvm.func @_QQmain() {
%0 = llvm.mlir.constant(1 : i64) : i64
%1 = llvm.alloca %0 x i32 : (i64) -> !llvm.ptr<5> loc(#loc2)
%2 = llvm.addrspacecast %1 : !llvm.ptr<5> to !llvm.ptr loc(#loc2)
- %5 = llvm.mlir.addressof @_QMtest_0Esp : !llvm.ptr<1> loc(#loc1)
- %6 = llvm.addrspacecast %5 : !llvm.ptr<1> to !llvm.ptr loc(#loc1)
+ %6 = llvm.mlir.addressof @_QMtest_0Esp : !llvm.ptr loc(#loc1)
%7 = omp.map.info var_ptr(%2 : !llvm.ptr, i32) map_clauses(tofrom) capture(ByRef) -> !llvm.ptr loc(#loc3)
%8 = omp.map.info var_ptr(%6 : !llvm.ptr, i32) map_clauses(tofrom) capture(ByRef) -> !llvm.ptr loc(#loc3)
omp.target map_entries(%7 -> %arg0, %8 -> %arg1 : !llvm.ptr, !llvm.ptr) {
More information about the Mlir-commits
mailing list