[mlir] Include anchor op in reproducer pipeline string

[rkayaith]

Summary

Including the anchor op ensures that all pass manager settings are fully
specified, and makes the string consistent with the printed form.

Depends on D134622

[rkayaith]

simplify change

[rkayaith]

clang-format

[rkayaith]

fix RUN command for windows

[rkayaith]

update

[rkayaith]

mlir/test/Pass/run-reproducer.mlir

17

not sure why whitespace gets printed after the {

[rkayaith]

update docs, rename variable

[rriddle]

mlir/test/Pass/run-reproducer.mlir

17

I think we should fix that, otherwise seems like it will create problems elsewhere.

mlir/lib/Pass/PassCrashRecovery.cpp

void RecoveryReproducerContext::generate(std::string &description) {
   std::string error;
   std::unique_ptr<PassManager::ReproducerStream> stream = streamFactory(error);
   if (!stream) {
     descOS << "failed to create output stream: " << error;
     return;
   }
   descOS << "reproducer generated at `" << stream->description() << "`";
 
+  std::string pipelineStr =
+      (preCrashOperation->getName().getStringRef() + "(" + pipeline + ")")
+          .str();
   AsmState state(preCrashOperation);
   state.attachResourcePrinter(
       "mlir_reproducer", [&](Operation *op, AsmResourceBuilder &builder) {
-        builder.buildString("pipeline", pipeline);
+        builder.buildString("pipeline", pipelineStr);
         builder.buildBool("disable_threading", disableThreads);
         builder.buildBool("verify_each", verifyPasses);
       });
 
   // Output the .mlir module.
   preCrashOperation->print(stream->os(), state);
 }
 
auto parseFn = [this](AsmParsedResourceEntry &entry) -> LogicalResult {
     }
     return entry.emitError() << "unknown 'mlir_reproducer' resource key '"
                              << entry.getKey() << "'";
   };
   config.attachResourceParser("mlir_reproducer", parseFn);
 }
 
 LogicalResult PassReproducerOptions::apply(PassManager &pm) const {
-  if (pipeline.has_value())
-    if (failed(parsePassPipeline(*pipeline, pm)))
+  if (pipeline.has_value()) {
+    FailureOr<OpPassManager> reproPm = parsePassPipeline(*pipeline);
+    if (failed(reproPm))
       return failure();
+    static_cast<OpPassManager &>(pm) = std::move(*reproPm);
+  }
 
   if (disableThreading.has_value())
     pm.getContext()->disableMultithreading(*disableThreading);
 
   if (verifyEach.has_value())
     pm.enableVerifier(*verifyEach);
 
   return success();
 }

mlir/test/Pass/crash-recovery-dynamic-failure.mlir

module @inner_mod1 {
   // expected-note@below {{Pipeline failed while executing}}
   module @foo {}
 }
 
 
 // REPRO_LOCAL_DYNAMIC_FAILURE: module @inner_mod1
 // REPRO_LOCAL_DYNAMIC_FAILURE: module @foo {
 
-// REPRO_LOCAL_DYNAMIC_FAILURE: pipeline: "builtin.module(test-pass-failure)"
+// REPRO_LOCAL_DYNAMIC_FAILURE: pipeline: "builtin.module(builtin.module(test-pass-failure))"

mlir/test/Pass/crash-recovery.mlir

 // expected-error@below {{Failures have been detected while processing an MLIR pass pipeline}}
 // expected-note@below {{Pipeline failed while executing}}
 module @inner_mod1 {
   module @foo {}
 }
 
 // REPRO: module @inner_mod1
 // REPRO: module @foo {
-// REPRO: pipeline: "builtin.module(test-module-pass,test-pass-crash)"
+// REPRO: pipeline: "builtin.module(builtin.module(test-module-pass,test-pass-crash))"
 
 // REPRO_LOCAL: module @inner_mod1
 // REPRO_LOCAL: module @foo {
-// REPRO_LOCAL: pipeline: "builtin.module(test-pass-crash)"
+// REPRO_LOCAL: pipeline: "builtin.module(builtin.module(test-pass-crash))"
 
 // REPRO_LOCAL_DYNAMIC: module @inner_mod1
 // REPRO_LOCAL_DYNAMIC: module @foo {
-// REPRO_LOCAL_DYNAMIC: pipeline: "builtin.module(test-pass-crash)"
+// REPRO_LOCAL_DYNAMIC: pipeline: "builtin.module(builtin.module(test-pass-crash))"

mlir/test/Pass/run-reproducer.mlir

+// RUN: mlir-opt %s -test-dump-pipeline 2>&1 | FileCheck %s
 // RUN: mlir-opt %s -mlir-print-ir-before=cse 2>&1 | FileCheck -check-prefix=BEFORE %s
 
 func.func @foo() {
   %0 = arith.constant 0 : i32
   return
 }
 
 func.func @bar() {
   return
 }
 
 {-#
   external_resources: {
     mlir_reproducer: {
-      pipeline: "func.func(cse,canonicalize)",
+      verify_each: true,
+      // CHECK:  builtin.module(func.func(cse,canonicalize{ max-iterations=1 region-simplify=false top-down=false}))
+      pipeline: "builtin.module(func.func(cse,canonicalize{max-iterations=1 region-simplify=false top-down=false}))",
       disable_threading: true
     }
   }
 #-}
 
 // BEFORE: // -----// IR Dump Before{{.*}}CSE (cse) //----- //
 // BEFORE-NEXT: func @foo()
 // BEFORE: // -----// IR Dump Before{{.*}}CSE (cse) //----- //
 // BEFORE-NEXT: func @bar()
 // BEFORE-NOT: // -----// IR Dump Before{{.*}}Canonicalizer (canonicalize) //----- //
 // BEFORE-NOT: // -----// IR Dump After