Revert "[fir] Split FIROptimizer lib into several smaller libraries"

This reverts commit c02a8cd.
llvm · Oct 5, 2021 · 4755fb2 · 4755fb2
1 parent e86d45e
commit 4755fb2
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 96 deletions.
diff --git a/flang/lib/Lower/CMakeLists.txt b/flang/lib/Lower/CMakeLists.txt
@@ -17,15 +17,11 @@ add_flang_library(FortranLower
   PFTBuilder.cpp
 
   DEPENDS
-  FIRDialect
-  FIRSupport
-  FIRTransforms
+  FIROptimizer
   ${dialect_libs}
 
   LINK_LIBS
-  FIRDialect
-  FIRSupport
-  FIRTransforms
+  FIROptimizer
   ${dialect_libs}
   FortranCommon
   FortranParser

diff --git a/flang/lib/Optimizer/CMakeLists.txt b/flang/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/flang/lib/Optimizer/CodeGen/CMakeLists.txt b/flang/lib/Optimizer/CodeGen/CMakeLists.txt
diff --git a/flang/lib/Optimizer/Dialect/CMakeLists.txt b/flang/lib/Optimizer/Dialect/CMakeLists.txt
diff --git a/flang/lib/Optimizer/Support/CMakeLists.txt b/flang/lib/Optimizer/Support/CMakeLists.txt
diff --git a/flang/lib/Optimizer/Transforms/CMakeLists.txt b/flang/lib/Optimizer/Transforms/CMakeLists.txt
diff --git a/flang/tools/fir-opt/CMakeLists.txt b/flang/tools/fir-opt/CMakeLists.txt
@@ -3,10 +3,7 @@ llvm_update_compile_flags(fir-opt)
 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/flang/tools/tco/CMakeLists.txt b/flang/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/flang/unittests/CMakeLists.txt b/flang/unittests/CMakeLists.txt
@@ -39,5 +39,6 @@ endfunction()
 add_subdirectory(Optimizer)
 add_subdirectory(Decimal)
 add_subdirectory(Evaluate)
+add_subdirectory(Lower)
 add_subdirectory(Runtime)
 add_subdirectory(Frontend)
diff --git a/flang/unittests/Lower/CMakeLists.txt b/flang/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/flang/unittests/Optimizer/RTBuilder.cpp → flang/unittests/Lower/RTBuilder.cpp b/flang/unittests/Optimizer/RTBuilder.cpp → flang/unittests/Lower/RTBuilder.cpp
diff --git a/flang/unittests/Optimizer/CMakeLists.txt b/flang/unittests/Optimizer/CMakeLists.txt
@@ -1,17 +1,14 @@
 get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
 
 set(LIBS
-  FIRCodeGen
-  FIRDialect
-  FIRSupport
+  FIROptimizer
   ${dialect_libs}
 )
 
 add_flang_unittest(FlangOptimizerTests
   FIRContextTest.cpp
   InternalNamesTest.cpp
   KindMappingTest.cpp
-  RTBuilder.cpp
 )
 target_link_libraries(FlangOptimizerTests
   PRIVATE