Revert "[mlir][bufferization] Add tensor-like and buffer-like interfaces (llvm#134220)"

nithinsubbiah · nithinsubbiah · commit a317eab51b2e · 2025-04-15T17:30:27.000-07:00
This reverts commit 00eaff3.
diff --git a/mlir/include/mlir/Dialect/Bufferization/IR/BufferizationTypeInterfaces.h b/mlir/include/mlir/Dialect/Bufferization/IR/BufferizationTypeInterfaces.h
diff --git a/mlir/include/mlir/Dialect/Bufferization/IR/BufferizationTypeInterfaces.td b/mlir/include/mlir/Dialect/Bufferization/IR/BufferizationTypeInterfaces.td
diff --git a/mlir/include/mlir/Dialect/Bufferization/IR/CMakeLists.txt b/mlir/include/mlir/Dialect/Bufferization/IR/CMakeLists.txt
@@ -10,9 +10,3 @@ mlir_tablegen(BufferizationEnums.h.inc -gen-enum-decls)
 mlir_tablegen(BufferizationEnums.cpp.inc -gen-enum-defs)
 add_public_tablegen_target(MLIRBufferizationEnumsIncGen)
 add_dependencies(mlir-headers MLIRBufferizationEnumsIncGen)
-
-set(LLVM_TARGET_DEFINITIONS BufferizationTypeInterfaces.td)
-mlir_tablegen(BufferizationTypeInterfaces.h.inc -gen-type-interface-decls)
-mlir_tablegen(BufferizationTypeInterfaces.cpp.inc -gen-type-interface-defs)
-add_public_tablegen_target(MLIRBufferizationTypeInterfacesIncGen)
-add_dependencies(mlir-headers MLIRBufferizationTypeInterfacesIncGen)
diff --git a/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.td b/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.td
@@ -471,10 +471,6 @@ def OneShotBufferizePass : Pass<"one-shot-bufferize", "ModuleOp"> {
     Statistic<"numTensorOutOfPlace", "num-tensor-out-of-place",
               "Number of out-of-place tensor OpOperands">,
   ];
-
-  let dependentDialects = [
-    "bufferization::BufferizationDialect", "memref::MemRefDialect"
-  ];
 }
 
 def PromoteBuffersToStackPass
diff --git a/mlir/lib/Dialect/Bufferization/IR/BufferizationDialect.cpp b/mlir/lib/Dialect/Bufferization/IR/BufferizationDialect.cpp
@@ -9,10 +9,8 @@
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h"
 #include "mlir/Dialect/Bufferization/IR/Bufferization.h"
-#include "mlir/Dialect/Bufferization/IR/BufferizationTypeInterfaces.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
-#include "mlir/IR/BuiltinTypes.h"
 #include "mlir/Interfaces/FunctionInterfaces.h"
 #include "mlir/Transforms/InliningUtils.h"
 
@@ -53,16 +51,6 @@ struct BufferizationInlinerInterface : public DialectInlinerInterface {
     return true;
   }
 };
-
-template <typename Tensor>
-struct BuiltinTensorExternalModel
-    : TensorLikeType::ExternalModel<BuiltinTensorExternalModel<Tensor>,
-                                    Tensor> {};
-
-template <typename MemRef>
-struct BuiltinMemRefExternalModel
-    : BufferLikeType::ExternalModel<BuiltinMemRefExternalModel<MemRef>,
-                                    MemRef> {};
 } // namespace
 
 //===----------------------------------------------------------------------===//
