[MLIR] Break cyclic dependencies with MLIRAnalysis

[stephenneuendorffer]

Summary

MLIRAnalysis depended on MLIRVectorOps
MLIRVectorOps depended on MLIRAnalysis for Loop information.

Both of these can be solved by factoring out libraries related to loop
analysis into their own library. The new MLIRLoopAnalysis might be
better off with the Loop Dialect in the future.

[merge_guards_bot]

Unit tests: unknown.

clang-tidy: unknown.

clang-format: unknown.

Build artifacts: diff.json, console-log.txt

Pre-merge checks is in beta. Report issue. Please join beta or enable it for your project.

[mehdi_amini]

LGTM, thanks!

But I'd like to have River's review here first.

mlir/lib/Analysis/CMakeLists.txt

46

I have a local patch prototyping this as well, but I split this in two libraries because it seemed a bit strange to me that using "Dominance" would require me to ask for linking to libVerifier (I'm not opposed this though).

[rriddle]

I think we can break the dependency by removing all of the "test" passes that are currently in the Analysis lib. They predate the Test dialect, and should really be moved out.

[stephenneuendorffer]

In D73655#1848713, @rriddle wrote:

I think we can break the dependency by removing all of the "test" passes that are currently in the Analysis lib. They predate the Test dialect, and should really be moved out.

OpStats.cpp and MemRefBoundCheck.cpp also depend on the MLIRPassLibrary. What do you want to do with these?

[rriddle]

In D73655#1856239, @stephenneuendorffer wrote:

In D73655#1848713, @rriddle wrote:

I think we can break the dependency by removing all of the "test" passes that are currently in the Analysis lib. They predate the Test dialect, and should really be moved out.

OpStats.cpp and MemRefBoundCheck.cpp also depend on the MLIRPassLibrary. What do you want to do with these?

OpStats.cpp can be moved to Transforms for now, and MemRefBoundCheck is just a test pass so it can go into the test/lib/Transforms.

[merge_guards_bot]

Unit tests: unknown.

clang-tidy: unknown.

clang-format: unknown.

Build artifacts: diff.json, console-log.txt

Pre-merge checks is in beta. Report issue. Please join beta or enable it for your project.

[mehdi_amini]

mlir/lib/Analysis/CMakeLists.txt

56

I suspect a bunch of this will end-up moving to the Affine dialect itself.

[merge_guards_bot]

Unit tests: unknown.

clang-tidy: unknown.

clang-format: unknown.

Build artifacts: console-log.txt

Pre-merge checks is in beta. Report issue. Please join beta or enable it for your project.

mlir/lib/Analysis/CMakeLists.txt

-add_llvm_library(MLIRAnalysis STATIC
+set(LLVM_OPTIONAL_SOURCES
   AffineAnalysis.cpp
   AffineStructures.cpp
   CallGraph.cpp
   Dominance.cpp
   InferTypeOpInterface.cpp
   Liveness.cpp
   LoopAnalysis.cpp
   MemRefBoundCheck.cpp
   NestedMatcher.cpp
   OpStats.cpp
   SliceAnalysis.cpp
   TestMemRefDependenceCheck.cpp
   TestParallelismDetection.cpp
   Utils.cpp
   Verifier.cpp
+  )
+
+add_llvm_library(MLIRAnalysis
+  CallGraph.cpp
+  InferTypeOpInterface.cpp
+  Liveness.cpp
+  MemRefBoundCheck.cpp
+  OpStats.cpp
+  SliceAnalysis.cpp
+  TestMemRefDependenceCheck.cpp
+  TestParallelismDetection.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
   )
 add_dependencies(MLIRAnalysis
   MLIRAffineOps
   MLIRCallOpInterfacesIncGen
   MLIRTypeInferOpInterfaceIncGen
   MLIRLoopOps
   )
-target_link_libraries(MLIRAnalysis MLIRAffineOps MLIRLoopOps)
+
+target_link_libraries(MLIRAnalysis MLIRPass MLIRAffineOps MLIRLoopOps)
+
+add_llvm_library(MLIRLoopAnalysis
+  AffineAnalysis.cpp
+  AffineStructures.cpp
+  LoopAnalysis.cpp
+  NestedMatcher.cpp
+  Utils.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
+  )
+add_dependencies(MLIRLoopAnalysis
+  MLIRAffineOps
+  MLIRCallOpInterfacesIncGen
+  MLIRTypeInferOpInterfaceIncGen
+  MLIRLoopOps
+  )
+
+target_link_libraries(MLIRLoopAnalysis MLIRAffineOps MLIRLoopOps)
+
+add_llvm_library(MLIRVerifier
+  Dominance.cpp
+  Verifier.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
+  )
+target_link_libraries(MLIRVerifier MLIRAffineOps MLIRLoopOps MLIRVectorOps)
+

mlir/lib/Dialect/VectorOps/CMakeLists.txt

 add_llvm_library(MLIRVectorOps
   DialectRegistration.cpp
   VectorOps.cpp
   VectorTransforms.cpp
   VectorUtils.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/VectorOps
   )
 
 add_dependencies(MLIRVectorOps MLIRVectorOpsIncGen)
 add_dependencies(MLIRVectorOps MLIRVectorTransformPatternsIncGen)
 
-target_link_libraries(MLIRVectorOps MLIRAnalysis MLIRIR MLIRStandardOps MLIRAffineOps MLIRLoopOps)
+target_link_libraries(MLIRVectorOps MLIRIR MLIRStandardOps MLIRAffineOps MLIRLoopOps MLIRLoopAnalysis)

mlir/lib/Pass/CMakeLists.txt

 file(GLOB globbed *.c *.cpp)
 add_llvm_library(MLIRPass
   ${globbed}
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Pass
   )
-add_dependencies(MLIRPass MLIRAnalysis MLIRIR LLVMSupport)
-target_link_libraries(MLIRPass MLIRAnalysis MLIRIR LLVMSupport)
+add_dependencies(MLIRPass MLIRVerifier MLIRIR LLVMSupport)
+target_link_libraries(MLIRPass MLIRVerifier MLIRIR LLVMSupport)