Skip to content

Commit c4fc358

Browse files
[flang][acc][nfc] Move FIROpenACCSupport to Support subfolder (#148710)
In order to prepare for adding FIROpenACCTransforms, move the FIR OpenACC support library to its own subfolder.
1 parent 711132d commit c4fc358

File tree

9 files changed

+34
-33
lines changed

9 files changed

+34
-33
lines changed

flang/include/flang/Optimizer/Support/InitFIR.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "flang/Optimizer/Dialect/CUF/CUFToLLVMIRTranslation.h"
1818
#include "flang/Optimizer/Dialect/FIRDialect.h"
1919
#include "flang/Optimizer/HLFIR/HLFIRDialect.h"
20-
#include "flang/Optimizer/OpenACC/RegisterOpenACCExtensions.h"
20+
#include "flang/Optimizer/OpenACC/Support/RegisterOpenACCExtensions.h"
2121
#include "flang/Optimizer/OpenMP/Support/RegisterOpenMPExtensions.h"
2222
#include "mlir/Conversion/Passes.h"
2323
#include "mlir/Dialect/Affine/Passes.h"

flang/lib/Optimizer/CodeGen/LowerRepackArrays.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "flang/Optimizer/Dialect/FIRDialect.h"
3939
#include "flang/Optimizer/Dialect/FIROps.h"
4040
#include "flang/Optimizer/Dialect/FIRType.h"
41-
#include "flang/Optimizer/OpenACC/RegisterOpenACCExtensions.h"
41+
#include "flang/Optimizer/OpenACC/Support/RegisterOpenACCExtensions.h"
4242
#include "flang/Optimizer/OpenMP/Support/RegisterOpenMPExtensions.h"
4343
#include "mlir/Pass/Pass.h"
4444
#include "mlir/Transforms/GreedyPatternRewriteDriver.h"
Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1 @@
1-
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
2-
3-
add_flang_library(FIROpenACCSupport
4-
FIROpenACCAttributes.cpp
5-
FIROpenACCTypeInterfaces.cpp
6-
RegisterOpenACCExtensions.cpp
7-
8-
DEPENDS
9-
FIRBuilder
10-
FIRDialect
11-
FIRDialectSupport
12-
FIRSupport
13-
HLFIRDialect
14-
15-
LINK_LIBS
16-
FIRBuilder
17-
FIRCodeGenDialect
18-
FIRDialect
19-
FIRDialectSupport
20-
FIRSupport
21-
HLFIRDialect
22-
23-
MLIR_DEPS
24-
MLIROpenACCDialect
25-
26-
MLIR_LIBS
27-
MLIROpenACCDialect
28-
)
1+
add_subdirectory(Support)
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
2+
3+
add_flang_library(FIROpenACCSupport
4+
FIROpenACCAttributes.cpp
5+
FIROpenACCTypeInterfaces.cpp
6+
RegisterOpenACCExtensions.cpp
7+
8+
DEPENDS
9+
FIRBuilder
10+
FIRDialect
11+
FIRDialectSupport
12+
FIRSupport
13+
HLFIRDialect
14+
15+
LINK_LIBS
16+
FIRBuilder
17+
FIRCodeGenDialect
18+
FIRDialect
19+
FIRDialectSupport
20+
FIRSupport
21+
HLFIRDialect
22+
23+
MLIR_DEPS
24+
MLIROpenACCDialect
25+
26+
MLIR_LIBS
27+
MLIROpenACCDialect
28+
)

flang/lib/Optimizer/OpenACC/FIROpenACCTypeInterfaces.cpp renamed to flang/lib/Optimizer/OpenACC/Support/FIROpenACCTypeInterfaces.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#include "flang/Optimizer/OpenACC/FIROpenACCTypeInterfaces.h"
13+
#include "flang/Optimizer/OpenACC/Support/FIROpenACCTypeInterfaces.h"
1414
#include "flang/Optimizer/Builder/BoxValue.h"
1515
#include "flang/Optimizer/Builder/DirectivesCommon.h"
1616
#include "flang/Optimizer/Builder/FIRBuilder.h"

flang/lib/Optimizer/OpenACC/RegisterOpenACCExtensions.cpp renamed to flang/lib/Optimizer/OpenACC/Support/RegisterOpenACCExtensions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#include "flang/Optimizer/OpenACC/RegisterOpenACCExtensions.h"
13+
#include "flang/Optimizer/OpenACC/Support/RegisterOpenACCExtensions.h"
1414
#include "flang/Optimizer/Dialect/FIRDialect.h"
1515
#include "flang/Optimizer/Dialect/FIRType.h"
16-
#include "flang/Optimizer/OpenACC/FIROpenACCTypeInterfaces.h"
16+
#include "flang/Optimizer/OpenACC/Support/FIROpenACCTypeInterfaces.h"
1717

1818
namespace fir::acc {
1919
void registerOpenACCExtensions(mlir::DialectRegistry &registry) {

0 commit comments

Comments
 (0)