[Mlir-commits] [mlir] [OpenACC][NFC] Generalize wrapMultiBlockRegionWithSCFExecuteRegion with variadic template (PR #187359)

[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 -- mlir/include/mlir/Dialect/OpenACC/OpenACCUtilsLoop.h mlir/lib/Dialect/OpenACC/Utils/OpenACCUtilsCG.cpp mlir/lib/Dialect/OpenACC/Utils/OpenACCUtilsLoop.cpp mlir/unittests/Dialect/OpenACC/OpenACCUtilsLoopTest.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/mlir/include/mlir/Dialect/OpenACC/OpenACCUtilsLoop.h b/mlir/include/mlir/Dialect/OpenACC/OpenACCUtilsLoop.h
index b26d576bc..b6f76b998 100644
--- a/mlir/include/mlir/Dialect/OpenACC/OpenACCUtilsLoop.h
+++ b/mlir/include/mlir/Dialect/OpenACC/OpenACCUtilsLoop.h
@@ -51,8 +51,7 @@ scf::ExecuteRegionOp wrapMultiBlockRegionWithSCFExecuteRegionImpl(
 template <typename... TerminatorOps>
 scf::ExecuteRegionOp
 wrapMultiBlockRegionWithSCFExecuteRegion(Region &region, IRMapping &mapping,
-                                         Location loc,
-                                         RewriterBase &rewriter) {
+                                         Location loc, RewriterBase &rewriter) {
   return wrapMultiBlockRegionWithSCFExecuteRegionImpl(
       region, mapping, loc, rewriter,
       [](Operation *op) { return isa<TerminatorOps...>(op); });
diff --git a/mlir/lib/Dialect/OpenACC/Utils/OpenACCUtilsCG.cpp b/mlir/lib/Dialect/OpenACC/Utils/OpenACCUtilsCG.cpp
index 73d837e8c..7359d6b69 100644
--- a/mlir/lib/Dialect/OpenACC/Utils/OpenACCUtilsCG.cpp
+++ b/mlir/lib/Dialect/OpenACC/Utils/OpenACCUtilsCG.cpp
@@ -100,10 +100,8 @@ ComputeRegionOp buildComputeRegion(Location loc, ValueRange launchArgs,
     rewriter.setInsertionPointToEnd(entryBlock);
     YieldOp::create(rewriter, loc, yieldOperands);
   } else {
-    auto exeRegion =
-        mlir::acc::wrapMultiBlockRegionWithSCFExecuteRegion<acc::YieldOp,
-                                                            func::ReturnOp>(
-            regionToClone, mapping, loc, rewriter);
+    auto exeRegion = mlir::acc::wrapMultiBlockRegionWithSCFExecuteRegion<
+        acc::YieldOp, func::ReturnOp>(regionToClone, mapping, loc, rewriter);
     if (!exeRegion) {
       rewriter.eraseOp(computeRegion);
       return nullptr;
diff --git a/mlir/lib/Dialect/OpenACC/Utils/OpenACCUtilsLoop.cpp b/mlir/lib/Dialect/OpenACC/Utils/OpenACCUtilsLoop.cpp
index f11fe2bac..7d13c4a05 100644
--- a/mlir/lib/Dialect/OpenACC/Utils/OpenACCUtilsLoop.cpp
+++ b/mlir/lib/Dialect/OpenACC/Utils/OpenACCUtilsLoop.cpp
@@ -298,9 +298,8 @@ scf::ParallelOp convertACCLoopToSCFParallel(LoopOp loopOp,
                         mapping);
 
   if (!loopOp.getRegion().hasOneBlock()) {
-    auto exeRegion =
-        wrapMultiBlockRegionWithSCFExecuteRegion<acc::YieldOp>(
-            loopOp.getRegion(), mapping, loc, rewriter);
+    auto exeRegion = wrapMultiBlockRegionWithSCFExecuteRegion<acc::YieldOp>(
+        loopOp.getRegion(), mapping, loc, rewriter);
     if (!exeRegion) {
       rewriter.eraseOp(parallelOp);
       return nullptr;

``````````

</details>


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