Revert "[mlir][bufferization] Support custom types (1/N) (llvm#142986)"

This reverts commit ee070d0.

Author: bjacob

mlir/include/mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h

@@ -17,7 +17,6 @@
 #include <optional>
 
 #include "mlir/Dialect/Bufferization/IR/BufferizationEnums.h.inc"
-#include "mlir/Dialect/Bufferization/IR/BufferizationTypeInterfaces.h"
 
 namespace mlir {
 class OpBuilder;
@@ -616,7 +615,7 @@ FailureOr<Value> getBuffer(RewriterBase &rewriter, Value value,
 /// IR, this function can be used.
 ///
 /// This function is a wrapper around BufferizableOpInterface::getBufferType.
-FailureOr<BufferLikeType> getBufferType(Value value,
+FailureOr<BaseMemRefType> getBufferType(Value value,
                                         const BufferizationOptions &options,
                                         const BufferizationState &state);
 
@@ -630,7 +629,7 @@ FailureOr<BufferLikeType> getBufferType(Value value,
 /// IR, this function can be used.
 ///
 /// This function is a wrapper around `BufferizableOpInterface::getBufferType`.
-FailureOr<BufferLikeType> getBufferType(Value value,
+FailureOr<BaseMemRefType> getBufferType(Value value,
                                         const BufferizationOptions &options,
                                         const BufferizationState &state,
                                         SmallVector<Value> &invocationStack);
@@ -740,19 +739,6 @@ AliasingValueList unknownGetAliasingValues(OpOperand &opOperand);
 /// This is the default implementation of
 /// BufferizableOpInterface::hasTensorSemantics
 bool defaultHasTensorSemantics(Operation *op);
-
-/// This is a helper function used when buffer type is guaranteed to be memref.
-/// It performs two actions: failure state checking and an explicit llvm::cast<>
-/// from the buffer-like type interface to a BaseMemRefType. This allows easier
-/// management of differences in C++ types at the API boundaries. Valid buffer
-/// type is casted to the memref type. Otherwise, the failure state is
-/// propagated i.e. asMemRefType(mlir::failure()) returns mlir::failure().
-FailureOr<BaseMemRefType> asMemRefType(FailureOr<BufferLikeType> bufferType);
-
-/// This function is a free-standing helper that relies on
-/// bufferization::TensorLikeTypeInterface to verify the types in tensor and
-/// buffer worlds match.
-bool typesMatchAfterBufferization(Operation &op, Value tensor, Value buffer);
 } // namespace detail
 
 } // namespace bufferization

mlir/include/mlir/Dialect/Bufferization/IR/BufferizationOps.td

@@ -12,7 +12,6 @@
 include "mlir/Dialect/Bufferization/IR/AllocationOpInterface.td"
 include "mlir/Dialect/Bufferization/IR/BufferViewFlowOpInterface.td"
 include "mlir/Dialect/Bufferization/IR/BufferizableOpInterface.td"
-include "mlir/Dialect/Bufferization/IR/BufferizationTypeInterfaces.td"
 include "mlir/Dialect/Bufferization/IR/BufferizationBase.td"
 include "mlir/Interfaces/DestinationStyleOpInterface.td"
 include "mlir/Interfaces/InferTypeOpInterface.td"
@@ -387,31 +386,20 @@ def Bufferization_DeallocTensorOp : Bufferization_Op<"dealloc_tensor",
 // ToTensorOp
 //===----------------------------------------------------------------------===//
 
-class Bufferization_TensorAndBufferMatch<string tensor, string buffer> : PredOpTrait<
-  "specified tensor and buffer types match",
-  CPred<
-    "::mlir::bufferization::detail::typesMatchAfterBufferization("
-        "$_op, $" # tensor # ", $" # buffer #")"
-  >
->;
-
 def Bufferization_ToTensorOp : Bufferization_Op<"to_tensor", [
     BufferizableOpInterface,
     SameOperandsAndResultShape,
     SameOperandsAndResultElementType,
-    Bufferization_TensorAndBufferMatch<"result", "buffer">
+    AllElementTypesMatch<["memref", "result"]>
   ]> {
-  let summary = "create a buffer-like type from a tensor-like type";
+  let summary = "create a tensor from a `memref`";
   let description = [{
-    An operation that creates a tensor from a buffer. The result value is a
-    tensor-like type that must match the corresponding buffer-like operand as
-    per TensorLikeType::verifyCompatibleBufferType(). For builtins (TensorType
-    and BaseMemRefType), this means that shapes and element types match between
-    the tensor and the buffer.
+    An operation that creates a tensor from a `memref`. The result value is a
+    tensor whose shape and element type match the memref operand.
 
     The opposite of this op is `to_buffer`. Together, these two ops are
     useful for source/target materializations when doing type conversions
-    involving tensors and buffers.
+    involving tensors and memrefs.
 
     Example:
 
@@ -453,16 +441,19 @@ def Bufferization_ToTensorOp : Bufferization_Op<"to_tensor", [
     away. However, such IR is no longer bufferizable with One-Shot Bufferize.
   }];
 
-  let arguments = (ins Arg<Bufferization_BufferLikeTypeInterface,
+  let arguments = (ins Arg<AnyRankedOrUnrankedMemRef,
                            "the reference to load from",
-                           [MemReadAt<0, FullEffect>]>:$buffer,
+                           [MemReadAt<0, FullEffect>]>:$memref,
                        UnitAttr:$restrict, UnitAttr:$writable);
-  let results = (outs Bufferization_TensorLikeTypeInterface:$result);
+  let results = (outs AnyTensor:$result);
 
   let extraClassDeclaration = [{
     /// The result of a to_tensor is always a tensor.
-    ::mlir::bufferization::TensorLikeType getType() {
-      return getResult().getType();
+    TensorType getType() {
+      Type resultType = getResult().getType();
+      if (::llvm::isa<TensorType>(resultType))
+        return ::llvm::cast<TensorType>(resultType);
+      return {};
     }
 
     //===------------------------------------------------------------------===//
@@ -481,15 +472,22 @@ def Bufferization_ToTensorOp : Bufferization_Op<"to_tensor", [
     FailureOr<BaseMemRefType> getBufferType(
         Value value, const BufferizationOptions &options,
         const BufferizationState &state, SmallVector<Value> &invocationStack) {
-      return ::llvm::cast<BaseMemRefType>(getBuffer().getType());
+      return ::llvm::cast<BaseMemRefType>(getMemref().getType());
     }
   }];
 
   let assemblyFormat = [{
-    $buffer (`restrict` $restrict^)? (`writable` $writable^)? attr-dict
-      `:` type($buffer) `to` type($result)
+    $memref (`restrict` $restrict^)? (`writable` $writable^)? attr-dict
+      `:` type($memref) `to` type($result)
   }];
 
+  let builders = [
+    OpBuilder<(ins "Value":$memref, CArg<"bool", "false">:$restrict, CArg<"bool", "false">:$writeable), [{
+      auto rtt = memref::getTensorTypeFromMemRefType(memref.getType());
+      build($_builder, $_state, rtt, memref, restrict, writeable);
+    }]>
+  ];
+
   let hasCanonicalizer = 1;
   let hasFolder = 1;
 }
@@ -504,9 +502,10 @@ def Bufferization_ToBufferOp : Bufferization_Op<"to_buffer", [
     SameOperandsAndResultShape,
     SameOperandsAndResultElementType,
     Pure,
-    Bufferization_TensorAndBufferMatch<"tensor", "buffer">
+    AllShapesMatch<["memref", "tensor"]>,
+    AllElementTypesMatch<["memref", "tensor"]>
   ]> {
-  let summary = "cast a tensor-like type to buffer-like type";
+  let summary = "cast a tensor to memref";
   let description = [{
     An operation that returns the future buffer of a `tensor`.
 
@@ -524,8 +523,8 @@ def Bufferization_ToBufferOp : Bufferization_Op<"to_buffer", [
     the returned buffer) will not be written to.
   }];
 
-  let arguments = (ins Bufferization_TensorLikeTypeInterface:$tensor, UnitAttr:$read_only);
-  let results = (outs Bufferization_BufferLikeTypeInterface:$buffer);
+  let arguments = (ins AnyTensor:$tensor, UnitAttr:$read_only);
+  let results = (outs AnyRankedOrUnrankedMemRef:$memref);
 
   let extraClassDeclaration = [{
     //===------------------------------------------------------------------===//
@@ -560,7 +559,7 @@ def Bufferization_ToBufferOp : Bufferization_Op<"to_buffer", [
   }];
 
   let assemblyFormat = [{
-    $tensor (`read_only` $read_only^)? attr-dict `:` type($tensor) `to` type($buffer)
+    $tensor (`read_only` $read_only^)? attr-dict `:` type($tensor) `to` type($memref)
   }];
 
   let hasFolder = 1;

mlir/include/mlir/Dialect/Bufferization/IR/BufferizationTypeInterfaces.h

@@ -13,15 +13,8 @@
 // Bufferization Type Interfaces
 //===----------------------------------------------------------------------===//
 
-#include "mlir/IR/Diagnostics.h"
 #include "mlir/IR/Types.h"
 
-namespace mlir::bufferization {
-struct BufferizationOptions;
-class BufferizationState;
-class BufferLikeType;
-} // namespace mlir::bufferization
-
 #include "mlir/Dialect/Bufferization/IR/BufferizationTypeInterfaces.h.inc"
 
 #endif // MLIR_DIALECT_BUFFERIZATION_IR_BUFFERIZATIONTYPEINTERFACES_H_

mlir/include/mlir/Dialect/Bufferization/IR/BufferizationTypeInterfaces.td

@@ -21,30 +21,10 @@ def Bufferization_TensorLikeTypeInterface
   let description = [{
     Indicates that this type is a tensor type (similarly to a MLIR builtin
     tensor) for bufferization purposes.
-  }];
 
-  let methods = [
-    InterfaceMethod<[{
-        Returns a BufferLike type for this TensorLike type.
-      }],
-      /*retTy=*/"::mlir::FailureOr<::mlir::bufferization::BufferLikeType>",
-      /*methodName=*/"getBufferType",
-      /*args=*/(ins
-        "const ::mlir::bufferization::BufferizationOptions &":$options,
-        "::llvm::function_ref<::mlir::InFlightDiagnostic()>":$emitError
-      )
-    >,
-    InterfaceMethod<[{
-        Returns whether a BufferLike type is compatible to this TensorLike type.
-        The BufferLike type is assumed to be created by getBufferType().
-      }],
-      /*retTy=*/"::mlir::LogicalResult",
-      /*methodName=*/"verifyCompatibleBufferType",
-      /*args=*/(ins
-        "::mlir::bufferization::BufferLikeType":$bufferType,
-        "::llvm::function_ref<::mlir::InFlightDiagnostic()>":$emitError)
-    >
-  ];
+    The interface currently has no methods as it is used by types to opt into
+    being supported by the bufferization procedures.
+  }];
 }
 
 def Bufferization_BufferLikeTypeInterface

mlir/include/mlir/Dialect/Bufferization/IR/UnstructuredControlFlow.h

@@ -65,13 +65,12 @@ struct OpWithUnstructuredControlFlowBufferizableOpInterfaceExternalModel
         // The operand was already bufferized. Take its type directly.
         callerType = memrefType;
       } else {
-        FailureOr<BufferLikeType> maybeCallerType =
+        FailureOr<BaseMemRefType> maybeCallerType =
             bufferization::getBufferType(opOperand->get(), options, state,
                                          invocationStack);
         if (failed(maybeCallerType))
           return failure();
-        assert(isa<BaseMemRefType>(*maybeCallerType) && "expected memref type");
-        callerType = cast<BaseMemRefType>(*maybeCallerType);
+        callerType = *maybeCallerType;
       }
 
       if (!bufferType) {

mlir/lib/Dialect/Arith/Transforms/BufferizableOpInterfaceImpl.cpp

@@ -164,8 +164,8 @@ struct SelectOpInterface
     // buffers have different types, they differ only in their layout map. Cast
     // both of them to the most dynamic MemRef type.
     if (trueBuffer.getType() != falseBuffer.getType()) {
-      auto targetType = bufferization::detail::asMemRefType(
-          bufferization::getBufferType(selectOp.getResult(), options, state));
+      auto targetType =
+          bufferization::getBufferType(selectOp.getResult(), options, state);
       if (failed(targetType))
         return failure();
       if (trueBuffer.getType() != *targetType)
@@ -187,12 +187,10 @@ struct SelectOpInterface
                 SmallVector<Value> &invocationStack) const {
     auto selectOp = cast<arith::SelectOp>(op);
     assert(value == selectOp.getResult() && "invalid value");
-    auto trueType =
-        bufferization::detail::asMemRefType(bufferization::getBufferType(
-            selectOp.getTrueValue(), options, state, invocationStack));
-    auto falseType =
-        bufferization::detail::asMemRefType(bufferization::getBufferType(
-            selectOp.getFalseValue(), options, state, invocationStack));
+    auto trueType = bufferization::getBufferType(
+        selectOp.getTrueValue(), options, state, invocationStack);
+    auto falseType = bufferization::getBufferType(
+        selectOp.getFalseValue(), options, state, invocationStack);
     if (failed(trueType) || failed(falseType))
       return failure();
     if (*trueType == *falseType)