[Mlir-commits] [mlir] 23dec4a - Move BufferViewFlowAnalysis to the Bufferization dialect.

[Johannes Reifferscheid]

Author: Johannes Reifferscheid
Date: 2022-08-30T14:25:49+02:00
New Revision: 23dec4a3524aa5c9cc3cb401987014c6c5ee9de0

URL: https://github.com/llvm/llvm-project/commit/23dec4a3524aa5c9cc3cb401987014c6c5ee9de0
DIFF: https://github.com/llvm/llvm-project/commit/23dec4a3524aa5c9cc3cb401987014c6c5ee9de0.diff

LOG: Move BufferViewFlowAnalysis to the Bufferization dialect.

It's only used from there, and this lets us remove the dependency from Analysis
to the Arith dialect.

Reviewed By: springerm

Differential Revision: https://reviews.llvm.org/D132928

Added: 
    mlir/include/mlir/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.h
    mlir/lib/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.cpp

Modified: 
    mlir/include/mlir/Dialect/Bufferization/Transforms/BufferUtils.h
    mlir/lib/Analysis/CMakeLists.txt
    mlir/lib/Dialect/Bufferization/Transforms/CMakeLists.txt
    utils/bazel/llvm-project-overlay/mlir/BUILD.bazel

Removed: 
    mlir/include/mlir/Analysis/BufferViewFlowAnalysis.h
    mlir/lib/Analysis/BufferViewFlowAnalysis.cpp


################################################################################
diff  --git a/mlir/include/mlir/Dialect/Bufferization/Transforms/BufferUtils.h b/mlir/include/mlir/Dialect/Bufferization/Transforms/BufferUtils.h
index 3b6d57e682cd7..130295ffa0e35 100644
--- a/mlir/include/mlir/Dialect/Bufferization/Transforms/BufferUtils.h
+++ b/mlir/include/mlir/Dialect/Bufferization/Transforms/BufferUtils.h
@@ -14,9 +14,9 @@
 #ifndef MLIR_DIALECT_BUFFERIZATION_TRANSFORMS_BUFFERUTILS_H
 #define MLIR_DIALECT_BUFFERIZATION_TRANSFORMS_BUFFERUTILS_H
 
-#include "mlir/Analysis/BufferViewFlowAnalysis.h"
 #include "mlir/Analysis/Liveness.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
+#include "mlir/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Dominance.h"

diff  --git a/mlir/include/mlir/Analysis/BufferViewFlowAnalysis.h b/mlir/include/mlir/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.h
similarity index 92%
rename from mlir/include/mlir/Analysis/BufferViewFlowAnalysis.h
rename to mlir/include/mlir/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.h
index ab208fc0ecff7..c03d78080888c 100644
--- a/mlir/include/mlir/Analysis/BufferViewFlowAnalysis.h
+++ b/mlir/include/mlir/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_ANALYSIS_BUFFERVIEWFLOWANALYSIS_H
-#define MLIR_ANALYSIS_BUFFERVIEWFLOWANALYSIS_H
+#ifndef MLIR_DIALECT_BUFFERIZATION_TRANSFORMS_BUFFERVIEWFLOWANALYSIS_H
+#define MLIR_DIALECT_BUFFERIZATION_TRANSFORMS_BUFFERVIEWFLOWANALYSIS_H
 
 #include "mlir/IR/Operation.h"
 #include "llvm/ADT/SmallPtrSet.h"
@@ -68,4 +68,4 @@ class BufferViewFlowAnalysis {
 
 } // namespace mlir
 
-#endif // MLIR_ANALYSIS_BUFFERVIEWFLOWANALYSIS_H
+#endif // MLIR_DIALECT_BUFFERIZATION_TRANSFORMS_BUFFERVIEWFLOWANALYSIS_H

diff  --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt
index 701584c53f362..23bcb97b6a2ee 100644
--- a/mlir/lib/Analysis/CMakeLists.txt
+++ b/mlir/lib/Analysis/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(LLVM_OPTIONAL_SOURCES
   AliasAnalysis.cpp
-  BufferViewFlowAnalysis.cpp
   CallGraph.cpp
   DataLayoutAnalysis.cpp
   Liveness.cpp
@@ -17,7 +16,6 @@ set(LLVM_OPTIONAL_SOURCES
 
 add_mlir_library(MLIRAnalysis
   AliasAnalysis.cpp
-  BufferViewFlowAnalysis.cpp
   CallGraph.cpp
   DataFlowAnalysis.cpp
   DataFlowFramework.cpp
@@ -40,7 +38,6 @@ add_mlir_library(MLIRAnalysis
   mlir-headers
 
   LINK_LIBS PUBLIC
-  MLIRArithmeticDialect
   MLIRCallInterfaces
   MLIRControlFlowInterfaces
   MLIRDataLayoutInterfaces

diff  --git a/mlir/lib/Analysis/BufferViewFlowAnalysis.cpp b/mlir/lib/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.cpp
similarity index 98%
rename from mlir/lib/Analysis/BufferViewFlowAnalysis.cpp
rename to mlir/lib/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.cpp
index 80f538dfb3bcb..4c64581190b10 100644
--- a/mlir/lib/Analysis/BufferViewFlowAnalysis.cpp
+++ b/mlir/lib/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Analysis/BufferViewFlowAnalysis.h"
+#include "mlir/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.h"
 
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
 #include "mlir/Interfaces/ControlFlowInterfaces.h"

diff  --git a/mlir/lib/Dialect/Bufferization/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Bufferization/Transforms/CMakeLists.txt
index 1b59c548d738d..dfb84c430c115 100644
--- a/mlir/lib/Dialect/Bufferization/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Bufferization/Transforms/CMakeLists.txt
@@ -5,6 +5,7 @@ add_mlir_dialect_library(MLIRBufferizationTransforms
   BufferOptimizations.cpp
   BufferResultsToOutParams.cpp
   BufferUtils.cpp
+  BufferViewFlowAnalysis.cpp
   DropEquivalentBufferResults.cpp
   FuncBufferizableOpInterfaceImpl.cpp
   OneShotAnalysis.cpp
@@ -27,5 +28,6 @@ add_mlir_dialect_library(MLIRBufferizationTransforms
   MLIRPass
   MLIRTensorDialect
   MLIRTransforms
+  MLIRViewLikeInterface
 )
 

diff  --git a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
index e77919941981f..f10690dfea4a3 100644
--- a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
@@ -9131,6 +9131,7 @@ cc_library(
         ":Pass",
         ":TensorDialect",
         ":Transforms",
+        ":ViewLikeInterface",
         "//llvm:Support",
     ],
 )