Skip to content

Commit fed2acc

Browse files
stephenneuendorfferstephenneuendorffer
committed
Revert "[MLIR] Remove redundant library dependencies"
This reverts commit e1cb15c.
1 parent 4383079 commit fed2acc

File tree

24 files changed

+165
-68
lines changed

24 files changed

+165
-68
lines changed

‎mlir/lib/Analysis/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ add_llvm_library(MLIRAnalysis
3131
LLVMSupport
3232
)
3333
add_dependencies(MLIRAnalysis
34+
MLIRAffineOps
3435
MLIRCallOpInterfacesIncGen
3536
MLIRTypeInferOpInterfaceIncGen
37+
MLIRLoopOps
3638
)
3739

3840
add_llvm_library(MLIRLoopAnalysis
@@ -54,6 +56,8 @@ add_llvm_library(MLIRLoopAnalysis
5456
LLVMSupport
5557
)
5658
add_dependencies(MLIRLoopAnalysis
59+
MLIRAffineOps
5760
MLIRCallOpInterfacesIncGen
5861
MLIRTypeInferOpInterfaceIncGen
62+
MLIRLoopOps
5963
)

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,12 @@ add_mlir_conversion_library(MLIRAffineToStandard
1414
LLVMCore
1515
LLVMSupport
1616
)
17+
add_dependencies(
18+
MLIRAffineToStandard
19+
20+
MLIRAffineOps
21+
MLIRStandardOps
22+
MLIRIR
23+
LLVMCore
24+
LLVMSupport
25+
)

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,11 @@ add_mlir_conversion_library(MLIRLoopToStandard
1313
LLVMCore
1414
LLVMSupport
1515
)
16+
add_dependencies(
17+
MLIRLoopToStandard
18+
19+
MLIRLoopOps
20+
MLIRTransforms
21+
LLVMCore
22+
LLVMSupport
23+
)

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
add_mlir_conversion_library(MLIRLoopsToGPU
2-
LoopsToGPU.cpp
3-
LoopsToGPUPass.cpp
4-
5-
ADDITIONAL_HEADER_DIRS
6-
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LoopsToGPU
7-
8-
LINK_LIBS
1+
set(LIBS
92
MLIRAffineOps
103
MLIRAffineToStandard
114
MLIRGPU
@@ -18,4 +11,16 @@ add_mlir_conversion_library(MLIRLoopsToGPU
1811
MLIRTransforms
1912
MLIRTransformUtils
2013
LLVMSupport
14+
)
15+
16+
add_mlir_conversion_library(MLIRLoopsToGPU
17+
LoopsToGPU.cpp
18+
LoopsToGPUPass.cpp
19+
20+
ADDITIONAL_HEADER_DIRS
21+
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LoopsToGPU
22+
23+
LINK_LIBS
24+
${LIBS}
2125
)
26+
add_dependencies(MLIRLoopsToGPU ${LIBS})

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,11 @@ add_mlir_conversion_library(MLIRStandardToLLVM
1313
LLVMCore
1414
LLVMSupport
1515
)
16+
add_dependencies(
17+
MLIRStandardToLLVM
18+
19+
MLIRLLVMIR
20+
MLIRTransforms
21+
LLVMCore
22+
LLVMSupport
23+
)

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ add_mlir_dialect_library(MLIRAffineOps
1313
LLVMSupport
1414
)
1515
add_dependencies(MLIRAffineOps
16+
1617
MLIRAffineOpsIncGen
18+
MLIREDSC
19+
MLIRIR
1720
MLIRLoopLikeInterfaceIncGen
21+
MLIRStandardOps
1822
)

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,9 @@ add_mlir_dialect_library(MLIRFxpMathOps
1616
LLVMSupport
1717
)
1818
add_dependencies(MLIRFxpMathOps
19-
MLIRFxpMathOpsIncGen
20-
)
19+
MLIRFxpMathOpsIncGen
20+
MLIRQuantOps
21+
MLIRIR
22+
MLIRPass
23+
MLIRSupport
24+
MLIRStandardOps)

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,10 @@ add_mlir_dialect_library(MLIRGPU
2121
)
2222
add_dependencies(MLIRGPU
2323
MLIRGPUOpsIncGen
24-
)
24+
MLIREDSC
25+
MLIRIR
26+
MLIRLLVMIR
27+
MLIRLoopOps
28+
MLIRSupport
29+
MLIRTransformUtils
30+
LLVMSupport)

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ add_mlir_dialect_library(MLIRLLVMIR
1111
MLIRIR
1212
MLIRSupport
1313
)
14-
add_dependencies(MLIRLLVMIR
15-
MLIRLLVMOpsIncGen
16-
MLIRLLVMConversionsIncGen
17-
)
14+
add_dependencies(MLIRLLVMIR MLIRLLVMOpsIncGen MLIRLLVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)
1815

1916
add_mlir_dialect_library(MLIRNVVMIR
2017
IR/NVVMDialect.cpp
@@ -29,11 +26,7 @@ add_mlir_dialect_library(MLIRNVVMIR
2926
LLVMSupport
3027
LLVMCore
3128
)
32-
add_dependencies(MLIRNVVMIR
33-
MLIRNVVMOpsIncGen
34-
MLIRNVVMConversionsIncGen
35-
)
36-
29+
add_dependencies(MLIRNVVMIR MLIRNVVMOpsIncGen MLIRNVVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)
3730

3831

3932
add_mlir_dialect_library(MLIRROCDLIR
@@ -48,7 +41,4 @@ add_mlir_dialect_library(MLIRROCDLIR
4841
LLVMSupport
4942
MLIRIR
5043
)
51-
add_dependencies(MLIRROCDLIR
52-
MLIRROCDLOpsIncGen
53-
MLIRROCDLConversionsIncGen
54-
)
44+
add_dependencies(MLIRROCDLIR MLIRROCDLOpsIncGen MLIRROCDLConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1+
set(LIBS
2+
MLIRIR
3+
MLIRLinalgOps
4+
MLIRStandardOps
5+
LLVMSupport
6+
)
7+
8+
19
add_mlir_dialect_library(MLIRLinalgAnalysis
210
DependenceAnalysis.cpp
311

412
ADDITIONAL_HEADER_DIRS
513
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
6-
714
DEPENDS
815
intrinsics_gen
916

1017
LINK_LIBS
11-
MLIRIR
12-
MLIRLinalgOps
13-
MLIRStandardOps
14-
LLVMSupport
18+
${LIBS}
1519
)
20+
21+
add_dependencies(MLIRLinalgAnalysis ${LIBS})

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
1+
set(LIBS
2+
3+
MLIREDSC
4+
MLIRIR
5+
MLIRAffineOps
6+
MLIRLinalgOps
7+
MLIRLoopOps
8+
MLIRStandardOps
9+
LLVMSupport
10+
)
11+
112
add_mlir_dialect_library(MLIRLinalgEDSC
213
Builders.cpp
314

415
ADDITIONAL_HEADER_DIRS
516
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
6-
717
DEPENDS
818
intrinsics_gen
919

1020
LINK_LIBS
11-
MLIREDSC
12-
MLIRIR
13-
MLIRAffineOps
14-
MLIRLinalgOps
15-
MLIRLoopOps
16-
MLIRStandardOps
17-
LLVMSupport
21+
${LIBS}
1822
)
23+
24+
add_dependencies(MLIRLinalgEDSC ${LIBS})

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1+
set(LIBS
2+
MLIRIR
3+
MLIRStandardOps
4+
MLIRSupport
5+
LLVMSupport
6+
)
7+
18
add_mlir_dialect_library(MLIRLinalgOps
29
LinalgOps.cpp
310
LinalgTypes.cpp
411

512
ADDITIONAL_HEADER_DIRS
613
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
7-
814
DEPENDS
915
intrinsics_gen
1016

@@ -14,7 +20,10 @@ add_mlir_dialect_library(MLIRLinalgOps
1420
MLIRSupport
1521
LLVMSupport
1622
)
23+
1724
add_dependencies(MLIRLinalgOps
25+
26+
${LIBS}
1827
MLIRLinalgOpsIncGen
1928
MLIRLinalgStructuredOpsIncGen
2029
MLIRLinalgStructuredOpsInterfaceIncGen

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

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
add_mlir_dialect_library(MLIRLinalgTransforms
2-
Fusion.cpp
3-
LinalgTransforms.cpp
4-
LinalgToLoops.cpp
5-
Promotion.cpp
6-
Tiling.cpp
1+
set(LIBS
72

8-
ADDITIONAL_HEADER_DIRS
9-
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
10-
DEPENDS
11-
intrinsics_gen
12-
13-
LINK_LIBS
143
MLIRAffineOps
154
MLIRAnalysis
165
MLIREDSC
@@ -27,6 +16,25 @@ add_mlir_dialect_library(MLIRLinalgTransforms
2716
MLIRVectorOps
2817
LLVMSupport
2918
)
19+
20+
add_mlir_dialect_library(MLIRLinalgTransforms
21+
Fusion.cpp
22+
LinalgTransforms.cpp
23+
LinalgToLoops.cpp
24+
Promotion.cpp
25+
Tiling.cpp
26+
27+
ADDITIONAL_HEADER_DIRS
28+
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
29+
DEPENDS
30+
intrinsics_gen
31+
32+
LINK_LIBS
33+
${LIBS}
34+
)
35+
3036
add_dependencies(MLIRLinalgTransforms
37+
38+
${LIBS}
3139
MLIRLinalgTransformPatternsIncGen
3240
)

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

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
add_mlir_dialect_library(MLIRLinalgUtils
2-
Utils.cpp
3-
4-
ADDITIONAL_HEADER_DIRS
5-
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
6-
7-
DEPENDS
8-
intrinsics_gen
9-
10-
LINK_LIBS
1+
set(LIBS
112
MLIRAffineOps
123
MLIREDSC
134
MLIRIR
@@ -18,3 +9,17 @@ add_mlir_dialect_library(MLIRLinalgUtils
189
MLIRTransformUtils
1910
LLVMSupport
2011
)
12+
13+
add_mlir_dialect_library(MLIRLinalgUtils
14+
15+
Utils.cpp
16+
17+
ADDITIONAL_HEADER_DIRS
18+
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
19+
DEPENDS
20+
intrinsics_gen
21+
22+
LINK_LIBS
23+
${LIBS})
24+
25+
add_dependencies(MLIRLinalgUtils ${LIBS})

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@ add_mlir_dialect_library(MLIRLoopOps
1313
LLVMSupport
1414
)
1515
add_dependencies(MLIRLoopOps
16+
17+
MLIREDSC
1618
MLIRLoopLikeInterfaceIncGen
1719
MLIRLoopOpsIncGen
20+
MLIRStandardOps
21+
LLVMSupport
1822
)
1923

2024
add_subdirectory(Transforms)

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@ add_mlir_dialect_library(MLIRQuantOps
2121
LLVMSupport
2222
)
2323
add_dependencies(MLIRQuantOps
24-
MLIRQuantOpsIncGen
25-
)
24+
MLIRIR
25+
MLIRPass
26+
MLIRQuantOpsIncGen
27+
MLIRSupport
28+
MLIRStandardOps)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ add_mlir_dialect_library(MLIRSDBM
1010
MLIRSupport
1111
LLVMSupport
1212
)
13+
add_dependencies(MLIRSDBM MLIRIR)

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ add_mlir_dialect_library(MLIRStandardOps
1414
LLVMSupport
1515
)
1616
add_dependencies(MLIRStandardOps
17+
1718
MLIRCallOpInterfacesIncGen
19+
MLIREDSC
20+
MLIRIR
1821
MLIRStandardOpsIncGen
22+
LLVMSupport
1923
)

‎mlir/lib/EDSC/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ add_llvm_library(MLIREDSCInterface
2727
MLIRParser
2828
LLVMSupport
2929
)
30+
add_dependencies(MLIREDSCInterface MLIRIR)

‎mlir/lib/IR/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,4 @@ add_llvm_library(MLIRIR
1010
LLVMSupport
1111
${LLVM_PTHREAD_LIB}
1212
)
13-
add_dependencies(MLIRIR
14-
MLIRCallOpInterfacesIncGen
15-
MLIROpAsmInterfacesIncGen
16-
)
13+
add_dependencies(MLIRIR MLIRCallOpInterfacesIncGen MLIROpAsmInterfacesIncGen MLIRSupport LLVMSupport)

‎mlir/lib/Parser/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ add_llvm_library(MLIRParser
1111
MLIRAnalysis
1212
LLVMSupport
1313
)
14+
add_dependencies(MLIRParser MLIRIR MLIRAnalysis)

‎mlir/lib/Pass/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ add_llvm_library(MLIRPass
1212
LLVMIRReader
1313
LLVMSupport
1414
)
15+
add_dependencies(MLIRPass MLIRAnalysis MLIRIR LLVMSupport)

0 commit comments

Comments
 (0)