Merge commit 'e0f0c463b539' from llvm.org/release/18.x into stable/20240123

git apple-llvm automerger · git apple-llvm automerger · commit 48789553c694 · 2024-04-01T14:01:03.000-07:00
diff --git a/mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp b/mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp
@@ -2092,6 +2092,7 @@ DiagnosedSilenceableFailure transform::ConvertToLoopsOp::applyToOne(
       scf::lowerToLoopsUsingSCFForOp(rewriter, target);
   if (failed(loops))
     return emitDefaultDefiniteFailure(target);
+  rewriter.eraseOp(target);
   return DiagnosedSilenceableFailure::success();
 }
 
diff --git a/mlir/test/Interfaces/TilingInterface/lower-to-loops-using-interface.mlir b/mlir/test/Interfaces/TilingInterface/lower-to-loops-using-interface.mlir
@@ -33,6 +33,7 @@ module attributes {transform.with_named_sequence} {
 //       CHECK:         %[[MULF:.+]] = arith.mulf %[[LHS]], %[[RHS]]
 //       CHECK:         %[[ADDF:.+]] = arith.addf %[[OUT]], %[[MULF]]
 //       CHECK:         memref.store %[[ADDF]], %[[ARG2]][%[[IV0]], %[[IV1]]]
+//   CHECK-NOT:   linalg.matmul ins(%arg0, %arg1 : memref<?x?xf32>, memref<?x?xf32>)
 
 // -----
 

Original file line number	Diff line number	Diff line change
`@@ -2092,6 +2092,7 @@ DiagnosedSilenceableFailure transform::ConvertToLoopsOp::applyToOne(`
`2092`	`2092`	`scf::lowerToLoopsUsingSCFForOp(rewriter, target);`
`2093`	`2093`	`if (failed(loops))`
`2094`	`2094`	`return emitDefaultDefiniteFailure(target);`
	`2095`	`+ rewriter.eraseOp(target);`
`2095`	`2096`	`return DiagnosedSilenceableFailure::success();`
`2096`	`2097`	`}`
`2097`	`2098`