Skip to content

Commit 4594d0e

Browse files
stephenneuendorfferstephenneuendorffer
committed
[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
1 parent 6d894af commit 4594d0e

File tree

29 files changed

+116
-89
lines changed

29 files changed

+116
-89
lines changed

‎mlir/examples/toy/Ch2/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@ add_toy_chapter(toyc-ch2
99
parser/AST.cpp
1010
mlir/MLIRGen.cpp
1111
mlir/Dialect.cpp
12+
13+
DEPENDS
14+
ToyCh2OpsIncGen
15+
1216
)
1317
include_directories(include/)
1418
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
15-
add_dependencies(toyc-ch2 ToyCh2OpsIncGen)
1619
target_link_libraries(toyc-ch2
1720
PRIVATE
1821
MLIRAnalysis

‎mlir/examples/toy/Ch3/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ add_toy_chapter(toyc-ch3
1414
mlir/MLIRGen.cpp
1515
mlir/Dialect.cpp
1616
mlir/ToyCombine.cpp
17+
18+
DEPENDS
19+
ToyCh3OpsIncGen
20+
ToyCh3CombineIncGen
1721
)
1822

19-
add_dependencies(toyc-ch3 ToyCh3OpsIncGen)
20-
add_dependencies(toyc-ch3 ToyCh3CombineIncGen)
2123
include_directories(include/)
2224
include_directories(${CMAKE_CURRENT_BINARY_DIR})
2325
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)

‎mlir/examples/toy/Ch4/CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ add_toy_chapter(toyc-ch4
1515
mlir/Dialect.cpp
1616
mlir/ShapeInferencePass.cpp
1717
mlir/ToyCombine.cpp
18+
19+
DEPENDS
20+
ToyCh4OpsIncGen
21+
ToyCh4ShapeInferenceInterfaceIncGen
22+
ToyCh4CombineIncGen
23+
MLIRCallOpInterfacesIncGen
1824
)
1925

20-
add_dependencies(toyc-ch4 ToyCh4OpsIncGen)
21-
add_dependencies(toyc-ch4 ToyCh4ShapeInferenceInterfaceIncGen)
22-
add_dependencies(toyc-ch4 ToyCh4CombineIncGen)
23-
add_dependencies(toyc-ch4 MLIRCallOpInterfacesIncGen)
2426
include_directories(include/)
2527
include_directories(${CMAKE_CURRENT_BINARY_DIR})
2628
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)

‎mlir/examples/toy/Ch5/CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ add_toy_chapter(toyc-ch5
1616
mlir/LowerToAffineLoops.cpp
1717
mlir/ShapeInferencePass.cpp
1818
mlir/ToyCombine.cpp
19+
20+
DEPENDS
21+
ToyCh5ShapeInferenceInterfaceIncGen
22+
ToyCh5OpsIncGen
23+
ToyCh5CombineIncGen
24+
MLIRCallOpInterfacesIncGen
1925
)
2026

21-
add_dependencies(toyc-ch5 ToyCh5ShapeInferenceInterfaceIncGen)
22-
add_dependencies(toyc-ch5 ToyCh5OpsIncGen)
23-
add_dependencies(toyc-ch5 ToyCh5CombineIncGen)
24-
add_dependencies(toyc-ch5 MLIRCallOpInterfacesIncGen)
2527
include_directories(include/)
2628
include_directories(${CMAKE_CURRENT_BINARY_DIR})
2729
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)

‎mlir/examples/toy/Ch6/CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ add_toy_chapter(toyc-ch6
1818
mlir/LowerToLLVM.cpp
1919
mlir/ShapeInferencePass.cpp
2020
mlir/ToyCombine.cpp
21+
22+
DEPENDS
23+
ToyCh6ShapeInferenceInterfaceIncGen
24+
ToyCh6OpsIncGen
25+
ToyCh6CombineIncGen
26+
MLIRCallOpInterfacesIncGen
2127
)
2228

