Skip to content

Commit 9021dbc

Browse files
committed
[NFC][flang] Move ReductionProcessor to Lower/Support.
With #145837, the `ReductionProcessor` component is now used by both OpenMP and `do concurrent`. Therefore, this PR moves it to a shared location: `flang/Lower/Support`.
1 parent be636dd commit 9021dbc

File tree

15 files changed

+16
-17
lines changed

15 files changed

+16
-17
lines changed

flang/lib/Lower/OpenMP/ReductionProcessor.h renamed to flang/include/flang/Lower/Support/ReductionProcessor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#ifndef FORTRAN_LOWER_REDUCTIONPROCESSOR_H
1414
#define FORTRAN_LOWER_REDUCTIONPROCESSOR_H
1515

16-
#include "Clauses.h"
16+
#include "flang/Lower/OpenMP/Clauses.h"
1717
#include "flang/Optimizer/Builder/FIRBuilder.h"
1818
#include "flang/Optimizer/Dialect/FIRType.h"
1919
#include "flang/Parser/parse-tree.h"

flang/lib/Lower/Bridge.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
#include "flang/Lower/Bridge.h"
1414

15-
#include "OpenMP/ReductionProcessor.h"
1615
#include "flang/Lower/Allocatable.h"
1716
#include "flang/Lower/CallInterface.h"
1817
#include "flang/Lower/Coarray.h"
@@ -32,6 +31,7 @@
3231
#include "flang/Lower/PFTBuilder.h"
3332
#include "flang/Lower/Runtime.h"
3433
#include "flang/Lower/StatementContext.h"
34+
#include "flang/Lower/Support/ReductionProcessor.h"
3535
#include "flang/Lower/Support/Utils.h"
3636
#include "flang/Optimizer/Builder/BoxValue.h"
3737
#include "flang/Optimizer/Builder/CUFCommon.h"

