Skip to content

Commit 7057eee

Browse files
joker-ephjoker-eph
authored
Revert "[mlir][core] Move InitAll*** implementation into static library." (#151118)
Reverts #150805 Some bots are failing.
1 parent ace42cf commit 7057eee

File tree

31 files changed

+480
-531
lines changed

31 files changed

+480
-531
lines changed

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
1+
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
2+
get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)
3+
14
include_directories(${LLVM_MAIN_SRC_DIR}/../mlir/include)
25
include_directories(${CMAKE_BINARY_DIR}/tools/mlir/include)
36

47
set(LIBS
8+
${dialect_libs}
9+
${conversion_libs}
510
${test_libs}
611
clangCIR
712
clangCIRLoweringDirectToLLVM
13+
MLIRCIR
814
MLIRAffineAnalysis
915
MLIRAnalysis
10-
MLIRCIR
1116
MLIRDialect
12-
MLIRIR
1317
MLIRLspServerLib
1418
MLIRParser
1519
MLIRPass
16-
MLIRRegisterAllDialects
17-
MLIRRegisterAllPasses
18-
MLIRSupport
19-
MLIRTransformUtils
2020
MLIRTransforms
21+
MLIRTransformUtils
22+
MLIRSupport
23+
MLIRIR
2124
)
2225

2326
add_mlir_tool(cir-lsp-server

‎clang/tools/cir-opt/cir-opt.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717
#include "mlir/Dialect/Func/IR/FuncOps.h"
1818
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
1919
#include "mlir/Dialect/MemRef/IR/MemRef.h"
20-
#include "mlir/IR/BuiltinDialect.h"
20+
#include "mlir/InitAllPasses.h"
2121
#include "mlir/Pass/PassManager.h"
2222
#include "mlir/Pass/PassOptions.h"
2323
#include "mlir/Pass/PassRegistry.h"
2424
#include "mlir/Tools/mlir-opt/MlirOptMain.h"
25-
#include "mlir/Transforms/Passes.h"
2625
#include "clang/CIR/Dialect/IR/CIRDialect.h"
2726
#include "clang/CIR/Dialect/Passes.h"
2827
#include "clang/CIR/Passes.h"

‎flang/include/flang/Optimizer/Support/InitFIR.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,12 @@
2020
#include "flang/Optimizer/OpenACC/Support/RegisterOpenACCExtensions.h"
2121
#include "flang/Optimizer/OpenMP/Support/RegisterOpenMPExtensions.h"
2222
#include "mlir/Conversion/Passes.h"
23-
#include "mlir/Dialect/Affine/IR/AffineOps.h"
2423
#include "mlir/Dialect/Affine/Passes.h"
2524
#include "mlir/Dialect/Complex/IR/Complex.h"
26-
#include "mlir/Dialect/ControlFlow/IR/ControlFlow.h"
27-
#include "mlir/Dialect/DLTI/DLTI.h"
2825
#include "mlir/Dialect/Func/Extensions/InlinerExtension.h"
29-
#include "mlir/Dialect/Func/IR/FuncOps.h"
3026
#include "mlir/Dialect/Index/IR/IndexDialect.h"
3127
#include "mlir/Dialect/LLVMIR/NVVMDialect.h"
32-
#include "mlir/Dialect/LLVMIR/Transforms/InlinerInterfaceImpl.h"
33-
#include "mlir/Dialect/Math/IR/Math.h"
34-
#include "mlir/Dialect/OpenACC/OpenACC.h"
3528
#include "mlir/Dialect/OpenACC/Transforms/Passes.h"
36-
#include "mlir/Dialect/SCF/IR/SCF.h"
3729
#include "mlir/Dialect/SCF/Transforms/Passes.h"
3830
#include "mlir/InitAllDialects.h"
3931
#include "mlir/Pass/Pass.h"

‎flang/lib/Optimizer/Support/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
2+
get_property(extension_libs GLOBAL PROPERTY MLIR_EXTENSION_LIBS)
3+
14
add_flang_library(FIRSupport
25
DataLayout.cpp
36
InitFIR.cpp
@@ -20,12 +23,12 @@ add_flang_library(FIRSupport
2023
${extension_libs}
2124

2225
MLIR_LIBS
26+
${dialect_libs}
27+
${extension_libs}
2328
MLIRBuiltinToLLVMIRTranslation
24-
MLIRLLVMToLLVMIRTranslation
2529
MLIROpenACCToLLVMIRTranslation
2630
MLIROpenMPToLLVMIRTranslation
27-
MLIRRegisterAllDialects
28-
MLIRRegisterAllExtensions
31+
MLIRLLVMToLLVMIRTranslation
2932
MLIRTargetLLVMIRExport
3033
MLIRTargetLLVMIRImport
3134
)

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
2+
get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)
13
set(LIBS
2-
MLIRArithDialect
3-
MLIROptLib
4-
MLIRRegisterAllDialects
5-
MLIRRegisterAllPasses
6-
MLIRStandalone
7-
)
4+
${dialect_libs}
5+
${conversion_libs}
6+
MLIRArithDialect
7+
MLIROptLib
8+
MLIRStandalone
9+
)
810
add_llvm_executable(standalone-opt standalone-opt.cpp)
911

