Merge pull request #1055 from kiranchandramohan/critical_cherry_picks

Cherry pick some patches required for supporting OpenMP critical construct

Author: jeanPerier

clang/lib/CodeGen/CGStmtOpenMP.cpp

@@ -3594,7 +3594,8 @@ void CodeGenFunction::EmitOMPForDirective(const OMPForDirective &S) {
           CGM.getOpenMPRuntime().getOMPBuilder();
       llvm::OpenMPIRBuilder::InsertPointTy AllocaIP(
           AllocaInsertPt->getParent(), AllocaInsertPt->getIterator());
-      OMPBuilder.createWorkshareLoop(Builder, CLI, AllocaIP, NeedsBarrier);
+      OMPBuilder.applyWorkshareLoop(Builder.getCurrentDebugLocation(), CLI,
+                                    AllocaIP, NeedsBarrier);
       return;
     }
 

flang/lib/Lower/OpenMP.cpp

@@ -423,7 +423,7 @@ static void genOMP(Fortran::lower::AbstractConverter &converter,
   auto currentLocation = converter.getCurrentLocation();
   SmallVector<Value, 4> lowerBound, upperBound, step, privateClauseOperands,
       firstPrivateClauseOperands, lastPrivateClauseOperands, linearVars,
-      linearStepVars;
+      linearStepVars, reductionVars;
   mlir::Value scheduleChunkClauseOperand;
   mlir::Attribute scheduleClauseOperand, collapseClauseOperand,
       noWaitClauseOperand, orderedClauseOperand, orderClauseOperand;
@@ -514,7 +514,7 @@ static void genOMP(Fortran::lower::AbstractConverter &converter,
   auto wsLoopOp = firOpBuilder.create<mlir::omp::WsLoopOp>(
       currentLocation, resultType, lowerBound, upperBound, step,
       privateClauseOperands, firstPrivateClauseOperands,
-      lastPrivateClauseOperands, linearVars, linearStepVars,
+      lastPrivateClauseOperands, linearVars, linearStepVars, reductionVars,
       scheduleClauseOperand.dyn_cast_or_null<StringAttr>(),
       scheduleChunkClauseOperand,
       collapseClauseOperand.dyn_cast_or_null<IntegerAttr>(),

llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h

@@ -907,6 +907,7 @@ __OMP_RTL_ATTRS(__kmpc_task_allow_completion_event, DefaultAttrs,
   OMP_IDENT_FLAG(OMP_IDENT_FLAG_##Name, #Name, Value)
 
 __OMP_IDENT_FLAG(KMPC, 0x02)
+__OMP_IDENT_FLAG(ATOMIC_REDUCE, 0x10)
 __OMP_IDENT_FLAG(BARRIER_EXPL, 0x20)
 __OMP_IDENT_FLAG(BARRIER_IMPL, 0x0040)
 __OMP_IDENT_FLAG(BARRIER_IMPL_MASK, 0x01C0)