[Mlir-commits] [mlir] 8a2b86b - [MLIR] Move from add_dependencies() to DEPENDS
Stephen Neuendorffer
llvmlistbot at llvm.org
Fri Feb 28 11:48:35 PST 2020
Author: Stephen Neuendorffer
Date: 2020-02-28T11:35:18-08:00
New Revision: 8a2b86b2c20a50f4a32931ae311b8e2457e591eb
URL: https://github.com/llvm/llvm-project/commit/8a2b86b2c20a50f4a32931ae311b8e2457e591eb
DIFF: https://github.com/llvm/llvm-project/commit/8a2b86b2c20a50f4a32931ae311b8e2457e591eb.diff
LOG: [MLIR] Move from add_dependencies() to DEPENDS
add_llvm_library and add_llvm_executable may need to create new targets with
appropriate dependencies. As a result, it is not sufficient in some
configurations (namely LLVM_BUILD_LLVM_DYLIB=on) to only call
add_dependencies(). Instead, the explicit TableGen dependencies must
be passed to add_llvm_library() or add_llvm_executable() using the DEPENDS
keyword.
Differential Revision: https://reviews.llvm.org/D74930
Added:
Modified:
mlir/examples/toy/Ch2/CMakeLists.txt
mlir/examples/toy/Ch3/CMakeLists.txt
mlir/examples/toy/Ch4/CMakeLists.txt
mlir/examples/toy/Ch5/CMakeLists.txt
mlir/examples/toy/Ch6/CMakeLists.txt
mlir/examples/toy/Ch7/CMakeLists.txt
mlir/lib/Analysis/CMakeLists.txt
mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
mlir/lib/Dialect/AffineOps/CMakeLists.txt
mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
mlir/lib/Dialect/GPU/CMakeLists.txt
mlir/lib/Dialect/LLVMIR/CMakeLists.txt
mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
mlir/lib/Dialect/LoopOps/CMakeLists.txt
mlir/lib/Dialect/OpenMP/CMakeLists.txt
mlir/lib/Dialect/QuantOps/CMakeLists.txt
mlir/lib/Dialect/SPIRV/CMakeLists.txt
mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
mlir/lib/Dialect/StandardOps/CMakeLists.txt
mlir/lib/Dialect/VectorOps/CMakeLists.txt
mlir/lib/IR/CMakeLists.txt
mlir/lib/Quantizer/CMakeLists.txt
mlir/lib/Transforms/CMakeLists.txt
mlir/lib/Transforms/Utils/CMakeLists.txt
mlir/test/lib/TestDialect/CMakeLists.txt
mlir/test/lib/Transforms/CMakeLists.txt
mlir/tools/mlir-cuda-runner/CMakeLists.txt
Removed:
################################################################################
diff --git a/mlir/examples/toy/Ch2/CMakeLists.txt b/mlir/examples/toy/Ch2/CMakeLists.txt
index 7154902017ee..ea03e4e4c13f 100644
--- a/mlir/examples/toy/Ch2/CMakeLists.txt
+++ b/mlir/examples/toy/Ch2/CMakeLists.txt
@@ -9,10 +9,13 @@ add_toy_chapter(toyc-ch2
parser/AST.cpp
mlir/MLIRGen.cpp
mlir/Dialect.cpp
+
+ DEPENDS
+ ToyCh2OpsIncGen
+
)
include_directories(include/)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
-add_dependencies(toyc-ch2 ToyCh2OpsIncGen)
target_link_libraries(toyc-ch2
PRIVATE
MLIRAnalysis
diff --git a/mlir/examples/toy/Ch3/CMakeLists.txt b/mlir/examples/toy/Ch3/CMakeLists.txt
index 823edfd343a3..e1bfe1bd12eb 100644
--- a/mlir/examples/toy/Ch3/CMakeLists.txt
+++ b/mlir/examples/toy/Ch3/CMakeLists.txt
@@ -14,10 +14,12 @@ add_toy_chapter(toyc-ch3
mlir/MLIRGen.cpp
mlir/Dialect.cpp
mlir/ToyCombine.cpp
+
+ DEPENDS
+ ToyCh3OpsIncGen
+ ToyCh3CombineIncGen
)
-add_dependencies(toyc-ch3 ToyCh3OpsIncGen)
-add_dependencies(toyc-ch3 ToyCh3CombineIncGen)
include_directories(include/)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
diff --git a/mlir/examples/toy/Ch4/CMakeLists.txt b/mlir/examples/toy/Ch4/CMakeLists.txt
index c9b0e71e5291..a78bedfd8814 100644
--- a/mlir/examples/toy/Ch4/CMakeLists.txt
+++ b/mlir/examples/toy/Ch4/CMakeLists.txt
@@ -15,12 +15,14 @@ add_toy_chapter(toyc-ch4
mlir/Dialect.cpp
mlir/ShapeInferencePass.cpp
mlir/ToyCombine.cpp
+
+ DEPENDS
+ ToyCh4OpsIncGen
+ ToyCh4ShapeInferenceInterfaceIncGen
+ ToyCh4CombineIncGen
+ MLIRCallOpInterfacesIncGen
)
-add_dependencies(toyc-ch4 ToyCh4OpsIncGen)
-add_dependencies(toyc-ch4 ToyCh4ShapeInferenceInterfaceIncGen)
-add_dependencies(toyc-ch4 ToyCh4CombineIncGen)
-add_dependencies(toyc-ch4 MLIRCallOpInterfacesIncGen)
include_directories(include/)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
diff --git a/mlir/examples/toy/Ch5/CMakeLists.txt b/mlir/examples/toy/Ch5/CMakeLists.txt
index 4c2cf4978140..6b9ded359f66 100644
--- a/mlir/examples/toy/Ch5/CMakeLists.txt
+++ b/mlir/examples/toy/Ch5/CMakeLists.txt
@@ -16,12 +16,14 @@ add_toy_chapter(toyc-ch5
mlir/LowerToAffineLoops.cpp
mlir/ShapeInferencePass.cpp
mlir/ToyCombine.cpp
+
+ DEPENDS
+ ToyCh5ShapeInferenceInterfaceIncGen
+ ToyCh5OpsIncGen
+ ToyCh5CombineIncGen
+ MLIRCallOpInterfacesIncGen
)
-add_dependencies(toyc-ch5 ToyCh5ShapeInferenceInterfaceIncGen)
-add_dependencies(toyc-ch5 ToyCh5OpsIncGen)
-add_dependencies(toyc-ch5 ToyCh5CombineIncGen)
-add_dependencies(toyc-ch5 MLIRCallOpInterfacesIncGen)
include_directories(include/)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
diff --git a/mlir/examples/toy/Ch6/CMakeLists.txt b/mlir/examples/toy/Ch6/CMakeLists.txt
index d22ee0873b56..767f2e31750b 100644
--- a/mlir/examples/toy/Ch6/CMakeLists.txt
+++ b/mlir/examples/toy/Ch6/CMakeLists.txt
@@ -18,12 +18,14 @@ add_toy_chapter(toyc-ch6
mlir/LowerToLLVM.cpp
mlir/ShapeInferencePass.cpp
mlir/ToyCombine.cpp
+
+ DEPENDS
+ ToyCh6ShapeInferenceInterfaceIncGen
+ ToyCh6OpsIncGen
+ ToyCh6CombineIncGen
+ MLIRCallOpInterfacesIncGen
)
-add_dependencies(toyc-ch6 ToyCh6ShapeInferenceInterfaceIncGen)
-add_dependencies(toyc-ch6 ToyCh6OpsIncGen)
-add_dependencies(toyc-ch6 ToyCh6CombineIncGen)
-add_dependencies(toyc-ch6 MLIRCallOpInterfacesIncGen)
include_directories(include/)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
diff --git a/mlir/examples/toy/Ch7/CMakeLists.txt b/mlir/examples/toy/Ch7/CMakeLists.txt
index 9f0790391366..2140678a3728 100644
--- a/mlir/examples/toy/Ch7/CMakeLists.txt
+++ b/mlir/examples/toy/Ch7/CMakeLists.txt
@@ -18,12 +18,14 @@ add_toy_chapter(toyc-ch7
mlir/LowerToLLVM.cpp
mlir/ShapeInferencePass.cpp
mlir/ToyCombine.cpp
+
+ DEPENDS
+ ToyCh7ShapeInferenceInterfaceIncGen
+ ToyCh7OpsIncGen
+ ToyCh7CombineIncGen
+ MLIRCallOpInterfacesIncGen
)
-add_dependencies(toyc-ch7 ToyCh7ShapeInferenceInterfaceIncGen)
-add_dependencies(toyc-ch7 ToyCh7OpsIncGen)
-add_dependencies(toyc-ch7 ToyCh7CombineIncGen)
-add_dependencies(toyc-ch7 MLIRCallOpInterfacesIncGen)
include_directories(include/)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
diff --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt
index 8c049882d711..5df7fcecd37c 100644
--- a/mlir/lib/Analysis/CMakeLists.txt
+++ b/mlir/lib/Analysis/CMakeLists.txt
@@ -23,6 +23,10 @@ add_llvm_library(MLIRAnalysis
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
+ DEPENDS
+ MLIRCallOpInterfacesIncGen
+ MLIRTypeInferOpInterfaceIncGen
+
LINK_LIBS
MLIRAffineOps
MLIRIR
@@ -30,10 +34,6 @@ add_llvm_library(MLIRAnalysis
MLIRSupport
LLVMSupport
)
-add_dependencies(MLIRAnalysis
- MLIRCallOpInterfacesIncGen
- MLIRTypeInferOpInterfaceIncGen
- )
add_llvm_library(MLIRLoopAnalysis
AffineAnalysis.cpp
@@ -45,6 +45,10 @@ add_llvm_library(MLIRLoopAnalysis
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
+ DEPENDS
+ MLIRCallOpInterfacesIncGen
+ MLIRTypeInferOpInterfaceIncGen
+
LINK_LIBS
MLIRAffineOps
MLIRIR
@@ -53,7 +57,3 @@ add_llvm_library(MLIRLoopAnalysis
MLIRSupport
LLVMSupport
)
-add_dependencies(MLIRLoopAnalysis
- MLIRCallOpInterfacesIncGen
- MLIRTypeInferOpInterfaceIncGen
- )
diff --git a/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt b/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
index 146c8a115cfe..0f423d4f64bd 100644
--- a/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
@@ -5,6 +5,9 @@ add_public_tablegen_target(MLIRGPUToNVVMIncGen)
add_mlir_conversion_library(MLIRGPUtoNVVMTransforms
LowerGpuOpsToNVVMOps.cpp
+ DEPENDS
+ MLIRGPUToNVVMIncGen
+
LINK_LIBS
LLVMCore
LLVMSupport
@@ -19,6 +22,3 @@ add_mlir_conversion_library(MLIRGPUtoNVVMTransforms
MLIRTransforms
MLIRTransformUtils
)
-
-add_dependencies(MLIRGPUtoNVVMTransforms
- MLIRGPUToNVVMIncGen)
diff --git a/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
index 36f8ad2afe2e..279d5478c3e9 100644
--- a/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
@@ -6,6 +6,9 @@ add_mlir_conversion_library(MLIRGPUtoSPIRVTransforms
ConvertGPUToSPIRV.cpp
ConvertGPUToSPIRVPass.cpp
+ DEPENDS
+ MLIRGPUToSPIRVIncGen
+
LINK_LIBS
MLIRGPU
MLIRIR
@@ -18,6 +21,3 @@ add_mlir_conversion_library(MLIRGPUtoSPIRVTransforms
MLIRTransforms
LLVMSupport
)
-
-add_dependencies(MLIRGPUtoSPIRVTransforms
- MLIRGPUToSPIRVIncGen)
diff --git a/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
index 6ba6c31606d9..d5b5b9633c17 100644
--- a/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
@@ -11,6 +11,9 @@ add_mlir_conversion_library(MLIRStandardToSPIRVTransforms
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
+ DEPENDS
+ MLIRStandardToSPIRVIncGen
+
LINK_LIBS
MLIRIR
MLIRPass
@@ -22,6 +25,3 @@ add_mlir_conversion_library(MLIRStandardToSPIRVTransforms
MLIRStandardOps
LLVMSupport
)
-
-add_dependencies(MLIRStandardToSPIRVTransforms
- MLIRStandardToSPIRVIncGen)
diff --git a/mlir/lib/Dialect/AffineOps/CMakeLists.txt b/mlir/lib/Dialect/AffineOps/CMakeLists.txt
index 51017de16c1c..c956b564177b 100644
--- a/mlir/lib/Dialect/AffineOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/AffineOps/CMakeLists.txt
@@ -6,13 +6,13 @@ add_mlir_dialect_library(MLIRAffineOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/AffineOps
+ DEPENDS
+ MLIRAffineOpsIncGen
+ MLIRLoopLikeInterfaceIncGen
+
LINK_LIBS
MLIREDSC
MLIRIR
MLIRStandardOps
LLVMSupport
)
-add_dependencies(MLIRAffineOps
- MLIRAffineOpsIncGen
- MLIRLoopLikeInterfaceIncGen
- )
diff --git a/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt b/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
index 057290149a1b..1e08882f3938 100644
--- a/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
@@ -5,6 +5,9 @@ add_mlir_dialect_library(MLIRFxpMathOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/FxpMathOps
+ DEPENDS
+ MLIRFxpMathOpsIncGen
+
LINK_LIBS
MLIRQuantOps
MLIRIR
@@ -15,6 +18,3 @@ add_mlir_dialect_library(MLIRFxpMathOps
MLIRTransformUtils
LLVMSupport
)
-add_dependencies(MLIRFxpMathOps
- MLIRFxpMathOpsIncGen
- )
diff --git a/mlir/lib/Dialect/GPU/CMakeLists.txt b/mlir/lib/Dialect/GPU/CMakeLists.txt
index 018291a7b7ae..dad3b37da03e 100644
--- a/mlir/lib/Dialect/GPU/CMakeLists.txt
+++ b/mlir/lib/Dialect/GPU/CMakeLists.txt
@@ -8,6 +8,9 @@ add_mlir_dialect_library(MLIRGPU
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/GPU
+ DEPENDS
+ MLIRGPUOpsIncGen
+
LINK_LIBS
MLIREDSC
MLIRIR
@@ -19,6 +22,3 @@ add_mlir_dialect_library(MLIRGPU
MLIRTransformUtils
LLVMSupport
)
-add_dependencies(MLIRGPU
- MLIRGPUOpsIncGen
- )
diff --git a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
index 71465c164eae..1583039e272e 100644
--- a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
+++ b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
@@ -4,6 +4,10 @@ add_mlir_dialect_library(MLIRLLVMIR
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
+ DEPENDS
+ MLIRLLVMOpsIncGen
+ MLIRLLVMConversionsIncGen
+
LINK_LIBS
LLVMAsmParser
LLVMCore
@@ -11,10 +15,6 @@ add_mlir_dialect_library(MLIRLLVMIR
MLIRIR
MLIRSupport
)
-add_dependencies(MLIRLLVMIR
- MLIRLLVMOpsIncGen
- MLIRLLVMConversionsIncGen
- )
add_mlir_dialect_library(MLIRNVVMIR
IR/NVVMDialect.cpp
@@ -22,6 +22,10 @@ add_mlir_dialect_library(MLIRNVVMIR
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
+ DEPENDS
+ MLIRNVVMOpsIncGen
+ MLIRNVVMConversionsIncGen
+
LINK_LIBS
LLVMAsmParser
MLIRIR
@@ -29,12 +33,6 @@ add_mlir_dialect_library(MLIRNVVMIR
LLVMSupport
LLVMCore
)
-add_dependencies(MLIRNVVMIR
- MLIRNVVMOpsIncGen
- MLIRNVVMConversionsIncGen
- )
-
-
add_mlir_dialect_library(MLIRROCDLIR
IR/ROCDLDialect.cpp
@@ -42,13 +40,13 @@ add_mlir_dialect_library(MLIRROCDLIR
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
+ DEPENDS
+ MLIRROCDLOpsIncGen
+ MLIRROCDLConversionsIncGen
+
LINK_LIBS
LLVMAsmParser
LLVMCore
LLVMSupport
MLIRIR
)
-add_dependencies(MLIRROCDLIR
- MLIRROCDLOpsIncGen
- MLIRROCDLConversionsIncGen
- )
diff --git a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
index 7287324faa6b..93290a02f174 100644
--- a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
@@ -7,8 +7,10 @@ add_mlir_dialect_library(MLIRLinalgTransforms
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
+
DEPENDS
intrinsics_gen
+ MLIRLinalgTransformPatternsIncGen
LINK_LIBS
MLIRAffineOps
@@ -27,6 +29,3 @@ add_mlir_dialect_library(MLIRLinalgTransforms
MLIRVectorOps
LLVMSupport
)
-add_dependencies(MLIRLinalgTransforms
- MLIRLinalgTransformPatternsIncGen
- )
diff --git a/mlir/lib/Dialect/LoopOps/CMakeLists.txt b/mlir/lib/Dialect/LoopOps/CMakeLists.txt
index 635bbdeb58a6..e5633cfd9f21 100644
--- a/mlir/lib/Dialect/LoopOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/LoopOps/CMakeLists.txt
@@ -6,15 +6,15 @@ add_mlir_dialect_library(MLIRLoopOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/LoopOps
+ DEPENDS
+ MLIRLoopLikeInterfaceIncGen
+ MLIRLoopOpsIncGen
+
LINK_LIBS
MLIREDSC
MLIRIR
MLIRStandardOps
LLVMSupport
)
-add_dependencies(MLIRLoopOps
- MLIRLoopLikeInterfaceIncGen
- MLIRLoopOpsIncGen
- )
add_subdirectory(Transforms)
diff --git a/mlir/lib/Dialect/OpenMP/CMakeLists.txt b/mlir/lib/Dialect/OpenMP/CMakeLists.txt
index 8e00e473af20..a7ac7ac1bc54 100644
--- a/mlir/lib/Dialect/OpenMP/CMakeLists.txt
+++ b/mlir/lib/Dialect/OpenMP/CMakeLists.txt
@@ -4,10 +4,11 @@ add_mlir_dialect_library(MLIROpenMP
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/OpenMP
+ DEPENDS
+ MLIROpenMPOpsIncGen
+
LINK_LIBS
MLIRIR
LLVMCore
LLVMSupport
)
-
-add_dependencies(MLIROpenMP MLIROpenMPOpsIncGen)
diff --git a/mlir/lib/Dialect/QuantOps/CMakeLists.txt b/mlir/lib/Dialect/QuantOps/CMakeLists.txt
index c9d104114465..5606612375ee 100644
--- a/mlir/lib/Dialect/QuantOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/QuantOps/CMakeLists.txt
@@ -12,6 +12,9 @@ add_mlir_dialect_library(MLIRQuantOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/QuantOps
+ DEPENDS
+ MLIRQuantOpsIncGen
+
LINK_LIBS
MLIRIR
MLIRPass
@@ -20,6 +23,3 @@ add_mlir_dialect_library(MLIRQuantOps
MLIRTransformUtils
LLVMSupport
)
-add_dependencies(MLIRQuantOps
- MLIRQuantOpsIncGen
- )
diff --git a/mlir/lib/Dialect/SPIRV/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/CMakeLists.txt
index ba67e745b13e..5f755e359a96 100644
--- a/mlir/lib/Dialect/SPIRV/CMakeLists.txt
+++ b/mlir/lib/Dialect/SPIRV/CMakeLists.txt
@@ -14,6 +14,15 @@ add_mlir_dialect_library(MLIRSPIRV
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
+ DEPENDS
+ MLIRSPIRVAvailabilityIncGen
+ MLIRSPIRVCanonicalizationIncGen
+ MLIRSPIRVEnumAvailabilityIncGen
+ MLIRSPIRVEnumsIncGen
+ MLIRSPIRVOpsIncGen
+ MLIRSPIRVOpUtilsGen
+ MLIRSPIRVTargetAndABIIncGen
+
LINK_LIBS
MLIRIR
MLIRParser
@@ -23,15 +32,5 @@ add_mlir_dialect_library(MLIRSPIRV
LLVMSupport
)
-add_dependencies(MLIRSPIRV
- MLIRSPIRVAvailabilityIncGen
- MLIRSPIRVCanonicalizationIncGen
- MLIRSPIRVEnumAvailabilityIncGen
- MLIRSPIRVEnumsIncGen
- MLIRSPIRVOpsIncGen
- MLIRSPIRVOpUtilsGen
- MLIRSPIRVTargetAndABIIncGen)
-
-
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 543e1b430ecb..ef44e986a50a 100644
--- a/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
+++ b/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
@@ -7,6 +7,9 @@ add_mlir_dialect_library(MLIRSPIRVSerialization
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
+ DEPENDS
+ MLIRSPIRVSerializationGen
+
LINK_LIBS
MLIRIR
MLIRParser
@@ -15,6 +18,3 @@ add_mlir_dialect_library(MLIRSPIRVSerialization
MLIRTranslation
LLVMSupport
)
-
-add_dependencies(MLIRSPIRVSerialization
- MLIRSPIRVSerializationGen)
diff --git a/mlir/lib/Dialect/StandardOps/CMakeLists.txt b/mlir/lib/Dialect/StandardOps/CMakeLists.txt
index acf47df6eb8d..4831441119e0 100644
--- a/mlir/lib/Dialect/StandardOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/StandardOps/CMakeLists.txt
@@ -6,6 +6,10 @@ add_mlir_dialect_library(MLIRStandardOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/StandardOps
+ DEPENDS
+ MLIRCallOpInterfacesIncGen
+ MLIRStandardOpsIncGen
+
LINK_LIBS
MLIREDSC
MLIRIR
@@ -13,7 +17,3 @@ add_mlir_dialect_library(MLIRStandardOps
LLVMCore
LLVMSupport
)
-add_dependencies(MLIRStandardOps
- MLIRCallOpInterfacesIncGen
- MLIRStandardOpsIncGen
- )
diff --git a/mlir/lib/Dialect/VectorOps/CMakeLists.txt b/mlir/lib/Dialect/VectorOps/CMakeLists.txt
index ff97a95b0c8b..86910d0c3a6c 100644
--- a/mlir/lib/Dialect/VectorOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/VectorOps/CMakeLists.txt
@@ -7,6 +7,10 @@ add_mlir_dialect_library(MLIRVectorOps
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/VectorOps
+ DEPENDS
+ MLIRVectorOpsIncGen
+ MLIRVectorTransformPatternsIncGen
+
LINK_LIBS
MLIRIR
MLIRStandardOps
@@ -15,6 +19,3 @@ add_mlir_dialect_library(MLIRVectorOps
MLIRLoopAnalysis
LLVMSupport
)
-
-add_dependencies(MLIRVectorOps MLIRVectorOpsIncGen)
-add_dependencies(MLIRVectorOps MLIRVectorTransformPatternsIncGen)
diff --git a/mlir/lib/IR/CMakeLists.txt b/mlir/lib/IR/CMakeLists.txt
index f3788e2ca0ab..80a9e4f12b9b 100644
--- a/mlir/lib/IR/CMakeLists.txt
+++ b/mlir/lib/IR/CMakeLists.txt
@@ -5,12 +5,12 @@ add_llvm_library(MLIRIR
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
+ DEPENDS
+ MLIRCallOpInterfacesIncGen
+ MLIROpAsmInterfacesIncGen
+
LINK_LIBS
MLIRSupport
LLVMSupport
${LLVM_PTHREAD_LIB}
)
-add_dependencies(MLIRIR
- MLIRCallOpInterfacesIncGen
- MLIROpAsmInterfacesIncGen
- )
diff --git a/mlir/lib/Quantizer/CMakeLists.txt b/mlir/lib/Quantizer/CMakeLists.txt
index 34d0effc9362..5b52b2a9a170 100644
--- a/mlir/lib/Quantizer/CMakeLists.txt
+++ b/mlir/lib/Quantizer/CMakeLists.txt
@@ -24,6 +24,9 @@ add_llvm_library(MLIRQuantizerFxpMathConfig
ADDITIONAL_HEADER_DIRS
+ DEPENDS
+ MLIRFxpMathOpsIncGen
+
LINK_LIBS
MLIRIR
MLIRFxpMathOps
@@ -34,10 +37,6 @@ add_llvm_library(MLIRQuantizerFxpMathConfig
LLVMSupport
)
-add_dependencies(MLIRQuantizerFxpMathConfig
- MLIRFxpMathOpsIncGen
- )
-
# Transforms.
add_llvm_library(MLIRQuantizerTransforms
Transforms/AddDefaultStatsTestPass.cpp
diff --git a/mlir/lib/Transforms/CMakeLists.txt b/mlir/lib/Transforms/CMakeLists.txt
index 7a98490904bd..980a357ed751 100644
--- a/mlir/lib/Transforms/CMakeLists.txt
+++ b/mlir/lib/Transforms/CMakeLists.txt
@@ -27,6 +27,10 @@ add_llvm_library(MLIRTransforms
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
+ DEPENDS
+ MLIRLoopLikeInterfaceIncGen
+ MLIRStandardOpsIncGen
+
LINK_LIBS
MLIRAffineOps
MLIRAnalysis
@@ -40,7 +44,3 @@ add_llvm_library(MLIRTransforms
MLIRVectorOps
LLVMSupport
)
-
-add_dependencies(MLIRTransforms
- MLIRLoopLikeInterfaceIncGen
- MLIRStandardOpsIncGen)
diff --git a/mlir/lib/Transforms/Utils/CMakeLists.txt b/mlir/lib/Transforms/Utils/CMakeLists.txt
index d826a6bde6fc..de3351133165 100644
--- a/mlir/lib/Transforms/Utils/CMakeLists.txt
+++ b/mlir/lib/Transforms/Utils/CMakeLists.txt
@@ -10,6 +10,9 @@ add_llvm_library(MLIRTransformUtils
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
+ DEPENDS
+ MLIRStandardOpsIncGen
+
LINK_LIBS
MLIRAffineOps
MLIRAnalysis
@@ -20,4 +23,3 @@ add_llvm_library(MLIRTransformUtils
MLIRStandardOps
LLVMSupport
)
-add_dependencies(MLIRTransformUtils MLIRStandardOpsIncGen)
diff --git a/mlir/test/lib/TestDialect/CMakeLists.txt b/mlir/test/lib/TestDialect/CMakeLists.txt
index d35caae2e5bb..d79d48128661 100644
--- a/mlir/test/lib/TestDialect/CMakeLists.txt
+++ b/mlir/test/lib/TestDialect/CMakeLists.txt
@@ -15,6 +15,10 @@ add_llvm_library(MLIRTestDialect
TestDialect.cpp
TestPatterns.cpp
+ DEPENDS
+ MLIRTestOpsIncGen
+ MLIRTypeInferOpInterfaceIncGen
+
LINK_LIBS
MLIRAnalysis
MLIRDialect
@@ -25,7 +29,3 @@ add_llvm_library(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 867a7b7c72cb..8b898d5472eb 100644
--- a/mlir/test/lib/Transforms/CMakeLists.txt
+++ b/mlir/test/lib/Transforms/CMakeLists.txt
@@ -23,6 +23,11 @@ add_llvm_library(MLIRTestTransforms
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
+ DEPENDS
+ MLIRStandardOpsIncGen
+ MLIRTestLinalgTransformPatternsIncGen
+ MLIRTestVectorTransformPatternsIncGen
+
LINK_LIBS
MLIRAffineOps
MLIRAnalysis
@@ -47,6 +52,3 @@ 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/tools/mlir-cuda-runner/CMakeLists.txt b/mlir/tools/mlir-cuda-runner/CMakeLists.txt
index babe13dd128d..63a2dc822440 100644
--- a/mlir/tools/mlir-cuda-runner/CMakeLists.txt
+++ b/mlir/tools/mlir-cuda-runner/CMakeLists.txt
@@ -68,8 +68,10 @@ if(MLIR_CUDA_RUNNER_ENABLED)
add_llvm_tool(mlir-cuda-runner
mlir-cuda-runner.cpp
- )
- add_dependencies(mlir-cuda-runner cuda-runtime-wrappers)
+
+ DEPENDS
+ cuda-runtime-wrappers
+ )
target_include_directories(mlir-cuda-runner
PRIVATE ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
)
More information about the Mlir-commits
mailing list