23-
add_dependencies(toyc-ch6 ToyCh6ShapeInferenceInterfaceIncGen)
24-
add_dependencies(toyc-ch6 ToyCh6OpsIncGen)
25-
add_dependencies(toyc-ch6 ToyCh6CombineIncGen)
26-
add_dependencies(toyc-ch6 MLIRCallOpInterfacesIncGen)
2729
include_directories(include/)
2830
include_directories(${CMAKE_CURRENT_BINARY_DIR})
2931
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)

‎mlir/examples/toy/Ch7/CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ add_toy_chapter(toyc-ch7
1818
mlir/LowerToLLVM.cpp
1919
mlir/ShapeInferencePass.cpp
2020
mlir/ToyCombine.cpp
21+
22+
DEPENDS
23+
ToyCh7ShapeInferenceInterfaceIncGen
24+
ToyCh7OpsIncGen
25+
ToyCh7CombineIncGen
26+
MLIRCallOpInterfacesIncGen
2127
)
2228

23-
add_dependencies(toyc-ch7 ToyCh7ShapeInferenceInterfaceIncGen)
24-
add_dependencies(toyc-ch7 ToyCh7OpsIncGen)
25-
add_dependencies(toyc-ch7 ToyCh7CombineIncGen)
26-
add_dependencies(toyc-ch7 MLIRCallOpInterfacesIncGen)
2729
include_directories(include/)
2830
include_directories(${CMAKE_CURRENT_BINARY_DIR})
2931
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)

