This is an archive of the discontinued LLVM Phabricator instance.

Differential D111055

[fir] Split FIROptimizer lib into several smaller libraries
ClosedPublic

Authored by clementval on Oct 4 2021, 6:28 AM.

Details

Reviewers
jeanPerier
svedanayagam
sscalpone
kiranchandramohan
jdoerfert
schweitz
pmccormick
mehdi_amini
rovka
AlexisPerry
awarzynski
Commits
rGb5a11a991e17: [fir] Split FIROptimizer lib into several smaller libraries
rGc02a8cdda873: [fir] Split FIROptimizer lib into several smaller libraries
rGc2eff3d5b931: [fir] Split FIROptimizer lib into several smaller libraries
Summary

Partition libFIROptimizer into smaller libraries that reflect the
structure. Adapt potential problems.

This patch is part of the upstreaming effort from fir-dev branch. It's a
building stone to upstreaming transformations.

Co-authored-by: Eric Schweitz <eschweitz@nvidia.com>

Diff Detail

Event Timeline

clementval created this revision.Oct 4 2021, 6:28 AM
Herald added a reviewer: awarzynski. · View Herald TranscriptOct 4 2021, 6:28 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a subscriber: mgorny. · View Herald Transcript
clementval requested review of this revision.Oct 4 2021, 6:28 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 4 2021, 6:28 AM
Herald added subscribers: llvm-commits, sstefan1. · View Herald Transcript
Harbormaster completed remote builds in B126822: Diff 376880.Oct 4 2021, 6:28 AM
schweitz accepted this revision.Oct 4 2021, 7:55 AM
This revision is now accepted and ready to land.Oct 4 2021, 7:55 AM
clementval updated this revision to Diff 376912.Oct 4 2021, 8:51 AM

Add missing newlines

Harbormaster completed remote builds in B126836: Diff 376912.Oct 4 2021, 8:51 AM
Closed by commit rGc2eff3d5b931: [fir] Split FIROptimizer lib into several smaller libraries (authored by clementval). · Explain WhyOct 5 2021, 12:41 AM
This revision was automatically updated to reflect the committed changes.
clementval added a commit: rGc2eff3d5b931: [fir] Split FIROptimizer lib into several smaller libraries.
clementval added a reverting change: rGbc02a3d4281c: Revert "[fir] Split FIROptimizer lib into several smaller libraries".Oct 5 2021, 1:16 AM
clementval reopened this revision.Oct 5 2021, 1:17 AM

Temporally reverted.

This revision is now accepted and ready to land.Oct 5 2021, 1:17 AM
clementval updated this revision to Diff 377116.Oct 5 2021, 1:57 AM

Fix dependency

Harbormaster completed remote builds in B126993: Diff 377116.Oct 5 2021, 2:02 AM
Closed by commit rGc02a8cdda873: [fir] Split FIROptimizer lib into several smaller libraries (authored by clementval). · Explain WhyOct 5 2021, 2:09 AM
This revision was automatically updated to reflect the committed changes.
clementval added a commit: rGc02a8cdda873: [fir] Split FIROptimizer lib into several smaller libraries.
clementval added a reverting change: rG4755fb2e187d: Revert "[fir] Split FIROptimizer lib into several smaller libraries".Oct 5 2021, 2:20 AM
clementval reopened this revision.Oct 5 2021, 2:43 AM
This revision is now accepted and ready to land.Oct 5 2021, 2:43 AM
clementval updated this revision to Diff 377130.Oct 5 2021, 2:46 AM

Fix dialect_libs variable

Harbormaster completed remote builds in B127005: Diff 377130.Oct 5 2021, 3:05 AM
Closed by commit rGb5a11a991e17: [fir] Split FIROptimizer lib into several smaller libraries (authored by clementval). · Explain WhyOct 5 2021, 5:03 AM
This revision was automatically updated to reflect the committed changes.
clementval added a commit: rGb5a11a991e17: [fir] Split FIROptimizer lib into several smaller libraries.

Revision Contents

PathSize
flang/
lib/
Lower/
8 lines
Optimizer/
38 lines
CodeGen/
22 lines
Dialect/
21 lines
Support/
18 lines
Transforms/
16 lines
tools/
fir-opt/
5 lines
tco/
5 lines
unittests/
1 line
Lower/
Optimizer/
5 lines
Optimizer/
Lower/

Diff 377156

flang/lib/Lower/CMakeLists.txt

Show All 11 Linesadd_flang_library(FortranLower
IntrinsicCall.cpp IntrinsicCall.cpp
IO.cpp IO.cpp
Mangler.cpp Mangler.cpp
OpenACC.cpp OpenACC.cpp
OpenMP.cpp OpenMP.cpp
PFTBuilder.cpp PFTBuilder.cpp
DEPENDS DEPENDS
FIROptimizer FIRDialect
FIRSupport
FIRTransforms
${dialect_libs} ${dialect_libs}
LINK_LIBS LINK_LIBS
FIROptimizer FIRDialect
FIRSupport
FIRTransforms
${dialect_libs} ${dialect_libs}
FortranCommon FortranCommon
FortranParser FortranParser
FortranEvaluate FortranEvaluate
FortranSemantics FortranSemantics
MLIRAffineToStandard MLIRAffineToStandard
MLIRLLVMIR MLIRLLVMIR
MLIRSCFToStandard MLIRSCFToStandard
MLIRStandard MLIRStandard
LINK_COMPONENTS LINK_COMPONENTS
Support Support
) )

