[Mlir-commits] [mlir] 2f265e3 - [MLIR] Move from using target_link_libraries to LINK_LIBS for llvm libraries.
Stephen Neuendorffer
llvmlistbot at llvm.org
Fri Feb 28 11:48:30 PST 2020
Author: Stephen Neuendorffer
Date: 2020-02-28T11:35:17-08:00
New Revision: 2f265e35285127de376afc2243e3b5d0c5842cc2
URL: https://github.com/llvm/llvm-project/commit/2f265e35285127de376afc2243e3b5d0c5842cc2
DIFF: https://github.com/llvm/llvm-project/commit/2f265e35285127de376afc2243e3b5d0c5842cc2.diff
LOG: [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
Added:
Modified:
mlir/examples/toy/Ch6/CMakeLists.txt
mlir/examples/toy/Ch7/CMakeLists.txt
mlir/lib/Analysis/CMakeLists.txt
mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt
mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt
mlir/lib/Conversion/LoopToStandard/CMakeLists.txt
mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt
mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt
mlir/lib/Conversion/VectorToLoops/CMakeLists.txt
mlir/lib/Dialect/AffineOps/CMakeLists.txt
mlir/lib/Dialect/CMakeLists.txt
mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
mlir/lib/Dialect/GPU/CMakeLists.txt
mlir/lib/Dialect/LLVMIR/CMakeLists.txt
mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
mlir/lib/Dialect/LoopOps/CMakeLists.txt
mlir/lib/Dialect/OpenMP/CMakeLists.txt
mlir/lib/Dialect/QuantOps/CMakeLists.txt
mlir/lib/Dialect/SDBM/CMakeLists.txt
mlir/lib/Dialect/SPIRV/CMakeLists.txt
mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt
mlir/lib/Dialect/StandardOps/CMakeLists.txt
mlir/lib/Dialect/VectorOps/CMakeLists.txt
mlir/lib/EDSC/CMakeLists.txt
mlir/lib/ExecutionEngine/CMakeLists.txt
mlir/lib/IR/CMakeLists.txt
mlir/lib/Parser/CMakeLists.txt
mlir/lib/Pass/CMakeLists.txt
mlir/lib/Quantizer/CMakeLists.txt
mlir/lib/Support/CMakeLists.txt
mlir/lib/TableGen/CMakeLists.txt
mlir/lib/Target/CMakeLists.txt
mlir/lib/Transforms/CMakeLists.txt
mlir/lib/Transforms/Utils/CMakeLists.txt
mlir/lib/Translation/CMakeLists.txt
mlir/test/EDSC/CMakeLists.txt
mlir/test/lib/Dialect/SPIRV/CMakeLists.txt
mlir/test/lib/IR/CMakeLists.txt
mlir/test/lib/Pass/CMakeLists.txt
mlir/test/lib/TestDialect/CMakeLists.txt
mlir/test/lib/Transforms/CMakeLists.txt
mlir/test/mlir-cpu-runner/CMakeLists.txt
mlir/tools/mlir-cuda-runner/CMakeLists.txt
mlir/tools/mlir-opt/CMakeLists.txt
mlir/unittests/Dialect/SPIRV/CMakeLists.txt
mlir/unittests/Pass/CMakeLists.txt
mlir/unittests/SDBM/CMakeLists.txt
Removed:
################################################################################
diff --git a/mlir/examples/toy/Ch6/CMakeLists.txt b/mlir/examples/toy/Ch6/CMakeLists.txt
index e46200d3f9ad..d22ee0873b56 100644
--- a/mlir/examples/toy/Ch6/CMakeLists.txt
+++ b/mlir/examples/toy/Ch6/CMakeLists.txt
@@ -41,4 +41,9 @@ target_link_libraries(toyc-ch6
MLIRPass
MLIRTargetLLVMIR
MLIRTransforms
+ LLVMOrcJIT
+ LLVMSupport
+ LLVMX86CodeGen
+ LLVMX86Desc
+ LLVMX86Info
)
diff --git a/mlir/examples/toy/Ch7/CMakeLists.txt b/mlir/examples/toy/Ch7/CMakeLists.txt
index 7f67cc9519ec..9f0790391366 100644
--- a/mlir/examples/toy/Ch7/CMakeLists.txt
+++ b/mlir/examples/toy/Ch7/CMakeLists.txt
@@ -38,6 +38,12 @@ target_link_libraries(toyc-ch7
MLIRIR
MLIRParser
MLIRPass
+ MLIRSupport
MLIRTargetLLVMIR
MLIRTransforms
+ LLVMOrcJIT
+ LLVMSupport
+ LLVMX86CodeGen
+ LLVMX86Desc
+ LLVMX86Info
)
diff --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt
index 9eccde56e6ee..23dcd0521e06 100644
--- a/mlir/lib/Analysis/CMakeLists.txt
+++ b/mlir/lib/Analysis/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
index 9d639e034b66..73ea74df5af3 100644
--- a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
+++ b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
@@ -3,24 +3,22 @@ add_mlir_conversion_library(MLIRAffineToStandard
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/AffineToStandard
-)
-add_dependencies(
- MLIRAffineToStandard
+ LINK_LIBS
MLIRAffineOps
+ MLIRLoopOps
+ MLIRPass
MLIRStandardOps
+ MLIRTransforms
MLIRIR
LLVMCore
LLVMSupport
-)
-target_link_libraries(
+ )
+add_dependencies(
MLIRAffineToStandard
MLIRAffineOps
- MLIRLoopOps
- MLIRPass
MLIRStandardOps
- MLIRTransforms
MLIRIR
LLVMCore
LLVMSupport
diff --git a/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt b/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
index 65c976ce9a38..4c682b471015 100644
--- a/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
@@ -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
-)
+ )
diff --git a/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt b/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
index 339b2b79a439..146c8a115cfe 100644
--- a/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
@@ -4,17 +4,21 @@ add_public_tablegen_target(MLIRGPUToNVVMIncGen)
add_mlir_conversion_library(MLIRGPUtoNVVMTransforms
LowerGpuOpsToNVVMOps.cpp
- )
-
-add_dependencies(MLIRGPUtoNVVMTransforms
- MLIRGPUToNVVMIncGen)
-target_link_libraries(MLIRGPUtoNVVMTransforms
+ LINK_LIBS
+ LLVMCore
LLVMSupport
MLIRGPU
+ MLIRIR
MLIRLLVMIR
MLIRNVVMIR
MLIRPass
+ MLIRStandardOps
MLIRStandardToLLVM
+ MLIRSupport
+ MLIRTransforms
MLIRTransformUtils
)
+
+add_dependencies(MLIRGPUtoNVVMTransforms
+ MLIRGPUToNVVMIncGen)
diff --git a/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt b/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt
index 778689859a84..ea3a3406608f 100644
--- a/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt
@@ -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
)
diff --git a/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
index e59c48e4a614..36f8ad2afe2e 100644
--- a/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt b/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
index c63411796465..2280d83dd382 100644
--- a/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
@@ -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})
diff --git a/mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt
index 5f00034abae9..1b5236ee5919 100644
--- a/mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt
@@ -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
)
diff --git a/mlir/lib/Conversion/LoopToStandard/CMakeLists.txt b/mlir/lib/Conversion/LoopToStandard/CMakeLists.txt
index 4297346a10bf..db17dd82ad9b 100644
--- a/mlir/lib/Conversion/LoopToStandard/CMakeLists.txt
+++ b/mlir/lib/Conversion/LoopToStandard/CMakeLists.txt
@@ -3,16 +3,17 @@ add_mlir_conversion_library(MLIRLoopToStandard
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LoopToStandard
-)
-add_dependencies(
- MLIRLoopToStandard
+ LINK_LIBS
+ MLIRIR
MLIRLoopOps
+ MLIRPass
+ MLIRStandardOps
MLIRTransforms
LLVMCore
LLVMSupport
-)
-target_link_libraries(
+ )
+add_dependencies(
MLIRLoopToStandard
MLIRLoopOps
diff --git a/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt b/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
index c2f3c2a7f852..739c5b89b14b 100644
--- a/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
+++ b/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
@@ -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})
diff --git a/mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt b/mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt
index 3e8f72bb60c5..36f9d601ec80 100644
--- a/mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt
@@ -3,16 +3,17 @@ add_mlir_conversion_library(MLIRStandardToLLVM
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/StandardToLLVM
-)
-add_dependencies(
- MLIRStandardToLLVM
+ LINK_LIBS
+ MLIRIR
MLIRLLVMIR
+ MLIRPass
+ MLIRStandardOps
MLIRTransforms
LLVMCore
LLVMSupport
-)
-target_link_libraries(
+ )
+add_dependencies(
MLIRStandardToLLVM
MLIRLLVMIR
diff --git a/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
index f02f68db7bb1..6ba6c31606d9 100644
--- a/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt b/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt
index 5a89f399516c..bba43147caf6 100644
--- a/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt
@@ -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})
+)
diff --git a/mlir/lib/Conversion/VectorToLoops/CMakeLists.txt b/mlir/lib/Conversion/VectorToLoops/CMakeLists.txt
index 0dccea93b234..0d95365ae1e6 100644
--- a/mlir/lib/Conversion/VectorToLoops/CMakeLists.txt
+++ b/mlir/lib/Conversion/VectorToLoops/CMakeLists.txt
@@ -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})
diff --git a/mlir/lib/Dialect/AffineOps/CMakeLists.txt b/mlir/lib/Dialect/AffineOps/CMakeLists.txt
index 1c1c95cf3f8f..749e7e283f3c 100644
--- a/mlir/lib/Dialect/AffineOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/AffineOps/CMakeLists.txt
@@ -5,18 +5,18 @@ add_mlir_dialect_library(MLIRAffineOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/AffineOps
- )
-add_dependencies(MLIRAffineOps
- MLIRAffineOpsIncGen
+ LINK_LIBS
MLIREDSC
MLIRIR
- MLIRLoopLikeInterfaceIncGen
MLIRStandardOps
+ LLVMSupport
)
-target_link_libraries(MLIRAffineOps
+add_dependencies(MLIRAffineOps
+ MLIRAffineOpsIncGen
MLIREDSC
MLIRIR
+ MLIRLoopLikeInterfaceIncGen
MLIRStandardOps
)
diff --git a/mlir/lib/Dialect/CMakeLists.txt b/mlir/lib/Dialect/CMakeLists.txt
index 59186ed37964..d9d91b9bb717 100644
--- a/mlir/lib/Dialect/CMakeLists.txt
+++ b/mlir/lib/Dialect/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt b/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
index 021cade6e091..e631fc67b534 100644
--- a/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
@@ -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
diff --git a/mlir/lib/Dialect/GPU/CMakeLists.txt b/mlir/lib/Dialect/GPU/CMakeLists.txt
index 41884a9ddb66..595f8b737ac9 100644
--- a/mlir/lib/Dialect/GPU/CMakeLists.txt
+++ b/mlir/lib/Dialect/GPU/CMakeLists.txt
@@ -7,23 +7,24 @@ add_mlir_dialect_library(MLIRGPU
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/GPU
-)
-add_dependencies(MLIRGPU
- MLIRGPUOpsIncGen
+
+ LINK_LIBS
MLIREDSC
MLIRIR
MLIRLLVMIR
MLIRLoopOps
+ MLIRPass
+ MLIRStandardOps
MLIRSupport
MLIRTransformUtils
- LLVMSupport)
-target_link_libraries(MLIRGPU
+ LLVMSupport
+ )
+add_dependencies(MLIRGPU
+ MLIRGPUOpsIncGen
MLIREDSC
MLIRIR
MLIRLLVMIR
MLIRLoopOps
- MLIRPass
- MLIRStandardOps
MLIRSupport
MLIRTransformUtils
LLVMSupport)
diff --git a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
index b0c4eb241381..eb32510c722a 100644
--- a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
+++ b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
index 96698a9ef5e8..629e071e7b57 100644
--- a/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
@@ -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})
diff --git a/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt b/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
index dc87d7fad224..6c0cc3cfe617 100644
--- a/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
@@ -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})
diff --git a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
index 9dba1e52bdb7..3988daa66b8c 100644
--- a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
@@ -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})
diff --git a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
index 763ef558e47c..5c1df0451c10 100644
--- a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
@@ -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})
diff --git a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
index 07e7588d24c2..98d5d9aed768 100644
--- a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
@@ -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})
diff --git a/mlir/lib/Dialect/LoopOps/CMakeLists.txt b/mlir/lib/Dialect/LoopOps/CMakeLists.txt
index 98367d1c2268..e228654ced25 100644
--- a/mlir/lib/Dialect/LoopOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/LoopOps/CMakeLists.txt
@@ -5,19 +5,18 @@ add_mlir_dialect_library(MLIRLoopOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/LoopOps
- )
-add_dependencies(MLIRLoopOps
+ LINK_LIBS
MLIREDSC
- MLIRLoopLikeInterfaceIncGen
- MLIRLoopOpsIncGen
+ MLIRIR
MLIRStandardOps
LLVMSupport
)
-target_link_libraries(MLIRLoopOps
+add_dependencies(MLIRLoopOps
MLIREDSC
- MLIRIR
+ MLIRLoopLikeInterfaceIncGen
+ MLIRLoopOpsIncGen
MLIRStandardOps
LLVMSupport
)
diff --git a/mlir/lib/Dialect/OpenMP/CMakeLists.txt b/mlir/lib/Dialect/OpenMP/CMakeLists.txt
index bf55088a7cb0..8e00e473af20 100644
--- a/mlir/lib/Dialect/OpenMP/CMakeLists.txt
+++ b/mlir/lib/Dialect/OpenMP/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/Dialect/QuantOps/CMakeLists.txt b/mlir/lib/Dialect/QuantOps/CMakeLists.txt
index 12cb44fd42db..14acb913ec85 100644
--- a/mlir/lib/Dialect/QuantOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/QuantOps/CMakeLists.txt
@@ -11,18 +11,18 @@ add_mlir_dialect_library(MLIRQuantOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/QuantOps
- )
-add_dependencies(MLIRQuantOps
- MLIRIR
- MLIRPass
- MLIRQuantOpsIncGen
- MLIRSupport
- MLIRStandardOps)
-target_link_libraries(MLIRQuantOps
+ LINK_LIBS
MLIRIR
MLIRPass
MLIRSupport
MLIRStandardOps
MLIRTransformUtils
+ LLVMSupport
)
+add_dependencies(MLIRQuantOps
+ MLIRIR
+ MLIRPass
+ MLIRQuantOpsIncGen
+ MLIRSupport
+ MLIRStandardOps)
diff --git a/mlir/lib/Dialect/SDBM/CMakeLists.txt b/mlir/lib/Dialect/SDBM/CMakeLists.txt
index 648d9f268c2f..b75e257daf77 100644
--- a/mlir/lib/Dialect/SDBM/CMakeLists.txt
+++ b/mlir/lib/Dialect/SDBM/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/Dialect/SPIRV/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/CMakeLists.txt
index ad1bb4df2b5b..ba67e745b13e 100644
--- a/mlir/lib/Dialect/SPIRV/CMakeLists.txt
+++ b/mlir/lib/Dialect/SPIRV/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
index 3d9ea7939535..543e1b430ecb 100644
--- a/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
+++ b/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
@@ -6,13 +6,15 @@ add_mlir_dialect_library(MLIRSPIRVSerialization
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
- )
-
-add_dependencies(MLIRSPIRVSerialization
- MLIRSPIRVSerializationGen)
-target_link_libraries(MLIRSPIRVSerialization
+ LINK_LIBS
MLIRIR
+ MLIRParser
MLIRSPIRV
MLIRSupport
- MLIRTranslation)
+ MLIRTranslation
+ LLVMSupport
+ )
+
+add_dependencies(MLIRSPIRVSerialization
+ MLIRSPIRVSerializationGen)
diff --git a/mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt
index e9d6492c0b1c..30c2c42e960f 100644
--- a/mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt
@@ -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
)
diff --git a/mlir/lib/Dialect/StandardOps/CMakeLists.txt b/mlir/lib/Dialect/StandardOps/CMakeLists.txt
index c8af4702fbc1..e802e0c0fb03 100644
--- a/mlir/lib/Dialect/StandardOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/StandardOps/CMakeLists.txt
@@ -5,18 +5,19 @@ add_mlir_dialect_library(MLIRStandardOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/StandardOps
- )
-add_dependencies(MLIRStandardOps
- MLIRCallOpInterfacesIncGen
+ LINK_LIBS
MLIREDSC
MLIRIR
- MLIRStandardOpsIncGen
+ MLIRSupport
+ LLVMCore
LLVMSupport
)
-target_link_libraries(MLIRStandardOps
+add_dependencies(MLIRStandardOps
+ MLIRCallOpInterfacesIncGen
MLIREDSC
MLIRIR
+ MLIRStandardOpsIncGen
LLVMSupport
)
diff --git a/mlir/lib/Dialect/VectorOps/CMakeLists.txt b/mlir/lib/Dialect/VectorOps/CMakeLists.txt
index 8bdce35f71ff..ff97a95b0c8b 100644
--- a/mlir/lib/Dialect/VectorOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/VectorOps/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/EDSC/CMakeLists.txt b/mlir/lib/EDSC/CMakeLists.txt
index 533d7ec84a40..3d0290a61dc1 100644
--- a/mlir/lib/EDSC/CMakeLists.txt
+++ b/mlir/lib/EDSC/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/ExecutionEngine/CMakeLists.txt b/mlir/lib/ExecutionEngine/CMakeLists.txt
index dc20e5fd4622..c24917c11a96 100644
--- a/mlir/lib/ExecutionEngine/CMakeLists.txt
+++ b/mlir/lib/ExecutionEngine/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/IR/CMakeLists.txt b/mlir/lib/IR/CMakeLists.txt
index 415d9d66e22c..8802f6c986d2 100644
--- a/mlir/lib/IR/CMakeLists.txt
+++ b/mlir/lib/IR/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/Parser/CMakeLists.txt b/mlir/lib/Parser/CMakeLists.txt
index 9fd29ae78791..36ede655daaa 100644
--- a/mlir/lib/Parser/CMakeLists.txt
+++ b/mlir/lib/Parser/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/Pass/CMakeLists.txt b/mlir/lib/Pass/CMakeLists.txt
index 05122f5a7ed4..54407d98503b 100644
--- a/mlir/lib/Pass/CMakeLists.txt
+++ b/mlir/lib/Pass/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/Quantizer/CMakeLists.txt b/mlir/lib/Quantizer/CMakeLists.txt
index 6e2c86484138..d87b7da0a10e 100644
--- a/mlir/lib/Quantizer/CMakeLists.txt
+++ b/mlir/lib/Quantizer/CMakeLists.txt
@@ -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,23 +18,32 @@ target_link_libraries(MLIRQuantizerSupport
LLVMSupport
)
+add_dependencies(MLIRQuantizerSupport
+ MLIRIR
+ MLIRQuantOps
+ MLIRSupport
+ MLIRStandardOps)
+
# Configurations.
add_llvm_library(MLIRQuantizerFxpMathConfig
Configurations/FxpMathConfig.cpp
ADDITIONAL_HEADER_DIRS
- )
-add_dependencies(MLIRQuantizerFxpMathConfig
- MLIRFxpMathOpsIncGen
- MLIRQuantizerSupport)
-target_link_libraries(MLIRQuantizerFxpMathConfig
+ LINK_LIBS
MLIRIR
MLIRFxpMathOps
MLIRQuantOps
MLIRQuantizerSupport
+ MLIRStandardOps
+ MLIRSupport
+ LLVMSupport
)
+add_dependencies(MLIRQuantizerFxpMathConfig
+ MLIRFxpMathOpsIncGen
+ MLIRQuantizerSupport)
+
# Transforms.
add_llvm_library(MLIRQuantizerTransforms
Transforms/AddDefaultStatsTestPass.cpp
@@ -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)
diff --git a/mlir/lib/Support/CMakeLists.txt b/mlir/lib/Support/CMakeLists.txt
index b8c0b17a68f8..140c2ce721a7 100644
--- a/mlir/lib/Support/CMakeLists.txt
+++ b/mlir/lib/Support/CMakeLists.txt
@@ -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
+ )
diff --git a/mlir/lib/TableGen/CMakeLists.txt b/mlir/lib/TableGen/CMakeLists.txt
index 6317c669192e..aa1e4a0a44b6 100644
--- a/mlir/lib/TableGen/CMakeLists.txt
+++ b/mlir/lib/TableGen/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/Target/CMakeLists.txt b/mlir/lib/Target/CMakeLists.txt
index 53786b94ad70..93f997f0876d 100644
--- a/mlir/lib/Target/CMakeLists.txt
+++ b/mlir/lib/Target/CMakeLists.txt
@@ -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
)
diff --git a/mlir/lib/Transforms/CMakeLists.txt b/mlir/lib/Transforms/CMakeLists.txt
index 7d671003e7f0..7a98490904bd 100644
--- a/mlir/lib/Transforms/CMakeLists.txt
+++ b/mlir/lib/Transforms/CMakeLists.txt
@@ -26,16 +26,21 @@ add_llvm_library(MLIRTransforms
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
- )
-add_dependencies(MLIRTransforms
- MLIRLoopLikeInterfaceIncGen
- MLIRStandardOpsIncGen)
-target_link_libraries(MLIRTransforms
+ LINK_LIBS
MLIRAffineOps
MLIRAnalysis
+ MLIRIR
MLIRLoopOps
+ MLIRLoopAnalysis
MLIRPass
+ MLIRSupport
+ MLIRStandardOps
MLIRTransformUtils
MLIRVectorOps
+ LLVMSupport
)
+
+add_dependencies(MLIRTransforms
+ MLIRLoopLikeInterfaceIncGen
+ MLIRStandardOpsIncGen)
diff --git a/mlir/lib/Transforms/Utils/CMakeLists.txt b/mlir/lib/Transforms/Utils/CMakeLists.txt
index bf4abf8f2807..d826a6bde6fc 100644
--- a/mlir/lib/Transforms/Utils/CMakeLists.txt
+++ b/mlir/lib/Transforms/Utils/CMakeLists.txt
@@ -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)
diff --git a/mlir/lib/Translation/CMakeLists.txt b/mlir/lib/Translation/CMakeLists.txt
index 122db2e6a319..b8e809f40129 100644
--- a/mlir/lib/Translation/CMakeLists.txt
+++ b/mlir/lib/Translation/CMakeLists.txt
@@ -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
+)
diff --git a/mlir/test/EDSC/CMakeLists.txt b/mlir/test/EDSC/CMakeLists.txt
index b922c594dffd..55e015bc4482 100644
--- a/mlir/test/EDSC/CMakeLists.txt
+++ b/mlir/test/EDSC/CMakeLists.txt
@@ -15,6 +15,7 @@ target_link_libraries(mlir-edsc-builder-api-test
MLIRStandardOps
MLIRTransforms
MLIRVectorOps
+ MLIRTransformUtils
LLVMCore
LLVMSupport
)
diff --git a/mlir/test/lib/Dialect/SPIRV/CMakeLists.txt b/mlir/test/lib/Dialect/SPIRV/CMakeLists.txt
index 5035c9cc8d49..1d6563cbf170 100644
--- a/mlir/test/lib/Dialect/SPIRV/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/SPIRV/CMakeLists.txt
@@ -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
)
diff --git a/mlir/test/lib/IR/CMakeLists.txt b/mlir/test/lib/IR/CMakeLists.txt
index b6b3c4377c6b..355faccc6927 100644
--- a/mlir/test/lib/IR/CMakeLists.txt
+++ b/mlir/test/lib/IR/CMakeLists.txt
@@ -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
- )
diff --git a/mlir/test/lib/Pass/CMakeLists.txt b/mlir/test/lib/Pass/CMakeLists.txt
index 3289a7add942..97900950010b 100644
--- a/mlir/test/lib/Pass/CMakeLists.txt
+++ b/mlir/test/lib/Pass/CMakeLists.txt
@@ -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
)
diff --git a/mlir/test/lib/TestDialect/CMakeLists.txt b/mlir/test/lib/TestDialect/CMakeLists.txt
index 15459b9abaa1..d35caae2e5bb 100644
--- a/mlir/test/lib/TestDialect/CMakeLists.txt
+++ b/mlir/test/lib/TestDialect/CMakeLists.txt
@@ -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
+)
diff --git a/mlir/test/lib/Transforms/CMakeLists.txt b/mlir/test/lib/Transforms/CMakeLists.txt
index 91672ea129c0..867a7b7c72cb 100644
--- a/mlir/test/lib/Transforms/CMakeLists.txt
+++ b/mlir/test/lib/Transforms/CMakeLists.txt
@@ -22,27 +22,31 @@ add_llvm_library(MLIRTestTransforms
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
-)
-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)
-target_link_libraries(MLIRTestTransforms
+ 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)
+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)
diff --git a/mlir/test/mlir-cpu-runner/CMakeLists.txt b/mlir/test/mlir-cpu-runner/CMakeLists.txt
index a9d45f0f7f8b..15a63978ea73 100644
--- a/mlir/test/mlir-cpu-runner/CMakeLists.txt
+++ b/mlir/test/mlir-cpu-runner/CMakeLists.txt
@@ -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)
diff --git a/mlir/tools/mlir-cuda-runner/CMakeLists.txt b/mlir/tools/mlir-cuda-runner/CMakeLists.txt
index 3c6dcbaec7ba..babe13dd128d 100644
--- a/mlir/tools/mlir-cuda-runner/CMakeLists.txt
+++ b/mlir/tools/mlir-cuda-runner/CMakeLists.txt
@@ -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)
diff --git a/mlir/tools/mlir-opt/CMakeLists.txt b/mlir/tools/mlir-opt/CMakeLists.txt
index b415bf97b63d..0eaed46521d8 100644
--- a/mlir/tools/mlir-opt/CMakeLists.txt
+++ b/mlir/tools/mlir-opt/CMakeLists.txt
@@ -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}
)
diff --git a/mlir/unittests/Dialect/SPIRV/CMakeLists.txt b/mlir/unittests/Dialect/SPIRV/CMakeLists.txt
index b444b5c0220a..84b442baf8e4 100644
--- a/mlir/unittests/Dialect/SPIRV/CMakeLists.txt
+++ b/mlir/unittests/Dialect/SPIRV/CMakeLists.txt
@@ -4,8 +4,11 @@ add_mlir_unittest(MLIRSPIRVTests
)
target_link_libraries(MLIRSPIRVTests
PRIVATE
+ MLIRIR
MLIRSPIRV
- MLIRSPIRVSerialization)
+ MLIRSPIRVSerialization
+ MLIRStandardOps
+ MLIRSupport)
whole_archive_link(MLIRSPIRVTests MLIRSPIRV)
diff --git a/mlir/unittests/Pass/CMakeLists.txt b/mlir/unittests/Pass/CMakeLists.txt
index a5aaee378f33..7421abd471f6 100644
--- a/mlir/unittests/Pass/CMakeLists.txt
+++ b/mlir/unittests/Pass/CMakeLists.txt
@@ -3,4 +3,7 @@ add_mlir_unittest(MLIRPassTests
)
target_link_libraries(MLIRPassTests
PRIVATE
- MLIRPass)
+ MLIRIR
+ MLIRPass
+ MLIRStandardOps
+ MLIRSupport)
diff --git a/mlir/unittests/SDBM/CMakeLists.txt b/mlir/unittests/SDBM/CMakeLists.txt
index 3d832ec15488..8fbea63f7a48 100644
--- a/mlir/unittests/SDBM/CMakeLists.txt
+++ b/mlir/unittests/SDBM/CMakeLists.txt
@@ -3,6 +3,9 @@ add_mlir_unittest(MLIRSDBMTests
)
target_link_libraries(MLIRSDBMTests
PRIVATE
+ MLIRIR
MLIRSDBM
-)
+ MLIRStandardOps
+ MLIRSupport
+ )
whole_archive_link(MLIRSDBMTests MLIRSDBM)
More information about the Mlir-commits
mailing list