Bump llvm to llvm/llvm-project@c06d0ff806b7

compiler/src/iree/compiler/Codegen/Common/TransformExtensions/CommonExtensions.cpp

@@ -964,14 +964,6 @@ DiagnosedSilenceableFailure transform_dialect::IREEBufferizeOp::apply(
     return listener.checkAndResetError();
   }
 
-  //   3. Post-bufferization passes are fine.
-  PassManager pm(getContext());
-  addIREEPostBufferizationPasses(pm);
-  if (failed(pm.run(target))) {
-    return mlir::emitDefiniteFailure(target)
-           << "post-bufferization passes failed";
-  }
-
   results.set(getOperation()->getOpResult(0), {target});
   return listener.checkAndResetError();
 }

compiler/src/iree/compiler/Codegen/LLVMCPU/test/transform_dialect_bufferize.mlir

@@ -35,7 +35,10 @@ module attributes {transform.with_named_sequence} {
     transform.print %8 : !transform.any_op
     transform.iree.eliminate_empty_tensors %8 : (!transform.any_op) -> ()
     %9 = transform.iree.bufferize %8 : (!transform.any_op) -> !transform.any_op
-    // %9 = transform.structured.match ops{["func.func"]} in %8 : (!transform.any_op) -> !transform.any_op
+    %10 = transform.structured.match ops{["func.func"]} in %9 : (!transform.any_op) -> !transform.op<"func.func">
+    transform.apply_patterns to %10 {
+      transform.apply_patterns.canonicalization
+    } : !transform.op<"func.func">
     transform.yield
   }
 }

compiler/src/iree/compiler/Codegen/LLVMGPU/test/transform_dialect_codegen_bufferize_spec.mlir

@@ -4,10 +4,14 @@ module attributes { transform.with_named_sequence } {
     %tensor_func = transform.structured.match ops{["func.func"]} in %variant_op : (!transform.any_op) -> !transform.any_op
     transform.iree.eliminate_empty_tensors %tensor_func : (!transform.any_op) -> ()
     %memref_func = transform.iree.bufferize %tensor_func : (!transform.any_op) -> !transform.any_op
+    %func_op_bufferized = transform.structured.match ops{["func.func"]} in %memref_func : (!transform.any_op) -> !transform.op<"func.func">
+    transform.apply_patterns to %func_op_bufferized {
+      transform.apply_patterns.canonicalization
+    } : !transform.op<"func.func">
 
     // Annotate the exported function as already translated.
     %none = transform.param.constant #iree_codegen.translation_info<pipeline = None> -> !transform.any_param
-    transform.annotate %memref_func "translation_info" = %none : !transform.any_op, !transform.any_param
+    transform.annotate %func_op_bufferized "translation_info" = %none : !transform.op<"func.func">, !transform.any_param
     transform.yield
   }
 } // module

compiler/src/iree/compiler/Dialect/HAL/Transforms/DumpExecutableBenchmarks.cpp

@@ -18,9 +18,11 @@
 #include "llvm/Support/Path.h"
 #include "llvm/Support/ToolOutputFile.h"
 #include "mlir/Dialect/SCF/IR/SCF.h"
+#include "mlir/IR/Dominance.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Pass/PassManager.h"
 #include "mlir/Support/FileUtilities.h"
+#include "mlir/Transforms/CSE.h"
 #include "mlir/Transforms/Passes.h"
 
 // NOTE: redundant bindings will result in unique buffer locations during the
@@ -447,14 +449,9 @@ buildBenchmarkModule(IREE::HAL::ExecutableOp sourceExecutableOp,
   if (!hasAnyBenchmarks)
     return {};
 
-  // Run CSE and the canonicalizer to pretty up the output.
-  PassManager passManager(moduleOp->getContext());
-  passManager.addPass(mlir::createCanonicalizerPass());
-  passManager.addPass(mlir::createCSEPass());
-  if (failed(passManager.run(*moduleOp))) {
-    moduleOp->emitError("failed to run canonicalizer; malformed output");
-    return {};
-  }
+  IRRewriter rewriter(moduleOp->getContext());
+  DominanceInfo domInfo;
+  mlir::eliminateCommonSubExpressions(rewriter, domInfo, moduleOp.get());
 
   return moduleOp;
 }