[MLIR] Move from using target_link_libraries to LINK_LIBS for llvm libraries.

When compiling libLLVM.so, add_llvm_library() manipulates the link libraries
being used.  This means that when using add_llvm_library(), we need to pass
the list of libraries to be linked (using the LINK_LIBS keyword) instead of
using the standard target_link_libraries call.  This is preparation for
properly dealing with creating libMLIR.so as well.

Differential Revision: https://reviews.llvm.org/D74864
This commit is contained in:
Stephen Neuendorffer 2020-02-18 15:07:35 -08:00
parent 07aa9ae23b
commit 7a6c689771
59 changed files with 461 additions and 254 deletions

View File

@ -41,4 +41,9 @@ target_link_libraries(toyc-ch6
MLIRPass
MLIRTargetLLVMIR
MLIRTransforms
LLVMOrcJIT
LLVMSupport
LLVMX86CodeGen
LLVMX86Desc
LLVMX86Info
)

View File

@ -38,6 +38,12 @@ target_link_libraries(toyc-ch7
MLIRIR
MLIRParser
MLIRPass
MLIRSupport
MLIRTargetLLVMIR
MLIRTransforms
LLVMOrcJIT
LLVMSupport
LLVMX86CodeGen
LLVMX86Desc
LLVMX86Info
)

View File

