diff --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt --- a/mlir/lib/Analysis/CMakeLists.txt +++ b/mlir/lib/Analysis/CMakeLists.txt @@ -31,10 +31,8 @@ LLVMSupport ) add_dependencies(MLIRAnalysis - MLIRAffineOps MLIRCallOpInterfacesIncGen MLIRTypeInferOpInterfaceIncGen - MLIRLoopOps ) add_llvm_library(MLIRLoopAnalysis @@ -56,8 +54,6 @@ LLVMSupport ) add_dependencies(MLIRLoopAnalysis - MLIRAffineOps MLIRCallOpInterfacesIncGen MLIRTypeInferOpInterfaceIncGen - MLIRLoopOps ) diff --git a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt --- a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt +++ b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt @@ -14,13 +14,4 @@ LLVMCore LLVMSupport ) -add_dependencies( - MLIRAffineToStandard - - MLIRAffineOps - MLIRStandardOps - MLIRIR - LLVMCore - LLVMSupport -) diff --git a/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt b/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt --- a/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt @@ -1,4 +1,10 @@ -set(LIBS +add_llvm_library(MLIRLinalgToLLVM + LinalgToLLVM.cpp + + ADDITIONAL_HEADER_DIRS + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LinalgToLLVM + + LINK_LIBS MLIRAffineToStandard MLIREDSC MLIRIR @@ -14,15 +20,3 @@ LLVMSupport ) -add_llvm_library(MLIRLinalgToLLVM - LinalgToLLVM.cpp - - ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LinalgToLLVM - - LINK_LIBS - ${LIBS} - ) - -add_dependencies(MLIRLinalgToLLVM ${LIBS}) - diff --git a/mlir/lib/Conversion/LoopToStandard/CMakeLists.txt b/mlir/lib/Conversion/LoopToStandard/CMakeLists.txt --- a/mlir/lib/Conversion/LoopToStandard/CMakeLists.txt +++ b/mlir/lib/Conversion/LoopToStandard/CMakeLists.txt @@ -13,11 +13,3 @@ LLVMCore LLVMSupport ) -add_dependencies( - MLIRLoopToStandard - - MLIRLoopOps - MLIRTransforms - LLVMCore - LLVMSupport -) diff --git a/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt b/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt --- a/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt +++ b/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt @@ -1,4 +1,11 @@ -set(LIBS +add_llvm_library(MLIRLoopsToGPU + LoopsToGPU.cpp + LoopsToGPUPass.cpp + + ADDITIONAL_HEADER_DIRS + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LoopsToGPU + + LINK_LIBS MLIRAffineOps MLIRAffineToStandard MLIRGPU @@ -11,16 +18,4 @@ MLIRTransforms MLIRTransformUtils LLVMSupport -) - -add_llvm_library(MLIRLoopsToGPU - LoopsToGPU.cpp - LoopsToGPUPass.cpp - - ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LoopsToGPU - - LINK_LIBS - ${LIBS} ) -add_dependencies(MLIRLoopsToGPU ${LIBS}) diff --git a/mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt b/mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt --- a/mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt @@ -13,11 +13,3 @@ LLVMCore LLVMSupport ) -add_dependencies( - MLIRStandardToLLVM - - MLIRLLVMIR - MLIRTransforms - LLVMCore - LLVMSupport -) diff --git a/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt b/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt --- a/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt @@ -1,4 +1,10 @@ -set(LIBS +add_llvm_library(MLIRVectorToLLVM + ConvertVectorToLLVM.cpp + + ADDITIONAL_HEADER_DIRS + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToLLVM + + LINK_LIBS MLIRIR MLIRLLVMIR MLIRPass @@ -10,14 +16,3 @@ LLVMCore LLVMSupport ) -add_llvm_library(MLIRVectorToLLVM - ConvertVectorToLLVM.cpp - - ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToLLVM - - LINK_LIBS - ${LIBS} - ) - -add_dependencies(MLIRVectorToLLVM ${LIBS}) diff --git a/mlir/lib/Conversion/VectorToLoops/CMakeLists.txt b/mlir/lib/Conversion/VectorToLoops/CMakeLists.txt --- a/mlir/lib/Conversion/VectorToLoops/CMakeLists.txt +++ b/mlir/lib/Conversion/VectorToLoops/CMakeLists.txt @@ -1,4 +1,10 @@ -set(LIBS +add_llvm_library(MLIRVectorToLoops + ConvertVectorToLoops.cpp + + ADDITIONAL_HEADER_DIRS + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToLoops + + LINK_LIBS MLIRAffineOps MLIREDSC MLIRIR @@ -11,15 +17,5 @@ LLVMCore LLVMSupport ) -add_llvm_library(MLIRVectorToLoops - ConvertVectorToLoops.cpp - - ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToLoops - - LINK_LIBS - ${LIBS} - ) -add_dependencies(MLIRVectorToLoops ${LIBS}) diff --git a/mlir/lib/Dialect/AffineOps/CMakeLists.txt b/mlir/lib/Dialect/AffineOps/CMakeLists.txt --- a/mlir/lib/Dialect/AffineOps/CMakeLists.txt +++ b/mlir/lib/Dialect/AffineOps/CMakeLists.txt @@ -14,10 +14,6 @@ LLVMSupport ) add_dependencies(MLIRAffineOps - MLIRAffineOpsIncGen - MLIREDSC - MLIRIR MLIRLoopLikeInterfaceIncGen - MLIRStandardOps ) diff --git a/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt b/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt --- a/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt +++ b/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt @@ -17,9 +17,5 @@ LLVMSupport ) add_dependencies(MLIRFxpMathOps - MLIRFxpMathOpsIncGen - MLIRQuantOps - MLIRIR - MLIRPass - MLIRSupport - MLIRStandardOps) + MLIRFxpMathOpsIncGen + ) diff --git a/mlir/lib/Dialect/GPU/CMakeLists.txt b/mlir/lib/Dialect/GPU/CMakeLists.txt --- a/mlir/lib/Dialect/GPU/CMakeLists.txt +++ b/mlir/lib/Dialect/GPU/CMakeLists.txt @@ -21,10 +21,4 @@ ) add_dependencies(MLIRGPU MLIRGPUOpsIncGen - MLIREDSC - MLIRIR - MLIRLLVMIR - MLIRLoopOps - MLIRSupport - MLIRTransformUtils - LLVMSupport) + ) diff --git a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt --- a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt +++ b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt @@ -11,7 +11,10 @@ MLIRIR MLIRSupport ) -add_dependencies(MLIRLLVMIR MLIRLLVMOpsIncGen MLIRLLVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport) +add_dependencies(MLIRLLVMIR + MLIRLLVMOpsIncGen + MLIRLLVMConversionsIncGen + ) add_llvm_library(MLIRNVVMIR IR/NVVMDialect.cpp @@ -26,7 +29,11 @@ LLVMSupport LLVMCore ) -add_dependencies(MLIRNVVMIR MLIRNVVMOpsIncGen MLIRNVVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport) +add_dependencies(MLIRNVVMIR + MLIRNVVMOpsIncGen + MLIRNVVMConversionsIncGen + ) + add_llvm_library(MLIRROCDLIR @@ -41,4 +48,8 @@ LLVMSupport MLIRIR ) -add_dependencies(MLIRROCDLIR MLIRROCDLOpsIncGen MLIRROCDLConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport) +add_dependencies(MLIRROCDLIR + MLIRROCDLOpsIncGen + MLIRROCDLConversionsIncGen + ) + diff --git a/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt --- a/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt @@ -1,22 +1,15 @@ -set(LIBS - MLIRIR - MLIRLinalgOps - MLIRStandardOps - LLVMSupport - ) - - add_llvm_library(MLIRLinalgAnalysis DependenceAnalysis.cpp ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg + DEPENDS intrinsics_gen LINK_LIBS - ${LIBS} + MLIRIR + MLIRLinalgOps + MLIRStandardOps + LLVMSupport ) - -add_dependencies(MLIRLinalgAnalysis ${LIBS}) - diff --git a/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt b/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt --- a/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt @@ -1,25 +1,19 @@ -set(LIBS - - MLIREDSC - MLIRIR - MLIRAffineOps - MLIRLinalgOps - MLIRLoopOps - MLIRStandardOps - LLVMSupport - ) - add_llvm_library(MLIRLinalgEDSC Builders.cpp ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg + DEPENDS intrinsics_gen LINK_LIBS - ${LIBS} + MLIREDSC + MLIRIR + MLIRAffineOps + MLIRLinalgOps + MLIRLoopOps + MLIRStandardOps + LLVMSupport ) -add_dependencies(MLIRLinalgEDSC ${LIBS}) - diff --git a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt --- a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt @@ -1,10 +1,3 @@ -set(LIBS - MLIRIR - MLIRStandardOps - MLIRSupport - LLVMSupport - ) - add_llvm_library(MLIRLinalgOps LinalgOps.cpp LinalgTypes.cpp @@ -12,6 +5,7 @@ ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg + DEPENDS intrinsics_gen @@ -21,10 +15,3 @@ MLIRSupport LLVMSupport ) - -add_dependencies(MLIRLinalgOps - - ${LIBS} - MLIRLinalgOpsIncGen - MLIRLinalgStructuredOpsIncGen - ) diff --git a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt --- a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt @@ -1,5 +1,16 @@ -set(LIBS +add_llvm_library(MLIRLinalgTransforms + Fusion.cpp + LinalgTransforms.cpp + LinalgToLoops.cpp + Promotion.cpp + Tiling.cpp + + ADDITIONAL_HEADER_DIRS + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg + DEPENDS + intrinsics_gen + LINK_LIBS MLIRAffineOps MLIRAnalysis MLIREDSC @@ -16,25 +27,7 @@ MLIRVectorOps LLVMSupport ) - -add_llvm_library(MLIRLinalgTransforms - Fusion.cpp - LinalgTransforms.cpp - LinalgToLoops.cpp - Promotion.cpp - Tiling.cpp - - ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg - DEPENDS - intrinsics_gen - - LINK_LIBS - ${LIBS}) - add_dependencies(MLIRLinalgTransforms - - ${LIBS} MLIRLinalgTransformPatternsIncGen ) diff --git a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt --- a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt @@ -1,4 +1,13 @@ -set(LIBS +add_llvm_library(MLIRLinalgUtils + Utils.cpp + + ADDITIONAL_HEADER_DIRS + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg + + DEPENDS + intrinsics_gen + + LINK_LIBS MLIRAffineOps MLIREDSC MLIRIR @@ -9,17 +18,5 @@ MLIRTransformUtils LLVMSupport ) - -add_llvm_library(MLIRLinalgUtils - - Utils.cpp - ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg - DEPENDS - intrinsics_gen - - LINK_LIBS - ${LIBS}) -add_dependencies(MLIRLinalgUtils ${LIBS}) diff --git a/mlir/lib/Dialect/LoopOps/CMakeLists.txt b/mlir/lib/Dialect/LoopOps/CMakeLists.txt --- a/mlir/lib/Dialect/LoopOps/CMakeLists.txt +++ b/mlir/lib/Dialect/LoopOps/CMakeLists.txt @@ -13,10 +13,6 @@ LLVMSupport ) add_dependencies(MLIRLoopOps - - MLIREDSC MLIRLoopLikeInterfaceIncGen MLIRLoopOpsIncGen - MLIRStandardOps - LLVMSupport ) diff --git a/mlir/lib/Dialect/QuantOps/CMakeLists.txt b/mlir/lib/Dialect/QuantOps/CMakeLists.txt --- a/mlir/lib/Dialect/QuantOps/CMakeLists.txt +++ b/mlir/lib/Dialect/QuantOps/CMakeLists.txt @@ -22,8 +22,5 @@ LLVMSupport ) add_dependencies(MLIRQuantOps - MLIRIR - MLIRPass - MLIRQuantOpsIncGen - MLIRSupport - MLIRStandardOps) + MLIRQuantOpsIncGen + ) diff --git a/mlir/lib/Dialect/SDBM/CMakeLists.txt b/mlir/lib/Dialect/SDBM/CMakeLists.txt --- a/mlir/lib/Dialect/SDBM/CMakeLists.txt +++ b/mlir/lib/Dialect/SDBM/CMakeLists.txt @@ -11,4 +11,4 @@ MLIRSupport LLVMSupport ) -add_dependencies(MLIRSDBM MLIRIR) + diff --git a/mlir/lib/Dialect/StandardOps/CMakeLists.txt b/mlir/lib/Dialect/StandardOps/CMakeLists.txt --- a/mlir/lib/Dialect/StandardOps/CMakeLists.txt +++ b/mlir/lib/Dialect/StandardOps/CMakeLists.txt @@ -15,10 +15,6 @@ LLVMSupport ) add_dependencies(MLIRStandardOps - MLIRCallOpInterfacesIncGen - MLIREDSC - MLIRIR MLIRStandardOpsIncGen - LLVMSupport ) diff --git a/mlir/lib/EDSC/CMakeLists.txt b/mlir/lib/EDSC/CMakeLists.txt --- a/mlir/lib/EDSC/CMakeLists.txt +++ b/mlir/lib/EDSC/CMakeLists.txt @@ -27,4 +27,4 @@ MLIRParser LLVMSupport ) -add_dependencies(MLIREDSCInterface MLIRIR) + diff --git a/mlir/lib/IR/CMakeLists.txt b/mlir/lib/IR/CMakeLists.txt --- a/mlir/lib/IR/CMakeLists.txt +++ b/mlir/lib/IR/CMakeLists.txt @@ -10,5 +10,8 @@ LLVMSupport ${LLVM_PTHREAD_LIB} ) -add_dependencies(MLIRIR MLIRCallOpInterfacesIncGen MLIROpAsmInterfacesIncGen MLIRSupport LLVMSupport) +add_dependencies(MLIRIR + MLIRCallOpInterfacesIncGen + MLIROpAsmInterfacesIncGen + ) diff --git a/mlir/lib/Parser/CMakeLists.txt b/mlir/lib/Parser/CMakeLists.txt --- a/mlir/lib/Parser/CMakeLists.txt +++ b/mlir/lib/Parser/CMakeLists.txt @@ -11,5 +11,5 @@ MLIRAnalysis LLVMSupport ) -add_dependencies(MLIRParser MLIRIR MLIRAnalysis) + diff --git a/mlir/lib/Pass/CMakeLists.txt b/mlir/lib/Pass/CMakeLists.txt --- a/mlir/lib/Pass/CMakeLists.txt +++ b/mlir/lib/Pass/CMakeLists.txt @@ -12,5 +12,4 @@ LLVMIRReader LLVMSupport ) -add_dependencies(MLIRPass MLIRAnalysis MLIRIR LLVMSupport) diff --git a/mlir/lib/Quantizer/CMakeLists.txt b/mlir/lib/Quantizer/CMakeLists.txt --- a/mlir/lib/Quantizer/CMakeLists.txt +++ b/mlir/lib/Quantizer/CMakeLists.txt @@ -18,12 +18,6 @@ LLVMSupport ) -add_dependencies(MLIRQuantizerSupport - MLIRIR - MLIRQuantOps - MLIRSupport - MLIRStandardOps) - # Configurations. add_llvm_library(MLIRQuantizerFxpMathConfig Configurations/FxpMathConfig.cpp @@ -41,8 +35,8 @@ ) add_dependencies(MLIRQuantizerFxpMathConfig - MLIRFxpMathOpsIncGen - MLIRQuantizerSupport) + MLIRFxpMathOpsIncGen + ) # Transforms. add_llvm_library(MLIRQuantizerTransforms @@ -62,7 +56,3 @@ MLIRTransformUtils LLVMSupport ) -add_dependencies(MLIRQuantizerTransforms - MLIRQuantizerFxpMathConfig - MLIRQuantizerSupport - MLIRPass) diff --git a/mlir/test/lib/IR/CMakeLists.txt b/mlir/test/lib/IR/CMakeLists.txt --- a/mlir/test/lib/IR/CMakeLists.txt +++ b/mlir/test/lib/IR/CMakeLists.txt @@ -13,6 +13,3 @@ ) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../TestDialect) include_directories(${CMAKE_CURRENT_BINARY_DIR}/../TestDialect) -add_dependencies(MLIRTestIR - MLIRTestDialect - )