Handle review comments.

Separate out the aloca generation in separate function.

Author: abidh

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

@@ -20,4 +20,4 @@ function add(a, b) result(ret)
 !CHECK: ![[SP]] = {{.*}}!DISubprogram(name: "add"{{.*}})
 !CHECK: ![[A]] = !DILocalVariable(name: "a", arg: 1, scope: ![[SP]]{{.*}})
 !CHECK: ![[B]] = !DILocalVariable(name: "b", arg: 2, scope: ![[SP]]{{.*}})
-!CHECK: ![[RET]] = !DILocalVariable(name: "ret", scope: ![[SP]]{{.*}})
+!CHECK: ![[RET]] = !DILocalVariable(name: "ret", scope: ![[SP]]{{.*}})

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

@@ -5465,12 +5465,7 @@ static void updateDebugInfoForDeclareTargetVariables(
   }
 }
 
-// This function handle any adjustments needed in declare target function to
-// generate valid debug info for AMDGPU. It does 2 main things:
-// 1. Add alloca for arguments passed by reference.
-// 2. Add DIOp based expressions
-
-static void updateDebugInfoForDeclareTargetFunctions(
+static void addAllocasForDeclareTargetFunctionPointerArgs(
     llvm::Function *Fn, LLVM::ModuleTranslation &moduleTranslation) {
   llvm::OpenMPIRBuilder *ompBuilder = moduleTranslation.getOpenMPBuilder();
   llvm::Module &M = ompBuilder->M;
@@ -5528,6 +5523,18 @@ static void updateDebugInfoForDeclareTargetFunctions(
     }
   }
   builder.restoreIP(curInsert);
+}
+
+// This function Add DIOp based expressions to the debug records in the
+// declare target functions.
+
+static void updateDebugInfoForDeclareTargetFunctions(
+    llvm::Function *Fn, LLVM::ModuleTranslation &moduleTranslation) {
+  llvm::OpenMPIRBuilder *ompBuilder = moduleTranslation.getOpenMPBuilder();
+  llvm::Module &M = ompBuilder->M;
+
+  if (!llvm::Triple(M.getTargetTriple()).isAMDGPU())
+    return;
 
   auto AddExpression = [&](auto *DR) {
     llvm::DIExpression *Old = DR->getExpression();
@@ -5579,8 +5586,11 @@ convertDeclareTargetAttr(Operation *op, mlir::omp::DeclareTargetAttr attribute,
       if (declareType == omp::DeclareTargetDeviceType::host) {
         llvmFunc->dropAllReferences();
         llvmFunc->eraseFromParent();
-      } else
+      } else {
+        addAllocasForDeclareTargetFunctionPointerArgs(llvmFunc,
+                                                      moduleTranslation);
         updateDebugInfoForDeclareTargetFunctions(llvmFunc, moduleTranslation);
+      }
     }
     return success();
   }

mlir/test/Target/LLVMIR/omptarget-decl-target-fn-debug-amdgpu.mlir

@@ -31,6 +31,3 @@ module attributes {llvm.target_triple = "amdgcn-amd-amdhsa", omp.is_target_devic
 // CHECK: }
 // CHECK: ![[SP]] = {{.*}}!DISubprogram(name: "add"{{.*}})
 // CHECK: ![[A]] = !DILocalVariable(name: "a", arg: 1, scope: ![[SP]]{{.*}})
-
-
-