Revert "[mlir][bufferization] Define a pipeline for buffer deallocation"

This reverts commit f0c4663. This caused problems in downstream projects. We are reverting to give them more time for integration.
llvm · Sep 13, 2023 · 7995a47 · 7995a47
1 parent 99cd1e7
commit 7995a47
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 153 deletions.
diff --git a/mlir/include/mlir/Dialect/Bufferization/Pipelines/Passes.h b/mlir/include/mlir/Dialect/Bufferization/Pipelines/Passes.h
diff --git a/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.h b/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.h
@@ -26,8 +26,7 @@ struct OneShotBufferizationOptions;
 
 /// Creates an instance of the BufferDeallocation pass to free all allocated
 /// buffers.
-std::unique_ptr<Pass>
-createBufferDeallocationPass(bool privateFuncDynamicOwnership = false);
+std::unique_ptr<Pass> createBufferDeallocationPass();
 
 /// Creates a pass that optimizes `bufferization.dealloc` operations. For
 /// example, it reduces the number of alias checks needed at runtime using

diff --git a/mlir/include/mlir/InitAllPasses.h b/mlir/include/mlir/InitAllPasses.h
@@ -20,7 +20,6 @@
 #include "mlir/Dialect/Arith/Transforms/Passes.h"
 #include "mlir/Dialect/ArmSME/Transforms/Passes.h"
 #include "mlir/Dialect/Async/Passes.h"
-#include "mlir/Dialect/Bufferization/Pipelines/Passes.h"
 #include "mlir/Dialect/Bufferization/Transforms/Passes.h"
 #include "mlir/Dialect/Func/Transforms/Passes.h"
 #include "mlir/Dialect/GPU/Transforms/Passes.h"
@@ -82,7 +81,6 @@ inline void registerAllPasses() {
   arm_sme::registerArmSMEPasses();
 
   // Dialect pipelines
-  bufferization::registerBufferizationPipelines();
   sparse_tensor::registerSparseTensorPipelines();
 }
 

diff --git a/mlir/lib/Dialect/Bufferization/CMakeLists.txt b/mlir/lib/Dialect/Bufferization/CMakeLists.txt
@@ -1,4 +1,3 @@
 add_subdirectory(IR)
-add_subdirectory(Pipelines)
 add_subdirectory(TransformOps)
 add_subdirectory(Transforms)