1012
llvm_update_compile_flags(standalone-opt)

‎mlir/examples/standalone/standalone-opt/standalone-opt.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "mlir/Dialect/Arith/IR/Arith.h"
10-
#include "mlir/Dialect/Func/IR/FuncOps.h"
119
#include "mlir/IR/MLIRContext.h"
1210
#include "mlir/InitAllDialects.h"
1311
#include "mlir/InitAllPasses.h"

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@ add_toy_chapter(toyc-ch5
2727

2828
include_directories(${CMAKE_CURRENT_BINARY_DIR})
2929
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
30+
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
31+
get_property(extension_libs GLOBAL PROPERTY MLIR_EXTENSION_LIBS)
3032
target_link_libraries(toyc-ch5
3133
PRIVATE
34+
${dialect_libs}
35+
${extension_libs}
3236
MLIRAnalysis
3337
MLIRCallInterfaces
3438
MLIRCastInterfaces
3539
MLIRFunctionInterfaces
3640
MLIRIR
3741
MLIRParser
3842
MLIRPass
39-
MLIRRegisterAllDialects
40-
MLIRRegisterAllExtensions
4143
MLIRSideEffectInterfaces
4244
MLIRSupport
43-
MLIRTransforms
44-
)
45+
MLIRTransforms)

‎mlir/examples/toy/Ch5/toyc.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#include "mlir/Dialect/Func/Extensions/AllExtensions.h"
14-
#include "mlir/Dialect/Func/IR/FuncOps.h"
1514
#include "mlir/IR/Diagnostics.h"
1615
#include "toy/AST.h"
1716
#include "toy/Dialect.h"

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,14 @@ add_toy_chapter(toyc-ch6
3737

3838
include_directories(${CMAKE_CURRENT_BINARY_DIR})
3939
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
40+
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
41+
get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)
42+
get_property(extension_libs GLOBAL PROPERTY MLIR_EXTENSION_LIBS)
4043
target_link_libraries(toyc-ch6
4144
PRIVATE
45+
${dialect_libs}
46+
${conversion_libs}
47+
${extension_libs}
4248
MLIRAnalysis
4349
MLIRBuiltinToLLVMIRTranslation
4450
MLIRCallInterfaces
@@ -52,11 +58,8 @@ target_link_libraries(toyc-ch6
5258
MLIRMemRefDialect
5359
MLIRParser
5460
MLIRPass
55-
MLIRRegisterAllDialects
56-
MLIRRegisterAllExtensions
57-
MLIRRegisterAllPasses
5861
MLIRSideEffectInterfaces
5962
MLIRSupport
6063
MLIRTargetLLVMIRExport
6164
MLIRTransforms
62-
)
65+
)

‎mlir/examples/toy/Ch6/toyc.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#include "mlir/Dialect/Func/Extensions/AllExtensions.h"
14-
#include "mlir/Dialect/Func/IR/FuncOps.h"
1514
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
1615
#include "mlir/Dialect/LLVMIR/Transforms/InlinerInterfaceImpl.h"
1716
#include "toy/AST.h"

0 commit comments

Comments
 (0)