@@ -75,20 +63,6 @@ void mlir::bufferization::BufferizationDialect::initialize() {
 #include "mlir/Dialect/Bufferization/IR/BufferizationOps.cpp.inc"
       >();
   addInterfaces<BufferizationInlinerInterface>();
-
-  // Note: Unlike with other external models, declaring bufferization's
-  // "promised interfaces" in builtins for TensorLike and BufferLike type
-  // interfaces is not possible (due to builtins being independent of
-  // bufferization). Thus, the compromise is to attach these interfaces directly
-  // during dialect initialization.
-  RankedTensorType::attachInterface<
-      BuiltinTensorExternalModel<RankedTensorType>>(*getContext());
-  UnrankedTensorType::attachInterface<
-      BuiltinTensorExternalModel<UnrankedTensorType>>(*getContext());
-  MemRefType::attachInterface<BuiltinMemRefExternalModel<MemRefType>>(
-      *getContext());
-  UnrankedMemRefType::attachInterface<
-      BuiltinMemRefExternalModel<UnrankedMemRefType>>(*getContext());
 }
 
 LogicalResult BufferizationDialect::verifyRegionArgAttribute(
diff --git a/mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp b/mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp
@@ -57,6 +57,11 @@ struct OneShotBufferizePass
           OneShotBufferizePass> {
   using Base::Base;
 
+  void getDependentDialects(DialectRegistry &registry) const override {
+    registry
+        .insert<bufferization::BufferizationDialect, memref::MemRefDialect>();
+  }
+
   void runOnOperation() override {
     OneShotBufferizationOptions opt;
     if (!options) {
diff --git a/mlir/test/Dialect/Bufferization/Transforms/tensorlike-bufferlike.mlir b/mlir/test/Dialect/Bufferization/Transforms/tensorlike-bufferlike.mlir
diff --git a/mlir/test/lib/Dialect/Bufferization/CMakeLists.txt b/mlir/test/lib/Dialect/Bufferization/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Exclude tests from libMLIR.so
 add_mlir_library(MLIRBufferizationTestPasses
   TestTensorCopyInsertion.cpp
-  TestTensorLikeAndBufferLike.cpp
 
   EXCLUDE_FROM_LIBMLIR
 )
@@ -10,11 +9,4 @@ mlir_target_link_libraries(MLIRBufferizationTestPasses PUBLIC
   MLIRBufferizationTransforms
   MLIRIR
   MLIRPass
-  MLIRTestDialect
 )
-
-target_include_directories(MLIRBufferizationTestPasses
-  PRIVATE
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../Dialect/Test
-  ${CMAKE_CURRENT_BINARY_DIR}/../../Dialect/Test
-  )
diff --git a/mlir/test/lib/Dialect/Bufferization/TestTensorLikeAndBufferLike.cpp b/mlir/test/lib/Dialect/Bufferization/TestTensorLikeAndBufferLike.cpp
diff --git a/mlir/test/lib/Dialect/Test/CMakeLists.txt b/mlir/test/lib/Dialect/Test/CMakeLists.txt
@@ -93,7 +93,6 @@ mlir_target_link_libraries(MLIRTestDialect PUBLIC
   MLIRTransformUtils
   MLIRTransforms
   MLIRValueBoundsOpInterface
-  MLIRBufferizationDialect
 )
 
 add_mlir_translation_library(MLIRTestFromLLVMIRTranslation
diff --git a/mlir/test/lib/Dialect/Test/TestTypeDefs.td b/mlir/test/lib/Dialect/Test/TestTypeDefs.td
@@ -19,7 +19,6 @@ include "TestAttrDefs.td"
 include "TestInterfaces.td"
 include "mlir/IR/BuiltinTypes.td"
 include "mlir/Interfaces/DataLayoutInterfaces.td"
-include "mlir/Dialect/Bufferization/IR/BufferizationTypeInterfaces.td"
 
 // All of the types will extend this class.
 class Test_Type<string name, list<Trait> traits = []>
@@ -404,49 +403,4 @@ def TestTypeOpAsmTypeInterface : Test_Type<"TestTypeOpAsmTypeInterface",
   let mnemonic = "op_asm_type_interface";
 }
 
-def TestTensorType : Test_Type<"TestTensor",
-    [Bufferization_TensorLikeTypeInterface, ShapedTypeInterface]> {
-  let mnemonic = "test_tensor";
-  let parameters = (ins
-    ArrayRefParameter<"int64_t">:$shape,
-    "mlir::Type":$elementType
-  );
-  let assemblyFormat = "`<` `[` $shape `]` `,` $elementType `>`";
-
-  let extraClassDeclaration = [{
-    // ShapedTypeInterface:
-    bool hasRank() const {
-      return true;
-    }
-    test::TestTensorType cloneWith(std::optional<llvm::ArrayRef<int64_t>> shape,
-                                   mlir::Type elementType) const {
-      return test::TestTensorType::get(
-        getContext(), shape.value_or(getShape()), elementType);
-    }
-  }];
-}
-
-def TestMemrefType : Test_Type<"TestMemref",
-    [Bufferization_BufferLikeTypeInterface, ShapedTypeInterface]> {
-  let mnemonic = "test_memref";
-  let parameters = (ins
-    ArrayRefParameter<"int64_t">:$shape,
-    "mlir::Type":$elementType,
-    DefaultValuedParameter<"mlir::Attribute", "nullptr">:$memSpace
-  );
-  let assemblyFormat = "`<` `[` $shape `]` `,` $elementType (`,` $memSpace^)? `>`";
-
-  let extraClassDeclaration = [{
-    // ShapedTypeInterface:
-    bool hasRank() const {
-      return true;
-    }
-    test::TestMemrefType cloneWith(std::optional<llvm::ArrayRef<int64_t>> shape,
-                                   mlir::Type elementType) const {
-      return test::TestMemrefType::get(
-        getContext(), shape.value_or(getShape()), elementType, getMemSpace());
-    }
-  }];
-}
-
 #endif // TEST_TYPEDEFS
diff --git a/mlir/test/lib/Dialect/Test/TestTypes.h b/mlir/test/lib/Dialect/Test/TestTypes.h
@@ -18,7 +18,6 @@
 #include <tuple>
 
 #include "TestTraits.h"
-#include "mlir/Dialect/Bufferization/IR/BufferizationTypeInterfaces.h"
 #include "mlir/IR/Diagnostics.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/DialectImplementation.h"
diff --git a/mlir/tools/mlir-opt/mlir-opt.cpp b/mlir/tools/mlir-opt/mlir-opt.cpp
@@ -150,7 +150,6 @@ void registerTestSPIRVCPURunnerPipeline();
 void registerTestSPIRVFuncSignatureConversion();
 void registerTestSPIRVVectorUnrolling();
 void registerTestTensorCopyInsertionPass();
-void registerTestTensorLikeAndBufferLikePass();
 void registerTestTensorTransforms();
 void registerTestTopologicalSortAnalysisPass();
 void registerTestTransformDialectEraseSchedulePass();
@@ -294,7 +293,6 @@ void registerTestPasses() {
   mlir::test::registerTestSPIRVFuncSignatureConversion();
   mlir::test::registerTestSPIRVVectorUnrolling();
   mlir::test::registerTestTensorCopyInsertionPass();
-  mlir::test::registerTestTensorLikeAndBufferLikePass();
   mlir::test::registerTestTensorTransforms();
   mlir::test::registerTestTopologicalSortAnalysisPass();
   mlir::test::registerTestTransformDialectEraseSchedulePass();

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,6 @@ mlir_target_link_libraries(MLIRTestDialect PUBLIC`
`93`	`93`	`MLIRTransformUtils`
`94`	`94`	`MLIRTransforms`
`95`	`95`	`MLIRValueBoundsOpInterface`
`96`		`- MLIRBufferizationDialect`
`97`	`96`	`)`
`98`	`97`
`99`	`98`	`add_mlir_translation_library(MLIRTestFromLLVMIRTranslation`