https://github.com/ergawy updated https://github.com/llvm/llvm-project/pull/146025
>From db537f5fbb7d1f7c6c965262beef9682ccdcabf3 Mon Sep 17 00:00:00 2001 From: ergawy <kareem.erg...@amd.com> Date: Thu, 26 Jun 2025 23:30:04 -0500 Subject: [PATCH 1/2] [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`. --- flang/{lib => include/flang}/Lower/OpenMP/Clauses.h | 0 .../flang/Lower/Support}/ReductionProcessor.h | 2 +- flang/lib/Lower/Bridge.cpp | 2 +- flang/lib/Lower/CMakeLists.txt | 2 +- flang/lib/Lower/OpenMP/ClauseFinder.h | 2 +- flang/lib/Lower/OpenMP/ClauseProcessor.cpp | 4 ++-- flang/lib/Lower/OpenMP/ClauseProcessor.h | 2 +- flang/lib/Lower/OpenMP/Clauses.cpp | 2 +- flang/lib/Lower/OpenMP/DataSharingProcessor.h | 2 +- flang/lib/Lower/OpenMP/Decomposer.cpp | 2 +- flang/lib/Lower/OpenMP/Decomposer.h | 2 +- flang/lib/Lower/OpenMP/OpenMP.cpp | 2 +- flang/lib/Lower/OpenMP/Utils.cpp | 3 +-- flang/lib/Lower/OpenMP/Utils.h | 2 +- flang/lib/Lower/{OpenMP => Support}/ReductionProcessor.cpp | 4 ++-- 15 files changed, 16 insertions(+), 17 deletions(-) rename flang/{lib => include/flang}/Lower/OpenMP/Clauses.h (100%) rename flang/{lib/Lower/OpenMP => include/flang/Lower/Support}/ReductionProcessor.h (99%) rename flang/lib/Lower/{OpenMP => Support}/ReductionProcessor.cpp (99%) diff --git a/flang/lib/Lower/OpenMP/Clauses.h b/flang/include/flang/Lower/OpenMP/Clauses.h similarity index 100% rename from flang/lib/Lower/OpenMP/Clauses.h rename to flang/include/flang/Lower/OpenMP/Clauses.h diff --git a/flang/lib/Lower/OpenMP/ReductionProcessor.h b/flang/include/flang/Lower/Support/ReductionProcessor.h similarity index 99% rename from flang/lib/Lower/OpenMP/ReductionProcessor.h rename to flang/include/flang/Lower/Support/ReductionProcessor.h index 95b4b077bdc46..72d8a0096f511 100644 --- a/flang/lib/Lower/OpenMP/ReductionProcessor.h +++ b/flang/include/flang/Lower/Support/ReductionProcessor.h @@ -13,7 +13,7 @@ #ifndef FORTRAN_LOWER_REDUCTIONPROCESSOR_H #define FORTRAN_LOWER_REDUCTIONPROCESSOR_H -#include "Clauses.h" +#include "flang/Lower/OpenMP/Clauses.h" #include "flang/Optimizer/Builder/FIRBuilder.h" #include "flang/Optimizer/Dialect/FIRType.h" #include "flang/Parser/parse-tree.h" diff --git a/flang/lib/Lower/Bridge.cpp b/flang/lib/Lower/Bridge.cpp index 8e1c7becdba45..d905d9437c659 100644 --- a/flang/lib/Lower/Bridge.cpp +++ b/flang/lib/Lower/Bridge.cpp @@ -12,7 +12,6 @@ #include "flang/Lower/Bridge.h" -#include "OpenMP/ReductionProcessor.h" #include "flang/Lower/Allocatable.h" #include "flang/Lower/CallInterface.h" #include "flang/Lower/Coarray.h" @@ -32,6 +31,7 @@ #include "flang/Lower/PFTBuilder.h" #include "flang/Lower/Runtime.h" #include "flang/Lower/StatementContext.h" +#include "flang/Lower/Support/ReductionProcessor.h" #include "flang/Lower/Support/Utils.h" #include "flang/Optimizer/Builder/BoxValue.h" #include "flang/Optimizer/Builder/CUFCommon.h" diff --git a/flang/lib/Lower/CMakeLists.txt b/flang/lib/Lower/CMakeLists.txt index 8049cdf333173..cd80aaf553869 100644 --- a/flang/lib/Lower/CMakeLists.txt +++ b/flang/lib/Lower/CMakeLists.txt @@ -29,11 +29,11 @@ add_flang_library(FortranLower OpenMP/DataSharingProcessor.cpp OpenMP/Decomposer.cpp OpenMP/OpenMP.cpp - OpenMP/ReductionProcessor.cpp OpenMP/Utils.cpp PFTBuilder.cpp Runtime.cpp Support/PrivateReductionUtils.cpp + Support/ReductionProcessor.cpp Support/Utils.cpp SymbolMap.cpp VectorSubscripts.cpp diff --git a/flang/lib/Lower/OpenMP/ClauseFinder.h b/flang/lib/Lower/OpenMP/ClauseFinder.h index 3b77f2ca1d4cb..af52585452833 100644 --- a/flang/lib/Lower/OpenMP/ClauseFinder.h +++ b/flang/lib/Lower/OpenMP/ClauseFinder.h @@ -12,7 +12,7 @@ #ifndef FORTRAN_LOWER_CLAUSEFINDER_H #define FORTRAN_LOWER_CLAUSEFINDER_H -#include "Clauses.h" +#include "flang/Lower/OpenMP/Clauses.h" namespace Fortran { namespace lower { diff --git a/flang/lib/Lower/OpenMP/ClauseProcessor.cpp b/flang/lib/Lower/OpenMP/ClauseProcessor.cpp index 5aebfc901e8ac..74087d42a8e6e 100644 --- a/flang/lib/Lower/OpenMP/ClauseProcessor.cpp +++ b/flang/lib/Lower/OpenMP/ClauseProcessor.cpp @@ -11,12 +11,12 @@ //===----------------------------------------------------------------------===// #include "ClauseProcessor.h" -#include "Clauses.h" -#include "ReductionProcessor.h" #include "Utils.h" #include "flang/Lower/ConvertExprToHLFIR.h" +#include "flang/Lower/OpenMP/Clauses.h" #include "flang/Lower/PFTBuilder.h" +#include "flang/Lower/Support/ReductionProcessor.h" #include "flang/Parser/tools.h" #include "flang/Semantics/tools.h" #include "llvm/Frontend/OpenMP/OMP.h.inc" diff --git a/flang/lib/Lower/OpenMP/ClauseProcessor.h b/flang/lib/Lower/OpenMP/ClauseProcessor.h index 46b749fb66c86..f8a1f7983b79b 100644 --- a/flang/lib/Lower/OpenMP/ClauseProcessor.h +++ b/flang/lib/Lower/OpenMP/ClauseProcessor.h @@ -13,11 +13,11 @@ #define FORTRAN_LOWER_CLAUSEPROCESSOR_H #include "ClauseFinder.h" -#include "Clauses.h" #include "Utils.h" #include "flang/Lower/AbstractConverter.h" #include "flang/Lower/Bridge.h" #include "flang/Lower/DirectivesCommon.h" +#include "flang/Lower/OpenMP/Clauses.h" #include "flang/Optimizer/Builder/Todo.h" #include "flang/Parser/dump-parse-tree.h" #include "flang/Parser/parse-tree.h" diff --git a/flang/lib/Lower/OpenMP/Clauses.cpp b/flang/lib/Lower/OpenMP/Clauses.cpp index b599d69a36272..22a07219d3a50 100644 --- a/flang/lib/Lower/OpenMP/Clauses.cpp +++ b/flang/lib/Lower/OpenMP/Clauses.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "Clauses.h" +#include "flang/Lower/OpenMP/Clauses.h" #include "flang/Common/idioms.h" #include "flang/Evaluate/expression.h" diff --git a/flang/lib/Lower/OpenMP/DataSharingProcessor.h b/flang/lib/Lower/OpenMP/DataSharingProcessor.h index fded04c839fb4..ee2fc70d2e673 100644 --- a/flang/lib/Lower/OpenMP/DataSharingProcessor.h +++ b/flang/lib/Lower/OpenMP/DataSharingProcessor.h @@ -12,9 +12,9 @@ #ifndef FORTRAN_LOWER_DATASHARINGPROCESSOR_H #define FORTRAN_LOWER_DATASHARINGPROCESSOR_H -#include "Clauses.h" #include "flang/Lower/AbstractConverter.h" #include "flang/Lower/OpenMP.h" +#include "flang/Lower/OpenMP/Clauses.h" #include "flang/Optimizer/Builder/FIRBuilder.h" #include "flang/Parser/parse-tree.h" #include "flang/Semantics/symbol.h" diff --git a/flang/lib/Lower/OpenMP/Decomposer.cpp b/flang/lib/Lower/OpenMP/Decomposer.cpp index 251cba9204adc..9bfbf67bec88c 100644 --- a/flang/lib/Lower/OpenMP/Decomposer.cpp +++ b/flang/lib/Lower/OpenMP/Decomposer.cpp @@ -12,8 +12,8 @@ #include "Decomposer.h" -#include "Clauses.h" #include "Utils.h" +#include "flang/Lower/OpenMP/Clauses.h" #include "flang/Lower/PFTBuilder.h" #include "flang/Semantics/semantics.h" #include "flang/Tools/CrossToolHelpers.h" diff --git a/flang/lib/Lower/OpenMP/Decomposer.h b/flang/lib/Lower/OpenMP/Decomposer.h index e3291b7c59e21..65492bd76280d 100644 --- a/flang/lib/Lower/OpenMP/Decomposer.h +++ b/flang/lib/Lower/OpenMP/Decomposer.h @@ -8,7 +8,7 @@ #ifndef FORTRAN_LOWER_OPENMP_DECOMPOSER_H #define FORTRAN_LOWER_OPENMP_DECOMPOSER_H -#include "Clauses.h" +#include "flang/Lower/OpenMP/Clauses.h" #include "mlir/IR/BuiltinOps.h" #include "llvm/Frontend/OpenMP/ConstructDecompositionT.h" #include "llvm/Frontend/OpenMP/OMP.h" diff --git a/flang/lib/Lower/OpenMP/OpenMP.cpp b/flang/lib/Lower/OpenMP/OpenMP.cpp index 65e852cbcc911..4458f62eea95a 100644 --- a/flang/lib/Lower/OpenMP/OpenMP.cpp +++ b/flang/lib/Lower/OpenMP/OpenMP.cpp @@ -14,7 +14,6 @@ #include "Atomic.h" #include "ClauseProcessor.h" -#include "Clauses.h" #include "DataSharingProcessor.h" #include "Decomposer.h" #include "Utils.h" @@ -23,6 +22,7 @@ #include "flang/Lower/ConvertExpr.h" #include "flang/Lower/ConvertVariable.h" #include "flang/Lower/DirectivesCommon.h" +#include "flang/Lower/OpenMP/Clauses.h" #include "flang/Lower/StatementContext.h" #include "flang/Lower/SymbolMap.h" #include "flang/Optimizer/Builder/BoxValue.h" diff --git a/flang/lib/Lower/OpenMP/Utils.cpp b/flang/lib/Lower/OpenMP/Utils.cpp index c226c2558e7aa..2e53f01f1da6a 100644 --- a/flang/lib/Lower/OpenMP/Utils.cpp +++ b/flang/lib/Lower/OpenMP/Utils.cpp @@ -12,9 +12,8 @@ #include "Utils.h" -#include "Clauses.h" - #include "ClauseFinder.h" +#include "flang/Lower/OpenMP/Clauses.h" #include <flang/Lower/AbstractConverter.h> #include <flang/Lower/ConvertType.h> #include <flang/Lower/DirectivesCommon.h> diff --git a/flang/lib/Lower/OpenMP/Utils.h b/flang/lib/Lower/OpenMP/Utils.h index a7eb2dc5ee664..1526bd4e90233 100644 --- a/flang/lib/Lower/OpenMP/Utils.h +++ b/flang/lib/Lower/OpenMP/Utils.h @@ -9,7 +9,7 @@ #ifndef FORTRAN_LOWER_OPENMPUTILS_H #define FORTRAN_LOWER_OPENMPUTILS_H -#include "Clauses.h" +#include "flang/Lower/OpenMP/Clauses.h" #include "mlir/Dialect/OpenMP/OpenMPDialect.h" #include "mlir/IR/Location.h" #include "mlir/IR/Value.h" diff --git a/flang/lib/Lower/OpenMP/ReductionProcessor.cpp b/flang/lib/Lower/Support/ReductionProcessor.cpp similarity index 99% rename from flang/lib/Lower/OpenMP/ReductionProcessor.cpp rename to flang/lib/Lower/Support/ReductionProcessor.cpp index d14fc1f7a52da..539d5cd37c2ea 100644 --- a/flang/lib/Lower/OpenMP/ReductionProcessor.cpp +++ b/flang/lib/Lower/Support/ReductionProcessor.cpp @@ -10,11 +10,11 @@ // //===----------------------------------------------------------------------===// -#include "ReductionProcessor.h" +#include "flang/Lower/Support/ReductionProcessor.h" -#include "Clauses.h" #include "flang/Lower/AbstractConverter.h" #include "flang/Lower/ConvertType.h" +#include "flang/Lower/OpenMP/Clauses.h" #include "flang/Lower/Support/PrivateReductionUtils.h" #include "flang/Lower/SymbolMap.h" #include "flang/Optimizer/Builder/Complex.h" >From aa3984a106f72321cf7e05a6dda2ecdb342fe6aa Mon Sep 17 00:00:00 2001 From: ergawy <kareem.erg...@amd.com> Date: Sun, 29 Jun 2025 23:35:38 -0500 Subject: [PATCH 2/2] fix include after rebase --- flang/lib/Lower/OpenMP/Atomic.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flang/lib/Lower/OpenMP/Atomic.cpp b/flang/lib/Lower/OpenMP/Atomic.cpp index 2ab91b239a3cc..6ea331c370640 100644 --- a/flang/lib/Lower/OpenMP/Atomic.cpp +++ b/flang/lib/Lower/OpenMP/Atomic.cpp @@ -7,13 +7,13 @@ //===----------------------------------------------------------------------===// #include "Atomic.h" -#include "Clauses.h" #include "flang/Evaluate/expression.h" #include "flang/Evaluate/fold.h" #include "flang/Evaluate/tools.h" #include "flang/Evaluate/traverse.h" #include "flang/Evaluate/type.h" #include "flang/Lower/AbstractConverter.h" +#include "flang/Lower/OpenMP/Clauses.h" #include "flang/Lower/PFTBuilder.h" #include "flang/Lower/StatementContext.h" #include "flang/Lower/SymbolMap.h" _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits