Address review comments

Author: harishch4

flang/lib/Lower/OpenMP/ClauseProcessor.cpp

@@ -395,15 +395,14 @@ bool ClauseProcessor::processNumThreads(
 }
 
 bool ClauseProcessor::processOrder(mlir::omp::OrderClauseOps &result) const {
-  if (auto *clause = findUniqueClause<omp::clause::Order>()) {
+  using Order = omp::clause::Order;
+  if (auto *clause = findUniqueClause<Order>()) {
     fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();
     result.orderAttr = mlir::omp::ClauseOrderKindAttr::get(
         firOpBuilder.getContext(), mlir::omp::ClauseOrderKind::Concurrent);
-    using Order = omp::clause::Order;
     const auto &modifier =
         std::get<std::optional<Order::OrderModifier>>(clause->t);
-    if (modifier &&
-        *modifier == omp::clause::Order::OrderModifier::Unconstrained) {
+    if (modifier && *modifier == Order::OrderModifier::Unconstrained) {
       result.orderModAttr = mlir::omp::OrderModifierAttr::get(
           firOpBuilder.getContext(), mlir::omp::OrderModifier::unconstrained);
     } else {

flang/lib/Lower/OpenMP/OpenMP.cpp

@@ -1037,6 +1037,7 @@ static void genDistributeClauses(lower::AbstractConverter &converter,
   ClauseProcessor cp(converter, semaCtx, clauses);
   cp.processAllocate(clauseOps);
   cp.processDistSchedule(stmtCtx, clauseOps);
+  cp.processOrder(clauseOps);
   // TODO Support delayed privatization.
 }
 

flang/test/Lower/OpenMP/order-clause.f90

@@ -54,9 +54,23 @@ end subroutine do_simd_order
 subroutine do_simd_order_parallel
    !CHECK: omp.parallel {
    !CHECK: omp.wsloop order(reproducible:concurrent) {
-   !$omp parallel
-   !$omp do simd order(reproducible:concurrent)
+   !$omp parallel do simd order(reproducible:concurrent)
    do i = 1, 10
    end do
-   !$omp end parallel
 end subroutine do_simd_order_parallel
+
+
+subroutine distribute_order
+   !CHECK: omp.distribute order(reproducible:concurrent) {
+   !$omp teams distribute order(concurrent)
+   do i=1,10
+   end do
+   !CHECK: omp.distribute order(reproducible:concurrent) {
+   !$omp teams distribute order(reproducible:concurrent)
+   do i=1,10
+   end do
+   !CHECK: omp.distribute order(unconstrained:concurrent) {
+   !$omp teams distribute order(unconstrained:concurrent)
+   do i = 1, 10
+   end do
+  end subroutine

llvm/include/llvm/Frontend/OpenMP/OMP.td

@@ -665,6 +665,7 @@ def OMP_Distribute : Directive<"distribute"> {
   let allowedOnceClauses = [
     VersionedClause<OMPC_Collapse>,
     VersionedClause<OMPC_DistSchedule>,
+    VersionedClause<OMPC_Order, 50>,
   ];
   let association = AS_Loop;
   let category = CA_Executable;
@@ -2057,6 +2058,7 @@ def OMP_TargetTeamsDistribute : Directive<"target teams distribute"> {
     VersionedClause<OMPC_NoWait>,
     VersionedClause<OMPC_NumTeams>,
     VersionedClause<OMPC_OMPX_DynCGroupMem>,
+    VersionedClause<OMPC_Order, 50>,
     VersionedClause<OMPC_ThreadLimit>,
   ];
   let leafConstructs = [OMP_Target, OMP_Teams, OMP_Distribute];
@@ -2330,6 +2332,7 @@ def OMP_TeamsDistribute : Directive<"teams distribute"> {
   ];
   let allowedOnceClauses = [
     VersionedClause<OMPC_If>,
+    VersionedClause<OMPC_Order, 50>,
   ];
   let leafConstructs = [OMP_Teams, OMP_Distribute];
   let category = CA_Executable;