Revert "[fir] Split FIROptimizer lib into several smaller libraries"
This reverts commit c2eff3d5b931191d77fe391f93e50283a4c88739.
GitOrigin-RevId: bc02a3d4281cd7a6535c657d3981af8b096a3aab
diff --git a/lib/Lower/CMakeLists.txt b/lib/Lower/CMakeLists.txt
index 27e54d4..07b87ef 100644
--- a/lib/Lower/CMakeLists.txt
+++ b/lib/Lower/CMakeLists.txt
@@ -17,15 +17,11 @@
PFTBuilder.cpp
DEPENDS
- FIRDialect
- FIRSupport
- FIRTransforms
+ FIROptimizer
${dialect_libs}
LINK_LIBS
- FIRDialect
- FIRSupport
- FIRTransforms
+ FIROptimizer
${dialect_libs}
FortranCommon
FortranParser
diff --git a/lib/Optimizer/CMakeLists.txt b/lib/Optimizer/CMakeLists.txt
index 4b37a18..b83d6a0 100644
--- a/lib/Optimizer/CMakeLists.txt
+++ b/lib/Optimizer/CMakeLists.txt
@@ -1,4 +1,34 @@
-add_subdirectory(CodeGen)
-add_subdirectory(Dialect)
-add_subdirectory(Support)
-add_subdirectory(Transforms)
+get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
+
+add_flang_library(FIROptimizer
+ Dialect/FIRAttr.cpp
+ Dialect/FIRDialect.cpp
+ Dialect/FIROps.cpp
+ Dialect/FIRType.cpp
+
+ Support/FIRContext.cpp
+ Support/InternalNames.cpp
+ Support/KindMapping.cpp
+
+ CodeGen/CGOps.cpp
+ CodeGen/PreCGRewrite.cpp
+
+ Transforms/Inliner.cpp
+
+ DEPENDS
+ FIROpsIncGen
+ FIROptCodeGenPassIncGen
+ FIROptTransformsPassIncGen
+ CGOpsIncGen
+ ${dialect_libs}
+
+ LINK_LIBS
+ ${dialect_libs}
+ MLIRLLVMToLLVMIRTranslation
+ MLIRTargetLLVMIRExport
+
+ LINK_COMPONENTS
+ AsmParser
+ AsmPrinter
+ Remarks
+)
diff --git a/lib/Optimizer/CodeGen/CMakeLists.txt b/lib/Optimizer/CodeGen/CMakeLists.txt
deleted file mode 100644
index 6a8d82c..0000000
--- a/lib/Optimizer/CodeGen/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-add_flang_library(FIRCodeGen
- CGOps.cpp
- PreCGRewrite.cpp
-
- DEPENDS
- FIRDialect
- FIRSupport
- FIROptCodeGenPassIncGen
- CGOpsIncGen
-
- LINK_LIBS
- FIRDialect
- FIRSupport
- MLIROpenMPToLLVM
- MLIRLLVMToLLVMIRTranslation
- MLIRTargetLLVMIRExport
-
- LINK_COMPONENTS
- AsmParser
- AsmPrinter
- Remarks
-)
diff --git a/lib/Optimizer/Dialect/CMakeLists.txt b/lib/Optimizer/Dialect/CMakeLists.txt
deleted file mode 100644
index 7116dab..0000000
--- a/lib/Optimizer/Dialect/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-add_flang_library(FIRDialect
- FIRAttr.cpp
- FIRDialect.cpp
- FIROps.cpp
- FIRType.cpp
-
- DEPENDS
- FIRSupport
- FIROpsIncGen
-
- LINK_LIBS
- FIRSupport
- MLIROpenMPToLLVM
- MLIRLLVMToLLVMIRTranslation
- MLIRTargetLLVMIRExport
-
- LINK_COMPONENTS
- AsmParser
- AsmPrinter
- Remarks
-)
diff --git a/lib/Optimizer/Support/CMakeLists.txt b/lib/Optimizer/Support/CMakeLists.txt
deleted file mode 100644
index 2e53c3f..0000000
--- a/lib/Optimizer/Support/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-add_flang_library(FIRSupport
- FIRContext.cpp
- InternalNames.cpp
- KindMapping.cpp
-
- DEPENDS
- ${dialect_libs}
-
- LINK_LIBS
- ${dialect_libs}
- MLIROpenMPToLLVMIRTranslation
- MLIRLLVMToLLVMIRTranslation
- MLIRTargetLLVMIRExport
-)
diff --git a/lib/Optimizer/Transforms/CMakeLists.txt b/lib/Optimizer/Transforms/CMakeLists.txt
deleted file mode 100644
index 462ae40..0000000
--- a/lib/Optimizer/Transforms/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-add_flang_library(FIRTransforms
- Inliner.cpp
-
- DEPENDS
- FIRDialect
- FIRSupport
- FIROptTransformsPassIncGen
-
- LINK_LIBS
- FIRDialect
- MLIRAffineToStandard
- MLIRLLVMIR
- MLIROpenACC
- MLIROpenMP
- FIRSupport
-)
diff --git a/tools/fir-opt/CMakeLists.txt b/tools/fir-opt/CMakeLists.txt
index 566aa78..efd33f9 100644
--- a/tools/fir-opt/CMakeLists.txt
+++ b/tools/fir-opt/CMakeLists.txt
@@ -3,10 +3,7 @@
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
target_link_libraries(fir-opt PRIVATE
- FIRDialect
- FIRSupport
- FIRTransforms
- FIRCodeGen
+ FIROptimizer
${dialect_libs}
# TODO: these should be transitive dependencies from a target providing
diff --git a/tools/tco/CMakeLists.txt b/tools/tco/CMakeLists.txt
index 1a9c5ac..4a22427 100644
--- a/tools/tco/CMakeLists.txt
+++ b/tools/tco/CMakeLists.txt
@@ -1,10 +1,7 @@
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
set(LIBS
- FIRCodeGen
- FIRDialect
- FIRSupport
- FIRTransforms
+ FIROptimizer
${dialect_libs}
MLIRIR
MLIRLLVMIR
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index 5acebce..95e3f6d 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -39,5 +39,6 @@
add_subdirectory(Optimizer)
add_subdirectory(Decimal)
add_subdirectory(Evaluate)
+add_subdirectory(Lower)
add_subdirectory(Runtime)
add_subdirectory(Frontend)
diff --git a/unittests/Lower/CMakeLists.txt b/unittests/Lower/CMakeLists.txt
new file mode 100644
index 0000000..a3f61f0
--- /dev/null
+++ b/unittests/Lower/CMakeLists.txt
@@ -0,0 +1,15 @@
+get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
+
+set(LIBS
+ FIROptimizer
+ MLIRLLVMIR
+ ${dialect_libs}
+)
+
+add_flang_unittest(FlangLoweringTests
+ RTBuilder.cpp
+)
+
+target_link_libraries(FlangLoweringTests
+ PRIVATE
+ ${LIBS})
diff --git a/unittests/Optimizer/RTBuilder.cpp b/unittests/Lower/RTBuilder.cpp
similarity index 100%
rename from unittests/Optimizer/RTBuilder.cpp
rename to unittests/Lower/RTBuilder.cpp
diff --git a/unittests/Optimizer/CMakeLists.txt b/unittests/Optimizer/CMakeLists.txt
index 8bfb860..3996c69 100644
--- a/unittests/Optimizer/CMakeLists.txt
+++ b/unittests/Optimizer/CMakeLists.txt
@@ -1,9 +1,7 @@
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
set(LIBS
- FIRCodeGen
- FIRDialect
- FIRSupport
+ FIROptimizer
${dialect_libs}
)
@@ -11,7 +9,6 @@
FIRContextTest.cpp
InternalNamesTest.cpp
KindMappingTest.cpp
- RTBuilder.cpp
)
target_link_libraries(FlangOptimizerTests
PRIVATE
