Post-merge fixes

Author: ergawy

flang/include/flang/Lower/OpenMP/Utils.h

@@ -98,62 +98,50 @@ struct OmpMapParentAndMemberData {
   // Placement of the member in the member vector.
   llvm::SmallVector<mlir::omp::MapInfoOp> memberMap;
 
-  // The list of associated parent object symbols. used to track data we
-  // need for various parent processing tasks when performing member
-  // mapping, the main example currently being re-evaluating the parent
-  // maps bounds at the final step of map processing, where we need to
-  // keep a hold of all of the omp::Object's which contain array bounds
-  // for the respective parent to calculate the final bounds from.
-  //
-  // As an Example:
-  //
-  // !$omp target map(tofrom: alloca_dtype_arr(2)%array_i,
-  // alloca_dtype_arr(3)%array_i)
-  //
-  // parentObjList will contain alloca_dtype_arr(3) as well as
-  // alloca_dtype_arr(2).
-  ObjectList parentObjList;
+  bool isDuplicateMemberMapInfo(llvm::SmallVectorImpl<int64_t> &memberIndices) {
+    return llvm::find_if(memberPlacementIndices, [&](auto &memberData) {
+             return llvm::equal(memberIndices, memberData);
+           }) != memberPlacementIndices.end();
+  }
+
+  void addChildIndexAndMapToParent(const omp::Object &object,
+                                   mlir::omp::MapInfoOp &mapOp,
+                                   semantics::SemanticsContext &semaCtx);
 };
 
+mlir::omp::MapInfoOp
+createMapInfoOp(fir::FirOpBuilder &builder, mlir::Location loc,
+                mlir::Value baseAddr, mlir::Value varPtrPtr,
+                llvm::StringRef name, llvm::ArrayRef<mlir::Value> bounds,
+                llvm::ArrayRef<mlir::Value> members,
+                mlir::ArrayAttr membersIndex, uint64_t mapType,
+                mlir::omp::VariableCaptureKind mapCaptureType, mlir::Type retTy,
+                bool partialMap = false);
+
+void insertChildMapInfoIntoParent(
+    Fortran::lower::AbstractConverter &converter,
+    Fortran::semantics::SemanticsContext &semaCtx,
+    Fortran::lower::StatementContext &stmtCtx,
+    std::map<Object, OmpMapParentAndMemberData> &parentMemberIndices,
+    llvm::SmallVectorImpl<mlir::Value> &mapOperands,
+    llvm::SmallVectorImpl<const semantics::Symbol *> &mapSyms);
+
 void generateMemberPlacementIndices(
     const Object &object, llvm::SmallVectorImpl<int64_t> &indices,
     Fortran::semantics::SemanticsContext &semaCtx);
 
 bool isMemberOrParentAllocatableOrPointer(
     const Object &object, Fortran::semantics::SemanticsContext &semaCtx);
 
-bool isDuplicateMemberMapInfo(OmpMapParentAndMemberData &parentMembers,
-                              llvm::SmallVectorImpl<int64_t> &memberIndices);
-
-mlir::omp::MapInfoOp createMapInfoOp(
-    fir::FirOpBuilder &builder, mlir::Location loc, mlir::Value baseAddr,
-    mlir::Value varPtrPtr, std::string name, mlir::ArrayRef<mlir::Value> bounds,
-    mlir::ArrayRef<mlir::Value> members, mlir::ArrayAttr membersIndex,
-    uint64_t mapType, mlir::omp::VariableCaptureKind mapCaptureType,
-    mlir::Type retTy, bool partialMap = false);
-
 mlir::Value createParentSymAndGenIntermediateMaps(
     mlir::Location clauseLocation, Fortran::lower::AbstractConverter &converter,
     semantics::SemanticsContext &semaCtx, lower::StatementContext &stmtCtx,
-    omp::ObjectList &objectList, llvm::SmallVector<int64_t> &indices,
-    OmpMapParentAndMemberData &parentMemberIndices, std::string asFortran,
+    omp::ObjectList &objectList, llvm::SmallVectorImpl<int64_t> &indices,
+    OmpMapParentAndMemberData &parentMemberIndices, llvm::StringRef asFortran,
     llvm::omp::OpenMPOffloadMappingFlags mapTypeBits);
 
