[mlir] Introduce transform.alternatives op

[ftynse]

Summary

Introduce a transform dialect op that allows one to attempt different
transformation sequences on the same piece of payload IR until one of them
succeeds. This op fundamentally expands the scope of possibilities in the
transform dialect that, until now, could only propagate transformation failure,
at least using in-tree operations. This requires a more detailed specification
of the execution model for the transform dialect that now indicates how failure
is handled and propagated.

Transformations described by transform operations now have tri-state results,
with some errors being fundamentally irrecoverable (e.g., generating malformed
IR) and some others being recoverable by containing ops. Existing transform ops
directly implementing the apply interface method are updated to produce this
directly. Transform ops with the TransformEachTransformOpTrait are currently
considered to produce only irrecoverable failures and will be updated
separately.

[springerm]

mlir/include/mlir/Dialect/Transform/IR/TransformDialect.td

170

remove

172

immediately

183

register/registry?

mlir/include/mlir/Dialect/Transform/IR/TransformInterfaces.h

27

can be

28

maybe put quotes around "reported"

30

either?

47–48

"Typically" or "must"?

738

silencable failure

mlir/include/mlir/Dialect/Transform/IR/TransformOps.td

30

arbitrary

31

Sounds like this could've been implemented with a single sequence op in each region (thus not having to support multiple ops per region in the alternatives op). Is this design mainly to avoid boilerplate code (multiple nested regions are hard to read)?

33

these

47

Maybe this could be checked to some degree by attaching a listener to the rewriter. If ops are created/deleted outside of the specified scope, we could fail an assertion. But I'm not sure if we can easily attach/detach listeners...

48

arbitrarily

55

is achieved

55

Is it possible that an existing handle to an op is invalidated during rollback? The cloned op will have a different Operation*. I'm thinking of 2 cases:

1. Handle defined above the alternatives op. First alternative is rolled back, the handle cannot be used in the second alternative. I guess that's not allowed due to "isolated from above"?
2. Handle defined above the alternatives op. It is not used in the alternatives op, but the op pointed to by the handle is within the specified scope. We have a rollback during the alternatives op. The handle is used after the alternatives op and may now be invalid.

59

lifted

62–64

Maybe add: Each alternative region must return the same number of results.

mlir/lib/Dialect/Bufferization/TransformOps/BufferizationTransformOps.cpp

41

A bit off topic: Looking at this piece of code again. Let's assume that OneShotBufferizeOp has a result (the bufferized op). For most ops (everything except for ModuleOp, maybe FuncOp), we don't have a handle to the bufferized op. In that case, we could just return a silencable error and not populate the transformResults. We could infer from the number of expected return values in the assembly format (one or zero PDL_Operations) if a return handle is expected or not. Then we don't need the targetIsModule attr anymore. Would that work?

mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp

191–192

You could make DiagnosedSilencableFailure(LogicalResult) constructor public.

mlir/lib/Dialect/Transform/IR/TransformOps.cpp

214–222

I'm not sure what this is doing. deleteClones.release() deactivates the deleteClones function, i.e., it is no longer run at the end of the scope. Don't we want the opposite? If !failed, i.e., if "success", delete the clones. And the for loop restores the original state. I was expecting to see this in an else branch (if failed).

[ftynse]

Review

mlir/include/mlir/Dialect/Transform/IR/TransformOps.td

31

Not only harder to read, but also a bit more annoying to reason about.

47

Not all transforms are performed with a rewriter. This is enforced by performing the transformations on a clone of the scope operation that is not inserted into the parent. Thus they are unable to touch anything else.

55

Handle defined above the alternatives op. First alternative is rolled back, the handle cannot be used in the second alternative. I guess that's not allowed due to "isolated from above"?

Indeed, isolated from above requires the handle to be remapped to a new value in each region.

Handle defined above the alternatives op. It is not used in the alternatives op, but the op pointed to by the handle is within the specified scope. We have a rollback during the alternatives op. The handle is used after the alternatives op and may now be invalid.

This is subject to general handle invalidation. AlternativesOp always consumes the scope handle, regardless of it succeeding. This invalidates all handles to any operation nested within the scope per https://mlir.llvm.org/docs/Dialects/Transform/#handle-invalidation. Uses of invalidated handles are caught by the expensive-checks mode.

mlir/lib/Dialect/Bufferization/TransformOps/BufferizationTransformOps.cpp

41

I don't think you can parse that way. The op parser has no access to the parsed LHS values, but still expects the matching number of types to be defined in the result. The attribute indicates whether to add the result type or not.

mlir/lib/Dialect/Transform/IR/TransformOps.cpp

214–222

The transformation is attempted on the clones, not on the original IR, by virtue of mapping the only handle available in the alternative region to the clones. So when the transformation succeeded, we want to keep the clones and erase the original IR, which is done by cancelling the scheduled deletions and calling replaceOp that calls eraseOp internally.

We may be wanting the opposite approach with the transform being applied to the original IR, but doing that will make scoping permeable (e.g., the transformation will be able to inspect and potentially modify the ops outside of the scope, currently the scope operation exists on its own so it is physically impossible for the transformation to do act beyond it). I'd go with the current version and see when we hit the need to inspect the surrounding IR.

Expanded the comment a bit.

[nicolasvasilache]

mlir/include/mlir/Dialect/Transform/IR/TransformDialect.td

173

typo

mlir/include/mlir/Dialect/Transform/IR/TransformInterfaces.h

33

Silenceable in languages without cedillas I guess :) ?

565

Weirdly, I don't see the region being used as != 0 anywhere and I find using the region magic number feels unfortunate.

Can we just drop (or at least use a Region* and interpret nullptr as 0) ?
Seems all the uses are going through the other flavor of mapBlockArguments that take explicit regions?

mlir/include/mlir/Dialect/Transform/IR/TransformOps.td

75

failible -> fallible

mlir/lib/Dialect/Transform/IR/TransformOps.cpp

175

I would add a hard failure here requiring originals to be isolated from above.
In the absence of that, nothing prevents your clone logic below to modify IR it shouldn't and it will likely get surprising.

194

return and leak ?
I always put the guard right after the alloc.

I'd restructure to:

clones = ...
guard = ...

// Map the block argument (the only visible handle) to the cloned scope operations. 
// This effectively prevents the transformation from accessing any IR outside the scope.
if (failed(state.mapBlockArguments(reg.front().getArgument(0), clones)))
  ...

[ftynse]

1d45282aa398a1afafd7070cf6a09efacab6dc27

mlir/include/mlir/Dialect/Transform/IR/TransformInterfaces.h

565

The number is the positional index, we use them from time to time. I switched to passing a Region & plus an overload without it (null pointer means error most of the time). I also had to assert that the region belongs to the op, which is wasn't necessary with the positional index.

mlir/include/mlir/Dialect/Transform/IR/TransformDialect.td

