[MLIR] Fix libMLIR.so and LLVM_LINK_LLVM_DYLIB

[stephenneuendorffer]

Summary

Primarily, this patch moves all mlir references to LLVM libraries into
either LLVM_LINK_COMPONENTS or LINK_COMPONENTS. This enables magic in
the llvm cmake files to automatically replace reference to LLVM components
with references to libLLVM.so when necessary. Among other things, this
completes fixing libMLIR.so, which has been broken for some configurations
since D77515.

Unlike previously, the pattern is now that mlir libraries should almost
always use add_mlir_library. Previously, some libraries still used
add_llvm_library. However, this confuses the export of targets for use
out of tree because libraries specified with add_llvm_library are exported
by LLVM. Instead users which don't need/can't be linked into libMLIR.so
can specify EXCLUDE_FROM_LIBMLIR

A common error mode is linking with LLVM libraries outside of LINK_COMPONENTS.
This almost always results in symbol confusion or multiply defined options
in LLVM when the same object file is included as a static library and
as part of libLLVM.so. To catch these errors more directly, there's now
mlir_check_all_link_libraries.

To simplify usage of add_mlir_library, we assume that all mlir
libraries depend on LLVMSupport, so it's not necessary to separately specify
it.

tested with:
BUILD_SHARED_LIBS=on,
BUILD_SHARED_LIBS=off + LLVM_BUILD_LLVM_DYLIB,
BUILD_SHARED_LIBS=off + LLVM_BUILD_LLVM_DYLIB + LLVM_LINK_LLVM_DYLIB.

[rriddle]

mlir/cmake/modules/AddMLIR.cmake

156

nit: Remove the new line here.

mlir/examples/toy/Ch6/CMakeLists.txt

7

Wonder why this name doesn't match the naming scheme of everything else...

mlir/lib/ExecutionEngine/CMakeLists.txt

15

Maybe we should add a comment when using this?

mlir/lib/Target/CMakeLists.txt

88

nit: Add a newline before this.

[stephenneuendorffer]

mlir/examples/toy/Ch6/CMakeLists.txt

7

nativecodegen is a pseudo-component which is expanded by AddLLVM.cmake. It refers to 'codegen for whatever architecture I'm compiled for'. It makes the JIT work regardless of what architecture you're compiling on.

[stephenneuendorffer]

This landed as part of a squashed commit

mlir/cmake/modules/AddMLIR.cmake

add_custom_command(
           COMMAND ${CMAKE_COMMAND} -E copy
                   ${CMAKE_CURRENT_BINARY_DIR}/${output_file}.md
                   ${GEN_DOC_FILE}
           DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${output_file}.md)
   add_custom_target(${output_file}DocGen DEPENDS ${GEN_DOC_FILE})
   add_dependencies(mlir-doc ${output_file}DocGen)
 endfunction()
 
-# Declare a library which can be compiled in libMLIR.so
-macro(add_mlir_library name)
+# Declare an mlir library which can be compiled in libMLIR.so
+# In addition to everything that llvm_add_librar accepts, this
+# also has the following option:
+# EXCLUDE_FROM_LIBMLIR
+#   Don't include this library in libMLIR.so.  This option should be used
+#   for test libraries, executable-specific libraries, or rarely used libraries
+#   with large dependencies.
+function(add_mlir_library name)
   cmake_parse_arguments(ARG
-    "SHARED;INSTALL_WITH_TOOLCHAIN"
+    "SHARED;INSTALL_WITH_TOOLCHAIN;EXCLUDE_FROM_LIBMLIR"
     ""
-    "ADDITIONAL_HEADERS"
+    "ADDITIONAL_HEADERS;DEPENDS;LINK_COMPONENTS;LINK_LIBS"
     ${ARGN})
   set(srcs)
   if(MSVC_IDE OR XCODE)
     # Add public headers
     file(RELATIVE_PATH lib_path
       ${MLIR_SOURCE_DIR}/lib/
       ${CMAKE_CURRENT_SOURCE_DIR}
     )
if(BUILD_SHARED_LIBS)
       set(LIBTYPE SHARED)
     else()
       set(LIBTYPE STATIC)
     endif()
     if(NOT XCODE)
       # The Xcode generator doesn't handle object libraries correctly.
       list(APPEND LIBTYPE OBJECT)
     endif()
-    set_property(GLOBAL APPEND PROPERTY CLANG_STATIC_LIBS ${name})
+    # Test libraries and such shouldn't be include in libMLIR.so
+    if(NOT ARG_EXCLUDE_FROM_LIBMLIR)
+      set_property(GLOBAL APPEND PROPERTY MLIR_STATIC_LIBS ${name})
+      set_property(GLOBAL APPEND PROPERTY MLIR_LLVM_LINK_COMPONENTS ${ARG_LINK_COMPONENTS})
+      set_property(GLOBAL APPEND PROPERTY MLIR_LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS})      
     endif()
