[flang-commits] [flang] [flang][Lower][nfc] vector subscript lhs first element to helper (PR #137456)
Tom Eccles via flang-commits
flang-commits at lists.llvm.org
Mon Apr 28 02:28:14 PDT 2025
https://github.com/tblah updated https://github.com/llvm/llvm-project/pull/137456
>From 0cec6561f980637b64fdda09068111e3f190b716 Mon Sep 17 00:00:00 2001
From: Tom Eccles <tom.eccles at arm.com>
Date: Sat, 26 Apr 2025 12:12:37 +0000
Subject: [PATCH 1/2] [flang][Lower][nfc] vector subscript lhs first element to
helper
This encapsulates implementation details of hlfir.elemental_addr inside
of ConvertExprToHLFIR instead of leaking to OpenMP code.
Requested here:
https://github.com/llvm/llvm-project/pull/133892#issuecomment-2821559394
---
.../include/flang/Lower/ConvertExprToHLFIR.h | 9 ++++
flang/lib/Lower/ConvertExprToHLFIR.cpp | 46 +++++++++++++++++++
flang/lib/Lower/OpenMP/ClauseProcessor.cpp | 46 +------------------
3 files changed, 57 insertions(+), 44 deletions(-)
diff --git a/flang/include/flang/Lower/ConvertExprToHLFIR.h b/flang/include/flang/Lower/ConvertExprToHLFIR.h
index c64fb01b33ed9..f4d7701e50a2c 100644
--- a/flang/include/flang/Lower/ConvertExprToHLFIR.h
+++ b/flang/include/flang/Lower/ConvertExprToHLFIR.h
@@ -137,6 +137,15 @@ hlfir::ElementalAddrOp convertVectorSubscriptedExprToElementalAddr(
const Fortran::lower::SomeExpr &, Fortran::lower::SymMap &,
Fortran::lower::StatementContext &);
+/// Lower a designator containing vector subscripts, creating a hlfir::Entity
+/// representing the first element in the vector subscripted array. This is a
+/// helper which calls convertVectorSubscriptedExprToElementalAddr and lowers
+/// the hlfir::ElementalAddrOp.
+hlfir::Entity genVectorSubscriptedDesignatorFirstElementAddress(
+ mlir::Location loc, Fortran::lower::AbstractConverter &converter,
+ const Fortran::lower::SomeExpr &expr, Fortran::lower::SymMap &symMap,
+ Fortran::lower::StatementContext &stmtCtx);
+
} // namespace Fortran::lower
#endif // FORTRAN_LOWER_CONVERTEXPRTOHLFIR_H
diff --git a/flang/lib/Lower/ConvertExprToHLFIR.cpp b/flang/lib/Lower/ConvertExprToHLFIR.cpp
index 5a4521140045c..a1a2d3a169362 100644
--- a/flang/lib/Lower/ConvertExprToHLFIR.cpp
+++ b/flang/lib/Lower/ConvertExprToHLFIR.cpp
@@ -31,6 +31,7 @@
#include "flang/Optimizer/Builder/Runtime/Pointer.h"
#include "flang/Optimizer/Builder/Todo.h"
#include "flang/Optimizer/HLFIR/HLFIROps.h"
+#include "mlir/IR/IRMapping.h"
#include "llvm/ADT/TypeSwitch.h"
#include <optional>
@@ -2120,3 +2121,48 @@ Fortran::lower::convertVectorSubscriptedExprToElementalAddr(
return HlfirDesignatorBuilder(loc, converter, symMap, stmtCtx)
.convertVectorSubscriptedExprToElementalAddr(designatorExpr);
}
+
+hlfir::Entity Fortran::lower::genVectorSubscriptedDesignatorFirstElementAddress(
+ mlir::Location loc, Fortran::lower::AbstractConverter &converter,
+ const Fortran::lower::SomeExpr &expr, Fortran::lower::SymMap &symMap,
+ Fortran::lower::StatementContext &stmtCtx) {
+ fir::FirOpBuilder &builder = converter.getFirOpBuilder();
+
+ // Get a hlfir.elemental_addr op describing the address of the value
+ // indexed from the original array.
+ // Note: the hlfir.elemental_addr op verifier requires it to be inside
+ // of a hlfir.region_assign op. This operation is never seen by the
+ // verifier because it is immediately inlined.
+ hlfir::ElementalAddrOp addrOp = convertVectorSubscriptedExprToElementalAddr(
+ loc, converter, expr, symMap, stmtCtx);
+ if (!addrOp.getCleanup().empty())
+ TODO(converter.getCurrentLocation(),
+ "Vector subscript requring a cleanup region");
+
+ // hlfir.elemental_addr doesn't have a normal lowering because it
+ // can't return a value. Instead we need to inline it here using
+ // values for the first element. Similar to hlfir::inlineElementalOp.
+
+ mlir::Value one = builder.createIntegerConstant(
+ converter.getCurrentLocation(), builder.getIndexType(), 1);
+ mlir::SmallVector<mlir::Value> oneBasedIndices;
+ oneBasedIndices.resize(addrOp.getIndices().size(), one);
+
+ mlir::IRMapping mapper;
+ mapper.map(addrOp.getIndices(), oneBasedIndices);
+ assert(addrOp.getElementalRegion().hasOneBlock());
+ mlir::Operation *newOp;
+ for (mlir::Operation &op : addrOp.getElementalRegion().back().getOperations())
+ newOp = builder.clone(op, mapper);
+ auto yield = mlir::cast<hlfir::YieldOp>(newOp);
+
+ addrOp->erase();
+
+ if (!yield.getCleanup().empty())
+ TODO(converter.getCurrentLocation(),
+ "Vector subscript requring element cleanup");
+
+ hlfir::Entity result{yield.getEntity()};
+ yield->erase();
+ return result;
+}
\ No newline at end of file
diff --git a/flang/lib/Lower/OpenMP/ClauseProcessor.cpp b/flang/lib/Lower/OpenMP/ClauseProcessor.cpp
index cce6dc32bad4b..77b4622547d7a 100644
--- a/flang/lib/Lower/OpenMP/ClauseProcessor.cpp
+++ b/flang/lib/Lower/OpenMP/ClauseProcessor.cpp
@@ -895,50 +895,8 @@ bool ClauseProcessor::processDepend(lower::SymMap &symMap,
// the standard to be the lowest index) to identify the dependency. We
// don't need an accurate length for the array section because the
// OpenMP standard forbids overlapping array sections.
-
- // Get a hlfir.elemental_addr op describing the address of the value
- // indexed from the original array.
- // Note: the hlfir.elemental_addr op verifier requires it to be inside
- // of a hlfir.region_assign op. This is because the only place in base
- // Fortran where you need the address of a vector subscript would be
- // in an assignment operation. We are not doing an assignment here
- // but we do want the address (without having to duplicate all of
- // Fortran designation lowering!). This operation is never seen by the
- // verifier because it is immediately inlined.
- hlfir::ElementalAddrOp addrOp =
- convertVectorSubscriptedExprToElementalAddr(
- converter.getCurrentLocation(), converter, expr, symMap,
- stmtCtx);
- if (!addrOp.getCleanup().empty())
- TODO(converter.getCurrentLocation(),
- "Vector subscript in DEPEND clause requring a cleanup region");
-
- // hlfir.elemental_addr doesn't have a normal lowering because it
- // can't return a value. Instead we need to inline it here using
- // values for the first element. Similar to hlfir::inlineElementalOp.
-
- mlir::Value one = builder.createIntegerConstant(
- converter.getCurrentLocation(), builder.getIndexType(), 1);
- mlir::SmallVector<mlir::Value> oneBasedIndices;
- oneBasedIndices.resize(addrOp.getIndices().size(), one);
-
- mlir::IRMapping mapper;
- mapper.map(addrOp.getIndices(), oneBasedIndices);
- assert(addrOp.getElementalRegion().hasOneBlock());
- mlir::Operation *newOp;
- for (mlir::Operation &op :
- addrOp.getElementalRegion().back().getOperations())
- newOp = builder.clone(op, mapper);
- auto yield = mlir::cast<hlfir::YieldOp>(newOp);
-
- addrOp->erase();
-
- if (!yield.getCleanup().empty())
- TODO(converter.getCurrentLocation(),
- "Vector subscript in DEPEND clause requring element cleanup");
-
- dependVar = yield.getEntity();
- yield->erase();
+ dependVar = genVectorSubscriptedDesignatorFirstElementAddress(
+ converter.getCurrentLocation(), converter, expr, symMap, stmtCtx);
} else {
// Ordinary array section e.g. A(1:512:2)
hlfir::EntityWithAttributes entity = convertExprToHLFIR(
>From 77b94bba6ea3d56f4236813a3e1f1680cdccce28 Mon Sep 17 00:00:00 2001
From: Tom Eccles <tom.eccles at arm.com>
Date: Mon, 28 Apr 2025 09:27:12 +0000
Subject: [PATCH 2/2] Add missing newline
---
flang/lib/Lower/ConvertExprToHLFIR.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flang/lib/Lower/ConvertExprToHLFIR.cpp b/flang/lib/Lower/ConvertExprToHLFIR.cpp
index a1a2d3a169362..ba0a3e7f816b7 100644
--- a/flang/lib/Lower/ConvertExprToHLFIR.cpp
+++ b/flang/lib/Lower/ConvertExprToHLFIR.cpp
@@ -2165,4 +2165,4 @@ hlfir::Entity Fortran::lower::genVectorSubscriptedDesignatorFirstElementAddress(
hlfir::Entity result{yield.getEntity()};
yield->erase();
return result;
-}
\ No newline at end of file
+}
More information about the flang-commits
mailing list