let description = [{
     is have the `Read` and `Free` effects on them. As with the usual memory
     effects, using a value after it was freed is incorrect. In case of the
     transform IR, this value is likely associated with payload IR operations
     that were modified or even removed by the transformation, so it is
     meaningless to refer to them. When further transformations are desired, the
     transform operations can return _new_ handles that can be read or consumed
     by subsequent operations.
 
+    ## Execution Model
+
+    The transformation starts at the specifed top-level transform IR operation
+    and applies to some payload IR scope, identified by the payload IR op that
+    contains the IR to transform. It is the responsibility of the user to
+    properly select the scope and/or to avoid the transformations to modify the
+    IR outside of the given scope. The top-level transform IR operation may
+    contain further transform operations and execute them in the desired order.
+
+    Transformation application functions produce a tri-state status:
+
+    - success;
+    - recoverable (silencable) failure;
+    - irrecoverable failure.
+
+    Transformation container operations may intercept recoverable failures and
+    perform the steps required recovery steps thus succeeding themselves. On
+    the other hand, they must propagate irrecoverable failures. For such
+    failures, the diagnostics are emitted immediatelty whereas their emission is
+    postponed for recoverable faliures. Transformation container operations may
+    also fail to recover from a theoretically recoverable failure, in which case
+    they are expected to emit the diagnostic and turn the failure into an
+    irrecoverable one. A recoverable failure produced by applying the top-level
+    transform IR operation is considered irrecoverable.
+
+    Transformation container operations are allowed to "step over" some nested
+    operations if the application of some previous operation produced a failure.
+    This can be conceptually thought of as having a global "recoverable error
+    register" that is read/write accessed by each transform operation as a side
+    effect. The transformation is skipped if the registrer already contains an
+    error description, and the control flow proceeds to the following operation.
+
     ## Handle Invalidation
 
     The execution model of the transform dialect expects that a payload IR
     operation is associated with _at most one_ transform IR handle. This avoids
     the situation when a handle to an operation outlives the operation itself
     that can be erased during a transformation triggered through another handle.
 
     Handles pointing to operations nested in each other are allowed to co-exist

mlir/include/mlir/Dialect/Transform/IR/TransformInterfaces.h

 //===- TransformInterfaces.h - Transform Dialect Interfaces -----*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef MLIR_DIALECT_TRANSFORM_IR_TRANSFORMINTERFACES_H
 #define MLIR_DIALECT_TRANSFORM_IR_TRANSFORMINTERFACES_H
 
 #include "mlir/IR/OpDefinition.h"
 
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 
 namespace mlir {
+
+/// The result of a transform IR operation application. This can have one of the
+/// three states:
+///   - success;
+///   - silencable (recoverable) failure with yet-unreported diagnostic;
+///   - definite failure.
+/// Silencable failure is intended to communicate information about
+/// transformations that did not apply but in a way that supports recovery,
+/// for example, they did not modify the payload IR or modified it in some
+/// predictable way. They are associated with a Diagnostic that provides more
+/// details on the failure. Silencable failure can discarded, turning the result
+/// into success, or reported, emitting the diagnostic and turning the result
+/// into definite failure. Transform IR operations containing other operations
+/// are allowed to do both with the results of the nested transformations, but
+/// must propagate definite failures as their diagnostics have been already
+/// reported to the user.
+class LLVM_NODISCARD DiagnosedSilencableFailure {
+public:
+  DiagnosedSilencableFailure(const DiagnosedSilencableFailure &) = delete;
+  DiagnosedSilencableFailure &
+  operator=(const DiagnosedSilencableFailure &) = delete;
+  DiagnosedSilencableFailure(DiagnosedSilencableFailure &&) = default;
+  DiagnosedSilencableFailure &
+  operator=(DiagnosedSilencableFailure &&) = default;
+
+  /// Constructs a DiagnosedSilencableFailure in the success state.
+  static DiagnosedSilencableFailure success() {
+    return DiagnosedSilencableFailure(::mlir::success());
+  }
+
+  /// Constructs a DiagnosedSilencableFailure in the failure state. Typically,
+  /// a diagnostic must have been emitted before this.
+  static DiagnosedSilencableFailure definiteFailure() {
+    return DiagnosedSilencableFailure(::mlir::failure());
+  }
+
+  /// Constructs a DiagnosedSilencableFailure in the silencable failure state,
+  /// ready to emit the given diagnostic. This is considered a failure
+  /// regardless of the diagnostic severity.
+  static DiagnosedSilencableFailure silencableFailure(Diagnostic &&diag) {
+    return DiagnosedSilencableFailure(std::forward<Diagnostic>(diag));
+  }
+
+  /// Converts all kinds of failure into a LogicalResult failure, emitting the
+  /// diagnostic if necessary. Must not be called more than once.
+  LogicalResult checkAndReport() {
+#if LLVM_ENABLE_ABI_BREAKING_CHECKS
+    assert(!reported && "attempting to report a diagnostic more than once");
+    reported = true;
+#endif // LLVM_ENABLE_ABI_BREAKING_CHECKS
+    if (diagnostic) {
+      diagnostic->getLocation().getContext()->getDiagEngine().emit(
+          std::move(*diagnostic));
+      diagnostic.reset();
+      result = ::mlir::failure();
+    }
+    return result;
+  }
+
+  /// Returns `true` if this is a silencable failure.
+  bool isSilencableFailure() const { return diagnostic.hasValue(); }
+
+  /// Returns `true` if this is a success.
+  bool succeeded() const {
+    return !diagnostic.hasValue() && ::mlir::succeeded(result);
+  }
+
+  /// Returns the diagnostic message without emitting it. Expects this object
+  /// to be a silencable failure.
+  std::string getMessage() const { return diagnostic->str(); }
+
+  /// Converts silencable failure into LogicalResult success without reporting
+  /// the diagnostic, preserves the other states.
+  LogicalResult silence() {
+    if (diagnostic) {
+      diagnostic.reset();
+      result = ::mlir::success();
+    }
+    return result;
+  }
+
+  /// Streams the given values into the diagnotic. Expects this object to be a
+  /// silencable failure.
+  template <typename T> DiagnosedSilencableFailure &operator<<(T &&value) & {
+    assert(isSilencableFailure() &&
+           "can only append output in silencable failure state");
+    *diagnostic << std::forward<T>(value);
+    return *this;
+  }
+  template <typename T> DiagnosedSilencableFailure &&operator<<(T &&value) && {
+    return std::move(this->operator<<(std::forward<T>(value)));
+  }
+
+  /// Attaches a note to the diagnostic. Expects this object to be a silencable
+  /// failure.
+  Diagnostic &attachNote(Optional<Location> loc = llvm::None) {
+    assert(isSilencableFailure() &&
+           "can only attach notes to silencable failures");
+    return diagnostic->attachNote(loc);
+  }
+
+private:
+  explicit DiagnosedSilencableFailure(LogicalResult result) : result(result) {}
+  explicit DiagnosedSilencableFailure(Diagnostic &&diagnostic)
+      : diagnostic(std::move(diagnostic)), result(failure()) {}
+
+  /// The diagnostic associated with this object. If present, the object is
+  /// considered to be in the silencable failure state regardless of the
+  /// `result` field.
+  Optional<Diagnostic> diagnostic;
+
+  /// The "definite" logical state, either success or failure. Ignored if the
+  /// diagnostic message is present.
+  LogicalResult result;
+
+#if LLVM_ENABLE_ABI_BREAKING_CHECKS
+  /// Whther the associated diagnostic have been reported. Diagnostic reporting
+  /// consumes the diagnostic, so we need a mechanism to differentiate a
+  /// reported diagnostic from a state where it was never created.
+  bool reported = false;
+#endif // LLVM_ENABLE_ABI_BREAKING_CHECKS
+};
+
 namespace transform {
 
 class TransformOpInterface;
 
 /// Options controlling the application of transform operations by the
 /// TransformState.
 class TransformOptions {
 public:
public:
   ArrayRef<Operation *> getPayloadOps(Value value) const;
 
   /// Returns the Transform IR handle for the given Payload IR op if it exists
   /// in the state, null otherwise.
   Value getHandleForPayloadOp(Operation *op) const;
 
   /// Applies the transformation specified by the given transform op and updates
   /// the state accordingly.
-  LogicalResult applyTransform(TransformOpInterface transform);
+  DiagnosedSilencableFailure applyTransform(TransformOpInterface transform);
 
   /// Records the mapping between a block argument in the transform IR and a
   /// list of operations in the payload IR. The arguments must be defined in
   /// blocks of the currently processed transform IR region, typically after a
   /// region scope is defined.
   LogicalResult mapBlockArguments(BlockArgument argument,
                                   ArrayRef<Operation *> operations) {
 #if LLVM_ENABLE_ABI_BREAKING_CHECKS

 }
 
 namespace detail {
 /// Maps the only block argument of the op with PossibleTopLevelTransformOpTrait
 /// to either the list of operations associated with its operand or the root of
 /// the payload IR, depending on what is available in the context.
 LogicalResult
 mapPossibleTopLevelTransformOpBlockArguments(TransformState &state,
-                                             Operation *op);
+                                             Operation *op, unsigned region);
 
 /// Verification hook for PossibleTopLevelTransformOpTrait.
 LogicalResult verifyPossibleTopLevelTransformOpTrait(Operation *op);
 } // namespace detail
 
 /// This trait is supposed to be attached to Transform dialect operations that
 /// can be standalone top-level transforms. Such operations typically contain
 /// other Transform dialect operations that can be executed following some
 /// control flow logic specific to the current operation. The operations with
-/// this trait are expected to have exactly one single-block region with one
+/// this trait are expected to have at least one single-block region with one
 /// argument of PDL Operation type. The operations are also expected to be valid
 /// without operands, in which case they are considered top-level, and with one
 /// or more arguments, in which case they are considered nested. Top-level
 /// operations have the block argument of the entry block in the Transform IR
 /// correspond to the root operation of Payload IR. Nested operations have the
 /// block argument of the entry block in the Transform IR correspond to a list
 /// of Payload IR operations mapped to the first operand of the Transform IR
 /// operation. The operation must implement TransformOpInterface.
 template <typename OpTy>
 class PossibleTopLevelTransformOpTrait
     : public OpTrait::TraitBase<OpTy, PossibleTopLevelTransformOpTrait> {
 public:
   /// Verifies that `op` satisfies the invariants of this trait. Not expected to
   /// be called directly.
   static LogicalResult verifyTrait(Operation *op) {
     return detail::verifyPossibleTopLevelTransformOpTrait(op);
   }
 
-  /// Returns the single block of the op's only region.
-  Block *getBodyBlock() { return &this->getOperation()->getRegion(0).front(); }
+  /// Returns the single block of the given region.
+  Block *getBodyBlock(unsigned region = 0) {
+    return &this->getOperation()->getRegion(region).front();
+  }
 
-  /// Sets up the mapping between the entry block of the only region of this op
+  /// Sets up the mapping between the entry block of the given region of this op
   /// and the relevant list of Payload IR operations in the given state. The
   /// state is expected to be already scoped at the region of this operation.
   /// Returns failure if the mapping failed, e.g., the value is already mapped.
-  LogicalResult mapBlockArguments(TransformState &state) {
+  LogicalResult mapBlockArguments(TransformState &state, unsigned region = 0) {
     return detail::mapPossibleTopLevelTransformOpBlockArguments(
-        state, this->getOperation());
+        state, this->getOperation(), region);
   }
 };
 
 /// Trait implementing the TransformOpInterface for operations applying a
 /// transformation to a single operation handle and producing a single operation
 /// handle. The op must implement a method with one of the following signatures:
 ///   - FailureOr<convertible-to-Operation*> applyToOne(OpTy)
 ///   - LogicalResult applyToOne(OpTy)
 /// to perform a transformation that is applied in turn to all payload IR
 /// operations that correspond to the handle of the transform IR operation.
 /// In the functions above, OpTy is either Operation * or a concrete payload IR
 /// Op class that the transformation is applied to (NOT the class of the
 /// transform IR op). The op is expected to have one operand and zero or one
 /// results.
 template <typename OpTy>
 class TransformEachOpTrait
     : public OpTrait::TraitBase<OpTy, TransformEachOpTrait> {
 public:
   /// Calls `applyToOne` for every payload operation associated with the operand
   /// of this transform IR op. If `applyToOne` returns ops, associates them with
   /// the result of this transform op.
-  LogicalResult apply(TransformResults &transformResults,
+  DiagnosedSilencableFailure apply(TransformResults &transformResults,
                                    TransformState &state);
 
   /// Checks that the op matches the expectations of this trait.
   static LogicalResult verifyTrait(Operation *op);
 };
 
 /// Side effect resource corresponding to the mapping between Transform IR
 /// values and Payload IR operations. An Allocate effect from this resource
 /// means creating a new mapping entry, it is always accompanied by a Write

 /// cannot modify the Payload IR without reading it first). This is intended
 /// to disallow reordering of Transform IR operations that mutate the Payload IR
 /// while still allowing the reordering of those that only access it.
 struct PayloadIRResource
     : public SideEffects::Resource::Base<PayloadIRResource> {
   StringRef getName() override { return "transform.payload_ir"; }
 };
 
-/// Trait implementing the MemoryEffectOpInterface for single-operand operations
-/// that "consume" their operand and produce a new result.
+/// Trait implementing the MemoryEffectOpInterface for operations that "consume"
+/// their operands and produce new results.
 template <typename OpTy>
 class FunctionalStyleTransformOpTrait
     : public OpTrait::TraitBase<OpTy, FunctionalStyleTransformOpTrait> {
 public:
-  /// This op "consumes" the operand by reading and freeing it, "produces" the
-  /// results by allocating and writing it and reads/writes the payload IR in
-  /// the process.
+  /// This op "consumes" the operands by reading and freeing then, "produces"
+  /// the results by allocating and writing it and reads/writes the payload IR
+  /// in the process.
   void getEffects(SmallVectorImpl<MemoryEffects::EffectInstance> &effects) {
-    effects.emplace_back(MemoryEffects::Read::get(),
-                         this->getOperation()->getOperand(0),
+    for (Value operand : this->getOperation()->getOperands()) {
+      effects.emplace_back(MemoryEffects::Read::get(), operand,
                            TransformMappingResource::get());
-    effects.emplace_back(MemoryEffects::Free::get(),
-                         this->getOperation()->getOperand(0),
+      effects.emplace_back(MemoryEffects::Free::get(), operand,
                            TransformMappingResource::get());
+    }
     for (Value result : this->getOperation()->getResults()) {
       effects.emplace_back(MemoryEffects::Allocate::get(), result,
                            TransformMappingResource::get());
       effects.emplace_back(MemoryEffects::Write::get(), result,
                            TransformMappingResource::get());
     }
     effects.emplace_back(MemoryEffects::Read::get(), PayloadIRResource::get());
     effects.emplace_back(MemoryEffects::Write::get(), PayloadIRResource::get());
   }
 
   /// Checks that the op matches the expectations of this trait.
   static LogicalResult verifyTrait(Operation *op) {
-    static_assert(OpTy::template hasTrait<OpTrait::OneOperand>(),
-                  "expected single-operand op");
     if (!op->getName().getInterface<MemoryEffectOpInterface>()) {
       op->emitError()
           << "FunctionalStyleTransformOpTrait should only be attached to ops "
              "that implement MemoryEffectOpInterface";
     }
     return success();
   }
 };

 /// results of transforms, if any, in `results` in the same order. Fails if any
 /// of the application fails. Individual transforms must be callable with
 /// one of the following signatures:
 ///   - FailureOr<convertible-to-Operation*>(OpTy)
 ///   - LogicalResult(OpTy)
 /// where OpTy is either
 ///   - Operation *, in which case the transform is always applied;
 ///   - a concrete Op class, in which case a check is performed whether
 ///   `targets` contains operations of the same class and a failure is reported
 ///   if it does not.
 template <typename FnTy>
-LogicalResult applyTransformToEach(ArrayRef<Operation *> targets,
-                                   SmallVectorImpl<Operation *> &results,
-                                   FnTy transform) {
+DiagnosedSilencableFailure
+applyTransformToEach(ArrayRef<Operation *> targets,
+                     SmallVectorImpl<Operation *> &results, FnTy transform) {
   using OpTy = typename llvm::function_traits<FnTy>::template arg_t<0>;
   static_assert(std::is_convertible<OpTy, Operation *>::value,
                 "expected transform function to take an operation");
   using RetTy = typename llvm::function_traits<FnTy>::result_t;
   static_assert(std::is_convertible<RetTy, LogicalResult>::value,
                 "expected transform function to return LogicalResult or "
                 "FailureOr<convertible-to-Operation*>");
   for (Operation *target : targets) {
     auto specificOp = dyn_cast<OpTy>(target);
-    if (!specificOp)
-      return failure();
+    if (!specificOp) {
+      Diagnostic diag(target->getLoc(), DiagnosticSeverity::Error);
+      diag << "attempted to apply transform to the wrong op kind";
+      return DiagnosedSilencableFailure::silencableFailure(std::move(diag));
+    }
 
     auto result = transform(specificOp);
     if (failed(appendTransformResultToVector(result, results)))
-      return failure();
+      return DiagnosedSilencableFailure::definiteFailure();
   }
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 } // namespace detail
 } // namespace transform
 } // namespace mlir
 
 template <typename OpTy>
-mlir::LogicalResult mlir::transform::TransformEachOpTrait<OpTy>::apply(
+mlir::DiagnosedSilencableFailure
+mlir::transform::TransformEachOpTrait<OpTy>::apply(
     TransformResults &transformResults, TransformState &state) {
   using TransformOpType = typename llvm::function_traits<
       decltype(&OpTy::applyToOne)>::template arg_t<0>;
   ArrayRef<Operation *> targets =
       state.getPayloadOps(this->getOperation()->getOperand(0));
   SmallVector<Operation *> results;
-  if (failed(detail::applyTransformToEach(
-          targets, results, [&](TransformOpType specificOp) {
-            return static_cast<OpTy *>(this)->applyToOne(specificOp);
-          })))
-    return failure();
+  DiagnosedSilencableFailure result = detail::applyTransformToEach(
+      });
+  if (!result.succeeded())
+    return result;
+
   if (OpTy::template hasTrait<OpTrait::OneResult>()) {
     transformResults.set(
         this->getOperation()->getResult(0).template cast<OpResult>(), results);
   }
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 
 template <typename OpTy>
 mlir::LogicalResult
 mlir::transform::TransformEachOpTrait<OpTy>::verifyTrait(Operation *op) {
   static_assert(OpTy::template hasTrait<OpTrait::OneOperand>(),
                 "expected single-operand op");
   static_assert(OpTy::template hasTrait<OpTrait::OneResult>() ||

mlir/include/mlir/Dialect/Transform/IR/TransformInterfaces.td

def TransformOpInterface : OpInterface<"TransformOpInterface"> {
 
   let methods = [
     InterfaceMethod<
       /*desc=*/[{
         Applies the transformation represented by the current operation. This
         accepts as arguments the object that must be populated with results of
         the current transformation and a transformation state object that can be
         used for queries, e.g., to obtain the list of operations on which the
-        transformation represented by the current op is targeted.
+        transformation represented by the current op is targeted. Returns a
+        special status object indicating whether the transformation succeeded
+        or failed, and, if it failed, whether the failure is recoverable or not.
       }],
-      /*returnType=*/"::mlir::LogicalResult",
+      /*returnType=*/"::mlir::DiagnosedSilencableFailure",
       /*name=*/"apply",
       /*arguments=*/(ins
           "::mlir::transform::TransformResults &":$transformResults,
           "::mlir::transform::TransformState &":$state
     )>,
   ];
 
   let extraSharedClassDeclaration = [{
     /// Emits a generic transform error for the current transform operation
     /// targeting the given Payload IR operation and returns failure. Should
     /// be only used as a last resort when the transformation itself provides
     /// no further indication as to the reason of the failure.
     ::mlir::LogicalResult reportUnknownTransformError(
         ::mlir::Operation *target) {
       ::mlir::InFlightDiagnostic diag = $_op->emitError() << "failed to apply";
       diag.attachNote(target->getLoc()) << "attempted to apply to this op";
       return diag;
     }
+
+    /// Creates the silencable failure object with a diagnostic located at the
+    /// current operation.
+    DiagnosedSilencableFailure emitSilencableError() {
+      Diagnostic diag($_op->getLoc(), DiagnosticSeverity::Error);
+      return DiagnosedSilencableFailure::silencableFailure(std::move(diag));
+    }
   }];
 }
 
 def FunctionalStyleTransformOpTrait
     : NativeOpTrait<"FunctionalStyleTransformOpTrait"> {
   let cppNamespace = "::mlir::transform";
 }
 

mlir/include/mlir/Dialect/Transform/IR/TransformOps.td

 include "mlir/Interfaces/ControlFlowInterfaces.td"
 include "mlir/IR/OpAsmInterface.td"
 include "mlir/IR/SymbolInterfaces.td"
 include "mlir/Dialect/PDL/IR/PDLTypes.td"
 include "mlir/Dialect/Transform/IR/TransformDialect.td"
 include "mlir/Dialect/Transform/IR/TransformEffects.td"
 include "mlir/Dialect/Transform/IR/TransformInterfaces.td"
 
+def AlternativesOp : TransformDialectOp<"alternatives",
+    [DeclareOpInterfaceMethods<RegionBranchOpInterface,
+        ["getSuccessorEntryOperands", "getSuccessorRegions",
+         "getRegionInvocationBounds"]>,
+     DeclareOpInterfaceMethods<TransformOpInterface>,
+     FunctionalStyleTransformOpTrait, MemoryEffectsOpInterface,
+     IsolatedFromAbove, PossibleTopLevelTransformOpTrait,
+     SingleBlockImplicitTerminator<"::mlir::transform::YieldOp">]> {
+  let summary = "Attempts sequences of transforms until one succeeds";
+  let description = [{
+    This op may have an arbtirary number of regions, each of which represents a
+    sequence of transform operations to be applied to the same payload IR. The
+    regions are visited in order of appearance, and transforms in them are
+    applied in their respective order of appearance. If one of such transforms
+    fails to apply, the remaining ops in the same region are skipped an the next
+    region is attempted. If all transformations in a region succeed, the
+    remaining regions are skipped and the entire "alternatives" transformation
+    succeeds. If all regions contained a failing transformation, the entire
+    "alternatives" transformation fails.
+
+    It is up to the nested operations to define which errors are "recoverable"
+    (or "silencable") and allow another alternatives to be attempted, and which
+    errors should be propagated without attempting the other alternatives.
+
+    The single operand of this operation is the scope in which the alternative
+    transformation sequences are attempted, that is, an operation in the payload
+    IR that contains all the other operations that may be modified by the
+    transformations. There is no check that the transforms are indeed scoped
+    as their "apply" methods can be arbtirarily complex. Therefore it is the
+    responsibility of the user to ensure that the transforms are scoped
+    correctly, or to produce an irrecoverable error and thus abort the execution
+    without attempting the remaining alternatives.
+    
+    The changes to the IR within the scope performed by transforms in the failed
+    alternative region are reverted before attempting the next region.
+    Practically, this achieved by cloning the scope. Therefore it is advised to
+    limit the scope as much as possible and place the most likely alternatives
+    early in the region list. The operation is also isolated from above and
+    requires rediscovering the operations within the given scope to avoid
+    additional handle invalidation. The latter restriction may be liften in the
+    future.
+
+    Each of the regions may yield transform IR handles. The handles of the first
+    successful alternative region are returned as the results of the
+    "alternatives" op.
+
+    Remark: this op allows one to implement a simple "try" construct as follows:
+
+    ```mlir
+    %result = transform.alternatives %scope {
+    ^bb0(%arg0: !pdl.operation):
+      // Try a failible transformation.
+      %0 = transform.failible %arg0 // ...
+      // If succeeded, yield the the result of the transformation.
+      transform.yield %0 : !pdl.operation
+    }, {
+    ^bb0(%arg0: !pdl.operation):
+      // Otherwise, the second alternative is tried and it always succeeeds by
+      // returning the original handle.
+      transform.yield %arg0 : !pdl.operation
+    }
+    ```
+  }];
+
+  let arguments = (ins Optional<PDL_Operation>:$scope);
+  let results = (outs Variadic<AnyType>:$results);
+  let regions = (region VariadicRegion<SizedRegion<1>>:$alternatives);
+
+  let assemblyFormat =
+    "($scope^)? (`->` type($results)^)? attr-dict-with-keyword regions";
+  let hasVerifier = 1;
+}
+
 def GetClosestIsolatedParentOp : TransformDialectOp<"get_closest_isolated_parent",
     [DeclareOpInterfaceMethods<TransformOpInterface>,
      NavigationTransformOpTrait, MemoryEffectsOpInterface]> {
   let summary = "Gets handles to the closest isolated-from-above parents";
   let description = [{
     The handles defined by this Transform op correspond to the closest isolated
     from above ancestor of the Payload IR operations associated with its
     operand. If any of the given Payload IR ops has no such parent (unlikely as

mlir/lib/Dialect/Bufferization/TransformOps/BufferizationTransformOps.cpp

 using namespace mlir;
 using namespace mlir::bufferization;
 using namespace mlir::transform;
 
 //===----------------------------------------------------------------------===//
 // OneShotBufferizeOp
 //===----------------------------------------------------------------------===//
 
-LogicalResult
+DiagnosedSilencableFailure
 transform::OneShotBufferizeOp::apply(TransformResults &transformResults,
                                      TransformState &state) {
   OneShotBufferizationOptions options;
   options.allowReturnAllocs = getAllowReturnAllocs();
   options.allowUnknownOps = getAllowUnknownOps();
   options.bufferizeFunctionBoundaries = getBufferizeFunctionBoundaries();
   options.createDeallocs = getCreateDeallocs();
   options.testAnalysisOnly = getTestAnalysisOnly();
   options.printConflicts = getPrintConflicts();
 
   ArrayRef<Operation *> payloadOps = state.getPayloadOps(getTarget());
   for (Operation *target : payloadOps) {
     auto moduleOp = dyn_cast<ModuleOp>(target);
     if (getTargetIsModule() && !moduleOp)
-      return emitError("expected ModuleOp target");
+      return emitSilencableError() << "expected ModuleOp target";
     if (options.bufferizeFunctionBoundaries) {
       if (!moduleOp)
-        return emitError("expected ModuleOp target");
+        return emitSilencableError() << "expected ModuleOp target";
       if (failed(bufferization::runOneShotModuleBufferize(moduleOp, options)))
-        return emitError("bufferization failed");
+        return emitSilencableError() << "bufferization failed";
     } else {
       if (failed(bufferization::runOneShotBufferize(target, options)))
-        return emitError("bufferization failed");
+        return emitSilencableError() << "bufferization failed";
     }
   }
 
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 
 void transform::OneShotBufferizeOp::getEffects(
     SmallVectorImpl<MemoryEffects::EffectInstance> &effects) {
   effects.emplace_back(MemoryEffects::Read::get(), getTarget(),
                        TransformMappingResource::get());
 
   // Handles that are not modules are not longer usable.

mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp

 //===- LinalgTransformOps.cpp - Implementation of Linalg transform ops ----===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "mlir/Dialect/Linalg/TransformOps/LinalgTransformOps.h"
 
 #include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/Linalg/Transforms/Transforms.h"
 #include "mlir/Dialect/PDL/IR/PDL.h"
 #include "mlir/Dialect/PDL/IR/PDLTypes.h"
 #include "mlir/Dialect/Transform/IR/TransformDialect.h"
-#include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "mlir/Parser/Parser.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-#include "llvm/Support/FormatVariadic.h"
 
 using namespace mlir;
 using namespace mlir::linalg;
 using namespace mlir::transform;
 
 /// Extracts a vector of int64_t from an array attribute. Asserts if the
 /// attribute contains values other than integers.
 static SmallVector<int64_t> extractI64Array(ArrayAttr attr) {
static ParseResult parseTileLikeOp(OpAsmParser &parser, OperationState &result,
   size_t numExpectedLoops =
       sizesArrayAttr.size() - llvm::count(extractI64Array(sizesArrayAttr), 0);
   result.addTypes(SmallVector<Type>(numExpectedLoops + 1, pdlOpType));
   if (parser.resolveOperand(targetOperand, pdlOpType, result.operands))
     return failure();
   return success();
 }
 
-LogicalResult
+DiagnosedSilencableFailure
 transform::FuseOp::apply(mlir::transform::TransformResults &transformResults,
                          mlir::transform::TransformState &state) {
   LinalgTilingAndFusionOptions fusionOptions;
   fusionOptions.tileSizes = extractI64Array(getTileSizes());
   fusionOptions.tileInterchange = extractI64Array(getTileInterchange());
 
-  return applyTilingToAll(
+  LogicalResult result = applyTilingToAll(
       getOperation(), getTarget(), fusionOptions.tileSizes, transformResults,
       state, [&](LinalgOp linalgOp) -> FailureOr<TiledLinalgOp> {
         LinalgTileAndFuseTensorOpsPattern pattern(getContext(), fusionOptions);
         SimpleRewriter rewriter(getContext());
         rewriter.setInsertionPoint(linalgOp);
         FailureOr<TileLoopNest> tileLoopNest =
             pattern.returningMatchAndRewrite(linalgOp, rewriter);
         if (failed(tileLoopNest))
           return failure();
 
         TiledLinalgOp tiledLinalgOp;
         tiledLinalgOp.op = tileLoopNest->getRootOp();
         tiledLinalgOp.loops = {tileLoopNest->getLoopOps().begin(),
                                tileLoopNest->getLoopOps().end()};
         return tiledLinalgOp;
       });
+  return failed(result) ? DiagnosedSilencableFailure::definiteFailure()
+                        : DiagnosedSilencableFailure::success();
 }
 
 ParseResult transform::FuseOp::parse(OpAsmParser &parser,
                                      OperationState &result) {
   return parseTileLikeOp(
       parser, result,
       transform::FuseOp::getTileSizesAttrName(result.name).getValue());
 }
FailureOr<LinalgOp> transform::ScalarizeOp::applyToOne(LinalgOp target) {
 
   return result->op;
 }
 
 //===----------------------------------------------------------------------===//
 // TileOp
 //===----------------------------------------------------------------------===//
 
-LogicalResult transform::TileOp::apply(TransformResults &transformResults,
-                                       TransformState &state) {
+DiagnosedSilencableFailure
+transform::TileOp::apply(TransformResults &transformResults,
   LinalgTilingOptions tilingOptions;
   SmallVector<int64_t> tileSizes = extractI64Array(getSizes());
 
   if (!tileSizes.empty())
     tilingOptions.setTileSizes(tileSizes);
   tilingOptions.setInterchange(extractUIntArray(getInterchange()));
   LinalgTilingPattern pattern(getContext(), tilingOptions);
 
-  return applyTilingToAll(getOperation(), getTarget(), tileSizes,
-                          transformResults, state, [&](LinalgOp linalgOp) {
-                            SimpleRewriter rewriter(linalgOp.getContext());
-                            return pattern.returningMatchAndRewrite(linalgOp,
-                                                                    rewriter);
-                          });
+  LogicalResult result = applyTilingToAll(
+      getOperation(), getTarget(), tileSizes, transformResults, state,
+      [&](LinalgOp linalgOp) {
+        return pattern.returningMatchAndRewrite(linalgOp, rewriter);
+  return failed(result) ? DiagnosedSilencableFailure::definiteFailure()
+                        : DiagnosedSilencableFailure::success();
 }
 
 ParseResult transform::TileOp::parse(OpAsmParser &parser,
                                      OperationState &result) {
   return parseTileLikeOp(parser, result,
                          TileOp::getSizesAttrName(result.name).getValue());
 }
 

mlir/lib/Dialect/SCF/TransformOps/SCFTransformOps.cpp

 //===- SCFTransformOps.cpp - Implementation of SCF transformation ops -----===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "mlir/Dialect/SCF/TransformOps/SCFTransformOps.h"
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Dialect/SCF/Patterns.h"
 #include "mlir/Dialect/SCF/SCF.h"
 #include "mlir/Dialect/SCF/Transforms.h"
 #include "mlir/Dialect/SCF/Utils/Utils.h"
 #include "mlir/Dialect/Transform/IR/TransformDialect.h"
+#include "mlir/Dialect/Transform/IR/TransformInterfaces.h"
 #include "mlir/Dialect/Vector/IR/VectorOps.h"
 
 using namespace mlir;
 
 namespace {
 /// A simple pattern rewriter that implements no special logic.
 class SimpleRewriter : public PatternRewriter {
 public:
   SimpleRewriter(MLIRContext *context) : PatternRewriter(context) {}
 };
 } // namespace
 
 //===----------------------------------------------------------------------===//
 // GetParentForOp
 //===----------------------------------------------------------------------===//
 
-LogicalResult
+DiagnosedSilencableFailure
 transform::GetParentForOp::apply(transform::TransformResults &results,
                                  transform::TransformState &state) {
   SetVector<Operation *> parents;
   for (Operation *target : state.getPayloadOps(getTarget())) {
     scf::ForOp loop;
     Operation *current = target;
     for (unsigned i = 0, e = getNumLoops(); i < e; ++i) {
       loop = current->getParentOfType<scf::ForOp>();
       if (!loop) {
-        InFlightDiagnostic diag = emitError() << "could not find an '"
-                                              << scf::ForOp::getOperationName()
-                                              << "' parent";
+        DiagnosedSilencableFailure diag = emitSilencableError()
+                                          << "could not find an '"
         diag.attachNote(target->getLoc()) << "target op";
         return diag;
       }
       current = loop;
     }
     parents.insert(loop);
   }
   results.set(getResult().cast<OpResult>(), parents.getArrayRef());
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 
 //===----------------------------------------------------------------------===//
 // LoopOutlineOp
 //===----------------------------------------------------------------------===//
 
 /// Wraps the given operation `op` into an `scf.execute_region` operation. Uses
 /// the provided rewriter for all operations to remain compatible with the
scf::ExecuteRegionOp executeRegionOp =
     b.inlineRegionBefore(op->getRegions().front(), clonedRegion,
                          clonedRegion.end());
     b.create<scf::YieldOp>(op->getLoc(), clonedOp->getResults());
   }
   b.replaceOp(op, executeRegionOp.getResults());
   return executeRegionOp;
 }
 
-LogicalResult
+DiagnosedSilencableFailure
 transform::LoopOutlineOp::apply(transform::TransformResults &results,
                                 transform::TransformState &state) {
   SmallVector<Operation *> transformed;
   DenseMap<Operation *, SymbolTable> symbolTables;
   for (Operation *target : state.getPayloadOps(getTarget())) {
     Location location = target->getLoc();
     Operation *symbolTableOp = SymbolTable::getNearestSymbolTable(target);
     SimpleRewriter rewriter(getContext());
     scf::ExecuteRegionOp exec = wrapInExecuteRegion(rewriter, target);
     if (!exec) {
-      InFlightDiagnostic diag = emitError() << "failed to outline";
+      DiagnosedSilencableFailure diag = emitSilencableError()
+                                        << "failed to outline";
       diag.attachNote(target->getLoc()) << "target op";
       return diag;
     }
     func::CallOp call;
     FailureOr<func::FuncOp> outlined = outlineSingleBlockRegion(
         rewriter, location, exec.getRegion(), getFuncName(), &call);
 
-    if (failed(outlined))
-      return reportUnknownTransformError(target);
+    if (failed(outlined)) {
+      (void)reportUnknownTransformError(target);
+      return DiagnosedSilencableFailure::definiteFailure();
+    }
 
     if (symbolTableOp) {
       SymbolTable &symbolTable =
           symbolTables.try_emplace(symbolTableOp, symbolTableOp)
               .first->getSecond();
       symbolTable.insert(*outlined);
       call.setCalleeAttr(FlatSymbolRefAttr::get(*outlined));
     }
     transformed.push_back(*outlined);
   }
   results.set(getTransformed().cast<OpResult>(), transformed);
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 
 //===----------------------------------------------------------------------===//
 // LoopPeelOp
 //===----------------------------------------------------------------------===//
 
 FailureOr<scf::ForOp> transform::LoopPeelOp::applyToOne(scf::ForOp loop) {
   scf::ForOp result;

mlir/lib/Dialect/Transform/IR/TransformInterfaces.cpp

 //===- TransformInterfaces.cpp - Transform Dialect Interfaces -------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "mlir/Dialect/Transform/IR/TransformInterfaces.h"
 #include "mlir/Dialect/PDL/IR/PDLTypes.h"
 #include "mlir/IR/Diagnostics.h"
 #include "mlir/IR/Operation.h"
-#include "llvm/ADT/ScopeExit.h"
-#include "llvm/ADT/SmallPtrSet.h"
+#include "llvm/Support/Debug.h"
+
+#define DEBUG_TYPE "transform-dialect"
+#define DBGS() (llvm::dbgs() << "[" DEBUG_TYPE "] ")
 
 using namespace mlir;
 
 //===----------------------------------------------------------------------===//
 // TransformState
 //===----------------------------------------------------------------------===//
 
 constexpr const Value transform::TransformState::kTopLevelValue;
auto consumesTarget = [&](const MemoryEffects::EffectInstance &effect) {
              effect.getValue() == target.get();
     };
     if (llvm::find_if(effects, consumesTarget) != effects.end())
       recordHandleInvalidation(target);
   }
   return success();
 }
 
-LogicalResult
+DiagnosedSilencableFailure
 transform::TransformState::applyTransform(TransformOpInterface transform) {
+  LLVM_DEBUG(DBGS() << "applying: " << transform << "\n");
   if (options.getExpensiveChecksEnabled() &&
       failed(checkAndRecordHandleInvalidation(transform))) {
-    return failure();
+    return DiagnosedSilencableFailure::definiteFailure();
   }
 
   transform::TransformResults results(transform->getNumResults());
-  if (failed(transform.apply(results, *this)))
-    return failure();
+  DiagnosedSilencableFailure result(transform.apply(results, *this));
+  if (!result.succeeded())
+    return result;
 
   // Remove the mapping for the operand if it is consumed by the operation. This
   // allows us to catch use-after-free with assertions later on.
   auto memEffectInterface =
       cast<MemoryEffectOpInterface>(transform.getOperation());
   SmallVector<MemoryEffects::EffectInstance, 2> effects;
   for (OpOperand &target : transform->getOpOperands()) {
     effects.clear();
     memEffectInterface.getEffectsOnValue(target.get(), effects);
     if (llvm::any_of(effects, [](const MemoryEffects::EffectInstance &effect) {
           return isa<transform::TransformMappingResource>(
                      effect.getResource()) &&
                  isa<MemoryEffects::Free>(effect.getEffect());
         })) {
       removePayloadOps(target.get());
     }
   }
 
   for (OpResult result : transform->getResults()) {
     assert(result.getDefiningOp() == transform.getOperation() &&
            "payload IR association for a value other than the result of the "
            "current transform op");
     if (failed(setPayloadOps(result, results.get(result.getResultNumber()))))
-      return failure();
+      return DiagnosedSilencableFailure::definiteFailure();
   }
 
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 
 //===----------------------------------------------------------------------===//
 // TransformState::Extension
 //===----------------------------------------------------------------------===//
 
 transform::TransformState::Extension::~Extension() = default;
 
transform::TransformResults::get(unsigned resultNumber) const {
   return segments[resultNumber];
 }
 
 //===----------------------------------------------------------------------===//
 // Utilities for PossibleTopLevelTransformOpTrait.
 //===----------------------------------------------------------------------===//
 
 LogicalResult transform::detail::mapPossibleTopLevelTransformOpBlockArguments(
-    TransformState &state, Operation *op) {
+    TransformState &state, Operation *op, unsigned region) {
   SmallVector<Operation *> targets;
   if (op->getNumOperands() != 0)
     llvm::append_range(targets, state.getPayloadOps(op->getOperand(0)));
   else
     targets.push_back(state.getTopLevel());
 
-  return state.mapBlockArguments(op->getRegion(0).front().getArgument(0),
+  return state.mapBlockArguments(op->getRegion(region).front().getArgument(0),
                                  targets);
 }
 
 LogicalResult
 transform::detail::verifyPossibleTopLevelTransformOpTrait(Operation *op) {
   // Attaching this trait without the interface is a misuse of the API, but it
   // cannot be caught via a static_assert because interface registration is
   // dynamic.
   assert(isa<TransformOpInterface>(op) &&
          "should implement TransformOpInterface to have "
          "PossibleTopLevelTransformOpTrait");
 
-  if (op->getNumRegions() != 1)
-    return op->emitOpError() << "expects one region";
+  if (op->getNumRegions() < 1)
+    return op->emitOpError() << "expects at least one region";
 
   Region *bodyRegion = &op->getRegion(0);
   if (!llvm::hasNItems(*bodyRegion, 1))
     return op->emitOpError() << "expects a single-block region";
 
   Block *body = &bodyRegion->front();
   if (body->getNumArguments() != 1 ||
       !body->getArgumentTypes()[0].isa<pdl::OperationType>()) {

mlir/lib/Dialect/Transform/IR/TransformOps.cpp

 //===- TransformDialect.cpp - Transform dialect operations ----------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "mlir/Dialect/Transform/IR/TransformOps.h"
 #include "mlir/Dialect/PDL/IR/PDLOps.h"
 #include "mlir/Dialect/Transform/IR/TransformDialect.h"
 #include "mlir/Dialect/Transform/IR/TransformInterfaces.h"
-#include "mlir/IR/Builders.h"
 #include "mlir/IR/OpImplementation.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Interfaces/ControlFlowInterfaces.h"
 #include "mlir/Rewrite/FrozenRewritePatternSet.h"
 #include "mlir/Rewrite/PatternApplicator.h"
 #include "llvm/ADT/ScopeExit.h"
+#include "llvm/Support/Debug.h"
+
+#define DEBUG_TYPE "transform-dialect"
+#define DBGS() (llvm::dbgs() << "[" DEBUG_TYPE "] ")
 
 using namespace mlir;
 
 #define GET_OP_CLASSES
 #include "mlir/Dialect/Transform/IR/TransformOps.cpp.inc"
 
 //===----------------------------------------------------------------------===//
 // PatternApplicatorExtension
if (succeeded(applicator.matchAndRewrite(op, rewriter)))
       results.push_back(op);
   });
 
   return success();
 }
 } // namespace
 
 //===----------------------------------------------------------------------===//
+// AlternativesOp
+//===----------------------------------------------------------------------===//
+
+OperandRange
+transform::AlternativesOp::getSuccessorEntryOperands(unsigned index) {
+  if (getOperation()->getNumOperands() == 1)
+    return getOperation()->getOperands();
+  return OperandRange(getOperation()->operand_end(),
+                      getOperation()->operand_end());
+}
+
+void transform::AlternativesOp::getSuccessorRegions(
+    Optional<unsigned> index, ArrayRef<Attribute> operands,
+    SmallVectorImpl<RegionSuccessor> &regions) {
+  for (Region &alternative :
+       llvm::drop_begin(getAlternatives(), index.hasValue() ? *index + 1 : 0)) {
+    regions.emplace_back(&alternative, !getOperands().empty()
+                                           ? alternative.getArguments()
+                                           : Block::BlockArgListType());
+  }
+  if (index.hasValue())
+    regions.emplace_back(getOperation()->getResults());
+}
+
+void transform::AlternativesOp::getRegionInvocationBounds(
+    ArrayRef<Attribute> operands, SmallVectorImpl<InvocationBounds> &bounds) {
+  (void)operands;
+  // The region corresponding to the first alternative is always executed, the
+  // remaining may or may not be executed.
+  bounds.reserve(getNumRegions());
+  bounds.emplace_back(1, 1);
+  bounds.resize(getNumRegions(), InvocationBounds(0, 1));
+}
+
+static void forwardTerminatorOperands(Block *block,
+                                      transform::TransformState &state,
+                                      transform::TransformResults &results) {
+  for (const auto &pair : llvm::zip(block->getTerminator()->getOperands(),
+                                    block->getParentOp()->getOpResults())) {
+    Value terminatorOperand = std::get<0>(pair);
+    OpResult result = std::get<1>(pair);
+    results.set(result, state.getPayloadOps(terminatorOperand));
+  }
+}
+
+DiagnosedSilencableFailure
+transform::AlternativesOp::apply(transform::TransformResults &results,
+                                 transform::TransformState &state) {
+  SmallVector<Operation *> originals;
+  if (Value scopeHandle = getScope())
+    llvm::append_range(originals, state.getPayloadOps(scopeHandle));
+  else
+    originals.push_back(state.getTopLevel());
+
+  for (Operation *original : originals) {
+    if (original->isAncestor(getOperation())) {
+      InFlightDiagnostic diag =
+          emitError() << "scope must not contain the transforms being applied";
+      diag.attachNote(original->getLoc()) << "scope";
+      return DiagnosedSilencableFailure::definiteFailure();
+    }
+  }
+
+  for (Region &reg : getAlternatives()) {
+    auto scope = state.make_region_scope(reg);
+    auto clones = llvm::to_vector(
+        llvm::map_range(originals, [](Operation *op) { return op->clone(); }));
+    if (failed(state.mapBlockArguments(reg.front().getArgument(0), clones)))
+      return DiagnosedSilencableFailure::definiteFailure();
+    auto deleteClones = llvm::make_scope_exit([&] {
+      for (Operation *clone : clones)
+        clone->erase();
+    });
+
+    bool failed = false;
+    for (Operation &transform : reg.front().without_terminator()) {
+      DiagnosedSilencableFailure result =
+          state.applyTransform(cast<TransformOpInterface>(transform));
+      if (result.isSilencableFailure()) {
+        LLVM_DEBUG(DBGS() << "alternative failed: " << result.getMessage()
+                          << "\n");
+        failed = true;
+        break;
+      }
+
+      if (::mlir::failed(result.silence()))
+        return DiagnosedSilencableFailure::definiteFailure();
+    }
+
+    // If all operations in the given alternative succeeded, no need to consider
+    // the rest.
+    if (!failed) {
+      deleteClones.release();
+      IRRewriter rewriter(getContext());
+      for (const auto &kvp : llvm::zip(originals, clones)) {
+        Operation *original = std::get<0>(kvp);
+        Operation *clone = std::get<1>(kvp);
+        original->getBlock()->getOperations().insert(original->getIterator(),
+                                                     clone);
+        rewriter.replaceOp(original, clone->getResults());
+      }
+      forwardTerminatorOperands(&reg.front(), state, results);
+      return DiagnosedSilencableFailure::success();
+    }
+  }
+  return emitSilencableError() << "all alternatives failed";
+}
+
+LogicalResult transform::AlternativesOp::verify() {
+  for (Region &alternative : getAlternatives()) {
+    Block &block = alternative.front();
+    if (block.getNumArguments() != 1 ||
+        !block.getArgument(0).getType().isa<pdl::OperationType>()) {
+      return emitOpError()
+             << "expects region blocks to have one operand of type "
+             << pdl::OperationType::get(getContext());
+    }
+
+    Operation *terminator = block.getTerminator();
+    if (terminator->getOperands().getTypes() != getResults().getTypes()) {
+      InFlightDiagnostic diag = emitOpError()
+                                << "expects terminator operands to have the "
+                                   "same type as results of the operation";
+      diag.attachNote(terminator->getLoc()) << "terminator";
+      return diag;
+    }
+  }
+
+  return success();
+}
+
+//===----------------------------------------------------------------------===//
 // GetClosestIsolatedParentOp
 //===----------------------------------------------------------------------===//
 
-LogicalResult transform::GetClosestIsolatedParentOp::apply(
+DiagnosedSilencableFailure transform::GetClosestIsolatedParentOp::apply(
     transform::TransformResults &results, transform::TransformState &state) {
   SetVector<Operation *> parents;
   for (Operation *target : state.getPayloadOps(getTarget())) {
     Operation *parent =
         target->getParentWithTrait<OpTrait::IsIsolatedFromAbove>();
     if (!parent) {
-      InFlightDiagnostic diag =
-          emitError() << "could not find an isolated-from-above parent op";
+      DiagnosedSilencableFailure diag =
+          emitSilencableError()
+          << "could not find an isolated-from-above parent op";
       diag.attachNote(target->getLoc()) << "target op";
       return diag;
     }
     parents.insert(parent);
   }
   results.set(getResult().cast<OpResult>(), parents.getArrayRef());
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 
 //===----------------------------------------------------------------------===//
 // PDLMatchOp
 //===----------------------------------------------------------------------===//
 
-LogicalResult transform::PDLMatchOp::apply(transform::TransformResults &results,
-                                           transform::TransformState &state) {
+DiagnosedSilencableFailure
+transform::PDLMatchOp::apply(transform::TransformResults &results,
   auto *extension = state.getExtension<PatternApplicatorExtension>();
   assert(extension &&
          "expected PatternApplicatorExtension to be attached by the parent op");
   SmallVector<Operation *> targets;
   for (Operation *root : state.getPayloadOps(getRoot())) {
     if (failed(extension->findAllMatches(
             getPatternName().getLeafReference().getValue(), root, targets))) {
-      return emitOpError() << "could not find pattern '" << getPatternName()
-                           << "'";
+      emitOpError() << "could not find pattern '" << getPatternName() << "'";
+      return DiagnosedSilencableFailure::definiteFailure();
     }
   }
   results.set(getResult().cast<OpResult>(), targets);
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 
 //===----------------------------------------------------------------------===//
 // SequenceOp
 //===----------------------------------------------------------------------===//
 
-LogicalResult transform::SequenceOp::apply(transform::TransformResults &results,
-                                           transform::TransformState &state) {
+DiagnosedSilencableFailure
+transform::SequenceOp::apply(transform::TransformResults &results,
   // Map the entry block argument to the list of operations.
   auto scope = state.make_region_scope(*getBodyBlock()->getParent());
   if (failed(mapBlockArguments(state)))
-    return failure();
+    return DiagnosedSilencableFailure::definiteFailure();
 
   // Apply the sequenced ops one by one.
-  for (Operation &transform : getBodyBlock()->without_terminator())
-    if (failed(state.applyTransform(cast<TransformOpInterface>(transform))))
-      return failure();
+  for (Operation &transform : getBodyBlock()->without_terminator()) {
+    DiagnosedSilencableFailure result =
+        state.applyTransform(cast<TransformOpInterface>(transform));
+    if (!result.succeeded())
+      return result;
+  }
 
   // Forward the operation mapping for values yielded from the sequence to the
   // values produced by the sequence op.
-  for (const auto &pair :
-       llvm::zip(getBodyBlock()->getTerminator()->getOperands(),
-                 getOperation()->getOpResults())) {
-    Value terminatorOperand = std::get<0>(pair);
-    OpResult result = std::get<1>(pair);
-    results.set(result, state.getPayloadOps(terminatorOperand));
-  }
-
-  return success();
+  forwardTerminatorOperands(getBodyBlock(), state, results);
+  return DiagnosedSilencableFailure::success();
 }
 
 /// Returns `true` if the given op operand may be consuming the handle value in
 /// the Transform IR. That is, if it may have a Free effect on it.
 static bool isValueUsePotentialConsumer(OpOperand &use) {
   // Conservatively assume the effect being present in absence of the interface.
   auto memEffectInterface = dyn_cast<MemoryEffectOpInterface>(use.getOwner());
   if (!memEffectInterface)
void transform::SequenceOp::getRegionInvocationBounds(
   (void)operands;
   bounds.emplace_back(1, 1);
 }
 
 //===----------------------------------------------------------------------===//
 // WithPDLPatternsOp
 //===----------------------------------------------------------------------===//
 
-LogicalResult
+DiagnosedSilencableFailure
 transform::WithPDLPatternsOp::apply(transform::TransformResults &results,
                                     transform::TransformState &state) {
   OwningOpRef<ModuleOp> pdlModuleOp =
       ModuleOp::create(getOperation()->getLoc());
   TransformOpInterface transformOp = nullptr;
   for (Operation &nested : getBody().front()) {
     if (!isa<pdl::PatternOp>(nested)) {
       transformOp = cast<TransformOpInterface>(nested);
       break;
     }
   }
 
   state.addExtension<PatternApplicatorExtension>(getOperation());
   auto guard = llvm::make_scope_exit(
       [&]() { state.removeExtension<PatternApplicatorExtension>(); });
 
   auto scope = state.make_region_scope(getBody());
   if (failed(mapBlockArguments(state)))
-    return failure();
+    return DiagnosedSilencableFailure::definiteFailure();
   return state.applyTransform(transformOp);
 }
 
 LogicalResult transform::WithPDLPatternsOp::verify() {
   Block *body = getBodyBlock();
   Operation *topLevelOp = nullptr;
   for (Operation &op : body->getOperations()) {
     if (isa<pdl::PatternOp>(op))

mlir/test/Dialect/Transform/ops-invalid.mlir

^bb0(%arg0: !pdl.operation):
    // expected-error @below {{op cannot be nested}}
   transform.with_pdl_patterns %arg0 {
   ^bb1(%arg1: !pdl.operation):
   }
 }
 
 // -----
 
-// expected-error @below {{expects one region}}
+// expected-error @below {{expects at least one region}}
 "transform.test_transform_unrestricted_op_no_interface"() : () -> ()
 
 // -----
 
 // expected-error @below {{expects a single-block region}}
 "transform.test_transform_unrestricted_op_no_interface"() ({
 ^bb0(%arg0: !pdl.operation):
   "test.potential_terminator"() : () -> ()
^bb0(%arg0: !pdl.operation):
   transform.sequence %0 {
   ^bb1(%arg1: !pdl.operation):
     transform.sequence %arg1 {
     ^bb2(%arg2: !pdl.operation):
       test_consume_operand_if_matches_param_or_fail %arg2[42]
     }
   }
 }
+
+// -----
+
+transform.sequence {
+^bb1(%arg1: !pdl.operation):
+  // expected-error @below {{expects at least one region}}
+  transform.alternatives
+}
+
+// -----
+
+transform.sequence {
+^bb1(%arg1: !pdl.operation):
+  // expected-error @below {{expects terminator operands to have the same type as results of the operation}}
+  %2 = transform.alternatives %arg1 -> !pdl.operation {
+  ^bb2(%arg2: !pdl.operation):
+    transform.yield %arg2 : !pdl.operation
+  }, {
+  ^bb2(%arg2: !pdl.operation):
+    // expected-note @below {{terminator}}
+    transform.yield
+  }
+}
+
+// -----
+
+// expected-error @below {{expects the entry block to have one argument of type '!pdl.operation'}}
+transform.alternatives {
+^bb0:
+  transform.yield
+}

mlir/test/Dialect/Transform/test-interpreter.mlir

^bb0(%arg0: !pdl.operation):
   transform.sequence %arg0 {
   ^bb1(%arg1: !pdl.operation):
     %f = pdl_match @const in %arg1
     // CHECK: %{{.+}} = get_closest_isolated_parent %{{.+}}
     %m = get_closest_isolated_parent %f
     test_print_remark_at_operand %m, "parent function"
   }
 }
+
+// -----
+
+func.func @foo() {
+  %0 = arith.constant 0 : i32
+  return
+}
+
+transform.with_pdl_patterns {
+^bb0(%arg0: !pdl.operation):
+  pdl.pattern @match_func : benefit(1) {
+    %0 = pdl.operands
+    %1 = pdl.types
+    %2 = pdl.operation "func.func"(%0 : !pdl.range<value>) -> (%1 : !pdl.range<type>)
+    pdl.rewrite %2 with "transform.dialect"
+  }
+
+  transform.sequence %arg0 {
+  ^bb1(%arg1: !pdl.operation):
+    // This is necessary to run the transformation on something other than the
+    // top-level module, "alternatives" cannot be run on that.
+    %0 = pdl_match @match_func in %arg1
+    transform.alternatives %0 {
+    ^bb2(%arg2: !pdl.operation):
+      %1 = transform.test_produce_param_or_forward_operand 42
+      // This operation fails, which triggers the next alternative without
+      // reporting the error.
+      transform.test_consume_operand_if_matches_param_or_fail %1[43]
+    }, {
+    ^bb2(%arg2: !pdl.operation):
+      %1 = transform.test_produce_param_or_forward_operand 42
+      // expected-remark @below {{succeeded}}
+      transform.test_consume_operand_if_matches_param_or_fail %1[42]
+    }
+  }
+}
+
+// -----
+
+func.func private @bar()
+
+func.func @foo() {
+  call @bar() : () -> ()
+  return
+}
+
+transform.with_pdl_patterns {
+^bb0(%arg0: !pdl.operation):
+  pdl.pattern @match_call : benefit(1) {
+    %0 = pdl.operands
+    %1 = pdl.types
+    %2 = pdl.operation "func.call"(%0 : !pdl.range<value>) -> (%1 : !pdl.range<type>)
+    pdl.rewrite %2 with "transform.dialect"
+  }
+
+  transform.sequence %arg0 {
+  ^bb1(%arg1: !pdl.operation):
+    %0 = pdl_match @match_call in %arg1
+    %1 = get_closest_isolated_parent %0
+    // expected-error @below {{all alternatives failed}}
+    transform.alternatives %1 {
+    ^bb2(%arg2: !pdl.operation):
+      %2 = transform.pdl_match @match_call in %arg2
+      // expected-remark @below {{applying}}
+      transform.test_emit_remark_and_erase_operand %2, "applying" {fail_after_erase}
+    }
+  }
+}
+
+// -----
+
+func.func private @bar()
+
+func.func @foo() {
+  // expected-remark @below {{still here}}
+  call @bar() : () -> ()
+  return
+}
+
+transform.with_pdl_patterns {
+^bb0(%arg0: !pdl.operation):
+  pdl.pattern @match_call : benefit(1) {
+    %0 = pdl.operands
+    %1 = pdl.types
+    %2 = pdl.operation "func.call"(%0 : !pdl.range<value>) -> (%1 : !pdl.range<type>)
+    pdl.rewrite %2 with "transform.dialect"
+  }
+
+  transform.sequence %arg0 {
+  ^bb1(%arg1: !pdl.operation):
+    %0 = pdl_match @match_call in %arg1
+    %1 = get_closest_isolated_parent %0
+    transform.alternatives %1 {
+    ^bb2(%arg2: !pdl.operation):
+      %2 = transform.pdl_match @match_call in %arg2
+      // expected-remark @below {{applying}}
+      transform.test_emit_remark_and_erase_operand %2, "applying" {fail_after_erase}
+    }, {
+    ^bb2(%arg2: !pdl.operation):
+      %2 = transform.pdl_match @match_call in %arg2
+      transform.test_print_remark_at_operand %2, "still here"
+      // This alternative succeeds.
+    }, {
+    ^bb2(%arg2: !pdl.operation):
+      // This alternative is never run, so we must not have a remark here.
+      %2 = transform.pdl_match @match_call in %arg2
+      transform.test_emit_remark_and_erase_operand %2, "should not happen" {fail_after_erase}
+    }
+  }
+}
+
+// -----
+
+func.func private @bar()
+
+// CHECK-LABEL: @erase_call
+func.func @erase_call() {
+  // CHECK-NOT: call @bar
+  call @bar() : () -> ()
+  return
+}
+
+transform.with_pdl_patterns {
+^bb0(%arg0: !pdl.operation):
+  pdl.pattern @match_call : benefit(1) {
+    %0 = pdl.operands
+    %1 = pdl.types
+    %2 = pdl.operation "func.call"(%0 : !pdl.range<value>) -> (%1 : !pdl.range<type>)
+    pdl.rewrite %2 with "transform.dialect"
+  }
+
+  transform.sequence %arg0 {
+  ^bb1(%arg1: !pdl.operation):
+    %0 = pdl_match @match_call in %arg1
+    %1 = get_closest_isolated_parent %0
+    transform.alternatives %1 {
+    ^bb2(%arg2: !pdl.operation):
+      %2 = transform.pdl_match @match_call in %arg2
+      // expected-remark @below {{applying}}
+      transform.test_emit_remark_and_erase_operand %2, "applying" {fail_after_erase}
+    }, {
+    ^bb2(%arg2: !pdl.operation):
+      %2 = transform.pdl_match @match_call in %arg2
+      // expected-remark @below {{applying second time}}
+      transform.test_emit_remark_and_erase_operand %2, "applying second time"
+    }
+  }
+}
+
+// -----
+
+func.func private @bar()
+
+func.func @foo() {
+  call @bar() : () -> ()
+  return
+}
+
+transform.with_pdl_patterns {
+^bb0(%arg0: !pdl.operation):
+  pdl.pattern @match_call : benefit(1) {
+    %0 = pdl.operands
+    %1 = pdl.types
+    %2 = pdl.operation "func.call"(%0 : !pdl.range<value>) -> (%1 : !pdl.range<type>)
+    pdl.rewrite %2 with "transform.dialect"
+  }
+
+  transform.sequence %arg0 {
+  ^bb1(%arg1: !pdl.operation):
+    %0 = pdl_match @match_call in %arg1
+    %1 = get_closest_isolated_parent %0
+    %2 = transform.alternatives %1 -> !pdl.operation {
+    ^bb2(%arg2: !pdl.operation):
+      %3 = transform.pdl_match @match_call in %arg2
+      // expected-remark @below {{applying}}
+      transform.test_emit_remark_and_erase_operand %3, "applying" {fail_after_erase}
+      %4 = transform.test_produce_param_or_forward_operand 43
+      transform.yield %4 : !pdl.operation
+    }, {
+    ^bb2(%arg2: !pdl.operation):
+      %4 = transform.test_produce_param_or_forward_operand 42
+      transform.yield %4 : !pdl.operation
+    }
+    // The first alternative failed, so the returned value is taken from the
+    // second alternative.
+    // expected-remark @below {{succeeded}}
+    transform.test_consume_operand_if_matches_param_or_fail %2[42]
+  }
+}
+
+// -----
+
+// expected-note @below {{scope}}
+module {
+  func.func @foo() {
+    %0 = arith.constant 0 : i32
+    return
+  }
+
+  func.func @bar() {
+    %0 = arith.constant 0 : i32
+    %1 = arith.constant 1 : i32
+    return
+  }
+
+  transform.sequence {
+  ^bb1(%arg1: !pdl.operation):
+    // expected-error @below {{scope must not contain the transforms being applied}}
+    transform.alternatives %arg1 {
+    ^bb2(%arg2: !pdl.operation):
+      %0 = transform.test_produce_param_or_forward_operand 42
+      transform.test_consume_operand_if_matches_param_or_fail %0[43]
+    }, {
+    ^bb2(%arg2: !pdl.operation):
+      %0 = transform.test_produce_param_or_forward_operand 42
+      transform.test_consume_operand_if_matches_param_or_fail %0[42]
+    }
+  }
+}
+

mlir/test/lib/Dialect/Transform/TestTransformDialectExtension.cpp

public:
   using Op::Op;
 
   static ArrayRef<StringRef> getAttributeNames() { return {}; }
 
   static constexpr llvm::StringLiteral getOperationName() {
     return llvm::StringLiteral("transform.test_transform_op");
   }
 
-  LogicalResult apply(transform::TransformResults &results,
+  DiagnosedSilencableFailure apply(transform::TransformResults &results,
                                    transform::TransformState &state) {
     InFlightDiagnostic remark = emitRemark() << "applying transformation";
     if (Attribute message = getMessage())
       remark << " " << message;
 
-    return success();
+    return DiagnosedSilencableFailure::success();
   }
 
   Attribute getMessage() { return getOperation()->getAttr("message"); }
 
   static ParseResult parse(OpAsmParser &parser, OperationState &state) {
     StringAttr message;
     OptionalParseResult result = parser.parseOptionalAttribute(message);
     if (!result.hasValue())
public:
 
   static ArrayRef<StringRef> getAttributeNames() { return {}; }
 
   static constexpr llvm::StringLiteral getOperationName() {
     return llvm::StringLiteral(
         "transform.test_transform_unrestricted_op_no_interface");
   }
 
-  LogicalResult apply(transform::TransformResults &results,
+  DiagnosedSilencableFailure apply(transform::TransformResults &results,
                                    transform::TransformState &state) {
-    return success();
+    return DiagnosedSilencableFailure::success();
   }
 
   // No side effects.
   void getEffects(SmallVectorImpl<MemoryEffects::EffectInstance> &effects) {}
 };
 } // namespace
 
-LogicalResult mlir::test::TestProduceParamOrForwardOperandOp::apply(
+DiagnosedSilencableFailure
+mlir::test::TestProduceParamOrForwardOperandOp::apply(
     transform::TransformResults &results, transform::TransformState &state) {
   if (getOperation()->getNumOperands() != 0) {
     results.set(getResult().cast<OpResult>(),
                 getOperation()->getOperand(0).getDefiningOp());
   } else {
     results.set(getResult().cast<OpResult>(),
                 reinterpret_cast<Operation *>(*getParameter()));
   }
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 
 LogicalResult mlir::test::TestProduceParamOrForwardOperandOp::verify() {
   if (getParameter().hasValue() ^ (getNumOperands() != 1))
     return emitOpError() << "expects either a parameter or an operand";
   return success();
 }
 
-LogicalResult
+DiagnosedSilencableFailure
 mlir::test::TestConsumeOperand::apply(transform::TransformResults &results,
                                       transform::TransformState &state) {
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 
-LogicalResult mlir::test::TestConsumeOperandIfMatchesParamOrFail::apply(
+DiagnosedSilencableFailure
+mlir::test::TestConsumeOperandIfMatchesParamOrFail::apply(
     transform::TransformResults &results, transform::TransformState &state) {
   ArrayRef<Operation *> payload = state.getPayloadOps(getOperand());
   assert(payload.size() == 1 && "expected a single target op");
   auto value = reinterpret_cast<intptr_t>(payload[0]);
   if (static_cast<uint64_t>(value) != getParameter()) {
-    return emitOpError() << "expected the operand to be associated with "
-                         << getParameter() << " got " << value;
+    return emitSilencableError()
+           << "op expected the operand to be associated with " << getParameter()
+           << " got " << value;
   }
 
   emitRemark() << "succeeded";
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 
-LogicalResult mlir::test::TestPrintRemarkAtOperandOp::apply(
+DiagnosedSilencableFailure mlir::test::TestPrintRemarkAtOperandOp::apply(
     transform::TransformResults &results, transform::TransformState &state) {
   ArrayRef<Operation *> payload = state.getPayloadOps(getOperand());
   for (Operation *op : payload)
     op->emitRemark() << getMessage();
 
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 
-LogicalResult
+DiagnosedSilencableFailure
 mlir::test::TestAddTestExtensionOp::apply(transform::TransformResults &results,
                                           transform::TransformState &state) {
   state.addExtension<TestTransformStateExtension>(getMessageAttr());
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 
-LogicalResult mlir::test::TestCheckIfTestExtensionPresentOp::apply(
+DiagnosedSilencableFailure mlir::test::TestCheckIfTestExtensionPresentOp::apply(
     transform::TransformResults &results, transform::TransformState &state) {
   auto *extension = state.getExtension<TestTransformStateExtension>();
   if (!extension) {
     emitRemark() << "extension absent";
-    return success();
+    return DiagnosedSilencableFailure::success();
   }
 
   InFlightDiagnostic diag = emitRemark()
                             << "extension present, " << extension->getMessage();
   for (Operation *payload : state.getPayloadOps(getOperand())) {
     diag.attachNote(payload->getLoc()) << "associated payload op";
     assert(state.getHandleForPayloadOp(payload) == getOperand() &&
            "inconsistent mapping between transform IR handles and payload IR "
            "operations");
   }
 
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 
-LogicalResult mlir::test::TestRemapOperandPayloadToSelfOp::apply(
+DiagnosedSilencableFailure mlir::test::TestRemapOperandPayloadToSelfOp::apply(
     transform::TransformResults &results, transform::TransformState &state) {
   auto *extension = state.getExtension<TestTransformStateExtension>();
-  if (!extension)
-    return emitError() << "TestTransformStateExtension missing";
+  if (!extension) {
+    emitError() << "TestTransformStateExtension missing";
+    return DiagnosedSilencableFailure::definiteFailure();
+  }
 
-  return extension->updateMapping(state.getPayloadOps(getOperand()).front(),
-                                  getOperation());
+  if (failed(extension->updateMapping(state.getPayloadOps(getOperand()).front(),
+                                      getOperation())))
+    return DiagnosedSilencableFailure::definiteFailure();
+  return DiagnosedSilencableFailure::success();
 }
 
-LogicalResult mlir::test::TestRemoveTestExtensionOp::apply(
+DiagnosedSilencableFailure mlir::test::TestRemoveTestExtensionOp::apply(
     transform::TransformResults &results, transform::TransformState &state) {
   state.removeExtension<TestTransformStateExtension>();
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
-LogicalResult mlir::test::TestTransformOpWithRegions::apply(
+DiagnosedSilencableFailure mlir::test::TestTransformOpWithRegions::apply(
     transform::TransformResults &results, transform::TransformState &state) {
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 
 void mlir::test::TestTransformOpWithRegions::getEffects(
     SmallVectorImpl<MemoryEffects::EffectInstance> &effects) {}
 
-LogicalResult mlir::test::TestBranchingTransformOpTerminator::apply(
+DiagnosedSilencableFailure
+mlir::test::TestBranchingTransformOpTerminator::apply(
     transform::TransformResults &results, transform::TransformState &state) {
-  return success();
+  return DiagnosedSilencableFailure::success();
 }
 
 void mlir::test::TestBranchingTransformOpTerminator::getEffects(
     SmallVectorImpl<MemoryEffects::EffectInstance> &effects) {}
 
+DiagnosedSilencableFailure mlir::test::TestEmitRemarkAndEraseOperandOp::apply(
+    transform::TransformResults &results, transform::TransformState &state) {
+  emitRemark() << getRemark();
+  for (Operation *op : state.getPayloadOps(getTarget()))
+    op->erase();
+
+  if (getFailAfterErase())
+    return emitSilencableError() << "silencable error";
+  return DiagnosedSilencableFailure::success();
+}
+
 namespace {
 /// Test extension of the Transform dialect. Registers additional ops and
 /// declares PDL as dependent dialect since the additional ops are using PDL
 /// types for operands and results.
 class TestTransformDialectExtension
     : public transform::TransformDialectExtension<
           TestTransformDialectExtension> {
 public:

mlir/test/lib/Dialect/Transform/TestTransformDialectExtension.td

 def TestBranchingTransformOpTerminator
   : Op<Transform_Dialect, "test_branching_transform_op_terminator",
        [Terminator, DeclareOpInterfaceMethods<TransformOpInterface>,
         DeclareOpInterfaceMethods<MemoryEffectsOpInterface>]> {
   let successors = (successor VariadicSuccessor<AnySuccessor>:$succ);
   let cppNamespace = "::mlir::test";
 }
 
+def TestEmitRemarkAndEraseOperandOp
+  : Op<Transform_Dialect, "test_emit_remark_and_erase_operand",
+    [DeclareOpInterfaceMethods<TransformOpInterface>,
+     MemoryEffectsOpInterface, FunctionalStyleTransformOpTrait]> {
+  let arguments = (ins PDL_Operation:$target, StrAttr:$remark,
+                   UnitAttr:$fail_after_erase);
+  let assemblyFormat = "$target `,` $remark attr-dict";
+  let cppNamespace = "::mlir::test";
+}
+
 #endif // MLIR_TESTTRANSFORMDIALECTEXTENSION_TD

mlir/test/lib/Dialect/Transform/TestTransformDialectInterpreter.cpp

public:
   void runOnOperation() override {
     ModuleOp module = getOperation();
     transform::TransformState state(
         module.getBodyRegion(), module,
         transform::TransformOptions().enableExpensiveChecks(
             enableExpensiveChecks));
     for (auto op :
          module.getBody()->getOps<transform::TransformOpInterface>()) {
-      if (failed(state.applyTransform(op)))
+      if (failed(state.applyTransform(op).checkAndReport()))
         return signalPassFailure();
     }
   }
 
   Option<bool> enableExpensiveChecks{
       *this, "enable-expensive-checks", llvm::cl::init(false),
       llvm::cl::desc("perform expensive checks to better report errors in the "
                      "transform IR")};