diff options
| author | Renaud-K <rkauffmann@nvidia.com> | 2023-03-08 18:39:40 -0800 |
|---|---|---|
| committer | Renaud-K <rkauffmann@nvidia.com> | 2023-03-09 15:24:51 -0800 |
| commit | b07ef9e7cd6f5348df0a4f63e70a60491427ff64 (patch) | |
| tree | 5326e5937d5441181ff30f3a075f7b2cb5321f7f /flang/unittests | |
| parent | 350d7e33ff09342d955c31699ce0f3e133e6bf02 (diff) | |
| download | llvm-b07ef9e7cd6f5348df0a4f63e70a60491427ff64.tar.gz | |
Break circular dependency between FIR dialect and utilities
Diffstat (limited to 'flang/unittests')
9 files changed, 10 insertions, 9 deletions
diff --git a/flang/unittests/Optimizer/Builder/CharacterTest.cpp b/flang/unittests/Optimizer/Builder/CharacterTest.cpp index 21230ae39963..c6defcd51095 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 4b895ee7d9e2..5364eec904ff 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 80cf1655df05..7e7206dbf934 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 3dedf3d75c5c..c3436ccd1c77 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 75bd4b35ccbc..1858b276f1fc 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 0e1c0f4cb60e..00c27f4bb214 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 76555fe7bccb..d55d69598b15 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 a4027b982835..88bb4363b2b4 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 6a11d6181715..8e0d879755fb 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> |