flang/lib/Optimizer/CMakeLists.txt

get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS) add_subdirectory(CodeGen)
add_subdirectory(Dialect)
add_flang_library(FIROptimizer add_subdirectory(Support)
Dialect/FIRAttr.cpp add_subdirectory(Transforms)
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
)

flang/lib/Optimizer/CodeGen/CMakeLists.txt

  • This file was added.
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
)

flang/lib/Optimizer/Dialect/CMakeLists.txt

  • This file was added.
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
)

flang/lib/Optimizer/Support/CMakeLists.txt

  • This file was added.
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
add_flang_library(FIRSupport
FIRContext.cpp
InternalNames.cpp
KindMapping.cpp
DEPENDS
FIROpsIncGen
MLIRIR
${dialect_libs}
LINK_LIBS
${dialect_libs}
MLIROpenMPToLLVMIRTranslation
MLIRLLVMToLLVMIRTranslation
MLIRTargetLLVMIRExport
)

flang/lib/Optimizer/Transforms/CMakeLists.txt

  • This file was added.
add_flang_library(FIRTransforms
Inliner.cpp
DEPENDS
FIRDialect
FIRSupport
FIROptTransformsPassIncGen
LINK_LIBS
FIRDialect
MLIRAffineToStandard
MLIRLLVMIR
MLIROpenACC
MLIROpenMP
FIRSupport
)

flang/tools/fir-opt/CMakeLists.txt

add_flang_tool(fir-opt fir-opt.cpp) add_flang_tool(fir-opt fir-opt.cpp)
llvm_update_compile_flags(fir-opt) llvm_update_compile_flags(fir-opt)
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS) get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
target_link_libraries(fir-opt PRIVATE target_link_libraries(fir-opt PRIVATE
FIROptimizer FIRDialect
FIRSupport
FIRTransforms
FIRCodeGen
${dialect_libs} ${dialect_libs}
# TODO: these should be transitive dependencies from a target providing # TODO: these should be transitive dependencies from a target providing
# "registerFIRPasses()" # "registerFIRPasses()"
MLIRAffineToStandard MLIRAffineToStandard
MLIROptLib MLIROptLib
) )

flang/tools/tco/CMakeLists.txt

get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS) get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
set(LIBS set(LIBS
FIROptimizer FIRCodeGen
FIRDialect
FIRSupport
FIRTransforms
${dialect_libs} ${dialect_libs}
MLIRIR MLIRIR
MLIRLLVMIR MLIRLLVMIR
MLIRPass MLIRPass
MLIRStandardToLLVM MLIRStandardToLLVM
MLIRTransforms MLIRTransforms
MLIRAffineToStandard MLIRAffineToStandard
MLIRAnalysis MLIRAnalysis
Show All 9 Lines

flang/unittests/CMakeLists.txt

Show All 33 Linesfunction(add_flang_nongtest_unittest test_name)
if(NOT ARG_SLOW_TEST) if(NOT ARG_SLOW_TEST)
add_dependencies(FlangUnitTests ${test_name}${suffix}) add_dependencies(FlangUnitTests ${test_name}${suffix})
endif() endif()
endfunction() endfunction()
add_subdirectory(Optimizer) add_subdirectory(Optimizer)
add_subdirectory(Decimal) add_subdirectory(Decimal)
add_subdirectory(Evaluate) add_subdirectory(Evaluate)
add_subdirectory(Lower)
add_subdirectory(Runtime) add_subdirectory(Runtime)
add_subdirectory(Frontend) add_subdirectory(Frontend)

flang/unittests/Lower/CMakeLists.txt

  • This file was deleted.
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})

flang/unittests/Lower/RTBuilder.cpp

  • This file was moved to flang/unittests/Optimizer/RTBuilder.cpp.

flang/unittests/Optimizer/CMakeLists.txt

get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS) get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
set(LIBS set(LIBS
FIROptimizer FIRCodeGen
FIRDialect
FIRSupport
${dialect_libs} ${dialect_libs}
) )
add_flang_unittest(FlangOptimizerTests add_flang_unittest(FlangOptimizerTests
FIRContextTest.cpp FIRContextTest.cpp
InternalNamesTest.cpp InternalNamesTest.cpp
KindMappingTest.cpp KindMappingTest.cpp
RTBuilder.cpp
) )
target_link_libraries(FlangOptimizerTests target_link_libraries(FlangOptimizerTests
PRIVATE PRIVATE
${LIBS}) ${LIBS})

flang/unittests/Optimizer/RTBuilder.cpp

  • This file was moved from flang/unittests/Lower/RTBuilder.cpp.
The contents of this file were not changed.
flang/tools/tco/CMakeLists.txt