-  llvm_add_library(${name} ${LIBTYPE} ${ARG_UNPARSED_ARGUMENTS} ${srcs})
+  endif()
+
+  # MLIR libraries uniformly depend on LLVMSupport.  Just specify it once here.
+  list(APPEND ARG_LINK_COMPONENTS Support)
+  list(APPEND ARG_DEPENDS mlir-generic-headers)
+  llvm_add_library(${name} ${LIBTYPE} ${ARG_UNPARSED_ARGUMENTS} ${srcs} DEPENDS ${ARG_DEPENDS} LINK_COMPONENTS ${ARG_LINK_COMPONENTS} LINK_LIBS ${ARG_LINK_LIBS})
 
   if(TARGET ${name})
     target_link_libraries(${name} INTERFACE ${LLVM_COMMON_LIBS})
 
     if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
       set(export_to_mlirtargets)
       if (${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
           "mlir-libraries" IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
         ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
         RUNTIME DESTINATION bin)
 
       if (NOT LLVM_ENABLE_IDE)
         add_llvm_install_targets(install-${name}
                                  DEPENDS ${name}
                                  COMPONENT ${name})
       endif()
-
       set_property(GLOBAL APPEND PROPERTY MLIR_ALL_LIBS ${name})
     endif()
     set_property(GLOBAL APPEND PROPERTY MLIR_EXPORTS ${name})
   else()
     # Add empty "phony" target
     add_custom_target(${name})
   endif()
   set_target_properties(${name} PROPERTIES FOLDER "MLIR libraries")
-endmacro(add_mlir_library)
+endfunction(add_mlir_library)
 
 # Declare the library associated with a dialect.
 function(add_mlir_dialect_library name)
   set_property(GLOBAL APPEND PROPERTY MLIR_DIALECT_LIBS ${name})
   add_mlir_library(${ARGV} DEPENDS mlir-headers)
 endfunction(add_mlir_dialect_library)
 
 # Declare the library associated with a conversion.
 function(add_mlir_conversion_library name)
   set_property(GLOBAL APPEND PROPERTY MLIR_CONVERSION_LIBS ${name})
   add_mlir_library(${ARGV} DEPENDS mlir-headers)
 endfunction(add_mlir_conversion_library)
 
 # Declare the library associated with a translation.
 function(add_mlir_translation_library name)
   set_property(GLOBAL APPEND PROPERTY MLIR_TRANSLATION_LIBS ${name})
   add_mlir_library(${ARGV} DEPENDS mlir-headers)
 endfunction(add_mlir_translation_library)
+
+# Verification tools to aid debugging.
+function(mlir_check_link_libraries name)
+  if(TARGET ${name})
+    get_target_property(libs ${name} LINK_LIBRARIES)
+    # message("${name} libs are: ${libs}")
+    set(linking_llvm 0)
+    foreach(lib ${libs})
+      if(lib)
+        if(${lib} MATCHES "^LLVM$")
+          set(linking_llvm 1)
+        endif()
+        if((${lib} MATCHES "^LLVM.+") AND ${linking_llvm})
+          # This will almost always cause execution problems, since the
+          # same symbol might be loaded from 2 separate libraries.  This
+          # often comes from referring to an LLVM library target
+          # explicitly in target_link_libraries()
+          message("WARNING: ${l} links LLVM and ${lib}!")
+        endif()
+      endif()
+    endforeach()
+  endif()
+endfunction(mlir_check_link_libraries)
+
+function(mlir_check_all_link_libraries name)
+  mlir_check_link_libraries(${name})
+  if(TARGET ${name})
+    get_target_property(libs ${name} LINK_LIBRARIES)
+    # message("${name} libs are: ${libs}")
+    foreach(lib ${libs})
+      mlir_check_link_libraries(${lib})
+    endforeach()
+  endif()
+endfunction(mlir_check_all_link_libraries)

mlir/examples/toy/Ch6/CMakeLists.txt

 include_directories(include)
 add_subdirectory(include)
 
 set(LLVM_LINK_COMPONENTS
   Core
   Support
+  nativecodegen
+  OrcJIT
   )
 
 set(LLVM_TARGET_DEFINITIONS mlir/ToyCombine.td)
 mlir_tablegen(ToyCombine.inc -gen-rewriters)
 add_public_tablegen_target(ToyCh6CombineIncGen)
 
 add_toy_chapter(toyc-ch6
   toyc.cpp

mlir/examples/toy/Ch7/CMakeLists.txt

 include_directories(include)
 add_subdirectory(include)
 
 set(LLVM_LINK_COMPONENTS
   Core
   Support
+  nativecodegen
+  OrcJIT
   )
 
 set(LLVM_TARGET_DEFINITIONS mlir/ToyCombine.td)
 mlir_tablegen(ToyCombine.inc -gen-rewriters)
 add_public_tablegen_target(ToyCh7CombineIncGen)
 
 add_toy_chapter(toyc-ch7
   toyc.cpp

mlir/lib/Conversion/AVX512ToLLVM/CMakeLists.txt

 add_mlir_conversion_library(MLIRAVX512ToLLVM
   ConvertAVX512ToLLVM.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/AVX512ToLLVM
 
   DEPENDS
   MLIRConversionPassIncGen
+
+  LINK_COMPONENTS
+  Core
   )
 
 target_link_libraries(MLIRAVX512ToLLVM
   PUBLIC
   MLIRAVX512
   MLIRLLVMAVX512
   MLIRLLVMIR
   MLIRStandardToLLVM
   MLIRTransforms
-  LLVMCore
-  LLVMSupport
   )

mlir/lib/Conversion/AffineToStandard/CMakeLists.txt

 add_mlir_conversion_library(MLIRAffineToStandard
   AffineToStandard.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/AffineToStandard
 
   DEPENDS
   MLIRConversionPassIncGen
+
+  LINK_COMPONENTS
+  Core
   )
 target_link_libraries(
   MLIRAffineToStandard
   PUBLIC
   MLIRAffineOps
   MLIRLoopOps
   MLIRPass
   MLIRStandardOps
   MLIRTransforms
   MLIRIR
-  LLVMCore
-  LLVMSupport
   )

mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt

 set(LLVM_OPTIONAL_SOURCES
   ConvertKernelFuncToCubin.cpp
 )
 
 set(SOURCES
   ConvertLaunchFuncToCudaCalls.cpp
 )
 
 if (MLIR_CUDA_CONVERSIONS_ENABLED)
  list(APPEND SOURCES "ConvertKernelFuncToCubin.cpp")
   set(NVPTX_LIBS
-    LLVMNVPTXCodeGen
-    LLVMNVPTXDesc
-    LLVMNVPTXInfo
+    NVPTXCodeGen
+    NVPTXDesc
+    NVPTXInfo
   )
 endif()
 
 add_mlir_conversion_library(MLIRGPUtoCUDATransforms
   ${SOURCES}
 
   DEPENDS
   MLIRConversionPassIncGen
+
+  LINK_COMPONENTS
+  Core
+  MC
+  ${NVPTX_LIBS}
   )
 target_link_libraries(MLIRGPUtoCUDATransforms
   PUBLIC
-  ${NVPTX_LIBS}
-  LLVMCore
-  LLVMMC
-  LLVMSupport
   MLIRGPU
   MLIRIR
   MLIRLLVMIR
   MLIRNVVMIR
   MLIRPass
   MLIRSupport
   MLIRTargetNVVMIR
 )

mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt

 set(LLVM_TARGET_DEFINITIONS GPUToNVVM.td)
 mlir_tablegen(GPUToNVVM.cpp.inc -gen-rewriters)
 add_public_tablegen_target(MLIRGPUToNVVMIncGen)
 
 add_mlir_conversion_library(MLIRGPUtoNVVMTransforms
   LowerGpuOpsToNVVMOps.cpp
 
   DEPENDS
   MLIRConversionPassIncGen
   MLIRGPUToNVVMIncGen
   )
 
 target_link_libraries(MLIRGPUtoNVVMTransforms
   PUBLIC
-  LLVMSupport
   MLIRGPU
   MLIRLLVMIR
   MLIRNVVMIR
   MLIRPass
   MLIRStandardToLLVM
   MLIRTransformUtils
   )

mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt

 add_mlir_conversion_library(MLIRGPUtoROCDLTransforms
   LowerGpuOpsToROCDLOps.cpp
 
   DEPENDS
   MLIRConversionPassIncGen
   )
 target_link_libraries(MLIRGPUtoROCDLTransforms
   PUBLIC
-  LLVMSupport
   MLIRGPU
   MLIRLLVMIR
   MLIRROCDLIR
   MLIRPass
   MLIRStandardToLLVM
   )

mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt

target_link_libraries(MLIRGPUtoVulkanTransforms
   MLIRLLVMIR
   MLIRPass
   MLIRSPIRV
   MLIRSPIRVSerialization
   MLIRStandardOps
   MLIRSupport
   MLIRTransforms
   MLIRTranslation
-  LLVMSupport
   )

mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt

 add_mlir_conversion_library(MLIRLinalgToLLVM
   LinalgToLLVM.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LinalgToLLVM
 
   DEPENDS
   MLIRConversionPassIncGen
+
+  LINK_COMPONENTS
+  Core
   )
 
 target_link_libraries(MLIRLinalgToLLVM
   PUBLIC
   MLIRAffineToStandard
   MLIREDSC
   MLIRIR
   MLIRLinalgOps
   MLIRLLVMIR
   MLIRLoopToStandard
   MLIRStandardToLLVM
   MLIRVectorToLLVM
   MLIRVectorToLoops
   MLIRTransforms
-  LLVMCore
-  LLVMSupport
   )

mlir/lib/Conversion/LoopToStandard/CMakeLists.txt

 add_mlir_conversion_library(MLIRLoopToStandard
   LoopToStandard.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LoopToStandard
 
   DEPENDS
   MLIRConversionPassIncGen
+
+  LINK_COMPONENTS
+  Core
   )
 target_link_libraries(
   MLIRLoopToStandard
   PUBLIC
   MLIRLoopOps
   MLIRTransforms
-  LLVMCore
-  LLVMSupport
   )

mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt

target_link_libraries(MLIRLoopsToGPU
   MLIRAffineToStandard
   MLIRGPU
   MLIRIR
   MLIRLinalgOps
   MLIRPass
   MLIRStandardOps
   MLIRSupport
   MLIRTransforms
-  LLVMSupport
   )

mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt

 add_mlir_conversion_library(MLIRStandardToLLVM
   StandardToLLVM.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/StandardToLLVM
 
   DEPENDS
   MLIRConversionPassIncGen
+
+  LINK_COMPONENTS
+  Core
   )
 target_link_libraries(
   MLIRStandardToLLVM
   PUBLIC
   MLIRLLVMIR
   MLIRTransforms
-  LLVMCore
-  LLVMSupport
   )

mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt

 add_mlir_conversion_library(MLIRVectorToLLVM
   ConvertVectorToLLVM.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToLLVM
 
   DEPENDS
   MLIRConversionPassIncGen
+
+  LINK_COMPONENTS
+  Core
   )
 
 target_link_libraries(MLIRVectorToLLVM
   PUBLIC
   MLIRLLVMIR
   MLIRStandardToLLVM
   MLIRVector
   MLIRTransforms
-  LLVMCore
-  LLVMSupport
   )

mlir/lib/Conversion/VectorToLoops/CMakeLists.txt

 add_mlir_conversion_library(MLIRVectorToLoops
   ConvertVectorToLoops.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToLoops
+
+  LINK_COMPONENTS
+  Core
   )
 
 target_link_libraries(MLIRVectorToLoops
   PUBLIC
   MLIREDSC
   MLIRAffineEDSC
   MLIRLLVMIR
   MLIRTransforms
-  LLVMCore
-  LLVMSupport
   )

mlir/lib/Dialect/AVX512/CMakeLists.txt

 add_mlir_dialect_library(MLIRAVX512
   IR/AVX512Dialect.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/AVX512
 
   DEPENDS
   MLIRAVX512IncGen
   )
 target_link_libraries(MLIRAVX512
   PUBLIC
   MLIRIR
   MLIRSideEffects
   MLIRVectorToLLVM
-  LLVMSupport
   )

mlir/lib/Dialect/GPU/CMakeLists.txt

target_link_libraries(MLIRGPU
   MLIRIR
   MLIRLLVMIR
   MLIRLoopOps
   MLIRPass
   MLIRSideEffects
   MLIRStandardOps
   MLIRSupport
   MLIRTransformUtils
-  LLVMSupport
   )

mlir/lib/Dialect/LLVMIR/CMakeLists.txt

 add_subdirectory(Transforms)
 
 add_mlir_dialect_library(MLIRLLVMIR
   IR/LLVMDialect.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
 
   DEPENDS
   MLIRLLVMOpsIncGen
   MLIRLLVMConversionsIncGen
-  )
+
+  LINK_COMPONENTS
+  AsmParser
+  BitReader
+  BitWriter
+  Core
+  FrontendOpenMP
 target_link_libraries(MLIRLLVMIR
   PUBLIC
-  LLVMAsmParser
-  LLVMBitReader
-  LLVMBitWriter
-  LLVMCore
-  LLVMSupport
-  LLVMFrontendOpenMP
   MLIRCallInterfaces
   MLIRControlFlowInterfaces
   MLIROpenMP
   MLIRIR
   MLIRSideEffects
   MLIRSupport
   )
 
 add_mlir_dialect_library(MLIRLLVMAVX512
   IR/LLVMAVX512Dialect.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
 
   DEPENDS
   MLIRLLVMAVX512IncGen
   MLIRLLVMAVX512ConversionsIncGen
+
+  LINK_COMPONENTS
+  AsmParser
+  Core
   )
 target_link_libraries(MLIRLLVMAVX512
   PUBLIC
-  LLVMAsmParser
   MLIRIR
   MLIRLLVMIR
   MLIRSideEffects
-  LLVMSupport
-  LLVMCore
   )
 
 add_mlir_dialect_library(MLIRNVVMIR
   IR/NVVMDialect.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
 
   DEPENDS
   MLIRNVVMOpsIncGen
   MLIRNVVMConversionsIncGen
+
+  LINK_COMPONENTS
+  AsmParser
+  Core
   )
 target_link_libraries(MLIRNVVMIR
   PUBLIC
-  LLVMAsmParser
   MLIRIR
   MLIRLLVMIR
   MLIRSideEffects
-  LLVMSupport
-  LLVMCore
   )
 
 add_mlir_dialect_library(MLIRROCDLIR
   IR/ROCDLDialect.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
 
   DEPENDS
   MLIRROCDLOpsIncGen
   MLIRROCDLConversionsIncGen
+
+  LINK_COMPONENTS
+  AsmParser
+  Core
   )
 target_link_libraries(MLIRROCDLIR
   PUBLIC
-  LLVMAsmParser
-  LLVMCore
-  LLVMSupport
   MLIRIR
   MLIRSideEffects
   MLIRVectorToLLVM
   )

mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt

 add_mlir_dialect_library(MLIRLinalgAnalysis
   DependenceAnalysis.cpp
   
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
 
   DEPENDS
   intrinsics_gen
   )
 
 target_link_libraries(MLIRLinalgAnalysis
   PUBLIC
   MLIRIR
   MLIRLinalgOps
   MLIRStandardOps
-  LLVMSupport
   )

mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt

target_link_libraries(MLIRLinalgEDSC
   PUBLIC
   MLIREDSC
   MLIRIR
   MLIRAffineOps
   MLIRAffineEDSC
   MLIRLinalgOps
   MLIRLoopOps
   MLIRStandardOps
-  LLVMSupport
   )

mlir/lib/Dialect/LoopOps/CMakeLists.txt

add_mlir_dialect_library(MLIRLoopOps
   )
 target_link_libraries(MLIRLoopOps
   PUBLIC
   MLIREDSC
   MLIRIR
   MLIRLoopLikeInterface
   MLIRSideEffects
   MLIRStandardOps
-  LLVMSupport
   )
 
 add_subdirectory(Transforms)

mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt

 target_link_libraries(MLIRLoopOpsTransforms
   PUBLIC
   MLIRAffineOps
   MLIRIR
   MLIRPass
   MLIRLoopOps
   MLIRStandardOps
   MLIRSupport
-  LLVMSupport
   )

mlir/lib/Dialect/Shape/CMakeLists.txt

 add_mlir_dialect_library(MLIRShape
   IR/Shape.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Shape
 
   DEPENDS
   MLIRShapeOpsIncGen
   )
 target_link_libraries(MLIRShape
   PUBLIC
   MLIRDialect
   MLIRInferTypeOpInterface
   MLIRIR
   MLIRSideEffects
-  LLVMSupport
   )

mlir/lib/Dialect/StandardOps/CMakeLists.txt

 target_link_libraries(MLIRStandardOps
   PUBLIC
   MLIRCallInterfaces
   MLIRControlFlowInterfaces
   MLIREDSC
   MLIRIR
   MLIRSideEffects
   MLIRViewLikeInterface
-  LLVMSupport
   )

mlir/lib/ExecutionEngine/CMakeLists.txt

+# Exclude these from libMLIR.so because the JIT infrastructure
+# is a big dependency which most don't need.
+
 set(LLVM_OPTIONAL_SOURCES
   CRunnerUtils.cpp
   ExecutionEngine.cpp
   RunnerUtils.cpp
   OptUtils.cpp
   )
 
-llvm_map_components_to_libnames(outlibs "nativecodegen" "IPO")
 add_mlir_library(MLIRExecutionEngine
   ExecutionEngine.cpp
   OptUtils.cpp
 
+  EXCLUDE_FROM_LIBMLIR
+  
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/ExecutionEngine
+
+  LINK_COMPONENTS
+  Core
+  ExecutionEngine
+  Object
+  OrcJIT
+  JITLink
+  Analysis
+  AggressiveInstCombine
+  InstCombine
+  MC
+  ScalarOpts
+  Target
+  Vectorize
+  TransformUtils
+  nativecodegen
+  IPO
   )
 target_link_libraries(MLIRExecutionEngine
   PUBLIC
   MLIRLLVMIR
   MLIRTargetLLVMIR
-  LLVMExecutionEngine
-  LLVMObject
-  LLVMOrcJIT
-  LLVMJITLink
-  LLVMSupport
-  LLVMAnalysis
-  LLVMAggressiveInstCombine
-  LLVMInstCombine
-  LLVMMC
-  LLVMScalarOpts
-  LLVMTarget
-  LLVMVectorize
-  LLVMTransformUtils
+  )
 
-  ${outlibs})
+add_mlir_library(mlir_c_runner_utils
+  SHARED
+  CRunnerUtils.cpp
 
-add_llvm_library(mlir_c_runner_utils SHARED CRunnerUtils.cpp)
+  EXCLUDE_FROM_LIBMLIR
+  )
 set_property(TARGET mlir_c_runner_utils PROPERTY CXX_STANDARD 11)
-add_llvm_library(mlir_c_runner_utils_static CRunnerUtils.cpp)
+
+add_mlir_library(mlir_c_runner_utils_static
+  CRunnerUtils.cpp
+
+  EXCLUDE_FROM_LIBMLIR
+  )
 set_property(TARGET mlir_c_runner_utils_static PROPERTY CXX_STANDARD 11)
 target_compile_definitions(mlir_c_runner_utils PRIVATE mlir_c_runner_utils_EXPORTS)
 
-add_llvm_library(mlir_runner_utils SHARED RunnerUtils.cpp)
+add_mlir_library(mlir_runner_utils
+  SHARED
+  RunnerUtils.cpp
+
+  EXCLUDE_FROM_LIBMLIR
+  )
 target_link_libraries(mlir_runner_utils
   PUBLIC
   mlir_c_runner_utils_static
 )
 target_compile_definitions(mlir_runner_utils PRIVATE mlir_runner_utils_EXPORTS)

mlir/lib/Pass/CMakeLists.txt

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

mlir/lib/Support/CMakeLists.txt

 set(LLVM_OPTIONAL_SOURCES
   FileUtilities.cpp
   JitRunner.cpp
   MlirOptMain.cpp
   StorageUniquer.cpp
   ToolUtilities.cpp
 )
 
 add_mlir_library(MLIRSupport
   FileUtilities.cpp
   StorageUniquer.cpp
   ToolUtilities.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Support
+
+  LINK_COMPONENTS
+  Support  
   )
 target_link_libraries(MLIRSupport
   PUBLIC
-  LLVMSupport
   ${LLVM_PTHREAD_LIB})
 
 add_mlir_library(MLIROptLib
   MlirOptMain.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Support
+
+  LINK_COMPONENTS
+  Support
   )
 target_link_libraries(MLIROptLib
   PUBLIC
   MLIRPass
   MLIRParser
-  LLVMSupport
   MLIRSupport
   )
 
-add_llvm_library(MLIRJitRunner
+# Exclude from libMLIR.so because the JIT infrastructure
+# is a big dependency which most don't need.
+add_mlir_library(MLIRJitRunner
   JitRunner.cpp
+
+  EXCLUDE_FROM_LIBMLIR
+  
+  LINK_COMPONENTS
+  Core
+  OrcJIT
+  JITLink
+  Support
   )
 target_link_libraries(MLIRJitRunner
   PUBLIC
   MLIRExecutionEngine
   MLIRIR
   MLIRParser
   MLIRStandardOps
   MLIRTargetLLVMIR
   MLIRTransforms
   MLIRStandardToLLVM
   MLIRSupport
-  LLVMCore
-  LLVMSupport
 )

mlir/lib/TableGen/CMakeLists.txt

-add_llvm_library(LLVMMLIRTableGen
+# This library is unusual, since mlir-tblgen depends on it.
+# For non-obvious reasons, linking mlir-tblgen fails with
+# LLVM_BUILD_LLVM_DYLIB and LLVM_LINK_LLVM_DYLIB unless
+# DISABLE_LLVM_LINK_LLVM_DYLIB is set.
+llvm_add_library(LLVMMLIRTableGen STATIC
   Argument.cpp
   Attribute.cpp
   Constraint.cpp
   Dialect.cpp
   Format.cpp
   Operator.cpp
   OpClass.cpp
   OpInterfaces.cpp
   OpTrait.cpp
   Pass.cpp
   Pattern.cpp
   Predicate.cpp
   Region.cpp
   SideEffects.cpp
   Successor.cpp
   Type.cpp
   
+  DISABLE_LLVM_LINK_LLVM_DYLIB
+  
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/TableGen
+
+  LINK_COMPONENTS
+  TableGen
+  Demangle
   )
-target_link_libraries(LLVMMLIRTableGen
-  PUBLIC
-  LLVMSupport
-  LLVMTableGen)
+
+mlir_check_all_link_libraries(LLVMMLIRTableGen)

mlir/lib/Target/CMakeLists.txt

 add_mlir_translation_library(MLIRTargetLLVMIRModuleTranslation
   LLVMIR/DebugTranslation.cpp
   LLVMIR/ModuleTranslation.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Target/LLVMIR
+
   DEPENDS
   intrinsics_gen
+
+  LINK_COMPONENTS
+  Core
+  FrontendOpenMP
+  TransformUtils
   )
 target_link_libraries(MLIRTargetLLVMIRModuleTranslation
   PUBLIC
   MLIRLLVMIR
   MLIRLLVMIRTransforms
-  LLVMCore
-  LLVMIRReader
-  LLVMSupport
-  LLVMTransformUtils
   MLIRTranslation
   )
 
 add_mlir_translation_library(MLIRTargetAVX512
   LLVMIR/LLVMAVX512Intr.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Target/LLVMIR
+
   DEPENDS
   MLIRLLVMAVX512ConversionsIncGen
+
+  LINK_COMPONENTS
+  Core
   )
 target_link_libraries(MLIRTargetAVX512
   PUBLIC
   MLIRIR
   MLIRLLVMAVX512
   MLIRLLVMIR
   MLIRTargetLLVMIRModuleTranslation
   )
 
 add_mlir_translation_library(MLIRTargetLLVMIR
   LLVMIR/ConvertFromLLVMIR.cpp
   LLVMIR/ConvertToLLVMIR.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Target/LLVMIR
+
+  LINK_COMPONENTS
+  Core
+  IRReader
   )
 target_link_libraries(MLIRTargetLLVMIR
   PUBLIC
   MLIRTargetLLVMIRModuleTranslation
   )
 
 add_mlir_translation_library(MLIRTargetNVVMIR
   LLVMIR/ConvertToNVVMIR.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Target/LLVMIR
+
   DEPENDS
   intrinsics_gen
+
+  LINK_COMPONENTS
+  Core
   )
 target_link_libraries(MLIRTargetNVVMIR
   PUBLIC
   MLIRGPU
   MLIRIR
   MLIRLLVMIR
   MLIRNVVMIR
   MLIRTargetLLVMIRModuleTranslation
   )
 
 add_mlir_translation_library(MLIRTargetROCDLIR
   LLVMIR/ConvertToROCDLIR.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Target/LLVMIR
+
   DEPENDS
   intrinsics_gen
+
+  LINK_COMPONENTS
+  Core
   )
 target_link_libraries(MLIRTargetROCDLIR
   PUBLIC
   MLIRGPU
   MLIRIR
   MLIRLLVMIR
   MLIRROCDLIR
   MLIRTargetLLVMIRModuleTranslation
   )

mlir/lib/Translation/CMakeLists.txt

 add_mlir_library(MLIRTranslation
   Translation.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Translation
   )
 target_link_libraries(MLIRTranslation
   PUBLIC
-  LLVMSupport
   MLIRIR
   MLIRParser
   )

mlir/test/EDSC/CMakeLists.txt

+set(LLVM_LINK_COMPONENTS
+  Core
+  Support
+  )
 add_llvm_executable(mlir-edsc-builder-api-test
   builder-api-test.cpp
 )
 
 llvm_update_compile_flags(mlir-edsc-builder-api-test)
 
 target_link_libraries(mlir-edsc-builder-api-test
   PRIVATE
   MLIRAffineOps
   MLIRAffineEDSC
   MLIREDSC
   MLIRIR
   MLIRLinalgEDSC
   MLIRLinalgOps
   MLIRLoopOps
   MLIRStandardOps
   MLIRTransforms
   MLIRVector
-  LLVMCore
-  LLVMSupport
   )
 
 target_include_directories(mlir-edsc-builder-api-test PRIVATE ..)

mlir/test/SDBM/CMakeLists.txt

+set(LLVM_LINK_COMPONENTS
+  Core
+  Support
+  )
+
 add_llvm_executable(mlir-sdbm-api-test
   sdbm-api-test.cpp
 )
 
 llvm_update_compile_flags(mlir-sdbm-api-test)
 
 target_link_libraries(mlir-sdbm-api-test
   PRIVATE
   MLIRIR
   MLIRSDBM
   MLIRSupport
-  LLVMCore
-  LLVMSupport
 )
 
 target_include_directories(mlir-sdbm-api-test PRIVATE ..)

mlir/test/lib/Dialect/Affine/CMakeLists.txt

-add_llvm_library(MLIRAffineTransformsTestPasses
+# Exclude tests from libMLIR.so
+add_mlir_library(MLIRAffineTransformsTestPasses
   TestAffineDataCopy.cpp
   TestAffineLoopUnswitching.cpp
   TestLoopPermutation.cpp
   TestParallelismDetection.cpp
   TestVectorizationUtils.cpp
 
+  EXCLUDE_FROM_LIBMLIR
+
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Affine
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
+
+  LINK_COMPONENTS
+  Core
   )
 
 target_link_libraries(MLIRAffineTransformsTestPasses PRIVATE
   MLIRIR
   MLIRPass
   MLIRAffineTransforms
   MLIRSupport
   MLIRAffineUtils
   )

mlir/test/lib/Dialect/SPIRV/CMakeLists.txt

-add_llvm_library(MLIRSPIRVTestPasses
+# Exclude tests from libMLIR.so
+add_mlir_library(MLIRSPIRVTestPasses
   TestAvailability.cpp
 
+  EXCLUDE_FROM_LIBMLIR
+
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
   )
 
 target_link_libraries(MLIRSPIRVTestPasses PRIVATE
   MLIRIR
   MLIRPass
   MLIRSPIRV
   MLIRSupport
   )

mlir/test/lib/Dialect/Test/CMakeLists.txt

 set(LLVM_OPTIONAL_SOURCES
   TestDialect.cpp
   TestPatterns.cpp
 )
 
 set(LLVM_TARGET_DEFINITIONS TestOps.td)
 mlir_tablegen(TestOps.h.inc -gen-op-decls)
 mlir_tablegen(TestOps.cpp.inc -gen-op-defs)
 mlir_tablegen(TestOpsDialect.h.inc -gen-dialect-decls)
 mlir_tablegen(TestOpEnums.h.inc -gen-enum-decls)
 mlir_tablegen(TestOpEnums.cpp.inc -gen-enum-defs)
 mlir_tablegen(TestOpStructs.h.inc -gen-struct-attr-decls)
 mlir_tablegen(TestOpStructs.cpp.inc -gen-struct-attr-defs)
 mlir_tablegen(TestPatterns.inc -gen-rewriters)
 add_public_tablegen_target(MLIRTestOpsIncGen)
 
-add_llvm_library(MLIRTestDialect
+# Exclude tests from libMLIR.so
+add_mlir_library(MLIRTestDialect
   TestDialect.cpp
   TestPatterns.cpp
 
+  EXCLUDE_FROM_LIBMLIR
+
   DEPENDS
   MLIRTestOpsIncGen
 )
 target_link_libraries(MLIRTestDialect
   PUBLIC
-  LLVMSupport
   MLIRControlFlowInterfaces
   MLIRDerivedAttributeOpInterface
   MLIRDialect
   MLIRIR
   MLIRInferTypeOpInterface
   MLIRLinalgTransforms
   MLIRPass
   MLIRStandardOps
   MLIRStandardToStandard
   MLIRTransformUtils
   MLIRTransforms
 )

mlir/test/lib/IR/CMakeLists.txt

-add_llvm_library(MLIRTestIR
+# Exclude tests from libMLIR.so
+add_mlir_library(MLIRTestIR
   TestFunc.cpp
   TestMatchers.cpp
   TestSideEffects.cpp
   TestSymbolUses.cpp
 
-  ADDITIONAL_HEADER_DIRS
+  EXCLUDE_FROM_LIBMLIR
   )
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test)
 
 target_link_libraries(MLIRTestIR
   PUBLIC
   MLIRPass
   MLIRTestDialect
   )

mlir/test/lib/Pass/CMakeLists.txt

-add_llvm_library(MLIRTestPass
+# Exclude tests from libMLIR.so
+add_mlir_library(MLIRTestPass
   TestPassManager.cpp
 
+  EXCLUDE_FROM_LIBMLIR
+
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Pass
   )
 target_link_libraries(MLIRTestPass
   PUBLIC
   MLIRIR
   MLIRPass
   )

mlir/test/lib/Transforms/CMakeLists.txt

-add_llvm_library(MLIRTestTransforms
+# Exclude tests from libMLIR.so
+add_mlir_library(MLIRTestTransforms
   TestAllReduceLowering.cpp
   TestBufferPlacement.cpp
   TestCallGraph.cpp
   TestConstantFold.cpp
   TestConvertGPUKernelToCubin.cpp
   TestDominance.cpp
   TestLoopFusion.cpp
   TestGpuMemoryPromotion.cpp
   TestGpuParallelLoopMapping.cpp
   TestInlining.cpp
   TestLinalgTransforms.cpp
   TestLiveness.cpp
   TestLoopMapping.cpp
   TestLoopParametricTiling.cpp
   TestOpaqueLoc.cpp
   TestMemRefBoundCheck.cpp
   TestMemRefDependenceCheck.cpp
   TestMemRefStrideCalculation.cpp
   TestVectorToLoopsConversion.cpp
   TestVectorTransforms.cpp
 
+  EXCLUDE_FROM_LIBMLIR
+
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
 
   DEPENDS
   MLIRStandardOpsIncGen
   MLIRTestLinalgTransformPatternsIncGen
   MLIRTestVectorTransformPatternsIncGen
   )
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../DeclarativeTransforms)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../DeclarativeTransforms)
 
 target_link_libraries(MLIRTestTransforms
   PUBLIC

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

+set(LLVM_LINK_COMPONENTS
+  Core
+  Support
+  nativecodegen
+  )
+
 add_llvm_tool(mlir-cpu-runner
   mlir-cpu-runner.cpp
   )
 llvm_update_compile_flags(mlir-cpu-runner)
 get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
 target_link_libraries(mlir-cpu-runner PRIVATE
   ${dialect_libs}
   MLIRAnalysis
   MLIREDSC
   MLIRExecutionEngine
   MLIRIR
   MLIRJitRunner
   MLIRLLVMIR
   MLIRParser
   MLIRTargetLLVMIR
   MLIRSupport
-  LLVMCore
-  LLVMSupport
   )

mlir/tools/mlir-linalg-ods-gen/CMakeLists.txt

+set(LLVM_LINK_COMPONENTS
+  Core
+  Support
+  )
 add_llvm_tool(mlir-linalg-ods-gen
   mlir-linalg-ods-gen.cpp
 )
 llvm_update_compile_flags(mlir-linalg-ods-gen)
 target_link_libraries(mlir-linalg-ods-gen PRIVATE
   MLIRParser
   MLIRSupport
-  LLVMCore
-  LLVMSupport
   )

mlir/tools/mlir-opt/CMakeLists.txt

 set(LLVM_OPTIONAL_SOURCES
   null.cpp
 )
 
 get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
 get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)
+set(LLVM_LINK_COMPONENTS
+  Core
+  Support
+  AsmParser
+  )
+
 set(LIBS
   ${dialect_libs}
   ${conversion_libs}
   MLIRLoopAnalysis
   MLIRAffineTransformsTestPasses
   MLIRAnalysis
   MLIRDialect
   MLIREDSC
   MLIROptLib
   MLIRParser
   MLIRPass
   MLIRSPIRVTestPasses
   MLIRTransforms
   MLIRTransformUtils
   MLIRTestDialect
   MLIRTestIR
   MLIRTestPass
   MLIRTestTransforms
   MLIRSupport
   MLIRIR
   MLIROptLib
-  LLVMSupport
-  LLVMCore
-  LLVMAsmParser
   )
 
-add_llvm_library(MLIRMlirOptMain
+# Exclude from libMLIR.so because this has static options intended for
+# opt-like tools only.
+add_mlir_library(MLIRMlirOptMain
   mlir-opt.cpp
+
+  EXCLUDE_FROM_LIBMLIR
   )
 target_link_libraries(MLIRMlirOptMain
   PUBLIC
   ${LIBS}
 )
 
 add_llvm_tool(mlir-opt
  mlir-opt.cpp
 )
 
 llvm_update_compile_flags(mlir-opt)
 target_link_libraries(mlir-opt PRIVATE ${LIBS} ${targets_to_link})
+
+mlir_check_link_libraries(mlir-opt)

mlir/tools/mlir-shlib/CMakeLists.txt

 # Building libmlir-cpp.so fails if LLVM_ENABLE_PIC=Off
 if (NOT LLVM_ENABLE_PIC)
   return()
 endif()
 
 # Building libmlir-cpp.so may not work on MSVC
 if (MSVC)
   return()
 endif()
 
-get_property(mlir_libs GLOBAL PROPERTY MLIR_ALL_LIBS)
+get_property(mlir_libs GLOBAL PROPERTY MLIR_STATIC_LIBS)
+get_property(mlir_llvm_link_components GLOBAL PROPERTY MLIR_LLVM_LINK_COMPONENTS)
 list(REMOVE_DUPLICATES mlir_libs)
+list(REMOVE_DUPLICATES mlir_llvm_link_components)
 
 foreach (lib ${mlir_libs})
   if(XCODE)
     # Xcode doesn't support object libraries, so we have to trick it into
     # linking the static libraries instead.
     list(APPEND _DEPS "-force_load" ${lib})
   else()
     list(APPEND _OBJECTS $<TARGET_OBJECTS:obj.${lib}>)
   endif()
-  list(APPEND _DEPS $<TARGET_PROPERTY:${lib},LINK_LIBRARIES>)
+  # libClang needs this, but it causes problems for MLIR (probably
+  # because we use public library dependencies within MLIR.)
+  # list(APPEND _DEPS  $<TARGET_PROPERTY:${lib},LINK_LIBRARIES>)
 endforeach ()
 
 if(MLIR_LINK_MLIR_DYLIB)
   set(INSTALL_WITH_TOOLCHAIN INSTALL_WITH_TOOLCHAIN)
 endif()
 
-# libMLIR.so depends on LLVM components.  To avoid multiple
-# copies of those LLVM components, libMLIR.so depends on libLLVM.so.
-# This probably won't work if some LLVM components are not included
-# in libLLVM.so.
 if(LLVM_BUILD_LLVM_DYLIB)
-  add_llvm_library(
+  add_mlir_library(
     MLIR
     SHARED
     ${INSTALL_WITH_TOOLCHAIN}
     mlir-shlib.cpp
     ${_OBJECTS}
     LINK_LIBS
     ${_DEPS}
+    
+    LINK_COMPONENTS
+    ${mlir_llvm_link_components}
   )
-  target_link_libraries(MLIR PRIVATE LLVM ${LLVM_PTHREAD_LIB})
+  target_link_libraries(MLIR PRIVATE ${LLVM_PTHREAD_LIB})
 endif()
+
+#message("Libraries included in libMLIR.so: ${mlir_libs}")
+#message("LLVM Components included in libMLIR.so: ${mlir_llvm_link_components}")
+
+mlir_check_all_link_libraries(MLIR)

mlir/tools/mlir-tblgen/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
-  MLIRTableGen
+  Demangle
   Support
+  TableGen
   )
 
 add_tablegen(mlir-tblgen MLIR
   DialectGen.cpp
   EnumsGen.cpp
   LLVMIRConversionGen.cpp
   LLVMIRIntrinsicGen.cpp
   mlir-tblgen.cpp
   OpDefinitionsGen.cpp
   OpDocGen.cpp
   OpFormatGen.cpp
   OpInterfacesGen.cpp
   PassGen.cpp
   PassDocGen.cpp
   RewriterGen.cpp
   SPIRVUtilsGen.cpp
   StructsGen.cpp
   )
+
 set_target_properties(mlir-tblgen PROPERTIES FOLDER "Tablegenning")
+target_link_libraries(mlir-tblgen
+  PRIVATE
+  LLVMMLIRTableGen)
+  
+mlir_check_all_link_libraries(mlir-tblgen)

mlir/tools/mlir-translate/CMakeLists.txt

+set(LLVM_LINK_COMPONENTS
+  Support
+  )
+
 get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
 get_property(translation_libs GLOBAL PROPERTY MLIR_TRANSLATION_LIBS)
-set(LIBS
+
+add_llvm_tool(mlir-translate
+  mlir-translate.cpp
+  )
+llvm_update_compile_flags(mlir-translate)
+target_link_libraries(mlir-translate
+  PRIVATE
   ${dialect_libs}
   ${translation_libs}
+  MLIRIR
   MLIRParser
   MLIRPass
   MLIRSPIRV
   MLIRTranslation
   MLIRSupport
   )
-add_llvm_tool(mlir-translate
-  mlir-translate.cpp
-)
-llvm_update_compile_flags(mlir-translate)
-target_link_libraries(mlir-translate PRIVATE MLIRIR MLIRTranslation ${LIBS} LLVMSupport)
+
+mlir_check_link_libraries(mlir-translate)