Skip to content

Commit d73d379

Browse files
committed
[WIP] Resolve cyclic dependency between FIROpenACCSupport and FIRCodeGen.
I would like to move FIRCodeGen passes into its own component library, and keep the FIRCodeGenDialect separate.
1 parent 8696a47 commit d73d379

File tree

7 files changed

+28
-6
lines changed

7 files changed

+28
-6
lines changed

flang/lib/Frontend/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ add_flang_library(flangFrontend
3333
FIRSupport
3434
FIRBuilder
3535
FIRCodeGen
36+
FIRCodeGenDialect
3637
FIRTransforms
3738
HLFIRDialect
3839
HLFIRTransforms

flang/lib/Optimizer/CodeGen/CMakeLists.txt

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
1+
add_flang_library(FIRCodeGenDialect
2+
CGOps.cpp
3+
4+
PARTIAL_SOURCES_INTENDED
5+
6+
DEPENDS
7+
CGOpsIncGen
8+
9+
LINK_LIBS
10+
FIRDialect
11+
MLIRIR
12+
13+
LINK_COMPONENTS
14+
AsmParser
15+
AsmPrinter
16+
17+
)
18+
119
add_flang_library(FIRCodeGen
220
BoxedProcedure.cpp
3-
CGOps.cpp
421
CodeGen.cpp
522
CodeGenOpenMP.cpp
623
FIROpPatterns.cpp
@@ -11,6 +28,8 @@ add_flang_library(FIRCodeGen
1128
TargetRewrite.cpp
1229
TypeConverter.cpp
1330

31+
PARTIAL_SOURCES_INTENDED
32+
1433
DEPENDS
1534
CUFAttrs
1635
FIRDialect
@@ -21,15 +40,14 @@ add_flang_library(FIRCodeGen
2140
CUFAttrs
2241
FIRAnalysis
2342
FIRBuilder
43+
FIRCodeGenDialect
2444
FIRDialect
2545
FIRDialectSupport
2646
FIROpenACCSupport
2747
FIROpenMPSupport
2848
FIRSupport
2949

3050
LINK_COMPONENTS
31-
AsmParser
32-
AsmPrinter
3351
Remarks
3452
TargetParser
3553

@@ -47,4 +65,5 @@ add_flang_library(FIRCodeGen
4765
MLIRLLVMToLLVMIRTranslation
4866
MLIRTargetLLVMIRExport
4967
MLIRVectorToLLVM
68+
5069
)

flang/lib/Optimizer/OpenACC/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ add_flang_library(FIROpenACCSupport
77

88
DEPENDS
99
FIRBuilder
10-
FIRCodeGen
1110
FIRDialect
1211
FIRDialectSupport
1312
FIRSupport
1413
HLFIRDialect
1514

1615
LINK_LIBS
1716
FIRBuilder
18-
FIRCodeGen
17+
FIRCodeGenDialect
1918
FIRDialect
2019
FIRDialectSupport
2120
FIRSupport

flang/lib/Optimizer/Transforms/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ add_flang_library(FIRTransforms
4747
FIRAnalysis
4848
FIRBuilder
4949
FIRCodeGen
50+
FIRCodeGenDialect
5051
FIRDialect
5152
FIRDialectSupport
5253
FIRSupport

flang/tools/fir-opt/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ target_link_libraries(fir-opt PRIVATE
1818
FIRSupport
1919
FIRTransforms
2020
FIRCodeGen
21+
FIRCodeGenDialect
2122
HLFIRDialect
2223
HLFIRTransforms
2324
FIROpenACCSupport

flang/tools/tco/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ target_link_libraries(tco PRIVATE
1010
CUFAttrs
1111
CUFDialect
1212
FIRCodeGen
13+
FIRCodeGenDialect
1314
FIRDialect
1415
FIRDialectSupport
1516
FIRSupport

flang/unittests/Optimizer/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set(LLVM_LINK_COMPONENTS
88
set(LIBS
99
CUFDialect
1010
FIRBuilder
11-
FIRCodeGen
11+
FIRCodeGenDialect
1212
FIRDialect
1313
FIRDialectSupport
1414
FIRSupport

0 commit comments

Comments
 (0)