Revert "[mlir][bufferization] Convert tensor enconding -> memref layout"

This reverts commit 94419f2.

Author: andrey-golubev

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

@@ -272,9 +272,6 @@ struct BufferizationOptions {
   // Produce a MemorySpace attribute from a tensor type
   using DefaultMemorySpaceFn =
       std::function<std::optional<Attribute>(TensorType t)>;
-  /// Construct a MemRefLayoutAttrInterface from a tensor type.
-  using ConstructMemRefLayoutFn =
-      std::function<MemRefLayoutAttrInterface(TensorType t)>;
 
   BufferizationOptions();
 
@@ -367,12 +364,6 @@ struct BufferizationOptions {
   DefaultMemorySpaceFn defaultMemorySpaceFn =
       [](TensorType t) -> std::optional<Attribute> { return Attribute(); };
 
-  /// Construction function used to determine the memref layout based on the
-  /// original tensor type. Can be used to specialize tensor encoding -> memref
-  /// layout conversion. By default, it is unset, making the layout construction
-  /// behavior depend on the place where it is used.
-  ConstructMemRefLayoutFn constructMemRefLayoutFn = nullptr;
-
   /// If set to `true`, the analysis is skipped. A buffer is copied before every
   /// write. This flag cannot be used together with `testAnalysisOnly = true`.
   bool copyBeforeWrite = false;

mlir/lib/Dialect/Bufferization/IR/BufferizationDialect.cpp

@@ -65,12 +65,9 @@ struct BuiltinTensorExternalModel
     auto memSpace = options.defaultMemorySpaceFn(tensorType);
     if (!memSpace.has_value())
       return emitError() << "could not infer memory space";
-    MemRefLayoutAttrInterface layout = {};
-    if (options.constructMemRefLayoutFn)
-      layout = options.constructMemRefLayoutFn(tensorType);
 
     return cast<BufferLikeType>(
-        getMemRefType(tensorType, options, layout, *memSpace));
+        getMemRefType(tensorType, options, /*layout=*/{}, *memSpace));
   }
 
   mlir::LogicalResult verifyCompatibleBufferType(

mlir/lib/Dialect/Bufferization/IR/BufferizationOps.cpp

@@ -244,15 +244,6 @@ AllocTensorOp::getBufferType(Value value, const BufferizationOptions &options,
     return getOperation()->emitError("could not infer memory space");
   }
 
-  // Note: Only rely on TensorLikeType::getBufferType() if memref layout is
-  // explicitly specified by the user. Otherwise, the default behavior is to
-  // return a fully dynamic layout map which is the opposite of the default
-  // behavior of this function.
-  if (options.constructMemRefLayoutFn) {
-    return cast<TensorLikeType>(getType()).getBufferType(
-        options, [&]() { return emitError(); });
-  }
-
   return cast<BufferLikeType>(
       getMemRefTypeWithStaticIdentityLayout(getType(), memorySpace));
 }

mlir/unittests/Transforms/CMakeLists.txt

@@ -1,11 +1,8 @@
 add_mlir_unittest(MLIRTransformsTests
   Canonicalizer.cpp
   DialectConversion.cpp
-  OneShotBufferization.cpp
 )
 mlir_target_link_libraries(MLIRTransformsTests
   PRIVATE
   MLIRParser
-  MLIRTransforms
-  MLIRBufferizationTransforms
-)
+  MLIRTransforms)