flang/lib/Lower/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ add_flang_library(FortranLower
2828
OpenMP/DataSharingProcessor.cpp
2929
OpenMP/Decomposer.cpp
3030
OpenMP/OpenMP.cpp
31-
OpenMP/ReductionProcessor.cpp
3231
OpenMP/Utils.cpp
3332
PFTBuilder.cpp
3433
Runtime.cpp
3534
Support/PrivateReductionUtils.cpp
35+
Support/ReductionProcessor.cpp
3636
Support/Utils.cpp
3737
SymbolMap.cpp
3838
VectorSubscripts.cpp

flang/lib/Lower/OpenMP/ClauseFinder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#ifndef FORTRAN_LOWER_CLAUSEFINDER_H
1313
#define FORTRAN_LOWER_CLAUSEFINDER_H
1414

15-
#include "Clauses.h"
15+
#include "flang/Lower/OpenMP/Clauses.h"
1616

1717
namespace Fortran {
1818
namespace lower {

flang/lib/Lower/OpenMP/ClauseProcessor.cpp

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

1313
#include "ClauseProcessor.h"
14-
#include "Clauses.h"
15-
#include "ReductionProcessor.h"
1614
#include "Utils.h"
1715

1816
#include "flang/Lower/ConvertExprToHLFIR.h"
17+
#include "flang/Lower/OpenMP/Clauses.h"
1918
#include "flang/Lower/PFTBuilder.h"
19+
#include "flang/Lower/Support/ReductionProcessor.h"
2020
#include "flang/Parser/tools.h"
2121
#include "flang/Semantics/tools.h"
2222
#include "llvm/Frontend/OpenMP/OMP.h.inc"

flang/lib/Lower/OpenMP/ClauseProcessor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
#define FORTRAN_LOWER_CLAUSEPROCESSOR_H
1414

1515
#include "ClauseFinder.h"
16-
#include "Clauses.h"
1716
#include "Utils.h"
1817
#include "flang/Lower/AbstractConverter.h"
1918
#include "flang/Lower/Bridge.h"
2019
#include "flang/Lower/DirectivesCommon.h"
20+
#include "flang/Lower/OpenMP/Clauses.h"
2121
#include "flang/Optimizer/Builder/Todo.h"
2222
#include "flang/Parser/dump-parse-tree.h"
2323
#include "flang/Parser/parse-tree.h"

flang/lib/Lower/OpenMP/Clauses.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "Clauses.h"
9+
#include "flang/Lower/OpenMP/Clauses.h"
1010

1111
#include "flang/Common/idioms.h"
1212
#include "flang/Evaluate/expression.h"

flang/lib/Lower/OpenMP/DataSharingProcessor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
#ifndef FORTRAN_LOWER_DATASHARINGPROCESSOR_H
1313
#define FORTRAN_LOWER_DATASHARINGPROCESSOR_H
1414

15-
#include "Clauses.h"
1615
#include "flang/Lower/AbstractConverter.h"
1716
#include "flang/Lower/OpenMP.h"
17+
#include "flang/Lower/OpenMP/Clauses.h"
1818
#include "flang/Optimizer/Builder/FIRBuilder.h"
1919
#include "flang/Parser/parse-tree.h"
2020
#include "flang/Semantics/symbol.h"

flang/lib/Lower/OpenMP/Decomposer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#include "Decomposer.h"
1414

15-
#include "Clauses.h"
1615
#include "Utils.h"
16+
#include "flang/Lower/OpenMP/Clauses.h"
1717
#include "flang/Lower/PFTBuilder.h"
1818
#include "flang/Semantics/semantics.h"
1919
#include "flang/Tools/CrossToolHelpers.h"

flang/lib/Lower/OpenMP/Decomposer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#ifndef FORTRAN_LOWER_OPENMP_DECOMPOSER_H
99
#define FORTRAN_LOWER_OPENMP_DECOMPOSER_H
1010

11-
#include "Clauses.h"
11+
#include "flang/Lower/OpenMP/Clauses.h"
1212
#include "mlir/IR/BuiltinOps.h"
1313
#include "llvm/Frontend/OpenMP/ConstructDecompositionT.h"
1414
#include "llvm/Frontend/OpenMP/OMP.h"

flang/lib/Lower/OpenMP/OpenMP.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "flang/Lower/OpenMP.h"
1414

1515
#include "ClauseProcessor.h"
16-
#include "Clauses.h"
1716
#include "DataSharingProcessor.h"
1817
#include "Decomposer.h"
1918
#include "Utils.h"
@@ -22,6 +21,7 @@
2221
#include "flang/Lower/ConvertExpr.h"
2322
#include "flang/Lower/ConvertVariable.h"
2423
#include "flang/Lower/DirectivesCommon.h"
24+
#include "flang/Lower/OpenMP/Clauses.h"
2525
#include "flang/Lower/StatementContext.h"
2626
#include "flang/Lower/SymbolMap.h"
2727
#include "flang/Optimizer/Builder/BoxValue.h"

flang/lib/Lower/OpenMP/Utils.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212

1313
#include "Utils.h"
1414

15-
#include "Clauses.h"
16-
1715
#include "ClauseFinder.h"
16+
#include "flang/Lower/OpenMP/Clauses.h"
1817
#include <flang/Lower/AbstractConverter.h>
1918
#include <flang/Lower/ConvertType.h>
2019
#include <flang/Lower/DirectivesCommon.h>

flang/lib/Lower/OpenMP/Utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef FORTRAN_LOWER_OPENMPUTILS_H
1010
#define FORTRAN_LOWER_OPENMPUTILS_H
1111

12-
#include "Clauses.h"
12+
#include "flang/Lower/OpenMP/Clauses.h"
1313
#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
1414
#include "mlir/IR/Location.h"
1515
#include "mlir/IR/Value.h"

flang/lib/Lower/OpenMP/ReductionProcessor.cpp renamed to flang/lib/Lower/Support/ReductionProcessor.cpp

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

13-
#include "ReductionProcessor.h"
13+
#include "flang/Lower/Support/ReductionProcessor.h"
1414

15-
#include "Clauses.h"
1615
#include "flang/Lower/AbstractConverter.h"
1716
#include "flang/Lower/ConvertType.h"
17+
#include "flang/Lower/OpenMP/Clauses.h"
1818
#include "flang/Lower/Support/PrivateReductionUtils.h"
1919
#include "flang/Lower/SymbolMap.h"
2020
#include "flang/Optimizer/Builder/Complex.h"

0 commit comments

Comments
 (0)