[Mlir-commits] [flang] [mlir] [OpenMP][flang] Lowering of OpenMP custom reductions to MLIR (PR #168417)

[llvmlistbot at llvm.org]

github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. :warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff origin/main HEAD --extensions h,cpp -- flang/include/flang/Lower/Support/ReductionProcessor.h flang/lib/Lower/OpenMP/ClauseProcessor.cpp flang/lib/Lower/OpenMP/ClauseProcessor.h flang/lib/Lower/OpenMP/Clauses.cpp flang/lib/Lower/OpenMP/OpenMP.cpp flang/lib/Lower/Support/ReductionProcessor.cpp flang/lib/Optimizer/OpenMP/MarkDeclareTarget.cpp mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp --diff_from_common_commit
``````````

:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/flang/lib/Lower/OpenMP/OpenMP.cpp b/flang/lib/Lower/OpenMP/OpenMP.cpp
index dd6b5664b..3410682e9 100644
--- a/flang/lib/Lower/OpenMP/OpenMP.cpp
+++ b/flang/lib/Lower/OpenMP/OpenMP.cpp
@@ -3577,7 +3577,7 @@ processReductionCombiner(lower::AbstractConverter &converter,
   const parser::OmpStylizedInstance &combinerInstance =
       combinerExpression.v.front();
   const parser::OmpStylizedInstance::Instance &instance =
-    std::get<parser::OmpStylizedInstance::Instance>(combinerInstance.t);
+      std::get<parser::OmpStylizedInstance::Instance>(combinerInstance.t);
   if (const auto *as = std::get_if<parser::AssignmentStmt>(&instance.u)) {
     auto &expr = std::get<parser::Expr>(as->t);
     genCombinerCB = [&](fir::FirOpBuilder &builder, mlir::Location loc,
@@ -3586,7 +3586,8 @@ processReductionCombiner(lower::AbstractConverter &converter,
       const auto &evalExpr = makeExpr(expr, semaCtx);
       lower::SymMapScope scope(symTable);
       const std::list<parser::OmpStylizedDeclaration> &declList =
-        std::get<std::list<parser::OmpStylizedDeclaration>>(combinerInstance.t);
+          std::get<std::list<parser::OmpStylizedDeclaration>>(
+              combinerInstance.t);
       for (const parser::OmpStylizedDeclaration &decl : declList) {
         auto &name = std::get<parser::ObjectName>(decl.var.t);
         mlir::Value addr = lhs;
@@ -3599,13 +3600,13 @@ processReductionCombiner(lower::AbstractConverter &converter,
 
         assert(name.symbol && "Reduction object name does not have a symbol");
         if (!fir::conformsWithPassByRef(type)) {
-            addr = builder.createTemporary(loc, type);
-            fir::StoreOp::create(builder, loc, isRhs ? rhs : lhs, addr);
+          addr = builder.createTemporary(loc, type);
+          fir::StoreOp::create(builder, loc, isRhs ? rhs : lhs, addr);
         }
         fir::FortranVariableFlagsEnum extraFlags = {};
         fir::FortranVariableFlagsAttr attributes =
-          Fortran::lower::translateSymbolAttributes(builder.getContext(),
-                                                    *name.symbol, extraFlags);
+            Fortran::lower::translateSymbolAttributes(builder.getContext(),
+                                                      *name.symbol, extraFlags);
         auto declareOp = hlfir::DeclareOp::create(
             builder, loc, addr, name.ToString(), nullptr, {}, nullptr, nullptr,
             0, attributes);
@@ -3615,8 +3616,7 @@ processReductionCombiner(lower::AbstractConverter &converter,
       lower::StatementContext stmtCtx;
       mlir::Value result = fir::getBase(
           convertExprToValue(loc, converter, evalExpr, symTable, stmtCtx));
-      if (auto refType =
-          llvm::dyn_cast<fir::ReferenceType>(result.getType()))
+      if (auto refType = llvm::dyn_cast<fir::ReferenceType>(result.getType()))
         if (lhs.getType() == refType.getElementType())
           result = fir::LoadOp::create(builder, loc, result);
       stmtCtx.finalizeAndPop();
diff --git a/flang/lib/Lower/Support/ReductionProcessor.cpp b/flang/lib/Lower/Support/ReductionProcessor.cpp
index 283e5ea73..12c8b8f33 100644
--- a/flang/lib/Lower/Support/ReductionProcessor.cpp
+++ b/flang/lib/Lower/Support/ReductionProcessor.cpp
@@ -619,7 +619,7 @@ bool ReductionProcessor::doReductionByRef(mlir::Type reductionType) {
       !fir::isa_derived(fir::unwrapRefType(reductionType)))
     return true;
 
-    return false;
+  return false;
 }
 
 bool ReductionProcessor::doReductionByRef(mlir::Value reductionVar) {
diff --git a/flang/lib/Optimizer/OpenMP/MarkDeclareTarget.cpp b/flang/lib/Optimizer/OpenMP/MarkDeclareTarget.cpp
index 1bd1cd6b0..5fa77fb20 100644
--- a/flang/lib/Optimizer/OpenMP/MarkDeclareTarget.cpp
+++ b/flang/lib/Optimizer/OpenMP/MarkDeclareTarget.cpp
@@ -65,10 +65,9 @@ class MarkDeclareTargetPass
     }
   }
 
-  void
-  processReductionRefs(std::optional<mlir::ArrayAttr> symRefs,
-                             ParentInfo parentInfo,
-                             llvm::SmallPtrSet<mlir::Operation *, 16> visited) {
+  void processReductionRefs(std::optional<mlir::ArrayAttr> symRefs,
+                            ParentInfo parentInfo,
+                            llvm::SmallPtrSet<mlir::Operation *, 16> visited) {
     if (!symRefs)
       return;
 
@@ -82,11 +81,10 @@ class MarkDeclareTargetPass
   }
 
   void
-  processReductionClauses(mlir::Operation *op,
-                          ParentInfo parentInfo,
+  processReductionClauses(mlir::Operation *op, ParentInfo parentInfo,
                           llvm::SmallPtrSet<mlir::Operation *, 16> visited) {
     llvm::TypeSwitch<mlir::Operation &>(*op)
-      .Case([&](mlir::omp::LoopOp op) {
+        .Case([&](mlir::omp::LoopOp op) {
           processReductionRefs(op.getReductionSyms(), parentInfo, visited);
         })
         .Case([&](mlir::omp::ParallelOp op) {

``````````

</details>


https://github.com/llvm/llvm-project/pull/168417