Revert "[llvm][mlir][OpenMP] Support translation for linear clause in omp.wsloop and omp.simd (llvm#139386)"

This reverts commit 290b32a.

Author: ronlieb

flang/lib/Lower/OpenMP/ClauseProcessor.cpp

@@ -1235,52 +1235,6 @@ bool ClauseProcessor::processIsDevicePtr(
       });
 }
 
-<<<<<<< HEAD
-=======
-bool ClauseProcessor::processLinear(mlir::omp::LinearClauseOps &result) const {
-  lower::StatementContext stmtCtx;
-  return findRepeatableClause<
-      omp::clause::Linear>([&](const omp::clause::Linear &clause,
-                               const parser::CharBlock &) {
-    auto &objects = std::get<omp::ObjectList>(clause.t);
-    static std::vector<mlir::Attribute> typeAttrs;
-
-    if (!result.linearVars.size())
-      typeAttrs.clear();
-
-    for (const omp::Object &object : objects) {
-      semantics::Symbol *sym = object.sym();
-      const mlir::Value variable = converter.getSymbolAddress(*sym);
-      result.linearVars.push_back(variable);
-      mlir::Type ty = converter.genType(*sym);
-      typeAttrs.push_back(mlir::TypeAttr::get(ty));
-    }
-    result.linearVarTypes =
-        mlir::ArrayAttr::get(&converter.getMLIRContext(), typeAttrs);
-    if (objects.size()) {
-      if (auto &mod =
-              std::get<std::optional<omp::clause::Linear::StepComplexModifier>>(
-                  clause.t)) {
-        mlir::Value operand =
-            fir::getBase(converter.genExprValue(toEvExpr(*mod), stmtCtx));
-        result.linearStepVars.append(objects.size(), operand);
-      } else if (std::get<std::optional<omp::clause::Linear::LinearModifier>>(
-                     clause.t)) {
-        mlir::Location currentLocation = converter.getCurrentLocation();
-        TODO(currentLocation, "Linear modifiers not yet implemented");
-      } else {
-        // If nothing is present, add the default step of 1.
-        fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();
-        mlir::Location currentLocation = converter.getCurrentLocation();
-        mlir::Value operand = firOpBuilder.createIntegerConstant(
-            currentLocation, firOpBuilder.getI32Type(), 1);
-        result.linearStepVars.append(objects.size(), operand);
-      }
-    }
-  });
-}
-
->>>>>>> 290b32a699ae
 bool ClauseProcessor::processLink(
     llvm::SmallVectorImpl<DeclareTargetCaptureInfo> &result) const {
   return findRepeatableClause<omp::clause::Link>(

flang/lib/Lower/OpenMP/OpenMP.cpp

@@ -1642,7 +1642,8 @@ static void genSimdClauses(
   cp.processReduction(loc, clauseOps, reductionSyms);
   cp.processSafelen(clauseOps);
   cp.processSimdlen(clauseOps);
-  cp.processLinear(clauseOps);
+
+  cp.processTODO<clause::Linear>(loc, llvm::omp::Directive::OMPD_simd);
 }
 
 static void genSingleClauses(lower::AbstractConverter &converter,
@@ -1838,9 +1839,9 @@ static void genWsloopClauses(
   cp.processOrdered(clauseOps);
   cp.processReduction(loc, clauseOps, reductionSyms);
   cp.processSchedule(stmtCtx, clauseOps);
-  cp.processLinear(clauseOps);
 
-  cp.processTODO<clause::Allocate>(loc, llvm::omp::Directive::OMPD_do);
+  cp.processTODO<clause::Allocate, clause::Linear>(
+      loc, llvm::omp::Directive::OMPD_do);
 }
 
 //===----------------------------------------------------------------------===//

flang/test/Lower/OpenMP/Todo/omp-do-simd-linear.f90

@@ -0,0 +1,14 @@
+! This test checks lowering of OpenMP do simd linear() pragma
+
+! RUN: %not_todo_cmd bbc -emit-fir -fopenmp -o - %s 2>&1 | FileCheck %s
+! RUN: %not_todo_cmd %flang_fc1 -emit-fir -fopenmp -o - %s 2>&1 | FileCheck %s
+subroutine testDoSimdLinear(int_array)
+        integer :: int_array(:)
+!CHECK: not yet implemented: Unhandled clause LINEAR in SIMD construct
+!$omp do simd linear(int_array)
+        do index_ = 1, 10
+        end do
+!$omp end do simd
+
+end subroutine testDoSimdLinear
+

flang/test/Lower/OpenMP/simd-linear.f90

@@ -1,10 +1,6 @@
 ! This test checks lowering of OpenMP DO Directive (Worksharing)
 ! with linear clause
-<<<<<<< HEAD
 ! XFAIL: *
-=======
-
->>>>>>> 290b32a699ae
 ! RUN: %flang_fc1 -fopenmp -emit-hlfir %s -o - 2>&1 | FileCheck %s
 
 !CHECK: %[[X_alloca:.*]] = fir.alloca i32 {bindc_name = "x", uniq_name = "_QFsimple_linearEx"}
@@ -22,10 +18,6 @@ subroutine simple_linear
         y = x + 2
     end do
     !$omp end do
-<<<<<<< HEAD
-=======
-    !CHECK: } {linear_var_types = [i32]}
->>>>>>> 290b32a699ae
 end subroutine
 
 
@@ -44,10 +36,6 @@ subroutine linear_step
         y = x + 2
     end do
     !$omp end do
-<<<<<<< HEAD
-=======
-    !CHECK: } {linear_var_types = [i32]}
->>>>>>> 290b32a699ae
 end subroutine
 
 !CHECK: %[[A_alloca:.*]] = fir.alloca i32 {bindc_name = "a", uniq_name = "_QFlinear_exprEa"}
@@ -66,8 +54,4 @@ subroutine linear_expr
         y = x + 2
     end do
     !$omp end do
-<<<<<<< HEAD
-=======
-    !CHECK: } {linear_var_types = [i32]}
->>>>>>> 290b32a699ae
 end subroutine

