[MLIR] break cyclic dependency between VectorOps and Analysis

[stephenneuendorffer]

Summary

Depends on D73653

[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]

I have a similar patch locally, thanks!

mlir/test/lib/Transforms/CMakeLists.txt

34

Could MLIRVectorOps be removed here?

[mehdi_amini]

@stephenneuendorffer do you have commit access or are you waiting for someone to land it for you?

mlir/test/lib/Transforms/CMakeLists.txt

34

This comment is marked "done" but the diff does not reflect it right now.

[stephenneuendorffer]

In D73654#1856264, @mehdi_amini wrote:

@stephenneuendorffer do you have commit access or are you waiting for someone to land it for you?

I have commit access, unfortunately, this conflicts with recent changes and I'm trying to figure out how to undo the damage.
I fear that after this lands, churn will continually break this unless there are nightly builds running with BUILD_SHARED_LIBS=ON.
I assume Google is running internal builds: Any chance that you can add a shared library build?

[mehdi_amini]

In D73654#1856279, @stephenneuendorffer wrote:

In D73654#1856264, @mehdi_amini wrote:

@stephenneuendorffer do you have commit access or are you waiting for someone to land it for you?

I have commit access, unfortunately, this conflicts with recent changes and I'm trying to figure out how to undo the damage.
I fear that after this lands, churn will continually break this unless there are nightly builds running with BUILD_SHARED_LIBS=ON.
I assume Google is running internal builds: Any chance that you can add a shared library build?

We don't integrate from upstream on every commits, we wouldn't catch breakages immediately. Also we don't use CMake in our internal build system (we use Bazel).

Ideally we should have a bot added to http://lab.llvm.org:8011 ; it is mostly a matter of someone plugging it there.

[stephenneuendorffer]

With the current state of the code, these changes are no longer necessary.

mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt

 add_llvm_library(MLIRVectorToLLVM
   ConvertVectorToLLVM.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToLLVM
 )
 set(LIBS
   MLIRLLVMIR
   MLIRStandardToLLVM
+  MLIRVectorTransforms
   MLIRTransforms
   LLVMCore
   LLVMSupport
   )
 
 add_dependencies(MLIRVectorToLLVM ${LIBS})
 target_link_libraries(MLIRVectorToLLVM ${LIBS})

mlir/lib/Dialect/VectorOps/CMakeLists.txt

-add_llvm_library(MLIRVectorOps STATIC
+set(LLVM_OPTIONAL_SOURCES
   DialectRegistration.cpp
   VectorOps.cpp
   VectorTransforms.cpp
+  )
+
+add_llvm_library(MLIRVectorOps
+  DialectRegistration.cpp
+  VectorOps.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)
+target_link_libraries(MLIRVectorOps MLIRIR MLIRStandardOps)
+
+add_llvm_library(MLIRVectorTransforms
+  VectorTransforms.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/VectorOps
+  )
+
+add_dependencies(MLIRVectorTransforms MLIRVectorTransformPatternsIncGen)
+
+target_link_libraries(MLIRVectorTransforms MLIRAnalysis MLIRIR MLIRAffineOps MLIRLoopOps MLIRStandardOps MLIRVectorOps)

mlir/test/lib/Transforms/CMakeLists.txt

add_llvm_library(MLIRTestTransforms
   MLIRLinalgOps
   MLIRLinalgTransforms
   MLIRLoopOps
   MLIRGPU
   MLIRPass
   MLIRTestDialect
   MLIRTransformUtils
   MLIRVectorToLoops
   MLIRVectorOps
+  MLIRVectorTransforms
   )
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../TestDialect)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../TestDialect)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../DeclarativeTransforms)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../DeclarativeTransforms)
 add_dependencies(MLIRTestTransforms MLIRStandardOpsIncGen)
 add_dependencies(MLIRTestTransforms MLIRTestLinalgTransformPatternsIncGen)
 add_dependencies(MLIRTestTransforms MLIRTestVectorTransformPatternsIncGen)