[mlir][OpenMP] Use correct debug location with link clause. #145026

abidh · 2025-06-20T11:31:51Z

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

When compiled with
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 caused an invalid location to be attached to the instruction.

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.

llvmbot · 2025-06-20T11:32:20Z

@llvm/pr-subscribers-mlir-llvm
@llvm/pr-subscribers-mlir-openmp

@llvm/pr-subscribers-mlir

Author: Abid Qadeer (abidh)

Changes

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

When compiled with
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 caused an invalid location to be attached to the instruction.

Full diff: https://github.com/llvm/llvm-project/pull/145026.diff

2 Files Affected:

(modified) mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp (+2)
(added) mlir/test/Target/LLVMIR/omptarget-debug-map-link-loc.mlir (+40)

diff --git a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
index 90ce06a0345c0..63f7fa1638904 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
@@ -4808,6 +4808,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
@@ -4842,6 +4843,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])

llvmbot · 2025-06-20T11:32:21Z

@llvm/pr-subscribers-flang-openmp

Author: Abid Qadeer (abidh)

Changes

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

When compiled with
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 caused an invalid location to be attached to the instruction.

Full diff: https://github.com/llvm/llvm-project/pull/145026.diff

2 Files Affected:

(modified) mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp (+2)
(added) mlir/test/Target/LLVMIR/omptarget-debug-map-link-loc.mlir (+40)

diff --git a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
index 90ce06a0345c0..63f7fa1638904 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
@@ -4808,6 +4808,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
@@ -4842,6 +4843,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])

bhandarkar-pranav

LGTM

abidh · 2025-06-25T16:11:44Z

I noticed that it causes a sanitizer fail on the newly added test. I am investigating.

qinkunbao · 2025-06-25T16:56:29Z

I noticed that it causes a sanitizer fail on the newly added test. I am investigating.

Hi, if the failure can’t be quickly fixed, do you mind reverting the PR first?

…145026)" This reverts commit 0060376.

…145768) Reverts #145026 Caused a CI failure on https://lab.llvm.org/buildbot/#/builders/169/builds/12504.

abidh · 2025-06-25T19:07:09Z

I noticed that it causes a sanitizer fail on the newly added test. I am investigating.

Hi, if the failure can’t be quickly fixed, do you mind reverting the PR first?

Done.

…k clause." (#145768) Reverts llvm/llvm-project#145026 Caused a CI failure on https://lab.llvm.org/buildbot/#/builders/169/builds/12504.

The code in OpenMPIRBuilder::getTargetEntryUniqueInfo calls ID.getDevice() even when getUniqueID has failed and ID is un-initialized. This caused a sanitizer fail for me in llvm#145026. Fix it by giving a default value to ID. The value chosen is the same as used in OpenMPToLLVMIRTranslation.cpp.

The code in `OpenMPIRBuilder::getTargetEntryUniqueInfo` calls `ID.getDevice()` even when `getUniqueID` has failed and ID is un-initialized. This caused a sanitizer fail for me in #145026. Fix it by giving a default value to `ID`. The value chosen is the same as used in `OpenMPToLLVMIRTranslation.cpp`.

The code in `OpenMPIRBuilder::getTargetEntryUniqueInfo` calls `ID.getDevice()` even when `getUniqueID` has failed and ID is un-initialized. This caused a sanitizer fail for me in llvm/llvm-project#145026. Fix it by giving a default value to `ID`. The value chosen is the same as used in `OpenMPToLLVMIRTranslation.cpp`.

…145889) #145026 was reverted because it failed a sanitizer test. That issue has been fixed in #145883.

… clause. (#145889) llvm/llvm-project#145026 was reverted because it failed a sanitizer test. That issue has been fixed in llvm/llvm-project#145883.

) 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 ``` When compiled with `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 caused an invalid location to be attached to the instruction.

…lvm#145768) Reverts llvm#145026 Caused a CI failure on https://lab.llvm.org/buildbot/#/builders/169/builds/12504.

The code in `OpenMPIRBuilder::getTargetEntryUniqueInfo` calls `ID.getDevice()` even when `getUniqueID` has failed and ID is un-initialized. This caused a sanitizer fail for me in llvm#145026. Fix it by giving a default value to `ID`. The value chosen is the same as used in `OpenMPToLLVMIRTranslation.cpp`.

…lvm#145889) llvm#145026 was reverted because it failed a sanitizer test. That issue has been fixed in llvm#145883.

abidh requested review from skatrak, tblah, agozillon and bhandarkar-pranav June 20, 2025 11:31

llvmbot added mlir:llvm mlir mlir:openmp flang:openmp labels Jun 20, 2025

bhandarkar-pranav approved these changes Jun 25, 2025

View reviewed changes

abidh merged commit 0060376 into llvm:main Jun 25, 2025
12 checks passed

abidh added a commit that referenced this pull request Jun 25, 2025

Revert "[mlir][OpenMP] Use correct debug location with link clause. (#…

f7f43d7

…145026)" This reverts commit 0060376.

abidh mentioned this pull request Jun 25, 2025

Revert "[mlir][OpenMP] Use correct debug location with link clause." #145768

Merged

abidh added a commit that referenced this pull request Jun 25, 2025

Revert "[mlir][OpenMP] Use correct debug location with link clause." (#…

a75279e

…145768) Reverts #145026 Caused a CI failure on https://lab.llvm.org/buildbot/#/builders/169/builds/12504.

abidh mentioned this pull request Jun 26, 2025

[OMPIRBuilder] Fix use of uninitialized variable. #145883

Merged

abidh mentioned this pull request Jun 26, 2025

Reland [mlir][OpenMP] Use correct debug location with link clause. #145889

Merged

abidh added a commit that referenced this pull request Jun 26, 2025

Reland [mlir][OpenMP] Use correct debug location with link clause. (#…

232c292

…145889) #145026 was reverted because it failed a sanitizer test. That issue has been fixed in #145883.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[mlir][OpenMP] Use correct debug location with link clause. #145026

[mlir][OpenMP] Use correct debug location with link clause. #145026

Uh oh!

abidh commented Jun 20, 2025

Uh oh!

llvmbot commented Jun 20, 2025 •

edited

Loading

Uh oh!

llvmbot commented Jun 20, 2025

Uh oh!

bhandarkar-pranav left a comment

Uh oh!

Uh oh!

abidh commented Jun 25, 2025

Uh oh!

qinkunbao commented Jun 25, 2025

Uh oh!

abidh commented Jun 25, 2025

Uh oh!

Uh oh!

[mlir][OpenMP] Use correct debug location with link clause. #145026

[mlir][OpenMP] Use correct debug location with link clause. #145026

Uh oh!

Conversation

abidh commented Jun 20, 2025

Uh oh!

llvmbot commented Jun 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented Jun 20, 2025

Uh oh!

bhandarkar-pranav left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

abidh commented Jun 25, 2025

Uh oh!

qinkunbao commented Jun 25, 2025

Uh oh!

abidh commented Jun 25, 2025

Uh oh!

Uh oh!

llvmbot commented Jun 20, 2025 •

edited

Loading