Fix issues with MLIR build when using BUILD_SHARED_LIBS

Author: bitwalker

mlir/CMakeLists.txt

@@ -55,7 +55,9 @@ include_directories( ${MLIR_INCLUDE_DIR})
 add_subdirectory(include/mlir)
 add_subdirectory(lib)
 add_subdirectory(tools)
-add_subdirectory(unittests)
+if ( LLVM_INCLUDE_TESTS )
+  add_subdirectory(unittests)
+endif()
 add_subdirectory(test)
 
 if( LLVM_INCLUDE_EXAMPLES )

mlir/include/mlir/Dialect/Shape/IR/Shape.h

@@ -24,7 +24,8 @@ namespace shape {
 class ShapeDialect : public Dialect {
 public:
   /// Create the dialect in the given `context`.
-  explicit ShapeDialect(MLIRContext *context);
+  explicit ShapeDialect(MLIRContext *context)
+      : Dialect("shape", context) {}
 };
 
 namespace ShapeTypes {

mlir/lib/Dialect/Shape/CMakeLists.txt

@@ -5,5 +5,5 @@ add_llvm_library(MLIRShape
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Shape
   )
-add_dependencies(MLIRShape MLIRShapeOpsIncGen LLVMSupport)
-target_link_libraries(MLIRShape LLVMSupport)
+add_dependencies(MLIRShape MLIRIR MLIRShapeOpsIncGen LLVMSupport)
+target_link_libraries(MLIRShape MLIRIR LLVMSupport)

mlir/lib/Support/CMakeLists.txt

@@ -42,6 +42,7 @@ add_llvm_library(MLIRJitRunner
   JitRunner.cpp
 )
 target_link_libraries(MLIRJitRunner PRIVATE
+  MLIRAllDialects
   MLIRExecutionEngine
   MLIRIR
   MLIRParser

mlir/test/CMakeLists.txt

@@ -61,12 +61,14 @@ if(MLIR_CUDA_RUNNER_ENABLED)
   )
 endif()
 
-add_lit_testsuite(check-mlir "Running the MLIR regression tests"
-  ${CMAKE_CURRENT_BINARY_DIR}
-  DEPENDS ${MLIR_TEST_DEPENDS}
+if(LLVM_BUILD_TESTS)
+  add_lit_testsuite(check-mlir "Running the MLIR regression tests"
+    ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS ${MLIR_TEST_DEPENDS}
   )
-set_target_properties(check-mlir PROPERTIES FOLDER "Tests")
+  set_target_properties(check-mlir PROPERTIES FOLDER "Tests")
 
-add_lit_testsuites(MLIR ${CMAKE_CURRENT_SOURCE_DIR}
-  DEPENDS ${MLIR_TEST_DEPS}
-)
+  add_lit_testsuites(MLIR ${CMAKE_CURRENT_SOURCE_DIR}
+    DEPENDS ${MLIR_TEST_DEPS}
+  )
+endif()

mlir/test/EDSC/CMakeLists.txt

@@ -21,11 +21,13 @@ target_link_libraries(mlir-edsc-builder-api-test
 
 target_include_directories(mlir-edsc-builder-api-test PRIVATE ..)
 
-whole_archive_link(mlir-edsc-builder-api-test
-  MLIRAffineOps
-  MLIRLinalgOps
-  MLIRLoopOps
-  MLIRStandardOps
-  MLIRVectorOps
-  MLIRTransforms
-)
+if( NOT BUILD_SHARED_LIBS )
+  whole_archive_link(mlir-edsc-builder-api-test
+    MLIRAffineOps
+    MLIRLinalgOps
+    MLIRLoopOps
+    MLIRStandardOps
+    MLIRVectorOps
+    MLIRTransforms
+  )
+endif()

mlir/test/SDBM/CMakeLists.txt

@@ -14,6 +14,8 @@ target_link_libraries(mlir-sdbm-api-test
 
 target_include_directories(mlir-sdbm-api-test PRIVATE ..)
 
-whole_archive_link(mlir-sdbm-api-test
-  MLIRSDBM
-)
+if( NOT BUILD_SHARED_LIBS)
+  whole_archive_link(mlir-sdbm-api-test
+    MLIRSDBM
+  )
+endif()

mlir/tools/mlir-opt/CMakeLists.txt

@@ -4,11 +4,32 @@ set(LLVM_OPTIONAL_SOURCES
 
 set(LIB_LIBS
   MLIRAnalysis
-  MLIRLLVMIR
+  MLIRAllDialects
+  MLIRAffineToStandard
+  MLIRGPUtoCUDATransforms
+  MLIRGPUtoNVVMTransforms
+  MLIRGPUtoROCDLTransforms
+  MLIRGPUtoSPIRVTransforms
+  MLIRGPUtoVulkanTransforms
+  MLIRLinalgTransforms
+  MLIRLinalgToLLVM
+  MLIRLinalgToSPIRVTransforms
+  MLIRLoopsToGPU
+  MLIRLoopToStandard
+  MLIRStandardToLLVM
+  MLIRStandardToSPIRVTransforms
+  MLIRSPIRVTransforms
+  MLIRSPIRVTestPasses
+  MLIRVectorToLLVM
+  MLIRVectorToLoops
   MLIROptLib
   MLIRParser
   MLIRPass
   MLIRTransforms
+  MLIRTestIR
+  MLIRTestPass
+  MLIRTestTransforms
+  MLIRQuantizerTransforms
   MLIRSupport
 )
 add_llvm_library(MLIRMlirOptMain

mlir/tools/mlir-translate/CMakeLists.txt

@@ -20,5 +20,7 @@ add_llvm_tool(mlir-translate
   mlir-translate.cpp
 )
 llvm_update_compile_flags(mlir-translate)
-whole_archive_link(mlir-translate ${FULL_LIBS})
+if( NOT BUILD_SHARED_LIBS)
+  whole_archive_link(mlir-translate ${FULL_LIBS})
+endif()
 target_link_libraries(mlir-translate PRIVATE MLIRIR MLIRTranslateClParser ${LIBS} LLVMSupport)