diff --git a/mlir/lib/Dialect/Bufferization/Pipelines/BufferizationPipelines.cpp b/mlir/lib/Dialect/Bufferization/Pipelines/BufferizationPipelines.cpp
diff --git a/mlir/lib/Dialect/Bufferization/Pipelines/CMakeLists.txt b/mlir/lib/Dialect/Bufferization/Pipelines/CMakeLists.txt
diff --git a/mlir/lib/Dialect/Bufferization/Transforms/BufferDeallocation.cpp b/mlir/lib/Dialect/Bufferization/Transforms/BufferDeallocation.cpp
@@ -994,10 +994,6 @@ namespace {
 struct BufferDeallocationPass
     : public bufferization::impl::BufferDeallocationBase<
           BufferDeallocationPass> {
-  BufferDeallocationPass(bool privateFuncDynamicOwnership)
-      : bufferization::impl::BufferDeallocationBase<BufferDeallocationPass>() {
-    this->privateFuncDynamicOwnership.setValue(privateFuncDynamicOwnership);
-  }
   void runOnOperation() override {
     func::FuncOp func = getOperation();
     if (func.isExternal())
@@ -1028,7 +1024,6 @@ bufferization::deallocateBuffers(FunctionOpInterface op,
 // BufferDeallocationPass construction
 //===----------------------------------------------------------------------===//
 
-std::unique_ptr<Pass> mlir::bufferization::createBufferDeallocationPass(
-    bool privateFuncDynamicOwnership) {
-  return std::make_unique<BufferDeallocationPass>(privateFuncDynamicOwnership);
+std::unique_ptr<Pass> mlir::bufferization::createBufferDeallocationPass() {
+  return std::make_unique<BufferDeallocationPass>();
 }
diff --git a/.../test/Dialect/Bufferization/Transforms/BufferDeallocation/dealloc-branchop-interface.mlir b/.../test/Dialect/Bufferization/Transforms/BufferDeallocation/dealloc-branchop-interface.mlir
@@ -2,8 +2,6 @@
 // RUN:  -buffer-deallocation-simplification -split-input-file %s | FileCheck %s
 // RUN: mlir-opt -verify-diagnostics -buffer-deallocation=private-function-dynamic-ownership=true -split-input-file %s > /dev/null
 
-// RUN: mlir-opt %s -buffer-deallocation-pipeline --split-input-file > /dev/null
-
 // Test Case:
 //    bb0
 //   /   \

diff --git a/mlir/test/Dialect/Bufferization/Transforms/BufferDeallocation/dealloc-callop-interface.mlir b/mlir/test/Dialect/Bufferization/Transforms/BufferDeallocation/dealloc-callop-interface.mlir
@@ -3,9 +3,6 @@
 // RUN: mlir-opt -verify-diagnostics -buffer-deallocation=private-function-dynamic-ownership=true \
 // RUN:   --buffer-deallocation-simplification -split-input-file %s | FileCheck %s --check-prefix=CHECK-DYNAMIC
 
-// RUN: mlir-opt %s -buffer-deallocation-pipeline --split-input-file > /dev/null
-// RUN: mlir-opt %s -buffer-deallocation-pipeline=private-function-dynamic-ownership --split-input-file > /dev/null
-
 func.func private @f(%arg0: memref<f64>) -> memref<f64> {
   return %arg0 : memref<f64>
 }

diff --git a/mlir/test/Dialect/Bufferization/Transforms/BufferDeallocation/dealloc-existing-deallocs.mlir b/mlir/test/Dialect/Bufferization/Transforms/BufferDeallocation/dealloc-existing-deallocs.mlir
@@ -1,8 +1,6 @@
 // RUN: mlir-opt -verify-diagnostics -expand-realloc=emit-deallocs=false -buffer-deallocation \
 // RUN:  --buffer-deallocation-simplification -split-input-file %s | FileCheck %s
 
-// RUN: mlir-opt %s -buffer-deallocation-pipeline --split-input-file > /dev/null
-
 func.func @auto_dealloc() {
   %c10 = arith.constant 10 : index
   %c100 = arith.constant 100 : index

diff --git a/...test/Dialect/Bufferization/Transforms/BufferDeallocation/dealloc-function-boundaries.mlir b/...test/Dialect/Bufferization/Transforms/BufferDeallocation/dealloc-function-boundaries.mlir
@@ -3,9 +3,6 @@
 // RUN: mlir-opt --allow-unregistered-dialect -verify-diagnostics -buffer-deallocation=private-function-dynamic-ownership=true \
 // RUN:  --buffer-deallocation-simplification -split-input-file %s | FileCheck %s --check-prefix=CHECK-DYNAMIC
 
-// RUN: mlir-opt %s -buffer-deallocation-pipeline --split-input-file > /dev/null
-// RUN: mlir-opt %s -buffer-deallocation-pipeline=private-function-dynamic-ownership --split-input-file > /dev/null
-
 // Test Case: Existing AllocOp with no users.
 // BufferDeallocation expected behavior: It should insert a DeallocOp right
 // before ReturnOp.

diff --git a/...t/Dialect/Bufferization/Transforms/BufferDeallocation/dealloc-memoryeffect-interface.mlir b/...t/Dialect/Bufferization/Transforms/BufferDeallocation/dealloc-memoryeffect-interface.mlir
@@ -2,8 +2,6 @@
 // RUN:   --buffer-deallocation-simplification -split-input-file %s | FileCheck %s
 // RUN: mlir-opt -verify-diagnostics -buffer-deallocation=private-function-dynamic-ownership=true -split-input-file %s > /dev/null
 
-// RUN: mlir-opt %s -buffer-deallocation-pipeline --split-input-file > /dev/null
-
 // Test Case: Dead operations in a single block.
 // BufferDeallocation expected behavior: It only inserts the two missing
 // DeallocOps after the last BufferBasedOp.

diff --git a/...ialect/Bufferization/Transforms/BufferDeallocation/dealloc-region-branchop-interface.mlir b/...ialect/Bufferization/Transforms/BufferDeallocation/dealloc-region-branchop-interface.mlir
@@ -2,8 +2,6 @@
 // RUN:  --buffer-deallocation-simplification -split-input-file %s | FileCheck %s
 // RUN: mlir-opt -allow-unregistered-dialect -verify-diagnostics -buffer-deallocation=private-function-dynamic-ownership=true -split-input-file %s > /dev/null
 
-// RUN: mlir-opt %s -buffer-deallocation-pipeline --split-input-file --verify-diagnostics > /dev/null
-
 // Test Case: Nested regions - This test defines a BufferBasedOp inside the
 // region of a RegionBufferBasedOp.
 // BufferDeallocation expected behavior: The AllocOp for the BufferBasedOp

diff --git a/mlir/test/Dialect/Bufferization/Transforms/BufferDeallocation/dealloc-subviews.mlir b/mlir/test/Dialect/Bufferization/Transforms/BufferDeallocation/dealloc-subviews.mlir
@@ -2,8 +2,6 @@
 // RUN:   --buffer-deallocation-simplification -split-input-file %s | FileCheck %s
 // RUN: mlir-opt -verify-diagnostics -buffer-deallocation=private-function-dynamic-ownership=true -split-input-file %s > /dev/null
 
-// RUN: mlir-opt %s -buffer-deallocation-pipeline --split-input-file > /dev/null
-
 // CHECK-LABEL: func @subview
 func.func @subview(%arg0 : index, %arg1 : index, %arg2 : memref<?x?xf32>) {
   %0 = memref.alloc() : memref<64x4xf32, strided<[4, 1], offset: 0>>

diff --git a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
@@ -8248,7 +8248,6 @@ cc_library(
         ":AsyncToLLVM",
         ":AsyncTransforms",
         ":BufferizationDialect",
-        ":BufferizationPipelines",
         ":BufferizationTransformOps",
         ":BufferizationTransforms",
         ":CastInterfaces",
@@ -12213,21 +12212,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "BufferizationPipelines",
-    srcs = glob(["lib/Dialect/Bufferization/Pipelines/*.cpp"]),
-    hdrs = ["include/mlir/Dialect/Bufferization/Pipelines/Passes.h"],
-    includes = ["include"],
-    deps = [
-        ":BufferizationToMemRef",
-        ":BufferizationTransforms",
-        ":FuncDialect",
-        ":MemRefTransforms",
-        ":Pass",
-        ":Transforms",
-    ],
-)
-
 td_library(
     name = "DLTIDialectTdFiles",
     srcs = [