[NFC] Follow up on D87111 - Add an option for unrolling loops up to a factor - CR issues addressed.

[llitchev]

Summary

Addressed some CR issues pointed out in D87111. Formatting and other nits.
The original Diff D87111 - Add an option for unrolling loops up to a factor.

[llitchev]

Some more formatting and squashing commits.

[bondhugula]

Please mark the commit 'NFC' (in the title). Please also include the previous commit title in the commit summary and a part of it in the current title.

[llitchev]

Fixed couple of typos and Diff title/summary issues

[llitchev]

Updated the Title and Summary of the diff as requested.

mlir/include/mlir/Dialect/Affine/Passes.td

 }
 
 def AffineLoopUnroll : FunctionPass<"affine-loop-unroll"> {
   let summary = "Unroll affine loops";
   let constructor = "mlir::createLoopUnrollPass()";
   let options = [
     Option<"unrollFactor", "unroll-factor", "unsigned", /*default=*/"4",
            "Use this unroll factor for all loops being unrolled">,
-    Option<"unrollUpToFactor", "unroll-up-to-factor", "bool", /*default=*/"false",
-           "Allow unroling up to the factor specicied">,
+    Option<"unrollUpToFactor", "unroll-up-to-factor", "bool",
+           /*default=*/"false", "Allow unrolling up to the factor specified">,
     Option<"unrollFull", "unroll-full", "bool", /*default=*/"false",
            "Fully unroll loops">,
     Option<"numRepetitions", "unroll-num-reps", "unsigned", /*default=*/"1",
            "Unroll innermost loops repeatedly this many times">,
     Option<"unrollFullThreshold", "unroll-full-threshold", "unsigned",
            /*default=*/"1",
            "Unroll all loops with trip count less than or equal to this">,
   ];

mlir/lib/Dialect/Affine/Transforms/LoopUnroll.cpp

 LogicalResult LoopUnroll::runOnAffineForOp(AffineForOp forOp) {
   // Use the function callback if one was provided.
   if (getUnrollFactor)
     return loopUnrollByFactor(forOp, getUnrollFactor(forOp));
   // Unroll completely if full loop unroll was specified.
   if (unrollFull)
     return loopUnrollFull(forOp);
   // Otherwise, unroll by the given unroll factor.
-  if (unrollUpToFactor) {
+  if (unrollUpToFactor)
     return loopUnrollUpToFactor(forOp, unrollFactor);
-  }
   return loopUnrollByFactor(forOp, unrollFactor);
 }
 
 std::unique_ptr<OperationPass<FuncOp>> mlir::createLoopUnrollPass(
     int unrollFactor, bool unrollUpToFactor, bool unrollFull,
     const std::function<unsigned(AffineForOp)> &getUnrollFactor) {
   return std::make_unique<LoopUnroll>(
       unrollFactor == -1 ? None : Optional<unsigned>(unrollFactor),
       unrollUpToFactor, unrollFull, getUnrollFactor);
 }

mlir/test/Dialect/SCF/loop-unroll.mlir

 //  UNROLL-BY-3-NEXT:    %[[C2_IV:.*]] = constant 2 : index
 //  UNROLL-BY-3-NEXT:    %[[V2:.*]] = muli %[[C1]], %[[C2_IV]] : index
 //  UNROLL-BY-3-NEXT:    %[[V3:.*]] = addi %[[IV]], %[[V2]] : index
 //  UNROLL-BY-3-NEXT:    store %{{.*}}, %[[MEM]][%[[V3]]] : memref<?xf32>
 //  UNROLL-BY-3-NEXT:  }
 //  UNROLL-BY-3-NEXT:  store %{{.*}}, %[[MEM]][%[[C9]]] : memref<?xf32>
 //  UNROLL-BY-3-NEXT:  return
 
-
 // Test unroll-up-to functionality.
 func @static_loop_unroll_up_to_factor(%arg0 : memref<?xf32>) {
   %0 = constant 7.0 : f32
   %lb = constant 0 : index
   %ub = constant 2 : index
   affine.for %i0 = %lb to %ub {
-    store %0, %arg0[%i0] : memref<?xf32>
+    affine.store %0, %arg0[%i0] : memref<?xf32>
   }
   return
 }
 // UNROLL-UP-TO-LABEL: func @static_loop_unroll_up_to_factor
 //  UNROLL-UP-TO-SAME:  %[[MEM:.*0]]: memref<?xf32>
-//  UNROLL-UP-TO-DAG:  %[[C0:.*]] = constant 0 : index
-//  UNROLL-UP-TO-DAG:  %[[C2:.*]] = constant 2 : index
-//  UNROLL-UP-TO-NEXT: %[[V0:.*]] = affine.apply {{.*}}
-//  UNROLL-UP-TO-NEXT: store %{{.*}}, %[[MEM]][%[[V0]]] : memref<?xf32>
-//  UNROLL-UP-TO-NEXT: %[[V1:.*]] = affine.apply {{.*}}
-//  UNROLL-UP-TO-NEXT: tore %{{.*}}, %[[MEM]][%[[V1]]] : memref<?xf32>
-//  UNROLL-UP-TO-NEXT: return
+//
+//   UNROLL-UP-TO-DAG:  %[[C0:.*]] = constant 0 : index
+//   UNROLL-UP-TO-DAG:  %[[C2:.*]] = constant 2 : index
+//   UNROLL-UP-TO-NEXT: %[[V0:.*]] = affine.apply {{.*}}
+//   UNROLL-UP-TO-NEXT: store %{{.*}}, %[[MEM]][%[[V0]]] : memref<?xf32>
+//   UNROLL-UP-TO-NEXT: %[[V1:.*]] = affine.apply {{.*}}
+//   UNROLL-UP-TO-NEXT: affine.store %{{.*}}, %[[MEM]][%[[V1]]] : memref<?xf32>
+//   UNROLL-UP-TO-NEXT: return
 No newline at end of file