https://github.com/Renaud-K created https://github.com/llvm/llvm-project/pull/72160
Fixing fir::unwrapSeqOrBoxedSeqType so it also works with the fir::ClassType >From af6200e4466066f92a67d69e6f49c8baa28bf62f Mon Sep 17 00:00:00 2001 From: Renaud-K <rkauffm...@nvidia.com> Date: Wed, 8 Mar 2023 18:39:40 -0800 Subject: [PATCH] Break circular dependency between FIR dialect and utilities Differential revision: https://reviews.llvm.org/D145640 --- flang/include/flang/Lower/Bridge.h | 2 +- flang/include/flang/Optimizer/Builder/FIRBuilder.h | 2 +- .../Optimizer/{ => Dialect}/Support/FIRContext.h | 0 .../Optimizer/{ => Dialect}/Support/KindMapping.h | 0 flang/lib/Frontend/CMakeLists.txt | 3 +-- flang/lib/Frontend/FrontendActions.cpp | 4 ++-- flang/lib/Lower/Bridge.cpp | 2 +- flang/lib/Lower/CMakeLists.txt | 5 ++--- flang/lib/Lower/ConvertVariable.cpp | 2 +- flang/lib/Lower/IO.cpp | 2 +- flang/lib/Optimizer/Analysis/CMakeLists.txt | 3 +-- flang/lib/Optimizer/Builder/CMakeLists.txt | 2 +- flang/lib/Optimizer/Builder/IntrinsicCall.cpp | 2 +- flang/lib/Optimizer/CodeGen/BoxedProcedure.cpp | 2 +- flang/lib/Optimizer/CodeGen/CMakeLists.txt | 3 +-- flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp | 2 +- flang/lib/Optimizer/CodeGen/Target.cpp | 2 +- flang/lib/Optimizer/CodeGen/Target.h | 2 +- flang/lib/Optimizer/CodeGen/TargetRewrite.cpp | 2 +- flang/lib/Optimizer/CodeGen/TypeConverter.h | 4 ++-- flang/lib/Optimizer/Dialect/CMakeLists.txt | 6 ++++-- flang/lib/Optimizer/Dialect/FIRAttr.cpp | 2 +- flang/lib/Optimizer/Dialect/FIROps.cpp | 4 ++-- flang/lib/Optimizer/Dialect/FIRType.cpp | 2 +- flang/lib/Optimizer/Dialect/Support/CMakeLists.txt | 12 ++++++++++++ .../Optimizer/{ => Dialect}/Support/FIRContext.cpp | 4 ++-- .../Optimizer/{ => Dialect}/Support/KindMapping.cpp | 2 +- .../Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp | 2 +- flang/lib/Optimizer/HLFIR/Transforms/CMakeLists.txt | 1 + .../lib/Optimizer/HLFIR/Transforms/ConvertToFIR.cpp | 2 +- flang/lib/Optimizer/Support/CMakeLists.txt | 2 -- flang/lib/Optimizer/Transforms/AbstractResult.cpp | 2 +- .../lib/Optimizer/Transforms/AddDebugFoundation.cpp | 2 +- flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp | 2 +- flang/lib/Optimizer/Transforms/CMakeLists.txt | 3 +-- .../lib/Optimizer/Transforms/CharacterConversion.cpp | 4 ++-- .../Optimizer/Transforms/ControlFlowConverter.cpp | 4 ++-- .../Optimizer/Transforms/PolymorphicOpConversion.cpp | 4 ++-- .../lib/Optimizer/Transforms/SimplifyIntrinsics.cpp | 2 +- flang/lib/Optimizer/Transforms/StackArrays.cpp | 2 +- flang/tools/bbc/CMakeLists.txt | 1 + flang/tools/bbc/bbc.cpp | 4 ++-- flang/tools/tco/CMakeLists.txt | 1 + flang/tools/tco/tco.cpp | 4 ++-- flang/unittests/Optimizer/Builder/CharacterTest.cpp | 2 +- flang/unittests/Optimizer/Builder/ComplexTest.cpp | 2 +- .../unittests/Optimizer/Builder/DoLoopHelperTest.cpp | 2 +- flang/unittests/Optimizer/Builder/FIRBuilderTest.cpp | 2 +- flang/unittests/Optimizer/Builder/HLFIRToolsTest.cpp | 2 +- .../Optimizer/Builder/Runtime/RuntimeCallTestBase.h | 2 +- flang/unittests/Optimizer/CMakeLists.txt | 1 + flang/unittests/Optimizer/FIRContextTest.cpp | 4 ++-- flang/unittests/Optimizer/KindMappingTest.cpp | 2 +- 53 files changed, 75 insertions(+), 64 deletions(-) rename flang/include/flang/Optimizer/{ => Dialect}/Support/FIRContext.h (100%) rename flang/include/flang/Optimizer/{ => Dialect}/Support/KindMapping.h (100%) create mode 100644 flang/lib/Optimizer/Dialect/Support/CMakeLists.txt rename flang/lib/Optimizer/{ => Dialect}/Support/FIRContext.cpp (95%) rename flang/lib/Optimizer/{ => Dialect}/Support/KindMapping.cpp (99%) diff --git a/flang/include/flang/Lower/Bridge.h b/flang/include/flang/Lower/Bridge.h index 6766613ebc27dba..b4ee77a0b166ec9 100644 --- a/flang/include/flang/Lower/Bridge.h +++ b/flang/include/flang/Lower/Bridge.h @@ -19,7 +19,7 @@ #include "flang/Lower/LoweringOptions.h" #include "flang/Lower/StatementContext.h" #include "flang/Optimizer/Builder/FIRBuilder.h" -#include "flang/Optimizer/Support/KindMapping.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "mlir/IR/BuiltinOps.h" namespace Fortran { diff --git a/flang/include/flang/Optimizer/Builder/FIRBuilder.h b/flang/include/flang/Optimizer/Builder/FIRBuilder.h index 085e91f0c6fa61d..0dbd77823d8f859 100644 --- a/flang/include/flang/Optimizer/Builder/FIRBuilder.h +++ b/flang/include/flang/Optimizer/Builder/FIRBuilder.h @@ -20,7 +20,7 @@ #include "flang/Optimizer/Dialect/FIROps.h" #include "flang/Optimizer/Dialect/FIROpsSupport.h" #include "flang/Optimizer/Dialect/FIRType.h" -#include "flang/Optimizer/Support/KindMapping.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "mlir/IR/Builders.h" #include "mlir/IR/BuiltinOps.h" #include "llvm/ADT/DenseMap.h" diff --git a/flang/include/flang/Optimizer/Support/FIRContext.h b/flang/include/flang/Optimizer/Dialect/Support/FIRContext.h similarity index 100% rename from flang/include/flang/Optimizer/Support/FIRContext.h rename to flang/include/flang/Optimizer/Dialect/Support/FIRContext.h diff --git a/flang/include/flang/Optimizer/Support/KindMapping.h b/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h similarity index 100% rename from flang/include/flang/Optimizer/Support/KindMapping.h rename to flang/include/flang/Optimizer/Dialect/Support/KindMapping.h diff --git a/flang/lib/Frontend/CMakeLists.txt b/flang/lib/Frontend/CMakeLists.txt index df5e324fdad711f..7a04a2e0b4336af 100644 --- a/flang/lib/Frontend/CMakeLists.txt +++ b/flang/lib/Frontend/CMakeLists.txt @@ -13,9 +13,7 @@ add_flang_library(flangFrontend TextDiagnostic.cpp DEPENDS - FIRBuilder FIRDialect - FIRSupport FIROptTransformsPassIncGen HLFIRDialect MLIRIR @@ -28,6 +26,7 @@ add_flang_library(flangFrontend FortranCommon FortranLower FIRDialect + FIRDialectSupport FIRSupport FIRBuilder FIRCodeGen diff --git a/flang/lib/Frontend/FrontendActions.cpp b/flang/lib/Frontend/FrontendActions.cpp index 3cf0b5f96806877..a6dac4df25d7209 100644 --- a/flang/lib/Frontend/FrontendActions.cpp +++ b/flang/lib/Frontend/FrontendActions.cpp @@ -18,9 +18,9 @@ #include "flang/Lower/Bridge.h" #include "flang/Lower/PFTBuilder.h" #include "flang/Lower/Support/Verifier.h" -#include "flang/Optimizer/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "flang/Optimizer/Support/InitFIR.h" -#include "flang/Optimizer/Support/KindMapping.h" #include "flang/Optimizer/Support/Utils.h" #include "flang/Parser/dump-parse-tree.h" #include "flang/Parser/parsing.h" diff --git a/flang/lib/Lower/Bridge.cpp b/flang/lib/Lower/Bridge.cpp index 5d5bb53d209a4c0..0c99e539259dfa4 100644 --- a/flang/lib/Lower/Bridge.cpp +++ b/flang/lib/Lower/Bridge.cpp @@ -41,8 +41,8 @@ #include "flang/Optimizer/Dialect/FIRAttr.h" #include "flang/Optimizer/Dialect/FIRDialect.h" #include "flang/Optimizer/Dialect/FIROps.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "flang/Optimizer/HLFIR/HLFIROps.h" -#include "flang/Optimizer/Support/FIRContext.h" #include "flang/Optimizer/Support/FatalError.h" #include "flang/Optimizer/Support/InternalNames.h" #include "flang/Optimizer/Transforms/Passes.h" diff --git a/flang/lib/Lower/CMakeLists.txt b/flang/lib/Lower/CMakeLists.txt index 7d2264c3ed8fbfa..e3c8504a0d602f0 100644 --- a/flang/lib/Lower/CMakeLists.txt +++ b/flang/lib/Lower/CMakeLists.txt @@ -27,17 +27,16 @@ add_flang_library(FortranLower Runtime.cpp SymbolMap.cpp VectorSubscripts.cpp - + DEPENDS FIRDialect - FIRBuilder - FIRSupport FIRTransforms HLFIRDialect ${dialect_libs} LINK_LIBS FIRDialect + FIRDialectSupport FIRBuilder FIRSupport FIRTransforms diff --git a/flang/lib/Lower/ConvertVariable.cpp b/flang/lib/Lower/ConvertVariable.cpp index b5470e5210fcfe2..1d91c86c3d2f569 100644 --- a/flang/lib/Lower/ConvertVariable.cpp +++ b/flang/lib/Lower/ConvertVariable.cpp @@ -32,8 +32,8 @@ #include "flang/Optimizer/Dialect/FIRAttr.h" #include "flang/Optimizer/Dialect/FIRDialect.h" #include "flang/Optimizer/Dialect/FIROps.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "flang/Optimizer/HLFIR/HLFIROps.h" -#include "flang/Optimizer/Support/FIRContext.h" #include "flang/Optimizer/Support/FatalError.h" #include "flang/Optimizer/Support/InternalNames.h" #include "flang/Semantics/runtime-type-info.h" diff --git a/flang/lib/Lower/IO.cpp b/flang/lib/Lower/IO.cpp index 6f30da290a6d551..e5a84b43264f7e0 100644 --- a/flang/lib/Lower/IO.cpp +++ b/flang/lib/Lower/IO.cpp @@ -29,7 +29,7 @@ #include "flang/Optimizer/Builder/Runtime/RTBuilder.h" #include "flang/Optimizer/Builder/Todo.h" #include "flang/Optimizer/Dialect/FIRDialect.h" -#include "flang/Optimizer/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "flang/Parser/parse-tree.h" #include "flang/Runtime/io-api.h" #include "flang/Semantics/tools.h" diff --git a/flang/lib/Optimizer/Analysis/CMakeLists.txt b/flang/lib/Optimizer/Analysis/CMakeLists.txt index 4ebe7d8c78c336e..a8a3c899f35de5d 100644 --- a/flang/lib/Optimizer/Analysis/CMakeLists.txt +++ b/flang/lib/Optimizer/Analysis/CMakeLists.txt @@ -2,9 +2,8 @@ add_flang_library(FIRAnalysis AliasAnalysis.cpp DEPENDS - FIRBuilder FIRDialect - FIRSupport + MLIRIR LINK_LIBS FIRBuilder diff --git a/flang/lib/Optimizer/Builder/CMakeLists.txt b/flang/lib/Optimizer/Builder/CMakeLists.txt index 5457a9e3f636aff..c93d4b9465148ed 100644 --- a/flang/lib/Optimizer/Builder/CMakeLists.txt +++ b/flang/lib/Optimizer/Builder/CMakeLists.txt @@ -27,12 +27,12 @@ add_flang_library(FIRBuilder DEPENDS FIRDialect - FIRSupport HLFIRDialect ${dialect_libs} LINK_LIBS FIRDialect + FIRDialectSupport FIRSupport HLFIRDialect ${dialect_libs} diff --git a/flang/lib/Optimizer/Builder/IntrinsicCall.cpp b/flang/lib/Optimizer/Builder/IntrinsicCall.cpp index 787a55e1341b652..75f67221deb2f06 100644 --- a/flang/lib/Optimizer/Builder/IntrinsicCall.cpp +++ b/flang/lib/Optimizer/Builder/IntrinsicCall.cpp @@ -33,7 +33,7 @@ #include "flang/Optimizer/Builder/Runtime/Transformational.h" #include "flang/Optimizer/Builder/Todo.h" #include "flang/Optimizer/Dialect/FIROpsSupport.h" -#include "flang/Optimizer/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "flang/Optimizer/Support/FatalError.h" #include "flang/Optimizer/Support/Utils.h" #include "flang/Runtime/entry-names.h" diff --git a/flang/lib/Optimizer/CodeGen/BoxedProcedure.cpp b/flang/lib/Optimizer/CodeGen/BoxedProcedure.cpp index 4df4dcb2d02b7d4..1ce23fb44f7ee1e 100644 --- a/flang/lib/Optimizer/CodeGen/BoxedProcedure.cpp +++ b/flang/lib/Optimizer/CodeGen/BoxedProcedure.cpp @@ -13,7 +13,7 @@ #include "flang/Optimizer/Dialect/FIRDialect.h" #include "flang/Optimizer/Dialect/FIROps.h" #include "flang/Optimizer/Dialect/FIRType.h" -#include "flang/Optimizer/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "flang/Optimizer/Support/FatalError.h" #include "flang/Optimizer/Support/InternalNames.h" #include "mlir/IR/PatternMatch.h" diff --git a/flang/lib/Optimizer/CodeGen/CMakeLists.txt b/flang/lib/Optimizer/CodeGen/CMakeLists.txt index 58c48479ff37546..1b8fe47084a6ca0 100644 --- a/flang/lib/Optimizer/CodeGen/CMakeLists.txt +++ b/flang/lib/Optimizer/CodeGen/CMakeLists.txt @@ -8,15 +8,14 @@ add_flang_library(FIRCodeGen TargetRewrite.cpp DEPENDS - FIRBuilder FIRDialect - FIRSupport FIROptCodeGenPassIncGen CGOpsIncGen LINK_LIBS FIRBuilder FIRDialect + FIRDialectSupport FIRSupport MLIRComplexToLLVM MLIRComplexToStandard diff --git a/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp b/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp index a45fed2a3679881..0170b56367cf3cd 100644 --- a/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp +++ b/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp @@ -17,7 +17,7 @@ #include "flang/Optimizer/Dialect/FIRDialect.h" #include "flang/Optimizer/Dialect/FIROps.h" #include "flang/Optimizer/Dialect/FIRType.h" -#include "flang/Optimizer/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "mlir/Transforms/DialectConversion.h" #include "mlir/Transforms/RegionUtils.h" #include "llvm/ADT/STLExtras.h" diff --git a/flang/lib/Optimizer/CodeGen/Target.cpp b/flang/lib/Optimizer/CodeGen/Target.cpp index e2d30b0019d40ac..50d144909a1c7f1 100644 --- a/flang/lib/Optimizer/CodeGen/Target.cpp +++ b/flang/lib/Optimizer/CodeGen/Target.cpp @@ -13,8 +13,8 @@ #include "Target.h" #include "flang/Optimizer/Builder/Todo.h" #include "flang/Optimizer/Dialect/FIRType.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "flang/Optimizer/Support/FatalError.h" -#include "flang/Optimizer/Support/KindMapping.h" #include "mlir/IR/BuiltinTypes.h" #include "mlir/IR/TypeRange.h" diff --git a/flang/lib/Optimizer/CodeGen/Target.h b/flang/lib/Optimizer/CodeGen/Target.h index 6bc56a9dc455996..acffe6c1cec9c00 100644 --- a/flang/lib/Optimizer/CodeGen/Target.h +++ b/flang/lib/Optimizer/CodeGen/Target.h @@ -13,7 +13,7 @@ #ifndef FORTRAN_OPTMIZER_CODEGEN_TARGET_H #define FORTRAN_OPTMIZER_CODEGEN_TARGET_H -#include "flang/Optimizer/Support/KindMapping.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "mlir/IR/BuiltinTypes.h" #include "llvm/TargetParser/Triple.h" #include <memory> diff --git a/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp b/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp index 3cd17cd027a0460..0957e399f4e5699 100644 --- a/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp +++ b/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp @@ -24,7 +24,7 @@ #include "flang/Optimizer/Dialect/FIROps.h" #include "flang/Optimizer/Dialect/FIROpsSupport.h" #include "flang/Optimizer/Dialect/FIRType.h" -#include "flang/Optimizer/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "mlir/Transforms/DialectConversion.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/TypeSwitch.h" diff --git a/flang/lib/Optimizer/CodeGen/TypeConverter.h b/flang/lib/Optimizer/CodeGen/TypeConverter.h index 4f472d31c93e6b1..c97400180a64cbb 100644 --- a/flang/lib/Optimizer/CodeGen/TypeConverter.h +++ b/flang/lib/Optimizer/CodeGen/TypeConverter.h @@ -18,8 +18,8 @@ #include "Target.h" #include "flang/Optimizer/Builder/Todo.h" // remove when TODO's are done #include "flang/Optimizer/Dialect/FIRType.h" -#include "flang/Optimizer/Support/FIRContext.h" -#include "flang/Optimizer/Support/KindMapping.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "mlir/Conversion/LLVMCommon/TypeConverter.h" #include "llvm/Support/Debug.h" diff --git a/flang/lib/Optimizer/Dialect/CMakeLists.txt b/flang/lib/Optimizer/Dialect/CMakeLists.txt index 8f82e9264638e78..58cecaa7cb7445a 100644 --- a/flang/lib/Optimizer/Dialect/CMakeLists.txt +++ b/flang/lib/Optimizer/Dialect/CMakeLists.txt @@ -1,3 +1,5 @@ +add_subdirectory(Support) + add_flang_library(FIRDialect FIRAttr.cpp FIRDialect.cpp @@ -8,11 +10,11 @@ add_flang_library(FIRDialect DEPENDS CanonicalizationPatternsIncGen - FIRSupport + MLIRIR FIROpsIncGen LINK_LIBS - FIRSupport + FIRDialectSupport MLIRArithDialect MLIROpenMPToLLVM MLIRLLVMToLLVMIRTranslation diff --git a/flang/lib/Optimizer/Dialect/FIRAttr.cpp b/flang/lib/Optimizer/Dialect/FIRAttr.cpp index 655a568382a8011..487109121db0c1e 100644 --- a/flang/lib/Optimizer/Dialect/FIRAttr.cpp +++ b/flang/lib/Optimizer/Dialect/FIRAttr.cpp @@ -12,7 +12,7 @@ #include "flang/Optimizer/Dialect/FIRAttr.h" #include "flang/Optimizer/Dialect/FIRDialect.h" -#include "flang/Optimizer/Support/KindMapping.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "mlir/IR/AttributeSupport.h" #include "mlir/IR/BuiltinTypes.h" #include "mlir/IR/DialectImplementation.h" diff --git a/flang/lib/Optimizer/Dialect/FIROps.cpp b/flang/lib/Optimizer/Dialect/FIROps.cpp index c62a7bc1174c93d..5d8be2c5cd8e2b4 100644 --- a/flang/lib/Optimizer/Dialect/FIROps.cpp +++ b/flang/lib/Optimizer/Dialect/FIROps.cpp @@ -14,8 +14,8 @@ #include "flang/Optimizer/Dialect/FIRAttr.h" #include "flang/Optimizer/Dialect/FIROpsSupport.h" #include "flang/Optimizer/Dialect/FIRType.h" -#include "flang/Optimizer/Support/FIRContext.h" -#include "flang/Optimizer/Support/KindMapping.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "flang/Optimizer/Support/Utils.h" #include "mlir/Dialect/CommonFolders.h" #include "mlir/Dialect/Func/IR/FuncOps.h" diff --git a/flang/lib/Optimizer/Dialect/FIRType.cpp b/flang/lib/Optimizer/Dialect/FIRType.cpp index 17fe1179162d109..d9f703a679d4ff5 100644 --- a/flang/lib/Optimizer/Dialect/FIRType.cpp +++ b/flang/lib/Optimizer/Dialect/FIRType.cpp @@ -12,7 +12,7 @@ #include "flang/Optimizer/Dialect/FIRType.h" #include "flang/Optimizer/Dialect/FIRDialect.h" -#include "flang/Optimizer/Support/KindMapping.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "flang/Tools/PointerModels.h" #include "mlir/IR/Builders.h" #include "mlir/IR/BuiltinDialect.h" diff --git a/flang/lib/Optimizer/Dialect/Support/CMakeLists.txt b/flang/lib/Optimizer/Dialect/Support/CMakeLists.txt new file mode 100644 index 000000000000000..352588f94085544 --- /dev/null +++ b/flang/lib/Optimizer/Dialect/Support/CMakeLists.txt @@ -0,0 +1,12 @@ +get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS) + +add_flang_library(FIRDialectSupport + KindMapping.cpp + FIRContext.cpp + + DEPENDS + MLIRIR + + LINK_LIBS + ${dialect_libs} +) diff --git a/flang/lib/Optimizer/Support/FIRContext.cpp b/flang/lib/Optimizer/Dialect/Support/FIRContext.cpp similarity index 95% rename from flang/lib/Optimizer/Support/FIRContext.cpp rename to flang/lib/Optimizer/Dialect/Support/FIRContext.cpp index 2a91a0a68b6bc03..a2b77ebcf52ae14 100644 --- a/flang/lib/Optimizer/Support/FIRContext.cpp +++ b/flang/lib/Optimizer/Dialect/Support/FIRContext.cpp @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -#include "flang/Optimizer/Support/FIRContext.h" -#include "flang/Optimizer/Support/KindMapping.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/IR/BuiltinAttributes.h" #include "mlir/IR/BuiltinOps.h" diff --git a/flang/lib/Optimizer/Support/KindMapping.cpp b/flang/lib/Optimizer/Dialect/Support/KindMapping.cpp similarity index 99% rename from flang/lib/Optimizer/Support/KindMapping.cpp rename to flang/lib/Optimizer/Dialect/Support/KindMapping.cpp index e5500c14476de60..c71e3939dc31d28 100644 --- a/flang/lib/Optimizer/Support/KindMapping.cpp +++ b/flang/lib/Optimizer/Dialect/Support/KindMapping.cpp @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -#include "flang/Optimizer/Support/KindMapping.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "llvm/Support/CommandLine.h" diff --git a/flang/lib/Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp b/flang/lib/Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp index 349a356f52b4a18..cc44e0eebd4eced 100644 --- a/flang/lib/Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp +++ b/flang/lib/Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp @@ -22,10 +22,10 @@ #include "flang/Optimizer/Dialect/FIRDialect.h" #include "flang/Optimizer/Dialect/FIROps.h" #include "flang/Optimizer/Dialect/FIRType.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "flang/Optimizer/HLFIR/HLFIRDialect.h" #include "flang/Optimizer/HLFIR/HLFIROps.h" #include "flang/Optimizer/HLFIR/Passes.h" -#include "flang/Optimizer/Support/FIRContext.h" #include "mlir/IR/PatternMatch.h" #include "mlir/Pass/Pass.h" #include "mlir/Pass/PassManager.h" diff --git a/flang/lib/Optimizer/HLFIR/Transforms/CMakeLists.txt b/flang/lib/Optimizer/HLFIR/Transforms/CMakeLists.txt index 983929b82c80503..b89d6b76bf653a2 100644 --- a/flang/lib/Optimizer/HLFIR/Transforms/CMakeLists.txt +++ b/flang/lib/Optimizer/HLFIR/Transforms/CMakeLists.txt @@ -12,6 +12,7 @@ add_flang_library(HLFIRTransforms LINK_LIBS FIRDialect FIRBuilder + FIRDialectSupport FIRSupport HLFIRDialect MLIRIR diff --git a/flang/lib/Optimizer/HLFIR/Transforms/ConvertToFIR.cpp b/flang/lib/Optimizer/HLFIR/Transforms/ConvertToFIR.cpp index d627c96fda31b11..8af01f0f013e137 100644 --- a/flang/lib/Optimizer/HLFIR/Transforms/ConvertToFIR.cpp +++ b/flang/lib/Optimizer/HLFIR/Transforms/ConvertToFIR.cpp @@ -18,9 +18,9 @@ #include "flang/Optimizer/Dialect/FIRDialect.h" #include "flang/Optimizer/Dialect/FIROps.h" #include "flang/Optimizer/Dialect/FIRType.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "flang/Optimizer/HLFIR/HLFIROps.h" #include "flang/Optimizer/HLFIR/Passes.h" -#include "flang/Optimizer/Support/FIRContext.h" #include "mlir/Transforms/DialectConversion.h" namespace hlfir { diff --git a/flang/lib/Optimizer/Support/CMakeLists.txt b/flang/lib/Optimizer/Support/CMakeLists.txt index 6a1c004ac88a4ec..33a9ed4e439d5de 100644 --- a/flang/lib/Optimizer/Support/CMakeLists.txt +++ b/flang/lib/Optimizer/Support/CMakeLists.txt @@ -1,10 +1,8 @@ get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS) add_flang_library(FIRSupport - FIRContext.cpp InitFIR.cpp InternalNames.cpp - KindMapping.cpp DEPENDS FIROpsIncGen diff --git a/flang/lib/Optimizer/Transforms/AbstractResult.cpp b/flang/lib/Optimizer/Transforms/AbstractResult.cpp index 5ef76feabf8dc77..2c0576eaa5cc4d1 100644 --- a/flang/lib/Optimizer/Transforms/AbstractResult.cpp +++ b/flang/lib/Optimizer/Transforms/AbstractResult.cpp @@ -11,7 +11,7 @@ #include "flang/Optimizer/Dialect/FIRDialect.h" #include "flang/Optimizer/Dialect/FIROps.h" #include "flang/Optimizer/Dialect/FIRType.h" -#include "flang/Optimizer/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "flang/Optimizer/Transforms/Passes.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/IR/Diagnostics.h" diff --git a/flang/lib/Optimizer/Transforms/AddDebugFoundation.cpp b/flang/lib/Optimizer/Transforms/AddDebugFoundation.cpp index 09c5edc67793511..be8f26dc678ca68 100644 --- a/flang/lib/Optimizer/Transforms/AddDebugFoundation.cpp +++ b/flang/lib/Optimizer/Transforms/AddDebugFoundation.cpp @@ -16,7 +16,7 @@ #include "flang/Optimizer/Dialect/FIRDialect.h" #include "flang/Optimizer/Dialect/FIROps.h" #include "flang/Optimizer/Dialect/FIRType.h" -#include "flang/Optimizer/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "flang/Optimizer/Transforms/Passes.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/LLVMIR/LLVMDialect.h" diff --git a/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp b/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp index c0563588bfc302f..f07debfc19ebab4 100644 --- a/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp +++ b/flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp @@ -14,7 +14,7 @@ #include "flang/Optimizer/Builder/Todo.h" #include "flang/Optimizer/Dialect/FIRDialect.h" #include "flang/Optimizer/Dialect/FIROpsSupport.h" -#include "flang/Optimizer/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "flang/Optimizer/Transforms/Passes.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/SCF/IR/SCF.h" diff --git a/flang/lib/Optimizer/Transforms/CMakeLists.txt b/flang/lib/Optimizer/Transforms/CMakeLists.txt index 2db16de2187a207..ca690c341bb265a 100644 --- a/flang/lib/Optimizer/Transforms/CMakeLists.txt +++ b/flang/lib/Optimizer/Transforms/CMakeLists.txt @@ -17,14 +17,13 @@ add_flang_library(FIRTransforms PolymorphicOpConversion.cpp DEPENDS - FIRBuilder FIRDialect - FIRSupport FIROptTransformsPassIncGen LINK_LIBS FIRBuilder FIRDialect + FIRDialectSupport FIRSupport HLFIRDialect MLIRAffineUtils diff --git a/flang/lib/Optimizer/Transforms/CharacterConversion.cpp b/flang/lib/Optimizer/Transforms/CharacterConversion.cpp index 971fb942e2cbd13..4940092871cbb46 100644 --- a/flang/lib/Optimizer/Transforms/CharacterConversion.cpp +++ b/flang/lib/Optimizer/Transforms/CharacterConversion.cpp @@ -9,8 +9,8 @@ #include "flang/Optimizer/Dialect/FIRDialect.h" #include "flang/Optimizer/Dialect/FIROps.h" #include "flang/Optimizer/Dialect/FIRType.h" -#include "flang/Optimizer/Support/FIRContext.h" -#include "flang/Optimizer/Support/KindMapping.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "flang/Optimizer/Transforms/Passes.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/Func/IR/FuncOps.h" diff --git a/flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp b/flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp index d13b488cfda5eec..631989a05b57cb7 100644 --- a/flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp +++ b/flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp @@ -9,9 +9,9 @@ #include "flang/Optimizer/Dialect/FIRDialect.h" #include "flang/Optimizer/Dialect/FIROps.h" #include "flang/Optimizer/Dialect/FIROpsSupport.h" -#include "flang/Optimizer/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "flang/Optimizer/Support/InternalNames.h" -#include "flang/Optimizer/Support/KindMapping.h" #include "flang/Optimizer/Support/TypeCode.h" #include "flang/Optimizer/Transforms/Passes.h" #include "flang/Runtime/derived-api.h" diff --git a/flang/lib/Optimizer/Transforms/PolymorphicOpConversion.cpp b/flang/lib/Optimizer/Transforms/PolymorphicOpConversion.cpp index 580e3ca2191a615..f7ee2c19d45ac27 100644 --- a/flang/lib/Optimizer/Transforms/PolymorphicOpConversion.cpp +++ b/flang/lib/Optimizer/Transforms/PolymorphicOpConversion.cpp @@ -9,9 +9,9 @@ #include "flang/Optimizer/Dialect/FIRDialect.h" #include "flang/Optimizer/Dialect/FIROps.h" #include "flang/Optimizer/Dialect/FIROpsSupport.h" -#include "flang/Optimizer/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "flang/Optimizer/Support/InternalNames.h" -#include "flang/Optimizer/Support/KindMapping.h" #include "flang/Optimizer/Support/TypeCode.h" #include "flang/Optimizer/Transforms/Passes.h" #include "flang/Runtime/derived-api.h" diff --git a/flang/lib/Optimizer/Transforms/SimplifyIntrinsics.cpp b/flang/lib/Optimizer/Transforms/SimplifyIntrinsics.cpp index 581ba006fea4052..244a462cb72252e 100644 --- a/flang/lib/Optimizer/Transforms/SimplifyIntrinsics.cpp +++ b/flang/lib/Optimizer/Transforms/SimplifyIntrinsics.cpp @@ -29,8 +29,8 @@ #include "flang/Optimizer/Builder/Todo.h" #include "flang/Optimizer/Dialect/FIROps.h" #include "flang/Optimizer/Dialect/FIRType.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "flang/Optimizer/HLFIR/HLFIRDialect.h" -#include "flang/Optimizer/Support/FIRContext.h" #include "flang/Optimizer/Transforms/Passes.h" #include "flang/Runtime/entry-names.h" #include "mlir/Dialect/LLVMIR/LLVMDialect.h" diff --git a/flang/lib/Optimizer/Transforms/StackArrays.cpp b/flang/lib/Optimizer/Transforms/StackArrays.cpp index c0a981e5f5ee68f..60a30d2d1ef64e8 100644 --- a/flang/lib/Optimizer/Transforms/StackArrays.cpp +++ b/flang/lib/Optimizer/Transforms/StackArrays.cpp @@ -12,7 +12,7 @@ #include "flang/Optimizer/Dialect/FIRDialect.h" #include "flang/Optimizer/Dialect/FIROps.h" #include "flang/Optimizer/Dialect/FIRType.h" -#include "flang/Optimizer/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "flang/Optimizer/Transforms/Passes.h" #include "mlir/Analysis/DataFlow/ConstantPropagationAnalysis.h" #include "mlir/Analysis/DataFlow/DeadCodeAnalysis.h" diff --git a/flang/tools/bbc/CMakeLists.txt b/flang/tools/bbc/CMakeLists.txt index dba7bee2ebb8862..0b8c2eb90e5c89a 100644 --- a/flang/tools/bbc/CMakeLists.txt +++ b/flang/tools/bbc/CMakeLists.txt @@ -12,6 +12,7 @@ llvm_update_compile_flags(bbc) get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS) target_link_libraries(bbc PRIVATE FIRDialect +FIRDialectSupport FIRSupport FIRTransforms FIRBuilder diff --git a/flang/tools/bbc/bbc.cpp b/flang/tools/bbc/bbc.cpp index ce4a8b92f990d04..d4692a671a8527f 100644 --- a/flang/tools/bbc/bbc.cpp +++ b/flang/tools/bbc/bbc.cpp @@ -19,10 +19,10 @@ #include "flang/Lower/Bridge.h" #include "flang/Lower/PFTBuilder.h" #include "flang/Lower/Support/Verifier.h" -#include "flang/Optimizer/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "flang/Optimizer/Support/InitFIR.h" #include "flang/Optimizer/Support/InternalNames.h" -#include "flang/Optimizer/Support/KindMapping.h" #include "flang/Optimizer/Support/Utils.h" #include "flang/Optimizer/Transforms/Passes.h" #include "flang/Parser/characters.h" diff --git a/flang/tools/tco/CMakeLists.txt b/flang/tools/tco/CMakeLists.txt index 28cbbb5154ccfd8..207e7225276df6b 100644 --- a/flang/tools/tco/CMakeLists.txt +++ b/flang/tools/tco/CMakeLists.txt @@ -8,6 +8,7 @@ get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS) target_link_libraries(tco PRIVATE FIRCodeGen FIRDialect + FIRDialectSupport FIRSupport FIRTransforms FIRBuilder diff --git a/flang/tools/tco/tco.cpp b/flang/tools/tco/tco.cpp index c68e5456ab31b40..e7dca6b06b27d1d 100644 --- a/flang/tools/tco/tco.cpp +++ b/flang/tools/tco/tco.cpp @@ -12,10 +12,10 @@ //===----------------------------------------------------------------------===// #include "flang/Optimizer/CodeGen/CodeGen.h" -#include "flang/Optimizer/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "flang/Optimizer/Support/InitFIR.h" #include "flang/Optimizer/Support/InternalNames.h" -#include "flang/Optimizer/Support/KindMapping.h" #include "flang/Optimizer/Transforms/Passes.h" #include "mlir/IR/AsmState.h" #include "mlir/IR/BuiltinOps.h" diff --git a/flang/unittests/Optimizer/Builder/CharacterTest.cpp b/flang/unittests/Optimizer/Builder/CharacterTest.cpp index 21230ae39963c9f..c6defcd51095ba4 100644 --- a/flang/unittests/Optimizer/Builder/CharacterTest.cpp +++ b/flang/unittests/Optimizer/Builder/CharacterTest.cpp @@ -10,8 +10,8 @@ #include "gtest/gtest.h" #include "flang/Optimizer/Builder/BoxValue.h" #include "flang/Optimizer/Builder/FIRBuilder.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "flang/Optimizer/Support/InitFIR.h" -#include "flang/Optimizer/Support/KindMapping.h" struct CharacterTest : public testing::Test { public: diff --git a/flang/unittests/Optimizer/Builder/ComplexTest.cpp b/flang/unittests/Optimizer/Builder/ComplexTest.cpp index 4b895ee7d9e2472..5364eec904ff4e8 100644 --- a/flang/unittests/Optimizer/Builder/ComplexTest.cpp +++ b/flang/unittests/Optimizer/Builder/ComplexTest.cpp @@ -9,8 +9,8 @@ #include "flang/Optimizer/Builder/Complex.h" #include "gtest/gtest.h" #include "flang/Optimizer/Builder/FIRBuilder.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "flang/Optimizer/Support/InitFIR.h" -#include "flang/Optimizer/Support/KindMapping.h" struct ComplexTest : public testing::Test { public: diff --git a/flang/unittests/Optimizer/Builder/DoLoopHelperTest.cpp b/flang/unittests/Optimizer/Builder/DoLoopHelperTest.cpp index 80cf1655df05314..7e7206dbf934de9 100644 --- a/flang/unittests/Optimizer/Builder/DoLoopHelperTest.cpp +++ b/flang/unittests/Optimizer/Builder/DoLoopHelperTest.cpp @@ -8,8 +8,8 @@ #include "flang/Optimizer/Builder/DoLoopHelper.h" #include "gtest/gtest.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "flang/Optimizer/Support/InitFIR.h" -#include "flang/Optimizer/Support/KindMapping.h" #include <string> using namespace mlir; diff --git a/flang/unittests/Optimizer/Builder/FIRBuilderTest.cpp b/flang/unittests/Optimizer/Builder/FIRBuilderTest.cpp index 3dedf3d75c5ced9..c3436ccd1c779a0 100644 --- a/flang/unittests/Optimizer/Builder/FIRBuilderTest.cpp +++ b/flang/unittests/Optimizer/Builder/FIRBuilderTest.cpp @@ -9,8 +9,8 @@ #include "flang/Optimizer/Builder/FIRBuilder.h" #include "gtest/gtest.h" #include "flang/Optimizer/Builder/BoxValue.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "flang/Optimizer/Support/InitFIR.h" -#include "flang/Optimizer/Support/KindMapping.h" using namespace mlir; diff --git a/flang/unittests/Optimizer/Builder/HLFIRToolsTest.cpp b/flang/unittests/Optimizer/Builder/HLFIRToolsTest.cpp index 75bd4b35ccbcfd1..1858b276f1fc359 100644 --- a/flang/unittests/Optimizer/Builder/HLFIRToolsTest.cpp +++ b/flang/unittests/Optimizer/Builder/HLFIRToolsTest.cpp @@ -10,8 +10,8 @@ #include "gtest/gtest.h" #include "flang/Optimizer/Builder/BoxValue.h" #include "flang/Optimizer/Builder/FIRBuilder.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "flang/Optimizer/Support/InitFIR.h" -#include "flang/Optimizer/Support/KindMapping.h" struct HLFIRToolsTest : public testing::Test { public: diff --git a/flang/unittests/Optimizer/Builder/Runtime/RuntimeCallTestBase.h b/flang/unittests/Optimizer/Builder/Runtime/RuntimeCallTestBase.h index 0e1c0f4cb60e204..00c27f4bb21425d 100644 --- a/flang/unittests/Optimizer/Builder/Runtime/RuntimeCallTestBase.h +++ b/flang/unittests/Optimizer/Builder/Runtime/RuntimeCallTestBase.h @@ -11,8 +11,8 @@ #include "gtest/gtest.h" #include "flang/Optimizer/Builder/FIRBuilder.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "flang/Optimizer/Support/InitFIR.h" -#include "flang/Optimizer/Support/KindMapping.h" struct RuntimeCallTest : public testing::Test { public: diff --git a/flang/unittests/Optimizer/CMakeLists.txt b/flang/unittests/Optimizer/CMakeLists.txt index 76555fe7bccbf85..d55d69598b153bc 100644 --- a/flang/unittests/Optimizer/CMakeLists.txt +++ b/flang/unittests/Optimizer/CMakeLists.txt @@ -4,6 +4,7 @@ set(LIBS FIRBuilder FIRCodeGen FIRDialect + FIRDialectSupport FIRSupport HLFIRDialect ${dialect_libs} diff --git a/flang/unittests/Optimizer/FIRContextTest.cpp b/flang/unittests/Optimizer/FIRContextTest.cpp index a4027b9828357ad..88bb4363b2b4512 100644 --- a/flang/unittests/Optimizer/FIRContextTest.cpp +++ b/flang/unittests/Optimizer/FIRContextTest.cpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include "flang/Optimizer/Support/FIRContext.h" +#include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "gtest/gtest.h" #include "mlir/IR/BuiltinAttributes.h" #include "mlir/IR/BuiltinOps.h" -#include "flang/Optimizer/Support/KindMapping.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "llvm/TargetParser/Host.h" #include <string> diff --git a/flang/unittests/Optimizer/KindMappingTest.cpp b/flang/unittests/Optimizer/KindMappingTest.cpp index 6a11d618171591c..8e0d879755fb1cb 100644 --- a/flang/unittests/Optimizer/KindMappingTest.cpp +++ b/flang/unittests/Optimizer/KindMappingTest.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "flang/Optimizer/Support/KindMapping.h" +#include "flang/Optimizer/Dialect/Support/KindMapping.h" #include "gtest/gtest.h" #include <string> _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
