[flang-commits] [flang] af8cec4 - [flang][NFC] move HLFIR dialect definition in IR

[Jean Perier via flang-commits]

Author: Jean Perier
Date: 2022-11-09T11:39:12+01:00
New Revision: af8cec4c1696f6ab168050d24522174f788fe236

URL: https://github.com/llvm/llvm-project/commit/af8cec4c1696f6ab168050d24522174f788fe236
DIFF: https://github.com/llvm/llvm-project/commit/af8cec4c1696f6ab168050d24522174f788fe236.diff

LOG: [flang][NFC] move HLFIR dialect definition in IR

Transforms will need to be put in a different library to avoid circular
dependencies with other parts of the compiler. So create an IR
directory, this (flat include directory, IR and Transform directories in
lib) matches how dialects like LLVM dialect are implemented.

Differential Revision: https://reviews.llvm.org/D137701

Added: 
    flang/lib/Optimizer/HLFIR/IR/CMakeLists.txt
    flang/lib/Optimizer/HLFIR/IR/HLFIRDialect.cpp

Modified: 
    flang/lib/Optimizer/HLFIR/CMakeLists.txt

Removed: 
    flang/lib/Optimizer/HLFIR/HLFIRDialect.cpp


################################################################################
diff  --git a/flang/lib/Optimizer/HLFIR/CMakeLists.txt b/flang/lib/Optimizer/HLFIR/CMakeLists.txt
index 890bc52cc8453..f33061b2d87cf 100644
--- a/flang/lib/Optimizer/HLFIR/CMakeLists.txt
+++ b/flang/lib/Optimizer/HLFIR/CMakeLists.txt
@@ -1,20 +1 @@
-get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
-
-add_flang_library(HLFIRDialect
-  HLFIRDialect.cpp
-
-  DEPENDS
-  FIRDialect
-  HLFIROpsIncGen
-  ${dialect_libs}
-
-  LINK_LIBS
-  FIRDialect
-  MLIRIR
-  ${dialect_libs}
-
-  LINK_COMPONENTS
-  AsmParser
-  AsmPrinter
-  Remarks
-)
+add_subdirectory(IR)

diff  --git a/flang/lib/Optimizer/HLFIR/IR/CMakeLists.txt b/flang/lib/Optimizer/HLFIR/IR/CMakeLists.txt
new file mode 100644
index 0000000000000..890bc52cc8453
--- /dev/null
+++ b/flang/lib/Optimizer/HLFIR/IR/CMakeLists.txt
@@ -0,0 +1,20 @@
+get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
+
+add_flang_library(HLFIRDialect
+  HLFIRDialect.cpp
+
+  DEPENDS
+  FIRDialect
+  HLFIROpsIncGen
+  ${dialect_libs}
+
+  LINK_LIBS
+  FIRDialect
+  MLIRIR
+  ${dialect_libs}
+
+  LINK_COMPONENTS
+  AsmParser
+  AsmPrinter
+  Remarks
+)

diff  --git a/flang/lib/Optimizer/HLFIR/HLFIRDialect.cpp b/flang/lib/Optimizer/HLFIR/IR/HLFIRDialect.cpp
similarity index 100%
rename from flang/lib/Optimizer/HLFIR/HLFIRDialect.cpp
rename to flang/lib/Optimizer/HLFIR/IR/HLFIRDialect.cpp