Minor fixes

Author: dhernandez0

mlir/lib/Conversion/TosaToRock/TosaToRock.cpp

@@ -502,9 +502,9 @@ getElementwiseRegion(Value input, OpBuilder &regionBuilder, Block *block,
 
   FailureOr<mlir::tosa::MatMulOp> maybeMatMul = failure();
   for (auto operand : op->getOperands()) {
-    auto [result, maybeSubTreeMatMul] =
-        getElementwiseRegion<OpT>(operand, regionBuilder, block, elementwiseArgs,
-                             loc, doRewrite, recDepth + 1);
+    auto [result, maybeSubTreeMatMul] = getElementwiseRegion<OpT>(
+        operand, regionBuilder, block, elementwiseArgs, loc, doRewrite,
+        recDepth + 1);
     mapper.map(operand, result);
     newOperands.push_back(result);
     if (succeeded(maybeSubTreeMatMul)) {
@@ -1049,7 +1049,8 @@ struct GemmElementwiseGemmRewritePattern
     SmallVector<Value> vec;
     FailureOr<tosa::MatMulOp> maybeFirstMatMul;
     std::tie(std::ignore, maybeFirstMatMul) =
-        getElementwiseRegion<rock::GemmElementwiseGemmOp>(op.getA(), b, nullptr, vec);
+        getElementwiseRegion<rock::GemmElementwiseGemmOp>(op.getA(), b, nullptr,
+                                                          vec);
 
     if (succeeded(maybeFirstMatMul))
       LLVM_DEBUG(llvm::dbgs()
@@ -1072,8 +1073,9 @@ struct GemmElementwiseGemmRewritePattern
     SmallVector<Value> elementwiseOtherArgs;
 
     FailureOr<tosa::MatMulOp> maybeFirstMatMul;
-    std::tie(std::ignore, maybeFirstMatMul) = getElementwiseRegion<rock::GemmElementwiseGemmOp>(
-        op.getA(), rewriter, nullptr, elementwiseOtherArgs);
+    std::tie(std::ignore, maybeFirstMatMul) =
+        getElementwiseRegion<rock::GemmElementwiseGemmOp>(
+            op.getA(), rewriter, nullptr, elementwiseOtherArgs);
     // This is guranteed by the matcher
     tosa::MatMulOp firstMatMulOp = maybeFirstMatMul.value();
     IntegerAttr numCUAttr =
@@ -1099,8 +1101,9 @@ struct GemmElementwiseGemmRewritePattern
       rewriter.setInsertionPointToStart(preSecondGemmElemwiseBlock);
       Value res;
       std::tie(res, maybeMatMul) =
-      getElementwiseRegion<rock::GemmElementwiseGemmOp>(op.getA(), rewriter, preSecondGemmElemwiseBlock,
-                               elementwiseOtherArgs, loc, true);
+          getElementwiseRegion<rock::GemmElementwiseGemmOp>(
+              op.getA(), rewriter, preSecondGemmElemwiseBlock,
+              elementwiseOtherArgs, loc, true);
       RankedTensorType resTensorType = cast<RankedTensorType>(res.getType());
       MemRefType resMemRefType = MemRefType::get(
           resTensorType.getShape(), resTensorType.getElementType());
@@ -1388,7 +1391,7 @@ struct AttentionRewritePattern : public OpRewritePattern<tosa::MatMulOp> {
     SmallVector<Value> vec;
     FailureOr<tosa::MatMulOp> maybeFirstMatMul;
     std::tie(std::ignore, maybeFirstMatMul) =
-      getElementwiseRegion<rock::AttentionOp>(softmaxInput, b, nullptr, vec);
+        getElementwiseRegion<rock::AttentionOp>(softmaxInput, b, nullptr, vec);
 
     if (succeeded(maybeFirstMatMul)) {
       TypedValue<TensorType> matC = maybeFirstMatMul.value().getC();
@@ -1425,8 +1428,9 @@ struct AttentionRewritePattern : public OpRewritePattern<tosa::MatMulOp> {
     SmallVector<Value> elementwiseOtherArgs;
 
     FailureOr<tosa::MatMulOp> maybeFirstMatMul;
-    std::tie(std::ignore, maybeFirstMatMul) = getElementwiseRegion<rock::AttentionOp>(
-        softmaxInput, rewriter, nullptr, elementwiseOtherArgs);
+    std::tie(std::ignore, maybeFirstMatMul) =
+        getElementwiseRegion<rock::AttentionOp>(softmaxInput, rewriter, nullptr,
+                                                elementwiseOtherArgs);
     // This is guranteed by the matcher
     tosa::MatMulOp firstMatMulOp = maybeFirstMatMul.value();
     IntegerAttr numCUAttr =
@@ -1457,9 +1461,9 @@ struct AttentionRewritePattern : public OpRewritePattern<tosa::MatMulOp> {
       PatternRewriter::InsertionGuard guard(rewriter);
       rewriter.setInsertionPointToStart(preSoftmaxElemwiseBlock);
       Value res;
-      std::tie(res, maybeMatMul) =
-        getElementwiseRegion<rock::AttentionOp>(softmaxInput, rewriter, preSoftmaxElemwiseBlock,
-                               elementwiseOtherArgs, loc, true);
+      std::tie(res, maybeMatMul) = getElementwiseRegion<rock::AttentionOp>(
+          softmaxInput, rewriter, preSoftmaxElemwiseBlock, elementwiseOtherArgs,
+          loc, true);
       RankedTensorType resTensorType = cast<RankedTensorType>(res.getType());
       MemRefType resMemRefType = MemRefType::get(
           resTensorType.getShape(), resTensorType.getElementType());

mlir/utils/performance/perfRunner.py

@@ -48,8 +48,6 @@
 INFO_ARCH_NAME = re.compile(r"Name:\s*(.*)")
 INFO_ARCH_CU = re.compile(r"Compute Unit:\s*(.*)")
 
-MLIR_N_REPEATS = 5
-
 @dataclass
 class MLIRPaths:
     rocmlir_gen_path : str