[flang][OpenMP][debug] Add DIOp expression for declare target variables. (#590)

It mimics the DIOp-based expression that clang generates for such variable. With this change in place, I see the correct value of the declare target variables in the debugger.

Author: abidh

flang/test/Integration/amdgpu/debug-declare-target-var.f90

@@ -0,0 +1,23 @@
+! RUN: %flang_fc1 -triple amdgcn-amd-amdhsa -emit-llvm -fopenmp  -fopenmp-is-target-device -debug-info-kind=standalone %s -o - | FileCheck  %s
+
+module helper
+  implicit none
+  real var_x
+  real var_y
+  !$omp declare target(var_x)
+  !$omp declare target(var_y)
+end module helper
+
+subroutine init()
+  use helper
+  !$omp declare target
+  var_x = 3.14
+  var_y = 0.25
+end
+
+! CHECK-DAG: @_QMhelperEvar_x = addrspace(1) {{.*}}!dbg ![[XE:[0-9]+]]
+! CHECK-DAG: @_QMhelperEvar_y = addrspace(1) {{.*}}!dbg ![[YE:[0-9]+]]
+! CHECK-DAG: ![[XE]] = !DIGlobalVariableExpression(var: ![[X:[0-9]+]], expr: !DIExpression(DIOpArg(0, ptr addrspace(1)), DIOpDeref(ptr addrspace(1))))
+! CHECK-DAG: ![[YE]] = !DIGlobalVariableExpression(var: ![[Y:[0-9]+]], expr: !DIExpression(DIOpArg(0, ptr addrspace(1)), DIOpDeref(ptr addrspace(1))))
+! CHECK-DAG: ![[X]] = {{.*}}!DIGlobalVariable(name: "var_x"{{.*}})
+! CHECK-DAG: ![[Y]] = {{.*}}!DIGlobalVariable(name: "var_y"{{.*}})

mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp

@@ -5104,6 +5104,33 @@ convertOmpTarget(Operation &opInst, llvm::IRBuilderBase &builder,
   return success();
 }
 
+// Add DIOp based expression in the declare target variables for AMDGPU target.
+static void updateDebugInfoForDeclareTargetVariables(
+    LLVM::GlobalOp globalOp, LLVM::ModuleTranslation &moduleTranslation) {
+  llvm::Module *M = moduleTranslation.getLLVMModule();
+  if (!llvm::Triple(M->getTargetTriple()).isAMDGPU())
+    return;
+
+  llvm::GlobalVariable *GV = M->getGlobalVariable(globalOp.getSymName());
+  if (GV) {
+    llvm::SmallVector<llvm::DIGlobalVariableExpression *> GVEs;
+    GV->getDebugInfo(GVEs);
+    GV->eraseMetadata(llvm::LLVMContext::MD_dbg);
+    llvm::DIExprBuilder ExprBuilder(M->getContext());
+    unsigned int globalAS = M->getDataLayout().getDefaultGlobalsAddressSpace();
+    auto ptrTy = llvm::PointerType::get(M->getContext(), globalAS);
+    ExprBuilder.append<llvm::DIOp::Arg>(0u, ptrTy);
+    ExprBuilder.append<llvm::DIOp::Deref>(GV->getType());
+    for (auto *GVE : GVEs) {
+      llvm::DIExpression *Old = GVE->getExpression();
+      assert((Old == nullptr) || (Old->getNumElements() == 0));
+      auto *newGVE = llvm::DIGlobalVariableExpression::get(
+          M->getContext(), GVE->getVariable(), ExprBuilder.intoExpression());
+      GV->addDebugInfo(newGVE);
+    }
+  }
+}
+
 static LogicalResult
 convertDeclareTargetAttr(Operation *op, mlir::omp::DeclareTargetAttr attribute,
                          LLVM::ModuleTranslation &moduleTranslation) {
@@ -5135,6 +5162,7 @@ convertDeclareTargetAttr(Operation *op, mlir::omp::DeclareTargetAttr attribute,
 
   if (LLVM::GlobalOp gOp = dyn_cast<LLVM::GlobalOp>(op)) {
     llvm::Module *llvmModule = moduleTranslation.getLLVMModule();
+    updateDebugInfoForDeclareTargetVariables(gOp, moduleTranslation);
     if (auto *gVal = llvmModule->getNamedValue(gOp.getSymName())) {
       llvm::OpenMPIRBuilder *ompBuilder = moduleTranslation.getOpenMPBuilder();
       bool isDeclaration = gOp.isDeclaration();