‎mlir/lib/Analysis/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ add_llvm_library(MLIRAnalysis
2424

2525
ADDITIONAL_HEADER_DIRS
2626
${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
27-
)
28-
add_dependencies(MLIRAnalysis
27+
28+
DEPENDS
2929
MLIRCallOpInterfacesIncGen
3030
MLIRControlFlowInterfacesIncGen
3131
MLIRTypeInferOpInterfaceIncGen
@@ -46,8 +46,8 @@ add_llvm_library(MLIRLoopAnalysis
4646

4747
ADDITIONAL_HEADER_DIRS
4848
${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
49-
)
50-
add_dependencies(MLIRLoopAnalysis
49+
50+
DEPENDS
5151
MLIRCallOpInterfacesIncGen
5252
MLIRControlFlowInterfacesIncGen
5353
MLIRTypeInferOpInterfaceIncGen

‎mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ add_public_tablegen_target(MLIRGPUToNVVMIncGen)
44

55
add_mlir_conversion_library(MLIRGPUtoNVVMTransforms
66
LowerGpuOpsToNVVMOps.cpp
7-
)
87

9-
add_dependencies(MLIRGPUtoNVVMTransforms
10-
MLIRGPUToNVVMIncGen)
8+
DEPENDS
9+
MLIRGPUToNVVMIncGen
10+
)
1111

1212
target_link_libraries(MLIRGPUtoNVVMTransforms
1313
PUBLIC

‎mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ add_public_tablegen_target(MLIRGPUToSPIRVIncGen)
55
add_mlir_conversion_library(MLIRGPUtoSPIRVTransforms
66
ConvertGPUToSPIRV.cpp
77
ConvertGPUToSPIRVPass.cpp
8-
)
98

10-
add_dependencies(MLIRGPUtoSPIRVTransforms
11-
MLIRGPUToSPIRVIncGen)
9+
DEPENDS
10+
MLIRGPUToSPIRVIncGen
11+
)
1212

1313
target_link_libraries(MLIRGPUtoSPIRVTransforms
1414
PUBLIC

‎mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ add_mlir_conversion_library(MLIRStandardToSPIRVTransforms
1010
ADDITIONAL_HEADER_DIRS
1111
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
1212
${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
13-
)
1413

15-
add_dependencies(MLIRStandardToSPIRVTransforms
16-
MLIRStandardToSPIRVIncGen)
14+
DEPENDS
15+
MLIRStandardToSPIRVIncGen
16+
)
1717

1818
target_link_libraries(MLIRStandardToSPIRVTransforms
1919
PUBLIC

‎mlir/lib/Dialect/AffineOps/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ add_mlir_dialect_library(MLIRAffineOps
55

66
ADDITIONAL_HEADER_DIRS
77
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/AffineOps
8-
)
9-
add_dependencies(MLIRAffineOps
8+
9+
DEPENDS
1010
MLIRAffineOpsIncGen
1111
MLIRLoopLikeInterfaceIncGen
1212
)

‎mlir/lib/Dialect/FxpMathOps/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ add_mlir_dialect_library(MLIRFxpMathOps
44

55
ADDITIONAL_HEADER_DIRS
66
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/FxpMathOps
7+
8+
DEPENDS
9+
MLIRFxpMathOpsIncGen
710
)
811

912
target_link_libraries(MLIRFxpMathOps
@@ -14,6 +17,3 @@ target_link_libraries(MLIRFxpMathOps
1417
MLIRSupport
1518
MLIRStandardOps
1619
)
17-
add_dependencies(MLIRFxpMathOps
18-
MLIRFxpMathOpsIncGen
19-
)

‎mlir/lib/Dialect/GPU/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ add_mlir_dialect_library(MLIRGPU
77

88
ADDITIONAL_HEADER_DIRS
99
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/GPU
10-
)
11-
add_dependencies(MLIRGPU
10+
11+
DEPENDS
1212
MLIRGPUOpsIncGen
1313
)
1414
target_link_libraries(MLIRGPU
@@ -21,4 +21,5 @@ target_link_libraries(MLIRGPU
2121
MLIRStandardOps
2222
MLIRSupport
2323
MLIRTransformUtils
24-
LLVMSupport)
24+
LLVMSupport
25+
)

‎mlir/lib/Dialect/LLVMIR/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ add_mlir_dialect_library(MLIRLLVMIR
33

44
ADDITIONAL_HEADER_DIRS
55
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
6-
)
7-
add_dependencies(MLIRLLVMIR
6+
7+
DEPENDS
88
MLIRControlFlowInterfacesIncGen
99
MLIRLLVMOpsIncGen
1010
MLIRLLVMConversionsIncGen
@@ -25,8 +25,8 @@ add_mlir_dialect_library(MLIRNVVMIR
2525

2626
ADDITIONAL_HEADER_DIRS
2727
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
28-
)
29-
add_dependencies(MLIRNVVMIR
28+
29+
DEPENDS
3030
MLIRNVVMOpsIncGen
3131
MLIRNVVMConversionsIncGen
3232
)
@@ -44,8 +44,8 @@ add_mlir_dialect_library(MLIRROCDLIR
4444

4545
ADDITIONAL_HEADER_DIRS
4646
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
47-
)
48-
add_dependencies(MLIRROCDLIR
47+
48+
DEPENDS
4949
MLIRROCDLOpsIncGen
5050
MLIRROCDLConversionsIncGen
5151
)

‎mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ add_mlir_dialect_library(MLIRLinalgTransforms
77

88
ADDITIONAL_HEADER_DIRS
99
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
10+
1011
DEPENDS
1112
intrinsics_gen
12-
)
13-
14-
add_dependencies(MLIRLinalgTransforms
1513
MLIRLinalgTransformPatternsIncGen
1614
)
1715
target_link_libraries(MLIRLinalgTransforms

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ add_mlir_dialect_library(MLIRLoopOps
55

66
ADDITIONAL_HEADER_DIRS
77
${MLIR_MAIN_INCLUDE_DIR}/mlir/LoopOps
8-
)
9-
add_dependencies(MLIRLoopOps
8+
9+
DEPENDS
1010
MLIRLoopLikeInterfaceIncGen
1111
MLIRLoopOpsIncGen
1212
)

‎mlir/lib/Dialect/OpenMP/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ add_mlir_dialect_library(MLIROpenMP
33

44
ADDITIONAL_HEADER_DIRS
55
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/OpenMP
6-
)
76

8-
add_dependencies(MLIROpenMP MLIROpenMPOpsIncGen)
7+
DEPENDS
8+
MLIROpenMPOpsIncGen
9+
)
910
target_link_libraries(MLIROpenMP
1011
PUBLIC
11-
MLIRIR)
12+
MLIRIR
13+
)

‎mlir/lib/Dialect/QuantOps/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ add_mlir_dialect_library(MLIRQuantOps
1111

1212
ADDITIONAL_HEADER_DIRS
1313
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/QuantOps
14-
)
15-
add_dependencies(MLIRQuantOps
14+
15+
DEPENDS
1616
MLIRQuantOpsIncGen
1717
)
1818
target_link_libraries(MLIRQuantOps

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,23 @@ add_mlir_dialect_library(MLIRSPIRV
1313

1414
ADDITIONAL_HEADER_DIRS
1515
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
16-
)
1716

18-
add_dependencies(MLIRSPIRV
1917
MLIRControlFlowInterfacesIncGen
2018
MLIRSPIRVAvailabilityIncGen
2119
MLIRSPIRVCanonicalizationIncGen
2220
MLIRSPIRVEnumAvailabilityIncGen
2321
MLIRSPIRVEnumsIncGen
2422
MLIRSPIRVOpsIncGen
2523
MLIRSPIRVOpUtilsGen
26-
MLIRSPIRVTargetAndABIIncGen)
27-
24+
MLIRSPIRVTargetAndABIIncGen
25+
)
2826
target_link_libraries(MLIRSPIRV
2927
PUBLIC
3028
MLIRIR
3129
MLIRParser
3230
MLIRSupport
33-
MLIRTransforms)
31+
MLIRTransforms
32+
)
3433

3534
add_subdirectory(Serialization)
3635
add_subdirectory(Transforms)

‎mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ add_mlir_dialect_library(MLIRSPIRVSerialization
66

77
ADDITIONAL_HEADER_DIRS
88
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
9-
)
10-
11-
add_dependencies(MLIRSPIRVSerialization
12-
MLIRSPIRVSerializationGen)
139

10+
DEPENDS
11+
MLIRSPIRVSerializationGen
12+
)
1413
target_link_libraries(MLIRSPIRVSerialization
1514
PUBLIC
1615
MLIRIR
1716
MLIRSPIRV
1817
MLIRSupport
19-
MLIRTranslation)
18+
MLIRTranslation
19+
)

‎mlir/lib/Dialect/StandardOps/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ add_mlir_dialect_library(MLIRStandardOps
55

66
ADDITIONAL_HEADER_DIRS
77
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/StandardOps
8-
)
9-
add_dependencies(MLIRStandardOps
8+
9+
DEPENDS
1010
MLIRCallOpInterfacesIncGen
1111
MLIRControlFlowInterfacesIncGen
1212
MLIRStandardOpsIncGen

‎mlir/lib/Dialect/VectorOps/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@ add_mlir_dialect_library(MLIRVectorOps
66

77
ADDITIONAL_HEADER_DIRS
88
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/VectorOps
9-
)
10-
11-
add_dependencies(MLIRVectorOps MLIRVectorOpsIncGen)
12-
add_dependencies(MLIRVectorOps MLIRVectorTransformPatternsIncGen)
139

10+
DEPENDS
11+
MLIRVectorOpsIncGen
12+
MLIRVectorTransformPatternsIncGen
13+
)
1414
target_link_libraries(MLIRVectorOps
1515
PUBLIC
1616
MLIRIR
1717
MLIRStandardOps
1818
MLIRAffineOps
1919
MLIRLoopOps
20-
MLIRLoopAnalysis)
20+
MLIRLoopAnalysis
21+
)

‎mlir/lib/IR/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ add_llvm_library(MLIRIR
44

55
ADDITIONAL_HEADER_DIRS
66
${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
7-
)
8-
add_dependencies(MLIRIR
7+
8+
DEPENDS
99
MLIRCallOpInterfacesIncGen
1010
MLIROpAsmInterfacesIncGen
1111
)
1212
target_link_libraries(MLIRIR
1313
PUBLIC
1414
MLIRSupport
15-
LLVMSupport)
15+
LLVMSupport
16+
)

0 commit comments

Comments
 (0)