-omp::ObjectList gatherObjects(omp::Object obj,
-                              semantics::SemanticsContext &semaCtx);
-
-void addChildIndexAndMapToParent(const omp::Object &object,
-                                 OmpMapParentAndMemberData &parentMemberIndices,
-                                 mlir::omp::MapInfoOp &mapOp,
-                                 semantics::SemanticsContext &semaCtx);
-
-void insertChildMapInfoIntoParent(
-    Fortran::lower::AbstractConverter &converter,
-    Fortran::semantics::SemanticsContext &semaCtx,
-    Fortran::lower::StatementContext &stmtCtx,
-    std::map<Object, OmpMapParentAndMemberData> &parentMemberIndices,
-    llvm::SmallVectorImpl<mlir::Value> &mapOperands,
-    llvm::SmallVectorImpl<const Fortran::semantics::Symbol *> &mapSymbols);
+omp::ObjectList gatherObjectsOf(omp::Object derivedTypeMember,
+                                semantics::SemanticsContext &semaCtx);
 
 mlir::Type getLoopVarType(lower::AbstractConverter &converter,
                           std::size_t loopVarTypeSize);

flang/lib/Lower/OpenMP/OpenMP.cpp

@@ -1918,7 +1918,8 @@ static void genLoopOp(lower::AbstractConverter &converter,
   DataSharingProcessor dsp(converter, semaCtx, item->clauses, eval,
                            /*shouldCollectPreDeterminedSymbols=*/true,
                            /*useDelayedPrivatization=*/true, &symTable);
-  dsp.processStep1(&loopClauseOps);
+  dsp.processStep1();
+  dsp.processStep2(&loopClauseOps);
 
   mlir::omp::LoopNestOperands loopNestClauseOps;
   llvm::SmallVector<const semantics::Symbol *> iv;

flang/lib/Lower/OpenMP/Utils.cpp

@@ -583,8 +583,6 @@ void insertChildMapInfoIntoParent(
           info.rawInput.getType(),
           /*partialMap=*/true);
 
-      extendBoundsFromMultipleSubscripts(converter, stmtCtx, mapOp,
-                                         indices.second.parentObjList);
       mapOperands.push_back(mapOp);
       mapSyms.push_back(indices.first.sym());
     }

flang/lib/Optimizer/OpenMP/MapInfoFinalization.cpp

@@ -319,9 +319,6 @@ class MapInfoFinalizationPass
     return newDescParentMapOp;
   }
 
-
-
-
   // We add all mapped record members not directly used in the target region
   // to the block arguments in front of their parent and we place them into
   // the map operands list for consistency.
@@ -373,50 +370,47 @@ class MapInfoFinalizationPass
     if (!mapClauseOwner)
       return;
 
