Skip to content

Commit a20a998

Browse files
committed
split libs
1 parent 6959f31 commit a20a998

File tree

19 files changed

+73
-38
lines changed

19 files changed

+73
-38
lines changed

clang/tools/cir-lsp-server/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@ set(LIBS
55
${test_libs}
66
clangCIR
77
clangCIRLoweringDirectToLLVM
8-
MLIRCIR
98
MLIRAffineAnalysis
109
MLIRAnalysis
10+
MLIRCIR
1111
MLIRDialect
12+
MLIRIR
1213
MLIRLspServerLib
1314
MLIRParser
1415
MLIRPass
15-
MLIRTransforms
16-
MLIRTransformUtils
16+
MLIRRegisterAllDialects
17+
MLIRRegisterAllPasses
1718
MLIRSupport
18-
MLIRIR
19-
MLIRRegisterEverything
19+
MLIRTransformUtils
20+
MLIRTransforms
2021
)
2122

2223
add_mlir_tool(cir-lsp-server

flang/lib/Optimizer/Support/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ add_flang_library(FIRSupport
2121

2222
MLIR_LIBS
2323
MLIRBuiltinToLLVMIRTranslation
24+
MLIRLLVMToLLVMIRTranslation
2425
MLIROpenACCToLLVMIRTranslation
2526
MLIROpenMPToLLVMIRTranslation
26-
MLIRLLVMToLLVMIRTranslation
27+
MLIRRegisterAllDialects
28+
MLIRRegisterAllExtensions
2729
MLIRTargetLLVMIRExport
2830
MLIRTargetLLVMIRImport
29-
MLIRRegisterEverything
3031
)

mlir/examples/standalone/standalone-opt/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
set(LIBS
2-
MLIRArithDialect
3-
MLIROptLib
4-
MLIRStandalone
5-
MLIRRegisterEverything
6-
)
2+
MLIRArithDialect
3+
MLIROptLib
4+
MLIRRegisterAllDialects
5+
MLIRRegisterAllPasses
6+
MLIRStandalone
7+
)
78
add_llvm_executable(standalone-opt standalone-opt.cpp)
89

910
llvm_update_compile_flags(standalone-opt)

mlir/examples/toy/Ch5/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,16 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
2929
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
3030
target_link_libraries(toyc-ch5
3131
PRIVATE
32-
MLIRRegisterEverything
3332
MLIRAnalysis
3433
MLIRCallInterfaces
3534
MLIRCastInterfaces
3635
MLIRFunctionInterfaces
3736
MLIRIR
3837
MLIRParser
3938
MLIRPass
39+
MLIRRegisterAllDialects
40+
MLIRRegisterAllExtensions
4041
MLIRSideEffectInterfaces
4142
MLIRSupport
42-
MLIRTransforms)
43+
MLIRTransforms
44+
)

mlir/examples/toy/Ch6/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
3939
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
4040
target_link_libraries(toyc-ch6
4141
PRIVATE
42-
MLIRRegisterEverything
4342
MLIRAnalysis
4443
MLIRBuiltinToLLVMIRTranslation
4544
MLIRCallInterfaces
@@ -53,8 +52,11 @@ target_link_libraries(toyc-ch6
5352
MLIRMemRefDialect
5453
MLIRParser
5554
MLIRPass
55+
MLIRRegisterAllDialects
56+
MLIRRegisterAllExtensions
57+
MLIRRegisterAllPasses
5658
MLIRSideEffectInterfaces
5759
MLIRSupport
5860
MLIRTargetLLVMIRExport
5961
MLIRTransforms
60-
)
62+
)

mlir/examples/toy/Ch7/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
3838
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
3939
target_link_libraries(toyc-ch7
4040
PRIVATE
41-
MLIRRegisterEverything
4241
MLIRAnalysis
4342
MLIRBuiltinToLLVMIRTranslation
4443
MLIRCallInterfaces
@@ -51,7 +50,10 @@ target_link_libraries(toyc-ch7
5150
MLIRMemRefDialect
5251
MLIRParser
5352
MLIRPass
53+
MLIRRegisterAllDialects
54+
MLIRRegisterAllExtensions
55+
MLIRRegisterAllPasses
5456
MLIRSideEffectInterfaces
5557
MLIRTargetLLVMIRExport
5658
MLIRTransforms
57-
)
59+
)

mlir/examples/transform-opt/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ set(LIBS
22
MLIRAnalysis
33
MLIRIR
44
MLIRParser
5+
MLIRRegisterAllDialects
6+
MLIRRegisterAllExtensions
7+
MLIRRegisterAllPasses
58
MLIRSupport
69
MLIRTransformDialect
710
MLIRTransformDialectTransforms
811
MLIRTransforms
9-
MLIRRegisterEverything
1012
)
1113

1214
add_mlir_tool(mlir-transform-opt

mlir/lib/CAPI/RegisterEverything/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ add_mlir_upstream_c_api_library(MLIRCAPIRegisterEverything
88

99
MLIRBuiltinToLLVMIRTranslation
1010
MLIRCAPIIR
11-
MLIRLLVMToLLVMIRTranslation
1211
MLIRCAPITransforms
13-
MLIRRegisterEverything
12+
MLIRLLVMToLLVMIRTranslation
13+
MLIRRegisterAllDialects
14+
MLIRRegisterAllExtensions
15+
MLIRRegisterAllPasses
1416
)

mlir/lib/CMakeLists.txt

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,30 @@ get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
2525
get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)
2626
get_property(extension_libs GLOBAL PROPERTY MLIR_EXTENSION_LIBS)
2727

28-
add_mlir_library(MLIRRegisterEverything
29-
InitAllDialects.cpp
30-
InitAllExtensions.cpp
31-
InitAllPasses.cpp
28+
add_mlir_library(MLIRRegisterAllDialects
29+
RegisterAllDialects.cpp
30+
31+
PARTIAL_SOURCES_INTENDED
3232

3333
LINK_LIBS PUBLIC
3434
${dialect_libs}
35+
)
36+
37+
add_mlir_library(MLIRRegisterAllPasses
38+
RegisterAllPasses.cpp
39+
40+
PARTIAL_SOURCES_INTENDED
41+
42+
LINK_LIBS PUBLIC
43+
${dialect_libs} # Some passes are part of the dialect libs
3544
${conversion_libs}
45+
)
46+
47+
add_mlir_library(MLIRRegisterAllExtensions
48+
RegisterAllExtensions.cpp
49+
50+
PARTIAL_SOURCES_INTENDED
51+
52+
LINK_LIBS PUBLIC
3653
${extension_libs}
3754
)

mlir/lib/InitAllDialects.cpp renamed to mlir/lib/RegisterAllDialects.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===- InitAllDialects.cpp - MLIR Dialects Registration ---------*- C++ -*-===//
1+
//===- RegisterAllDialects.cpp - MLIR Dialects Registration -----*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

0 commit comments

Comments
 (0)