[mlir] Improve LLVM shlib support

[serge-sans-paille]

Summary

mlir-tblgen was incompatible with libLLVM, due to explicit linkage with libLLVMSupport etc.
As it cannot link with libLLVM, make sure all lib it uses are not using libLLVM either.

As a side effect, also remove some explicit references to LLVM libs and use components instead.

[stephenneuendorffer]

Thanks for this!

mlir/lib/Support/CMakeLists.txt

34–41

Good catch!

[awarzynski]

Hi @serge-sans-paille, thanks for working on this!

Sadly, our Flang buildbots that set BUILD_SHARED_LIBS to ON are currently failing, e.g. http://lab.llvm.org:8014/#/builders/26. These buildbots are still in the staging area so no notifications are sent. Also, there have been other breaking changes submitted and subsequently reverted recently, so it's not obvious that _this_ is the problematic change. I wish that we had better and more robust pre-commit testing :)

Anyway, I reverted the changes in mlir/tools/mlir-tblgen/CMakeLists.txt locally and that fixed the build for me: https://reviews.llvm.org/D89111. Please, could you take a look? I'm not that familiar with the CMake magic happening here (though to me this patch looks good!). Thank you!

mlir/lib/Support/CMakeLists.txt

add_mlir_library(MLIROptLib
   LINK_LIBS PUBLIC
   MLIRPass
   MLIRParser
   MLIRSupport
   )
 
 # This doesn't use add_mlir_library as it is used in mlir-tblgen and else
 # mlir-tblgen ends up depending on mlir-generic-headers.
 add_llvm_library(MLIRSupportIndentedOstream
   IndentedOstream.cpp
 
-  LINK_LIBS PUBLIC
-  LLVMSupport
+  DISABLE_LLVM_LINK_LLVM_DYLIB
+
+  LINK_COMPONENTS
+  Support
   )

mlir/tools/mlir-cuda-runner/CMakeLists.txt

target_link_libraries(cuda-runtime-wrappers
     ${CUDA_RUNTIME_LIBRARY}
   )
 
   get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
   get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)
   set(LIBS
     ${dialect_libs}
     ${conversion_libs}
-    LLVMCore
-    LLVMSupport
     MLIRJitRunner
     MLIRAnalysis
     MLIREDSC
     MLIRExecutionEngine
     MLIRIR
     MLIRParser
     MLIRSupport
     MLIRTargetLLVMIR
FOREACH(t ${TARGET_LIBS})
     LIST(APPEND targets_to_link "LLVM${t}")
   ENDFOREACH(t)
 
   add_llvm_tool(mlir-cuda-runner
     mlir-cuda-runner.cpp
 
     DEPENDS
     cuda-runtime-wrappers
+
+    LINK_COMPONENTS
+    Core
+    Support
     )
   target_include_directories(mlir-cuda-runner
     PRIVATE ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
   )
   llvm_update_compile_flags(mlir-cuda-runner)
   target_link_libraries(mlir-cuda-runner PRIVATE ${LIBS} ${targets_to_link})
 
 endif()

mlir/tools/mlir-rocm-runner/CMakeLists.txt

if(MLIR_ROCM_RUNNER_ENABLED)
   get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
   get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)
   set(LIBS
     ${dialect_libs}
     ${conversion_libs}
     lldCommon
     lldDriver
     lldELF
-    LLVMCore
-    LLVMLTO
-    LLVMMC
-    LLVMMCParser
-    LLVMOption
-    LLVMSupport
     MLIRJitRunner
     MLIRAnalysis
     MLIREDSC
     MLIRExecutionEngine
     MLIRIR
     MLIRParser
     MLIRROCDLIR
     MLIRSupport
FOREACH(t ${TARGET_LIBS})
     LIST(APPEND targets_to_link "LLVM${t}")
   ENDFOREACH(t)
 
   add_llvm_tool(mlir-rocm-runner
     mlir-rocm-runner.cpp
 
     DEPENDS
     rocm-runtime-wrappers
+
+    LINK_COMPONENTS
+
+    Core
+    LTO
+    MC
+    MCParser
+    Option
+    Support
     )
   llvm_update_compile_flags(mlir-rocm-runner)
   target_include_directories(mlir-rocm-runner
     PRIVATE
     "${HIP_PATH}/../include"
     "${HIP_PATH}/include"
   )
   target_link_libraries(mlir-rocm-runner PRIVATE ${LIBS} ${targets_to_link})
 
 endif()

mlir/tools/mlir-tblgen/CMakeLists.txt

-set(LLVM_LINK_COMPONENTS
-  Demangle
-  Support
-  TableGen
-  )
 
 add_tablegen(mlir-tblgen MLIR
   DialectGen.cpp
   EnumsGen.cpp
   LLVMIRConversionGen.cpp
   LLVMIRIntrinsicGen.cpp
   mlir-tblgen.cpp
   OpDefinitionsGen.cpp

mlir/tools/mlir-vulkan-runner/CMakeLists.txt

target_link_libraries(vulkan-runtime-wrappers
     ${Vulkan_LIBRARY}
   )
 
   get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
   get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)
   set(LIBS
     ${dialect_libs}
     ${conversion_libs}
-    LLVMCore
-    LLVMSupport
     MLIRAnalysis
     MLIREDSC
     MLIRExecutionEngine
     MLIRIR
     MLIRJitRunner
     MLIRLLVMIR
     MLIRParser
     MLIRSPIRVTransforms
if (MLIR_VULKAN_RUNNER_ENABLED)
   # are named with CMake
   SET(targets_to_link)
   FOREACH(t ${TARGET_LIBS})
     LIST(APPEND targets_to_link "LLVM${t}")
   ENDFOREACH(t)
 
   add_llvm_tool(mlir-vulkan-runner
     mlir-vulkan-runner.cpp
+
+    LINK_COMPONENTS
+    Core
+    Support
   )
   add_dependencies(mlir-vulkan-runner vulkan-runtime-wrappers)
   llvm_update_compile_flags(mlir-vulkan-runner)
   target_link_libraries(mlir-vulkan-runner PRIVATE ${FULL_LINK_LIBS} ${LIBS})
 
 endif()