-    auto addOperands = [&](mlir::MutableOperandRange &mutableOpRange,
+    auto addOperands = [&](mlir::MutableOperandRange &mapVarsArr,
                            mlir::Operation *directiveOp,
                            unsigned blockArgInsertIndex = 0) {
-      if (!llvm::is_contained(mutableOpRange.getAsOperandRange(),
-                              op.getResult()))
+      if (!llvm::is_contained(mapVarsArr.getAsOperandRange(), op.getResult()))
         return;
 
       // There doesn't appear to be a simple way to convert MutableOperandRange
       // to a vector currently, so we instead use a for_each to populate our
       // vector.
       llvm::SmallVector<mlir::Value> newMapOps;
-      newMapOps.reserve(mutableOpRange.size());
+      newMapOps.reserve(mapVarsArr.size());
       llvm::for_each(
-          mutableOpRange.getAsOperandRange(),
+          mapVarsArr.getAsOperandRange(),
           [&newMapOps](mlir::Value oper) { newMapOps.push_back(oper); });
 
       for (auto mapMember : op.getMembers()) {
-        if (llvm::is_contained(mutableOpRange.getAsOperandRange(), mapMember))
+        if (llvm::is_contained(mapVarsArr.getAsOperandRange(), mapMember))
           continue;
         newMapOps.push_back(mapMember);
         if (directiveOp) {
           directiveOp->getRegion(0).insertArgument(
               blockArgInsertIndex, mapMember.getType(), mapMember.getLoc());
           blockArgInsertIndex++;
         }
-        newMapOps.push_back(mapVar.get());
       }
 
-      mutableOpRange.assign(newMapOps);
+      mapVarsArr.assign(newMapOps);
     };
 
     auto argIface =
         llvm::dyn_cast<mlir::omp::BlockArgOpenMPOpInterface>(target);
 
     if (auto mapClauseOwner =
             llvm::dyn_cast<mlir::omp::MapClauseOwningOpInterface>(target)) {
-      mlir::MutableOperandRange mapMutableOpRange =
-          mapClauseOwner.getMapVarsMutable();
+      mlir::MutableOperandRange mapVarsArr = mapClauseOwner.getMapVarsMutable();
       unsigned blockArgInsertIndex =
           argIface
               ? argIface.getMapBlockArgsStart() + argIface.numMapBlockArgs()
               : 0;
       addOperands(
-          mapMutableOpRange,
+          mapVarsArr,
           llvm::dyn_cast_or_null<mlir::omp::TargetOp>(argIface.getOperation()),
           blockArgInsertIndex);
     }

flang/test/Semantics/OpenMP/combined-constructs.f90

@@ -1,4 +1,4 @@
-! RUN: %python %S/../test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp -fopenmp-version=11
 
 program main
   implicit none

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

@@ -3242,13 +3242,10 @@ static llvm::omp::OpenMPOffloadMappingFlags mapParentWithMembers(
     auto mapOp = dyn_cast<omp::MapInfoOp>(mapData.MapClause[mapDataIndex]);
     int firstMemberIdx = getMapDataMemberIdx(
         mapData, getFirstOrLastMappedMemberPtr(mapOp, true));
-    int lastMemberIdx = getMapDataMemberIdx(
-        mapData, getFirstOrLastMappedMemberPtr(mapOp, false));
-
-    // NOTE/TODO: Should perhaps use OriginalValue here instead of Pointers to
-    // avoid offset or any manipulations interfering with the calculation.
     lowAddr = builder.CreatePointerCast(mapData.Pointers[firstMemberIdx],
                                         builder.getPtrTy());
+    int lastMemberIdx = getMapDataMemberIdx(
+        mapData, getFirstOrLastMappedMemberPtr(mapOp, false));
     highAddr = builder.CreatePointerCast(
         builder.CreateGEP(mapData.BaseType[lastMemberIdx],
                           mapData.Pointers[lastMemberIdx], builder.getInt64(1)),
@@ -3280,7 +3277,7 @@ static llvm::omp::OpenMPOffloadMappingFlags mapParentWithMembers(
     ompBuilder.setCorrectMemberOfFlag(mapFlag, memberOfFlag);
     combinedInfo.Types.emplace_back(mapFlag);
     combinedInfo.DevicePointers.emplace_back(
-        mapData.DevicePointers[mapDataIndex]);
+        llvm::OpenMPIRBuilder::DeviceInfoTy::None);
     combinedInfo.Names.emplace_back(LLVM::createMappingInformation(
         mapData.MapClause[mapDataIndex]->getLoc(), ompBuilder));
     combinedInfo.BasePointers.emplace_back(mapData.BasePointers[mapDataIndex]);