Skip to content

Commit 31e07d7

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 c4c8fbd commit 31e07d7

File tree

29 files changed

+130
-114
lines changed

29 files changed

+130
-114
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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ add_llvm_library(MLIRAnalysis
2323
ADDITIONAL_HEADER_DIRS
2424
${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
2525

26+
DEPENDS
27+
MLIRCallOpInterfacesIncGen
28+
MLIRTypeInferOpInterfaceIncGen
29+
2630
LINK_LIBS
2731
MLIRAffineOps
2832
MLIRIR
2933
MLIRLoopOps
3034
MLIRSupport
3135
LLVMSupport
3236
)
33-
add_dependencies(MLIRAnalysis
34-
MLIRCallOpInterfacesIncGen
35-
MLIRTypeInferOpInterfaceIncGen
36-
)
3737

3838
add_llvm_library(MLIRLoopAnalysis
3939
AffineAnalysis.cpp
@@ -45,6 +45,10 @@ add_llvm_library(MLIRLoopAnalysis
4545
ADDITIONAL_HEADER_DIRS
4646
${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
4747

48+
DEPENDS
49+
MLIRCallOpInterfacesIncGen
50+
MLIRTypeInferOpInterfaceIncGen
51+
4852
LINK_LIBS
4953
MLIRAffineOps
5054
MLIRIR
@@ -53,7 +57,3 @@ add_llvm_library(MLIRLoopAnalysis
5357
MLIRSupport
5458
LLVMSupport
5559
)
56-
add_dependencies(MLIRLoopAnalysis
57-
MLIRCallOpInterfacesIncGen
58-
MLIRTypeInferOpInterfaceIncGen
59-
)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ add_public_tablegen_target(MLIRGPUToNVVMIncGen)
55
add_mlir_conversion_library(MLIRGPUtoNVVMTransforms
66
LowerGpuOpsToNVVMOps.cpp
77

8+
DEPENDS
9+
MLIRGPUToNVVMIncGen
10+
811
LINK_LIBS
912
LLVMCore
1013
LLVMSupport
@@ -19,6 +22,3 @@ add_mlir_conversion_library(MLIRGPUtoNVVMTransforms
1922
MLIRTransforms
2023
MLIRTransformUtils
2124
)
22-
23-
add_dependencies(MLIRGPUtoNVVMTransforms
24-
MLIRGPUToNVVMIncGen)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ add_mlir_conversion_library(MLIRGPUtoSPIRVTransforms
66
ConvertGPUToSPIRV.cpp
77
ConvertGPUToSPIRVPass.cpp
88

9+
DEPENDS
10+
MLIRGPUToSPIRVIncGen
11+
912
LINK_LIBS
1013
MLIRGPU
1114
MLIRIR
@@ -18,6 +21,3 @@ add_mlir_conversion_library(MLIRGPUtoSPIRVTransforms
1821
MLIRTransforms
1922
LLVMSupport
2023
)
21-
22-
add_dependencies(MLIRGPUtoSPIRVTransforms
23-
MLIRGPUToSPIRVIncGen)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ add_mlir_conversion_library(MLIRStandardToSPIRVTransforms
1111
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
1212
${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
1313

14+
DEPENDS
15+
MLIRStandardToSPIRVIncGen
16+
1417
LINK_LIBS
1518
MLIRIR
1619
MLIRPass
@@ -22,6 +25,3 @@ add_mlir_conversion_library(MLIRStandardToSPIRVTransforms
2225
MLIRStandardOps
2326
LLVMSupport
2427
)
25-
26-
add_dependencies(MLIRStandardToSPIRVTransforms
27-
MLIRStandardToSPIRVIncGen)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ add_mlir_dialect_library(MLIRAffineOps
66
ADDITIONAL_HEADER_DIRS
77
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/AffineOps
88

9+
DEPENDS
10+
MLIRAffineOpsIncGen
11+
MLIRLoopLikeInterfaceIncGen
12+
913
LINK_LIBS
1014
MLIREDSC
1115
MLIRIR
1216
MLIRStandardOps
1317
LLVMSupport
1418
)
15-
add_dependencies(MLIRAffineOps
16-
MLIRAffineOpsIncGen
17-
MLIRLoopLikeInterfaceIncGen
18-
)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ add_mlir_dialect_library(MLIRFxpMathOps
55
ADDITIONAL_HEADER_DIRS
66
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/FxpMathOps
77

8+
DEPENDS
9+
MLIRFxpMathOpsIncGen
10+
811
LINK_LIBS
912
MLIRQuantOps
1013
MLIRIR
@@ -15,6 +18,3 @@ add_mlir_dialect_library(MLIRFxpMathOps
1518
MLIRTransformUtils
1619
LLVMSupport
1720
)
18-
add_dependencies(MLIRFxpMathOps
19-
MLIRFxpMathOpsIncGen
20-
)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ add_mlir_dialect_library(MLIRGPU
88
ADDITIONAL_HEADER_DIRS
99
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/GPU
1010

11+
DEPENDS
12+
MLIRGPUOpsIncGen
13+
1114
LINK_LIBS
1215
MLIREDSC
1316
MLIRIR
@@ -19,6 +22,3 @@ add_mlir_dialect_library(MLIRGPU
1922
MLIRTransformUtils
2023
LLVMSupport
2124
)
22-
add_dependencies(MLIRGPU
23-
MLIRGPUOpsIncGen
24-
)

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

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,51 +4,49 @@ add_mlir_dialect_library(MLIRLLVMIR
44
ADDITIONAL_HEADER_DIRS
55
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
66

7+
DEPENDS
8+
MLIRLLVMOpsIncGen
9+
MLIRLLVMConversionsIncGen
10+
711
LINK_LIBS
812
LLVMAsmParser
913
LLVMCore
1014
LLVMSupport
1115
MLIRIR
1216
MLIRSupport
1317
)
14-
add_dependencies(MLIRLLVMIR
15-
MLIRLLVMOpsIncGen
16-
MLIRLLVMConversionsIncGen
17-
)
1818

1919
add_mlir_dialect_library(MLIRNVVMIR
2020
IR/NVVMDialect.cpp
2121

2222
ADDITIONAL_HEADER_DIRS
2323
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
2424

25+
DEPENDS
26+
MLIRNVVMOpsIncGen
27+
MLIRNVVMConversionsIncGen
28+
2529
LINK_LIBS
2630
LLVMAsmParser
2731
MLIRIR
2832
MLIRLLVMIR
2933
LLVMSupport
3034
LLVMCore
3135
)
32-
add_dependencies(MLIRNVVMIR
33-
MLIRNVVMOpsIncGen
34-
MLIRNVVMConversionsIncGen
35-
)
36-
37-
3836

3937
add_mlir_dialect_library(MLIRROCDLIR
4038
IR/ROCDLDialect.cpp
4139

4240
ADDITIONAL_HEADER_DIRS
4341
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
4442

43+
DEPENDS
44+
MLIRROCDLOpsIncGen
45+
MLIRROCDLConversionsIncGen
46+
4547
LINK_LIBS
4648
LLVMAsmParser
4749
LLVMCore
4850
LLVMSupport
4951
MLIRIR
5052
)
51-
add_dependencies(MLIRROCDLIR
52-
MLIRROCDLOpsIncGen
53-
MLIRROCDLConversionsIncGen
54-
)

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

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

88
ADDITIONAL_HEADER_DIRS
99
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
10+
1011
DEPENDS
1112
intrinsics_gen
13+
MLIRLinalgTransformPatternsIncGen
1214

1315
LINK_LIBS
1416
MLIRAffineOps
@@ -27,6 +29,3 @@ add_mlir_dialect_library(MLIRLinalgTransforms
2729
MLIRVectorOps
2830
LLVMSupport
2931
)
30-
add_dependencies(MLIRLinalgTransforms
31-
MLIRLinalgTransformPatternsIncGen
32-
)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ add_mlir_dialect_library(MLIRLoopOps
66
ADDITIONAL_HEADER_DIRS
77
${MLIR_MAIN_INCLUDE_DIR}/mlir/LoopOps
88

9+
DEPENDS
10+
MLIRLoopLikeInterfaceIncGen
11+
MLIRLoopOpsIncGen
12+
913
LINK_LIBS
1014
MLIREDSC
1115
MLIRIR
1216
MLIRStandardOps
1317
LLVMSupport
1418
)
15-
add_dependencies(MLIRLoopOps
16-
MLIRLoopLikeInterfaceIncGen
17-
MLIRLoopOpsIncGen
18-
)
1919

2020
add_subdirectory(Transforms)

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ add_mlir_dialect_library(MLIROpenMP
44
ADDITIONAL_HEADER_DIRS
55
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/OpenMP
66

7+
DEPENDS
8+
MLIROpenMPOpsIncGen
9+
710
LINK_LIBS
811
MLIRIR
912
LLVMCore
1013
LLVMSupport
1114
)
12-
13-
add_dependencies(MLIROpenMP MLIROpenMPOpsIncGen)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ add_mlir_dialect_library(MLIRQuantOps
1212
ADDITIONAL_HEADER_DIRS
1313
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/QuantOps
1414

15+
DEPENDS
16+
MLIRQuantOpsIncGen
17+
1518
LINK_LIBS
1619
MLIRIR
1720
MLIRPass
@@ -20,6 +23,3 @@ add_mlir_dialect_library(MLIRQuantOps
2023
MLIRTransformUtils
2124
LLVMSupport
2225
)
23-
add_dependencies(MLIRQuantOps
24-
MLIRQuantOpsIncGen
25-
)

0 commit comments

Comments
 (0)