flang/test/Lower/OpenMP/wsloop-linear.f90

@@ -22,7 +22,6 @@
 include "mlir/Dialect/OpenMP/OpenMPOpBase.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
 include "mlir/IR/SymbolInterfaces.td"
-include "mlir/IR/BuiltinAttributes.td"
 
 //===----------------------------------------------------------------------===//
 // V5.2: [6.3] `align` clause
@@ -777,9 +776,10 @@ class OpenMP_LinearClauseSkip<
     bit description = false, bit extraClassDeclaration = false
   > : OpenMP_Clause<traits, arguments, assemblyFormat, description,
                     extraClassDeclaration> {
-  let arguments = (ins Variadic<AnyType>:$linear_vars,
-      Variadic<I32>:$linear_step_vars,
-      OptionalAttr<ArrayAttr>:$linear_var_types);
+  let arguments = (ins
+    Variadic<AnyType>:$linear_vars,
+    Variadic<I32>:$linear_step_vars
+  );
 
   let optAssemblyFormat = [{
     `linear` `(`

mlir/include/mlir/Dialect/OpenMP/OpenMPClauses.td

@@ -2862,7 +2862,6 @@ void WsloopOp::build(OpBuilder &builder, OperationState &state,
                      ArrayRef<NamedAttribute> attributes) {
   build(builder, state, /*allocate_vars=*/{}, /*allocator_vars=*/{},
         /*linear_vars=*/ValueRange(), /*linear_step_vars=*/ValueRange(),
-        /*linear_var_types*/ nullptr,
         /*nowait=*/false, /*order=*/nullptr, /*order_mod=*/nullptr,
         /*ordered=*/nullptr, /*private_vars=*/{}, /*private_syms=*/nullptr,
         /*private_needs_barrier=*/false,
@@ -2881,8 +2880,8 @@ void WsloopOp::build(OpBuilder &builder, OperationState &state,
   WsloopOp::build(
       builder, state,
       /*allocate_vars=*/{}, /*allocator_vars=*/{}, clauses.linearVars,
-      clauses.linearStepVars, clauses.linearVarTypes, clauses.nowait,
-      clauses.order, clauses.orderMod, clauses.ordered, clauses.privateVars,
+      clauses.linearStepVars, clauses.nowait, clauses.order, clauses.orderMod,
+      clauses.ordered, clauses.privateVars,
       makeArrayAttr(ctx, clauses.privateSyms), clauses.privateNeedsBarrier,
       clauses.reductionMod, clauses.reductionVars,
       makeDenseBoolArrayAttr(ctx, clauses.reductionByref),
@@ -2927,16 +2926,17 @@ LogicalResult WsloopOp::verifyRegions() {
 void SimdOp::build(OpBuilder &builder, OperationState &state,
                    const SimdOperands &clauses) {
   MLIRContext *ctx = builder.getContext();
-  SimdOp::build(
-      builder, state, clauses.alignedVars,
-      makeArrayAttr(ctx, clauses.alignments), clauses.ifExpr,
-      clauses.linearVars, clauses.linearStepVars, clauses.linearVarTypes,
-      clauses.nontemporalVars, clauses.order, clauses.orderMod,
-      clauses.privateVars, makeArrayAttr(ctx, clauses.privateSyms),
-      clauses.privateNeedsBarrier, clauses.reductionMod, clauses.reductionVars,
-      makeDenseBoolArrayAttr(ctx, clauses.reductionByref),
-      makeArrayAttr(ctx, clauses.reductionSyms), clauses.safelen,
-      clauses.simdlen);
+  // TODO Store clauses in op: linearVars, linearStepVars
+  SimdOp::build(builder, state, clauses.alignedVars,
+                makeArrayAttr(ctx, clauses.alignments), clauses.ifExpr,
+                /*linear_vars=*/{}, /*linear_step_vars=*/{},
+                clauses.nontemporalVars, clauses.order, clauses.orderMod,
+                clauses.privateVars, makeArrayAttr(ctx, clauses.privateSyms),
+                clauses.privateNeedsBarrier, clauses.reductionMod,
+                clauses.reductionVars,
+                makeDenseBoolArrayAttr(ctx, clauses.reductionByref),
+                makeArrayAttr(ctx, clauses.reductionSyms), clauses.safelen,
+                clauses.simdlen);
 }
 
 LogicalResult SimdOp::verify() {