Add methods to operation to test if the mold arg is read

Author: tblah

flang/lib/Lower/OpenMP/DataSharingProcessor.cpp

@@ -594,7 +594,7 @@ void DataSharingProcessor::doPrivatize(const semantics::Symbol *sym,
           sym, cannotHaveNonDefaultLowerBounds);
       // TODO: currently there are false positives from dead uses of the mold
       // arg
-      if (!result.getInitMoldArg().getUses().empty())
+      if (result.initReadsFromMold())
         mightHaveReadHostSym.insert(sym);
     }
 

mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td

@@ -146,13 +146,24 @@ def PrivateClauseOp : OpenMP_Op<"private", [IsolatedFromAbove, RecipeInterface]>
       return region.empty() ? nullptr : region.getArgument(0);
     }
 
+    /// Returns true if the init region might read from the mold argument
+    bool initReadsFromMold() {
+      BlockArgument moldArg = getInitMoldArg();
+      return moldArg ? !moldArg.use_empty() : false;
+    }
+
+    /// Returns true if any region of this privatizer might read from the mold
+    /// argument
+    bool readsFromMold() {
+      return initReadsFromMold() || !getCopyRegion().empty();
+    }
+
     /// needsMap returns true if the value being privatized should additionally
     /// be mapped to the target region using a MapInfoOp. This is most common
     /// when an allocatable is privatized. In such cases, the descriptor is used
     /// in privatization and needs to be mapped on to the device.
     bool needsMap() {
-      BlockArgument moldArg = getInitMoldArg();
-      return moldArg ? !moldArg.use_empty() : false;
+      return initReadsFromMold();
     }
 
     /// Get the type for arguments to nested regions. This should

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

@@ -1755,20 +1755,6 @@ buildDependData(std::optional<ArrayAttr> dependKinds, OperandRange dependVars,
   }
 }
 
-static bool privatizerReadsSourceVariable(omp::PrivateClauseOp &priv) {
-  if (priv.getDataSharingType() == omp::DataSharingClauseType::FirstPrivate)
-    return true;
-
-  Region &initRegion = priv.getInitRegion();
-  if (initRegion.empty())
-    return false;
-
-  BlockArgument sourceVariable = priv.getInitMoldArg();
-  if (!sourceVariable)
-    return false;
-  return !sourceVariable.use_empty();
-}
-
 namespace {
 /// TaskContextStructManager takes care of creating and freeing a structure
 /// containing information needed by the task body to execute.
@@ -1821,7 +1807,7 @@ void TaskContextStructManager::generateTaskContextStruct() {
   for (omp::PrivateClauseOp &privOp : privateDecls) {
     // Skip private variables which can safely be allocated and initialised
     // inside of the task
-    if (!privatizerReadsSourceVariable(privOp))
+    if (!privOp.readsFromMold())
       continue;
     Type mlirType = privOp.getType();
     privateVarTypes.push_back(moduleTranslation.convertType(mlirType));
@@ -1853,7 +1839,7 @@ void TaskContextStructManager::createGEPsToPrivateVars(
   llvm::Value *zero = builder.getInt32(0);
   unsigned i = 0;
   for (auto privDecl : privateDecls) {
-    if (!privatizerReadsSourceVariable(privDecl)) {
+    if (!privDecl.readsFromMold()) {
       // Handle this inside of the task so we don't pass unnessecary vars in
       llvmPrivateVars.push_back(nullptr);
       continue;
@@ -2008,7 +1994,7 @@ convertOmpTaskOp(omp::TaskOp taskOp, llvm::IRBuilderBase &builder,
     llvm::BasicBlock *privInitBlock = nullptr;
     for (auto [blockArg, privDecl, mlirPrivVar] :
          llvm::zip_equal(privateBlockArgs, privateDecls, mlirPrivateVars)) {
-      if (privatizerReadsSourceVariable(privDecl))
+      if (privDecl.readsFromMold())
         // This is handled before the task executes
         continue;