Fix formatting

Author: jsjodin

flang/lib/Lower/OpenMP/OpenMP.cpp

@@ -427,9 +427,10 @@ static void processHostEvalClauses(lower::AbstractConverter &converter,
               if (innerOptional.has_value()) {
                 const auto &innerLoopDirective = innerOptional.value().value();
                 const auto &innerBegin =
-                  std::get<parser::OmpBeginLoopDirective>(innerLoopDirective.t);
+                    std::get<parser::OmpBeginLoopDirective>(
+                        innerLoopDirective.t);
                 const auto &innerDirective =
-                  std::get<parser::OmpLoopDirective>(innerBegin.t);
+                    std::get<parser::OmpLoopDirective>(innerBegin.t);
                 if (innerDirective.v == llvm::omp::Directive::OMPD_tile) {
                   middleClauseList =
                       &std::get<parser::OmpClauseList>(innerBegin.t);
@@ -2268,11 +2269,13 @@ static void genUnrollOp(Fortran::lower::AbstractConverter &converter,
   auto cli = canonLoop.getCli();
   mlir::omp::UnrollHeuristicOp::create(firOpBuilder, loc, cli);
 
-static mlir::omp::LoopOp
-genTiledLoopOp(lower::AbstractConverter &converter, lower::SymMap &symTable,
-          semantics::SemanticsContext &semaCtx, lower::pft::Evaluation &eval,
-          mlir::Location loc, const ConstructQueue &queue,
-          ConstructQueue::const_iterator item) {
+static mlir::omp::LoopOp genTiledLoopOp(lower::AbstractConverter &converter,
+                                        lower::SymMap &symTable,
+                                        semantics::SemanticsContext &semaCtx,
+                                        lower::pft::Evaluation &eval,
+                                        mlir::Location loc,
+                                        const ConstructQueue &queue,
+                                        ConstructQueue::const_iterator item) {
   mlir::omp::LoopOperands loopClauseOps;
   llvm::SmallVector<const semantics::Symbol *> loopReductionSyms;
   genLoopClauses(converter, semaCtx, item->clauses, loc, loopClauseOps,
@@ -3522,7 +3525,7 @@ static void genOMPDispatch(lower::AbstractConverter &converter,
     break;
   case llvm::omp::Directive::OMPD_tile:
     newOp =
-      genTiledLoopOp(converter, symTable, semaCtx, eval, loc, queue, item);
+        genTiledLoopOp(converter, symTable, semaCtx, eval, loc, queue, item);
     break;
   case llvm::omp::Directive::OMPD_unroll:
     genUnrollOp(converter, symTable, stmtCtx, semaCtx, eval, loc, queue, item);
@@ -3959,13 +3962,15 @@ static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
   List<Clause> clauses = makeClauses(
       std::get<parser::OmpClauseList>(beginLoopDirective.t), semaCtx);
 
-  const auto &innerOptional = std::get<std::optional<common::Indirection<parser::OpenMPLoopConstruct>>>(loopConstruct.t);
+  const auto &innerOptional =
+      std::get<std::optional<common::Indirection<parser::OpenMPLoopConstruct>>>(
+          loopConstruct.t);
   if (innerOptional.has_value()) {
     const auto &innerLoopDirective = innerOptional.value().value();
     const auto &innerBegin =
-      std::get<parser::OmpBeginLoopDirective>(innerLoopDirective.t);
+        std::get<parser::OmpBeginLoopDirective>(innerLoopDirective.t);
     const auto &innerDirective =
-      std::get<parser::OmpLoopDirective>(innerBegin.t);
+        std::get<parser::OmpLoopDirective>(innerBegin.t);
     if (innerDirective.v == llvm::omp::Directive::OMPD_tile) {
       clauses.append(
           makeClauses(std::get<parser::OmpClauseList>(innerBegin.t), semaCtx));

flang/lib/Lower/OpenMP/Utils.cpp

@@ -51,8 +51,7 @@ int64_t getCollapseValue(const List<Clause> &clauses) {
   }
 
   collapseValue = collapseValue - numTileSizes;
-  int64_t result =
-    collapseValue > numTileSizes ? collapseValue : numTileSizes;
+  int64_t result = collapseValue > numTileSizes ? collapseValue : numTileSizes;
   return result;
 }
 

flang/lib/Semantics/canonicalize-omp.cpp

@@ -11,7 +11,7 @@
 #include "flang/Parser/parse-tree.h"
 #include "flang/Semantics/semantics.h"
 
-# include <stack>
+#include <stack>
 // After Loop Canonicalization, rewrite OpenMP parse tree to make OpenMP
 // Constructs more structured which provide explicit scopes for later
 // structural checks and semantic analysis.
@@ -153,7 +153,7 @@ class CanonicalizationOfOmp {
       std::stack<parser::OpenMPLoopConstruct *> loops;
       loops.push(&x);
       if (auto *innerConstruct{
-          GetConstructIf<parser::OpenMPConstruct>(*nextIt)}) {
+              GetConstructIf<parser::OpenMPConstruct>(*nextIt)}) {
         if (auto *innerOmpLoop{
                 std::get_if<parser::OpenMPLoopConstruct>(&innerConstruct->u)}) {
           auto &innerBeginDir{

mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp

@@ -2995,8 +2995,7 @@ ParseResult LoopNestOp::parse(OpAsmParser &parser, OperationState &result) {
   };
 
   if (!parser.parseOptionalKeyword("tiles") &&
-      (parser.parseLParen() ||
-      parser.parseCommaSeparatedList(parseTiles) ||
+      (parser.parseLParen() || parser.parseCommaSeparatedList(parseTiles) ||
        parser.parseRParen()))
     return failure();
 

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

@@ -2966,7 +2966,7 @@ convertOmpSimd(Operation &opInst, llvm::IRBuilderBase &builder,
 /// Converts an OpenMP loop nest into LLVM IR using OpenMPIRBuilder.
 static LogicalResult
 convertOmpLoopNest(Operation &opInst, llvm::IRBuilderBase &builder,
-                        LLVM::ModuleTranslation &moduleTranslation) {
+                   LLVM::ModuleTranslation &moduleTranslation) {
   llvm::OpenMPIRBuilder *ompBuilder = moduleTranslation.getOpenMPBuilder();
   auto loopOp = cast<omp::LoopNestOp>(opInst);
   // Set up the source location value for OpenMP runtime.
@@ -3036,7 +3036,7 @@ convertOmpLoopNest(Operation &opInst, llvm::IRBuilderBase &builder,
 
   //  llvm::OpenMPIRBuilder::InsertPointTy afterIP = builder.saveIP();
   llvm::OpenMPIRBuilder::InsertPointTy afterIP =
-    loopInfos.front()->getAfterIP();
+      loopInfos.front()->getAfterIP();
 
   // Initialize the new loop info to the current one, in case there
   // are no loop transformations done.
@@ -3048,12 +3048,12 @@ convertOmpLoopNest(Operation &opInst, llvm::IRBuilderBase &builder,
     SmallVector<llvm::Value *> TileSizes;
 
     for (auto tile : tiles.value()) {
-      llvm::Value *TileVal =  llvm::ConstantInt::get(IVType, tile);
+      llvm::Value *TileVal = llvm::ConstantInt::get(IVType, tile);
       TileSizes.push_back(TileVal);
     }
 
-    std::vector<llvm::CanonicalLoopInfo*> NewLoops =
-      ompBuilder->tileLoops(ompLoc.DL, loopInfos, TileSizes);
+    std::vector<llvm::CanonicalLoopInfo *> NewLoops =
+        ompBuilder->tileLoops(ompLoc.DL, loopInfos, TileSizes);
 
     // Collapse loops. Store the insertion point because LoopInfos may get
     // invalidated.
@@ -3064,7 +3064,7 @@ convertOmpLoopNest(Operation &opInst, llvm::IRBuilderBase &builder,
 
     // Update the loop infos
     loopInfos.clear();
-    for (const auto& newLoop : NewLoops) {
+    for (const auto &newLoop : NewLoops) {
       loopInfos.push_back(newLoop);
     }
   } // Tiling done