@ -22,6 +22,13 @@ add_llvm_library(MLIRAnalysis
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
LINK_LIBS
MLIRAffineOps
MLIRIR
MLIRLoopOps
MLIRSupport
LLVMSupport
)
add_dependencies(MLIRAnalysis
MLIRAffineOps
@ -30,8 +37,6 @@ add_dependencies(MLIRAnalysis
MLIRLoopOps
)
target_link_libraries(MLIRAnalysis MLIRAffineOps MLIRLoopOps)
add_llvm_library(MLIRLoopAnalysis
AffineAnalysis.cpp
AffineStructures.cpp
@ -41,6 +46,14 @@ add_llvm_library(MLIRLoopAnalysis
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
LINK_LIBS
MLIRAffineOps
MLIRIR
MLIRLoopOps
MLIRStandardOps
MLIRSupport
LLVMSupport
)
add_dependencies(MLIRLoopAnalysis
MLIRAffineOps
@ -48,5 +61,3 @@ add_dependencies(MLIRLoopAnalysis
MLIRTypeInferOpInterfaceIncGen
MLIRLoopOps
)
target_link_libraries(MLIRLoopAnalysis MLIRAffineOps MLIRLoopOps)

View File

@ -3,7 +3,17 @@ add_mlir_conversion_library(MLIRAffineToStandard
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/AffineToStandard
)
LINK_LIBS
MLIRAffineOps
MLIRLoopOps
MLIRPass
MLIRStandardOps
MLIRTransforms
MLIRIR
LLVMCore
LLVMSupport
)
add_dependencies(
MLIRAffineToStandard
@ -13,15 +23,3 @@ add_dependencies(
LLVMCore
LLVMSupport
)
target_link_libraries(
MLIRAffineToStandard
MLIRAffineOps
MLIRLoopOps
MLIRPass
MLIRStandardOps
MLIRTransforms
MLIRIR
LLVMCore
LLVMSupport
)

View File

@ -10,11 +10,15 @@ if (MLIR_CUDA_CONVERSIONS_ENABLED)
list(APPEND SOURCES "ConvertKernelFuncToCubin.cpp")
endif()
add_mlir_conversion_library(MLIRGPUtoCUDATransforms ${SOURCES})
target_link_libraries(MLIRGPUtoCUDATransforms
add_mlir_conversion_library(MLIRGPUtoCUDATransforms
${SOURCES}
LINK_LIBS
LLVMNVPTXCodeGen
LLVMNVPTXDesc
LLVMNVPTXInfo
MLIRGPU
MLIRLLVMIR
MLIRNVVMIR
MLIRPass
MLIRTargetNVVMIR
)
)

View File

@ -4,17 +4,21 @@ add_public_tablegen_target(MLIRGPUToNVVMIncGen)
add_mlir_conversion_library(MLIRGPUtoNVVMTransforms
LowerGpuOpsToNVVMOps.cpp
LINK_LIBS
LLVMCore
LLVMSupport
MLIRGPU
MLIRIR
MLIRLLVMIR
MLIRNVVMIR
MLIRPass
MLIRStandardOps
MLIRStandardToLLVM
MLIRSupport
MLIRTransforms
MLIRTransformUtils
)
add_dependencies(MLIRGPUtoNVVMTransforms
MLIRGPUToNVVMIncGen)
target_link_libraries(MLIRGPUtoNVVMTransforms
LLVMSupport
MLIRGPU
MLIRLLVMIR
MLIRNVVMIR
MLIRPass
MLIRStandardToLLVM
MLIRTransformUtils
)

View File

@ -1,11 +1,16 @@
add_mlir_conversion_library(MLIRGPUtoROCDLTransforms
LowerGpuOpsToROCDLOps.cpp
)
target_link_libraries(MLIRGPUtoROCDLTransforms
LINK_LIBS
LLVMCore
LLVMSupport
MLIRGPU
MLIRIR
MLIRLLVMIR
MLIRROCDLIR
MLIRPass
MLIRStandardToLLVM
MLIRStandardOps
MLIRTransforms
MLIRTransformUtils
)

View File

@ -5,18 +5,19 @@ add_public_tablegen_target(MLIRGPUToSPIRVIncGen)
add_mlir_conversion_library(MLIRGPUtoSPIRVTransforms
ConvertGPUToSPIRV.cpp
ConvertGPUToSPIRVPass.cpp
)
add_dependencies(MLIRGPUtoSPIRVTransforms
MLIRGPUToSPIRVIncGen)
target_link_libraries(MLIRGPUtoSPIRVTransforms
LINK_LIBS
MLIRGPU
MLIRIR
MLIRLoopOps
MLIRPass
MLIRSPIRV
MLIRStandardOps
MLIRStandardToSPIRVTransforms
MLIRSupport
MLIRTransforms
LLVMSupport
)
add_dependencies(MLIRGPUtoSPIRVTransforms
MLIRGPUToSPIRVIncGen)

View File

@ -3,20 +3,19 @@ add_mlir_conversion_library(MLIRLinalgToLLVM
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LinalgToLLVM
)
set(LIBS
LINK_LIBS
MLIRAffineToStandard
MLIREDSC
MLIRIR
MLIRLinalgOps
MLIRLLVMIR
MLIRLoopToStandard
MLIRPass
MLIRStandardOps
MLIRStandardToLLVM
MLIRVectorToLLVM
MLIRTransforms
LLVMCore
LLVMSupport
)
add_dependencies(MLIRLinalgToLLVM ${LIBS})
target_link_libraries(MLIRLinalgToLLVM ${LIBS})

View File

@ -5,13 +5,15 @@ add_mlir_conversion_library(MLIRLinalgToSPIRVTransforms
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
)
target_link_libraries(MLIRLinalgToSPIRVTransforms
LINK_LIBS
MLIRIR
MLIRLinalgOps
MLIRLinalgUtils
MLIRPass
MLIRSPIRV
MLIRSupport
MLIRTransforms
MLIRTransformUtils
LLVMSupport
)

View File

@ -3,7 +3,16 @@ add_mlir_conversion_library(MLIRLoopToStandard
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LoopToStandard
)
LINK_LIBS
MLIRIR
MLIRLoopOps
MLIRPass
MLIRStandardOps
MLIRTransforms
LLVMCore
LLVMSupport
)
add_dependencies(
MLIRLoopToStandard
@ -12,11 +21,3 @@ add_dependencies(
LLVMCore
LLVMSupport
)
target_link_libraries(
MLIRLoopToStandard
MLIRLoopOps
MLIRTransforms
LLVMCore
LLVMSupport
)

View File

@ -4,10 +4,12 @@ set(LIBS
MLIRGPU
MLIRIR
MLIRLinalgOps
MLIRLoopOps
MLIRPass
MLIRStandardOps
MLIRSupport
MLIRTransforms
MLIRTransformUtils
LLVMSupport
)
@ -17,6 +19,8 @@ add_mlir_conversion_library(MLIRLoopsToGPU
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LoopsToGPU
)
LINK_LIBS
${LIBS}
)
add_dependencies(MLIRLoopsToGPU ${LIBS})
target_link_libraries(MLIRLoopsToGPU ${LIBS})

View File

@ -3,7 +3,16 @@ add_mlir_conversion_library(MLIRStandardToLLVM
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/StandardToLLVM
)
LINK_LIBS
MLIRIR
MLIRLLVMIR
MLIRPass
MLIRStandardOps
MLIRTransforms
LLVMCore
LLVMSupport
)
add_dependencies(
MLIRStandardToLLVM
@ -12,11 +21,3 @@ add_dependencies(
LLVMCore
LLVMSupport
)
target_link_libraries(
MLIRStandardToLLVM
MLIRLLVMIR
MLIRTransforms
LLVMCore
LLVMSupport
)

View File

@ -10,17 +10,18 @@ add_mlir_conversion_library(MLIRStandardToSPIRVTransforms
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
)
add_dependencies(MLIRStandardToSPIRVTransforms
MLIRStandardToSPIRVIncGen)
target_link_libraries(MLIRStandardToSPIRVTransforms
LINK_LIBS
MLIRIR
MLIRPass
MLIRSPIRV
MLIRSupport
MLIRTransforms
MLIRTransformUtils
MLIRSPIRV
MLIRStandardOps
LLVMSupport
)
add_dependencies(MLIRStandardToSPIRVTransforms
MLIRStandardToSPIRVIncGen)

View File

@ -3,15 +3,16 @@ add_mlir_conversion_library(MLIRVectorToLLVM
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToLLVM
)
set(LIBS
LINK_LIBS
MLIRIR
MLIRLLVMIR
MLIRPass
MLIRStandardOps
MLIRStandardToLLVM
MLIRVectorOps
MLIRTransforms
MLIRTransformUtils
LLVMCore
LLVMSupport
)
add_dependencies(MLIRVectorToLLVM ${LIBS})
target_link_libraries(MLIRVectorToLLVM ${LIBS})
)

View File

@ -3,14 +3,17 @@ add_mlir_conversion_library(MLIRVectorToLoops
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToLoops
)
set(LIBS
LINK_LIBS
MLIRAffineOps
MLIREDSC
MLIRIR
MLIRLLVMIR
MLIRLoopOps
MLIRStandardOps
MLIRTransforms
MLIRTransformUtils
MLIRVectorOps
LLVMCore
LLVMSupport
)
add_dependencies(MLIRVectorToLoops ${LIBS})
target_link_libraries(MLIRVectorToLoops ${LIBS})

View File

@ -5,6 +5,12 @@ add_mlir_dialect_library(MLIRAffineOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/AffineOps
LINK_LIBS
MLIREDSC
MLIRIR
MLIRStandardOps
LLVMSupport
)
add_dependencies(MLIRAffineOps
@ -14,9 +20,3 @@ add_dependencies(MLIRAffineOps
MLIRLoopLikeInterfaceIncGen
MLIRStandardOps
)
target_link_libraries(MLIRAffineOps
MLIREDSC
MLIRIR
MLIRStandardOps
)

View File

@ -22,5 +22,8 @@ add_llvm_library(MLIRDialect
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect
LINK_LIBS
MLIRIR
LLVMSupport
)
target_link_libraries(MLIRDialect MLIRIR)

View File

@ -4,14 +4,16 @@ add_mlir_dialect_library(MLIRFxpMathOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/FxpMathOps
)
target_link_libraries(MLIRFxpMathOps
LINK_LIBS
MLIRQuantOps
MLIRIR
MLIRPass
MLIRSupport
MLIRStandardOps
MLIRTransforms
MLIRTransformUtils
LLVMSupport
)
add_dependencies(MLIRFxpMathOps
MLIRFxpMathOpsIncGen

View File

@ -7,7 +7,18 @@ add_mlir_dialect_library(MLIRGPU
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/GPU
)
LINK_LIBS
MLIREDSC
MLIRIR
MLIRLLVMIR
MLIRLoopOps
MLIRPass
MLIRStandardOps
MLIRSupport
MLIRTransformUtils
LLVMSupport
)
add_dependencies(MLIRGPU
MLIRGPUOpsIncGen
MLIREDSC
@ -17,13 +28,3 @@ add_dependencies(MLIRGPU
MLIRSupport
MLIRTransformUtils
LLVMSupport)
target_link_libraries(MLIRGPU
MLIREDSC
MLIRIR
MLIRLLVMIR
MLIRLoopOps
MLIRPass
MLIRStandardOps
MLIRSupport
MLIRTransformUtils
LLVMSupport)

View File

@ -3,24 +3,42 @@ add_mlir_dialect_library(MLIRLLVMIR
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
LINK_LIBS
LLVMAsmParser
LLVMCore
LLVMSupport
MLIRIR
MLIRSupport
)
add_dependencies(MLIRLLVMIR MLIRLLVMOpsIncGen MLIRLLVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)
target_link_libraries(MLIRLLVMIR LLVMAsmParser LLVMCore LLVMSupport MLIRIR)
add_mlir_dialect_library(MLIRNVVMIR
IR/NVVMDialect.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
LINK_LIBS
LLVMAsmParser
MLIRIR
MLIRLLVMIR
LLVMSupport
LLVMCore
)
add_dependencies(MLIRNVVMIR MLIRNVVMOpsIncGen MLIRNVVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)
target_link_libraries(MLIRNVVMIR LLVMAsmParser MLIRIR MLIRLLVMIR LLVMSupport LLVMCore)
add_mlir_dialect_library(MLIRROCDLIR
IR/ROCDLDialect.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
LINK_LIBS
LLVMAsmParser
LLVMCore
LLVMSupport
MLIRIR
)
add_dependencies(MLIRROCDLIR MLIRROCDLOpsIncGen MLIRROCDLConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)
target_link_libraries(MLIRROCDLIR LLVMAsmParser LLVMCore LLVMSupport MLIRIR)

View File

@ -1,7 +1,8 @@
set(LIBS
MLIRIR
MLIRLinalgOps
MLIRStandardOps
LLVMSupport
)
@ -12,7 +13,9 @@ add_mlir_dialect_library(MLIRLinalgAnalysis
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
DEPENDS
intrinsics_gen
LINK_LIBS
${LIBS}
)
add_dependencies(MLIRLinalgAnalysis ${LIBS})
target_link_libraries(MLIRLinalgAnalysis ${LIBS})

View File

@ -6,6 +6,7 @@ set(LIBS
MLIRLinalgOps
MLIRLoopOps
MLIRStandardOps
LLVMSupport
)
add_mlir_dialect_library(MLIRLinalgEDSC
@ -15,7 +16,9 @@ add_mlir_dialect_library(MLIRLinalgEDSC
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
DEPENDS
intrinsics_gen
LINK_LIBS
${LIBS}
)
add_dependencies(MLIRLinalgEDSC ${LIBS})
target_link_libraries(MLIRLinalgEDSC ${LIBS})

View File

@ -1,7 +1,8 @@
set(LIBS
MLIRIR
MLIRStandardOps
MLIRSupport
LLVMSupport
)
add_mlir_dialect_library(MLIRLinalgOps
@ -12,6 +13,12 @@ add_mlir_dialect_library(MLIRLinalgOps
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
DEPENDS
intrinsics_gen
LINK_LIBS
MLIRIR
MLIRStandardOps
MLIRSupport
LLVMSupport
)
add_dependencies(MLIRLinalgOps
@ -21,4 +28,3 @@ add_dependencies(MLIRLinalgOps
MLIRLinalgStructuredOpsIncGen
MLIRLinalgStructuredOpsInterfaceIncGen
)
target_link_libraries(MLIRLinalgOps ${LIBS})

View File

@ -14,6 +14,7 @@ set(LIBS
MLIRStandardToLLVM
MLIRTransformUtils
MLIRVectorOps
LLVMSupport
)
add_mlir_dialect_library(MLIRLinalgTransforms
@ -27,6 +28,9 @@ add_mlir_dialect_library(MLIRLinalgTransforms
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
DEPENDS
intrinsics_gen
LINK_LIBS
${LIBS}
)
add_dependencies(MLIRLinalgTransforms
@ -34,4 +38,3 @@ add_dependencies(MLIRLinalgTransforms
${LIBS}
MLIRLinalgTransformPatternsIncGen
)
target_link_libraries(MLIRLinalgTransforms ${LIBS})

View File

@ -1,5 +1,5 @@
set(LIBS
MLIRAffineOps
MLIREDSC
MLIRIR
MLIRLinalgOps
@ -7,6 +7,7 @@ set(LIBS
MLIRPass
MLIRStandardOps
MLIRTransformUtils
LLVMSupport
)
add_mlir_dialect_library(MLIRLinalgUtils
@ -17,7 +18,8 @@ add_mlir_dialect_library(MLIRLinalgUtils
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
DEPENDS
intrinsics_gen
)
LINK_LIBS
${LIBS})
add_dependencies(MLIRLinalgUtils ${LIBS})
target_link_libraries(MLIRLinalgUtils ${LIBS})

View File

@ -5,6 +5,12 @@ add_mlir_dialect_library(MLIRLoopOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/LoopOps
LINK_LIBS
MLIREDSC
MLIRIR
MLIRStandardOps
LLVMSupport
)
add_dependencies(MLIRLoopOps
@ -14,12 +20,5 @@ add_dependencies(MLIRLoopOps
MLIRStandardOps
LLVMSupport
)
target_link_libraries(MLIRLoopOps
MLIREDSC
MLIRIR
MLIRStandardOps
LLVMSupport
)
add_subdirectory(Transforms)

View File

@ -3,7 +3,11 @@ add_mlir_dialect_library(MLIROpenMP
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/OpenMP
LINK_LIBS
MLIRIR
LLVMCore
LLVMSupport
)
add_dependencies(MLIROpenMP MLIROpenMPOpsIncGen)
target_link_libraries(MLIROpenMP MLIRIR)

View File

@ -11,6 +11,14 @@ add_mlir_dialect_library(MLIRQuantOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/QuantOps
LINK_LIBS
MLIRIR
MLIRPass
MLIRSupport
MLIRStandardOps
MLIRTransformUtils
LLVMSupport
)
add_dependencies(MLIRQuantOps
MLIRIR
@ -18,11 +26,3 @@ add_dependencies(MLIRQuantOps
MLIRQuantOpsIncGen
MLIRSupport
MLIRStandardOps)
target_link_libraries(MLIRQuantOps
MLIRIR
MLIRPass
MLIRSupport
MLIRStandardOps
MLIRTransformUtils
)

View File

@ -4,6 +4,10 @@ add_mlir_dialect_library(MLIRSDBM
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SDBM
)
LINK_LIBS
MLIRIR
MLIRSupport
LLVMSupport
)
add_dependencies(MLIRSDBM MLIRIR)
target_link_libraries(MLIRSDBM MLIRIR)

View File

@ -13,6 +13,14 @@ add_mlir_dialect_library(MLIRSPIRV
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
LINK_LIBS
MLIRIR
MLIRParser
MLIRStandardOps
MLIRSupport
MLIRTransforms
LLVMSupport
)
add_dependencies(MLIRSPIRV
@ -24,11 +32,6 @@ add_dependencies(MLIRSPIRV
MLIRSPIRVOpUtilsGen
MLIRSPIRVTargetAndABIIncGen)
target_link_libraries(MLIRSPIRV
MLIRIR
MLIRParser
MLIRSupport
MLIRTransforms)
add_subdirectory(Serialization)
add_subdirectory(Transforms)

View File

@ -6,13 +6,15 @@ add_mlir_dialect_library(MLIRSPIRVSerialization
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
LINK_LIBS
MLIRIR
MLIRParser
MLIRSPIRV
MLIRSupport
MLIRTranslation
LLVMSupport
)
add_dependencies(MLIRSPIRVSerialization
MLIRSPIRVSerializationGen)
target_link_libraries(MLIRSPIRVSerialization
MLIRIR
MLIRSPIRV
MLIRSupport
MLIRTranslation)

View File

@ -4,9 +4,13 @@ add_mlir_dialect_library(MLIRSPIRVTransforms
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
)
target_link_libraries(MLIRSPIRVTransforms
LINK_LIBS
MLIRIR
MLIRPass
MLIRSPIRV
MLIRStandardOps
MLIRTransforms
MLIRTransformUtils
LLVMSupport
)

View File

@ -5,6 +5,13 @@ add_mlir_dialect_library(MLIRStandardOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/StandardOps
LINK_LIBS
MLIREDSC
MLIRIR
MLIRSupport
LLVMCore
LLVMSupport
)
add_dependencies(MLIRStandardOps
@ -14,9 +21,3 @@ add_dependencies(MLIRStandardOps
MLIRStandardOpsIncGen
LLVMSupport
)
target_link_libraries(MLIRStandardOps
MLIREDSC
MLIRIR
LLVMSupport
)

View File

@ -6,9 +6,15 @@ add_mlir_dialect_library(MLIRVectorOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/VectorOps
LINK_LIBS
MLIRIR
MLIRStandardOps
MLIRAffineOps
MLIRLoopOps
MLIRLoopAnalysis
LLVMSupport
)
add_dependencies(MLIRVectorOps MLIRVectorOpsIncGen)
add_dependencies(MLIRVectorOps MLIRVectorTransformPatternsIncGen)
target_link_libraries(MLIRVectorOps MLIRIR MLIRStandardOps MLIRAffineOps MLIRLoopOps MLIRLoopAnalysis)

View File

@ -8,12 +8,11 @@ add_llvm_library(MLIREDSC
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/EDSC
)
target_link_libraries(MLIREDSC
PUBLIC
LINK_LIBS
MLIRIR
MLIRSupport
LLVMSupport
)
add_llvm_library(MLIREDSCInterface
@ -21,11 +20,11 @@ add_llvm_library(MLIREDSCInterface
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/EDSC
)
add_dependencies(MLIREDSCInterface MLIRIR)
target_link_libraries(MLIREDSCInterface
PUBLIC
LINK_LIBS
MLIRIR
MLIRSupport
MLIRParser
LLVMSupport
)
add_dependencies(MLIREDSCInterface MLIRIR)

View File

@ -12,13 +12,15 @@ add_llvm_library(MLIRExecutionEngine
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/ExecutionEngine
)
target_link_libraries(MLIRExecutionEngine
LINK_LIBS
MLIRIR
MLIRLLVMIR
MLIRSupport
MLIRTargetLLVMIR
LLVMBitReader
LLVMBitWriter
LLVMCore
LLVMExecutionEngine
LLVMObject
LLVMOrcJIT
@ -32,8 +34,8 @@ target_link_libraries(MLIRExecutionEngine
LLVMTarget
LLVMVectorize
LLVMTransformUtils
${outlibs})
${outlibs}
)
add_llvm_library(mlir_c_runner_utils SHARED CRunnerUtils.cpp)
target_compile_definitions(mlir_c_runner_utils PRIVATE mlir_c_runner_utils_EXPORTS)

View File

@ -4,6 +4,10 @@ add_llvm_library(MLIRIR
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
LINK_LIBS
MLIRSupport
LLVMSupport
${LLVM_PTHREAD_LIB}
)
add_dependencies(MLIRIR MLIRCallOpInterfacesIncGen MLIROpAsmInterfacesIncGen MLIRSupport LLVMSupport)
target_link_libraries(MLIRIR MLIRSupport LLVMSupport)

View File

@ -5,6 +5,10 @@ add_llvm_library(MLIRParser
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Parser
LINK_LIBS
MLIRIR
MLIRAnalysis
LLVMSupport
)
add_dependencies(MLIRParser MLIRIR MLIRAnalysis)
target_link_libraries(MLIRParser MLIRIR MLIRAnalysis)

View File

@ -4,6 +4,12 @@ add_llvm_library(MLIRPass
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Pass
LINK_LIBS
MLIRAnalysis
MLIRIR
MLIRSupport
LLVMIRReader
LLVMSupport
)
add_dependencies(MLIRPass MLIRAnalysis MLIRIR LLVMSupport)
target_link_libraries(MLIRPass MLIRAnalysis MLIRIR LLVMSupport)

View File

@ -9,14 +9,8 @@ add_llvm_library(MLIRQuantizerSupport
Support/UniformSolvers.cpp
ADDITIONAL_HEADER_DIRS
)
add_dependencies(MLIRQuantizerSupport
MLIRIR
MLIRQuantOps
MLIRSupport
MLIRStandardOps)
target_link_libraries(MLIRQuantizerSupport
LINK_LIBS
MLIRIR
MLIRQuantOps
MLIRSupport
@ -24,22 +18,31 @@ target_link_libraries(MLIRQuantizerSupport
LLVMSupport
)
add_dependencies(MLIRQuantizerSupport
MLIRIR
MLIRQuantOps
MLIRSupport
MLIRStandardOps)
# Configurations.
add_llvm_library(MLIRQuantizerFxpMathConfig
Configurations/FxpMathConfig.cpp
ADDITIONAL_HEADER_DIRS
LINK_LIBS
MLIRIR
MLIRFxpMathOps
MLIRQuantOps
MLIRQuantizerSupport
MLIRStandardOps
MLIRSupport
LLVMSupport
)
add_dependencies(MLIRQuantizerFxpMathConfig
MLIRFxpMathOpsIncGen
MLIRQuantizerSupport)
target_link_libraries(MLIRQuantizerFxpMathConfig
MLIRIR
MLIRFxpMathOps
MLIRQuantOps
MLIRQuantizerSupport
)
# Transforms.
add_llvm_library(MLIRQuantizerTransforms
@ -48,16 +51,18 @@ add_llvm_library(MLIRQuantizerTransforms
Transforms/RemoveInstrumentationPass.cpp
ADDITIONAL_HEADER_DIRS
)
add_dependencies(MLIRQuantizerTransforms
MLIRQuantizerFxpMathConfig
MLIRQuantizerSupport
MLIRPass)
target_link_libraries(MLIRQuantizerTransforms
LINK_LIBS
MLIRIR
MLIRQuantizerFxpMathConfig
MLIRQuantizerSupport
MLIRQuantOps
MLIRPass
MLIRTransforms
MLIRTransformUtils
LLVMSupport
)
add_dependencies(MLIRQuantizerTransforms
MLIRQuantizerFxpMathConfig
MLIRQuantizerSupport
MLIRPass)

View File

@ -14,20 +14,24 @@ add_llvm_library(MLIRSupport
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Support
LINK_LIBS
LLVMSupport
${LLVM_PTHREAD_LIB}
)
target_link_libraries(MLIRSupport LLVMSupport ${LLVM_PTHREAD_LIB})
add_llvm_library(MLIROptLib
MlirOptMain.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Support
)
target_link_libraries(MLIROptLib
LINK_LIBS
MLIRIR
MLIRPass
MLIRParser
LLVMSupport
MLIRSupport
LLVMSupport
)
add_llvm_library(MLIRTranslateClParser
@ -35,15 +39,22 @@ add_llvm_library(MLIRTranslateClParser
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Support
LINK_LIBS
LLVMSupport
MLIRAnalysis
MLIRIR
MLIRTranslation
MLIRParser
)
target_link_libraries(MLIRTranslateClParser LLVMSupport MLIRIR MLIRTranslation MLIRParser)
add_llvm_library(MLIRJitRunner
JitRunner.cpp
)
target_link_libraries(MLIRJitRunner PRIVATE
LINK_LIBS
MLIRExecutionEngine
MLIRIR
MLIRLLVMIR
MLIRParser
MLIRStandardOps
MLIRTargetLLVMIR
@ -51,5 +62,9 @@ target_link_libraries(MLIRJitRunner PRIVATE
MLIRStandardToLLVM
MLIRSupport
LLVMCore
LLVMOrcJIT
LLVMSupport
)
LLVMX86CodeGen
LLVMX86Desc
LLVMX86Info
)

View File

@ -15,5 +15,8 @@ add_llvm_library(LLVMMLIRTableGen
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/TableGen
LINK_LIBS
LLVMSupport
LLVMTableGen
)
target_link_libraries(LLVMMLIRTableGen LLVMSupport LLVMTableGen)

View File

@ -4,47 +4,74 @@ add_llvm_library(MLIRTargetLLVMIRModuleTranslation
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Target/LLVMIR
DEPENDS
intrinsics_gen
LINK_LIBS
MLIRLLVMIR
LLVMCore
LLVMIRReader
LLVMSupport
LLVMTransformUtils
MLIRIR
MLIRSupport
MLIRTranslation
)
target_link_libraries(MLIRTargetLLVMIRModuleTranslation
MLIRLLVMIR LLVMCore LLVMIRReader LLVMSupport LLVMTransformUtils
MLIRTranslation)
add_llvm_library(MLIRTargetLLVMIR
LLVMIR/ConvertFromLLVMIR.cpp
LLVMIR/ConvertToLLVMIR.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Target/LLVMIR
LINK_LIBS
MLIRIR
MLIRLLVMIR
MLIRSupport
MLIRTargetLLVMIRModuleTranslation
MLIRTranslation
LLVMCore
LLVMIRReader
LLVMSupport
)
target_link_libraries(MLIRTargetLLVMIR MLIRTargetLLVMIRModuleTranslation)
add_llvm_library(MLIRTargetNVVMIR
LLVMIR/ConvertToNVVMIR.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Target/LLVMIR
DEPENDS
intrinsics_gen
)
target_link_libraries(MLIRTargetNVVMIR
LINK_LIBS
MLIRGPU
MLIRIR
MLIRLLVMIR
MLIRNVVMIR
MLIRTargetLLVMIRModuleTranslation
MLIRTranslation
LLVMCore
LLVMSupport
)
add_llvm_library(MLIRTargetROCDLIR
LLVMIR/ConvertToROCDLIR.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Target/LLVMIR
DEPENDS
intrinsics_gen
)
target_link_libraries(MLIRTargetROCDLIR
LINK_LIBS
MLIRGPU
MLIRIR
MLIRLLVMIR
MLIRROCDLIR
MLIRTargetLLVMIRModuleTranslation
MLIRTranslation
LLVMCore
LLVMSupport
)

View File

@ -26,16 +26,21 @@ add_llvm_library(MLIRTransforms
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
LINK_LIBS
MLIRAffineOps
MLIRAnalysis
MLIRIR
MLIRLoopOps
MLIRLoopAnalysis
MLIRPass
MLIRSupport
MLIRStandardOps
MLIRTransformUtils
MLIRVectorOps
LLVMSupport
)
add_dependencies(MLIRTransforms
MLIRLoopLikeInterfaceIncGen
MLIRStandardOpsIncGen)
target_link_libraries(MLIRTransforms
MLIRAffineOps
MLIRAnalysis
MLIRLoopOps
MLIRPass
MLIRTransformUtils
MLIRVectorOps
)

View File

@ -9,14 +9,15 @@ add_llvm_library(MLIRTransformUtils
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
)
add_dependencies(MLIRTransformUtils MLIRStandardOpsIncGen)
target_link_libraries(MLIRTransformUtils
LINK_LIBS
MLIRAffineOps
MLIRAnalysis
MLIRIR
MLIRLoopAnalysis
MLIRLoopOps
MLIRPass
MLIRStandardOps
LLVMSupport
)
add_dependencies(MLIRTransformUtils MLIRStandardOpsIncGen)

View File

@ -3,5 +3,7 @@ add_llvm_library(MLIRTranslation
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Translation
)
target_link_libraries(MLIRTranslation LLVMSupport)
LINK_LIBS
LLVMSupport
)

View File

@ -15,6 +15,7 @@ target_link_libraries(mlir-edsc-builder-api-test
MLIRStandardOps
MLIRTransforms
MLIRVectorOps
MLIRTransformUtils
LLVMCore
LLVMSupport
)

View File

@ -4,11 +4,13 @@ add_llvm_library(MLIRSPIRVTestPasses
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
)
target_link_libraries(MLIRSPIRVTestPasses PRIVATE
LINK_LIBS
MLIRIR
MLIRPass
MLIRSPIRV
MLIRSupport
MLIRTransforms
MLIRTransformUtils
LLVMSupport
)

View File

@ -4,12 +4,15 @@ add_llvm_library(MLIRTestIR
TestSymbolUses.cpp
ADDITIONAL_HEADER_DIRS
LINK_LIBS
MLIRIR
MLIRPass
MLIRStandardOps
LLVMSupport
)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../TestDialect)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../TestDialect)
add_dependencies(MLIRTestIR
MLIRTestDialect
)
target_link_libraries(MLIRTestIR
MLIRPass
)

View File

@ -3,8 +3,9 @@ add_llvm_library(MLIRTestPass
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Pass
)
target_link_libraries(MLIRTestPass
LINK_LIBS
MLIRIR
MLIRPass
LLVMSupport
)

View File

@ -14,12 +14,9 @@ add_public_tablegen_target(MLIRTestOpsIncGen)
add_llvm_library(MLIRTestDialect
TestDialect.cpp
TestPatterns.cpp
)
add_dependencies(MLIRTestDialect
MLIRTestOpsIncGen
MLIRTypeInferOpInterfaceIncGen
)
target_link_libraries(MLIRTestDialect
LINK_LIBS
MLIRAnalysis
MLIRDialect
MLIRIR
MLIRLinalgTransforms
@ -28,3 +25,7 @@ target_link_libraries(MLIRTestDialect
MLIRTransformUtils
LLVMSupport
)
add_dependencies(MLIRTestDialect
MLIRTestOpsIncGen
MLIRTypeInferOpInterfaceIncGen
)

View File

@ -22,6 +22,25 @@ add_llvm_library(MLIRTestTransforms
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
LINK_LIBS
MLIRAffineOps
MLIRAnalysis
MLIRLoopAnalysis
MLIREDSC
MLIRGPU
MLIRIR
MLIRLinalgOps
MLIRLinalgTransforms
MLIRLoopOps
MLIRGPU
MLIRPass
MLIRStandardOps
MLIRTestDialect
MLIRTransformUtils
MLIRVectorToLoops
MLIRVectorOps
LLVMSupport
)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../TestDialect)
@ -31,18 +50,3 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/../DeclarativeTransforms)
add_dependencies(MLIRTestTransforms MLIRStandardOpsIncGen)
add_dependencies(MLIRTestTransforms MLIRTestLinalgTransformPatternsIncGen)
add_dependencies(MLIRTestTransforms MLIRTestVectorTransformPatternsIncGen)
target_link_libraries(MLIRTestTransforms
MLIRAffineOps
MLIRAnalysis
MLIREDSC
MLIRGPU
MLIRLinalgOps
MLIRLinalgTransforms
MLIRLoopOps
MLIRGPU
MLIRPass
MLIRTestDialect
MLIRTransformUtils
MLIRVectorToLoops
MLIRVectorOps
)

View File

@ -6,7 +6,9 @@ set(LLVM_OPTIONAL_SOURCES
add_llvm_library(cblas SHARED cblas.cpp)
target_compile_definitions(cblas PRIVATE cblas_EXPORTS)
add_llvm_library(cblas_interface SHARED cblas_interface.cpp)
target_link_libraries(cblas_interface PRIVATE cblas)
add_llvm_library(cblas_interface SHARED cblas_interface.cpp
LINK_LIBS
cblas
)
target_compile_definitions(cblas_interface PRIVATE cblas_interface_EXPORTS)

View File

@ -25,15 +25,15 @@ if(MLIR_CUDA_RUNNER_ENABLED)
add_llvm_library(cuda-runtime-wrappers SHARED
cuda-runtime-wrappers.cpp
LINK_LIBS
LLVMSupport
${CUDA_RUNTIME_LIBRARY}
)
target_include_directories(cuda-runtime-wrappers
PRIVATE ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
LLVMSupport
)
target_link_libraries(cuda-runtime-wrappers
LLVMSupport
${CUDA_RUNTIME_LIBRARY}
)
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)

View File

@ -10,11 +10,12 @@ set(LIB_LIBS
MLIRPass
MLIRTransforms
MLIRSupport
)
LLVMSupport
)
add_llvm_library(MLIRMlirOptMain
mlir-opt.cpp
)
target_link_libraries(MLIRMlirOptMain
LINK_LIBS
${LIB_LIBS}
)

View File

@ -4,8 +4,11 @@ add_mlir_unittest(MLIRSPIRVTests
)
target_link_libraries(MLIRSPIRVTests
PRIVATE
MLIRIR
MLIRSPIRV
MLIRSPIRVSerialization)
MLIRSPIRVSerialization
MLIRStandardOps
MLIRSupport)
whole_archive_link(MLIRSPIRVTests MLIRSPIRV)

View File

@ -3,4 +3,7 @@ add_mlir_unittest(MLIRPassTests
)
target_link_libraries(MLIRPassTests
PRIVATE
MLIRPass)
MLIRIR
MLIRPass
MLIRStandardOps
MLIRSupport)

View File

@ -3,6 +3,9 @@ add_mlir_unittest(MLIRSDBMTests
)
target_link_libraries(MLIRSDBMTests
PRIVATE
MLIRIR
MLIRSDBM
)
MLIRStandardOps
MLIRSupport
)
whole_archive_link(MLIRSDBMTests MLIRSDBM)