https://github.com/TIFitis updated
https://github.com/llvm/llvm-project/pull/151989
>From e9b6766c5fbfd25b5acfc686cbdc41f8dd727b03 Mon Sep 17 00:00:00 2001
From: Akash Banerjee <akash.baner...@amd.com>
Date: Thu, 31 Jul 2025 19:48:15 +0100
Subject: [PATCH 1/2] [MLIR][OpenMP] Add a new AutomapToTargetData conversion
pass in FIR
Add a new AutomapToTargetData pass. This gathers the declare target enter
variables which have the AUTOMAP modifier.
And adds omp.declare_target_enter/exit mapping directives for fir.alloca and
fir.free oeprations on the AUTOMAP enabled variables.
---
.../include/flang/Optimizer/OpenMP/Passes.td | 11 ++
.../Optimizer/OpenMP/AutomapToTargetData.cpp | 171 ++++++++++++++++++
flang/lib/Optimizer/OpenMP/CMakeLists.txt | 1 +
flang/lib/Optimizer/Passes/Pipelines.cpp | 12 +-
.../Transforms/omp-automap-to-target-data.fir | 40 ++++
.../fortran/declare-target-automap.f90 | 36 ++++
6 files changed, 265 insertions(+), 6 deletions(-)
create mode 100644 flang/lib/Optimizer/OpenMP/AutomapToTargetData.cpp
create mode 100644 flang/test/Transforms/omp-automap-to-target-data.fir
create mode 100644 offload/test/offloading/fortran/declare-target-automap.f90
diff --git a/flang/include/flang/Optimizer/OpenMP/Passes.td
b/flang/include/flang/Optimizer/OpenMP/Passes.td
index 704faf0ccd856..0bff58f0f6394 100644
--- a/flang/include/flang/Optimizer/OpenMP/Passes.td
+++ b/flang/include/flang/Optimizer/OpenMP/Passes.td
@@ -112,4 +112,15 @@ def GenericLoopConversionPass
];
}
+def AutomapToTargetDataPass
+ : Pass<"omp-automap-to-target-data", "::mlir::ModuleOp"> {
+ let summary = "Insert OpenMP target data operations for AUTOMAP variables";
+ let description = [{
+ Inserts `omp.target_enter_data` and `omp.target_exit_data` operations to
+ map variables marked with the `AUTOMAP` modifier when their allocation
+ or deallocation is detected in the FIR.
+ }];
+ let dependentDialects = ["mlir::omp::OpenMPDialect"];
+}
+
#endif //FORTRAN_OPTIMIZER_OPENMP_PASSES
diff --git a/flang/lib/Optimizer/OpenMP/AutomapToTargetData.cpp
b/flang/lib/Optimizer/OpenMP/AutomapToTargetData.cpp
new file mode 100644
index 0000000000000..c4937f1e90ee3
--- /dev/null
+++ b/flang/lib/Optimizer/OpenMP/AutomapToTargetData.cpp
@@ -0,0 +1,171 @@
+//===- AutomapToTargetData.cpp -------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "flang/Optimizer/Builder/DirectivesCommon.h"
+#include "flang/Optimizer/Builder/FIRBuilder.h"
+#include "flang/Optimizer/Builder/HLFIRTools.h"
+#include "flang/Optimizer/Dialect/FIROps.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
+#include "flang/Optimizer/Dialect/Support/KindMapping.h"
+#include "flang/Optimizer/HLFIR/HLFIROps.h"
+#include "mlir/IR/BuiltinAttributes.h"
+#include "mlir/Pass/Pass.h"
+#include "llvm/Frontend/OpenMP/OMPConstants.h"
+#include <mlir/Dialect/OpenMP/OpenMPInterfaces.h>
+#include <mlir/IR/Operation.h>
+
+namespace flangomp {
+#define GEN_PASS_DEF_AUTOMAPTOTARGETDATAPASS
+#include "flang/Optimizer/OpenMP/Passes.h.inc"
+} // namespace flangomp
+
+using namespace mlir;
+
+namespace {
+class AutomapToTargetDataPass
+ : public flangomp::impl::AutomapToTargetDataPassBase<
+ AutomapToTargetDataPass> {
+ // Returns true if the variable has a dynamic size and therefore requires
+ // bounds operations to describe its extents.
+ bool needsBoundsOps(Value var) {
+ assert(isa<omp::PointerLikeType>(var.getType()) &&
+ "only pointer like types expected");
+ Type t = fir::unwrapRefType(var.getType());
+ if (Type inner = fir::dyn_cast_ptrOrBoxEleTy(t))
+ return fir::hasDynamicSize(inner);
+ return fir::hasDynamicSize(t);
+ }
+
+ // Generate MapBoundsOp operations for the variable if required.
+ void genBoundsOps(fir::FirOpBuilder &builder, Value var,
+ SmallVectorImpl<Value> &boundsOps) {
+ Location loc = var.getLoc();
+ fir::factory::AddrAndBoundsInfo info =
+ fir::factory::getDataOperandBaseAddr(builder, var,
+ /*isOptional=*/false, loc);
+ fir::ExtendedValue exv =
+ hlfir::translateToExtendedValue(loc, builder, hlfir::Entity{info.addr},
+ /*contiguousHint=*/true)
+ .first;
+ SmallVector<Value> tmp =
+ fir::factory::genImplicitBoundsOps<mlir::omp::MapBoundsOp,
+ mlir::omp::MapBoundsType>(
+ builder, info, exv, /*dataExvIsAssumedSize=*/false, loc);
+ llvm::append_range(boundsOps, tmp);
+ }
+
+ void findRelatedAllocmemFreemem(fir::AddrOfOp addressOfOp,
+ llvm::SmallVector<fir::StoreOp> &allocmems,
+ llvm::SmallVector<fir::LoadOp> &freemems) {
+ assert(addressOfOp->hasOneUse() && "op must have single use");
+
+ auto declaredRef =
+ cast<hlfir::DeclareOp>(*addressOfOp->getUsers().begin())->getResult(0);
+
+ for (Operation *refUser : declaredRef.getUsers()) {
+ if (auto storeOp = dyn_cast<fir::StoreOp>(refUser))
+ if (auto emboxOp = storeOp.getValue().getDefiningOp<fir::EmboxOp>())
+ if (auto allocmemOp =
+ emboxOp.getOperand(0).getDefiningOp<fir::AllocMemOp>())
+ allocmems.push_back(storeOp);
+
+ if (auto loadOp = dyn_cast<fir::LoadOp>(refUser))
+ for (Operation *loadUser : loadOp.getResult().getUsers())
+ if (auto boxAddrOp = dyn_cast<fir::BoxAddrOp>(loadUser))
+ for (Operation *boxAddrUser : boxAddrOp.getResult().getUsers())
+ if (auto freememOp = dyn_cast<fir::FreeMemOp>(boxAddrUser))
+ freemems.push_back(loadOp);
+ }
+ }
+
+ void runOnOperation() override {
+ ModuleOp module = getOperation()->getParentOfType<ModuleOp>();
+ if (!module)
+ module = dyn_cast<ModuleOp>(getOperation());
+ if (!module)
+ return;
+
+ // Build FIR builder for helper utilities.
+ fir::KindMapping kindMap = fir::getKindMapping(module);
+ fir::FirOpBuilder builder{module, std::move(kindMap)};
+
+ // Collect global variables with AUTOMAP flag.
+ llvm::DenseSet<fir::GlobalOp> automapGlobals;
+ module.walk([&](fir::GlobalOp globalOp) {
+ if (auto iface =
+ dyn_cast<omp::DeclareTargetInterface>(globalOp.getOperation()))
+ if (iface.isDeclareTarget() && iface.getDeclareTargetAutomap())
+ automapGlobals.insert(globalOp);
+ });
+
+ for (fir::GlobalOp globalOp : automapGlobals)
+ if (auto uses = globalOp.getSymbolUses(module.getOperation()))
+ for (auto &x : *uses)
+ if (auto addrOp = dyn_cast<fir::AddrOfOp>(x.getUser())) {
+ llvm::SmallVector<fir::StoreOp> allocstores;
+ llvm::SmallVector<fir::LoadOp> freememloads;
+ findRelatedAllocmemFreemem(addrOp, allocstores, freememloads);
+
+ for (auto storeOp : allocstores) {
+ builder.setInsertionPointAfter(storeOp);
+ SmallVector<Value> bounds;
+ if (needsBoundsOps(storeOp.getMemref()))
+ genBoundsOps(builder, storeOp.getMemref(), bounds);
+
+ omp::TargetEnterExitUpdateDataOperands clauses;
+ mlir::omp::MapInfoOp mapInfo = mlir::omp::MapInfoOp::create(
+ builder, storeOp.getLoc(), storeOp.getMemref().getType(),
+ storeOp.getMemref(),
+ TypeAttr::get(
+ fir::unwrapRefType(storeOp.getMemref().getType())),
+ builder.getIntegerAttr(
+ builder.getIntegerType(64, false),
+ static_cast<unsigned>(
+ llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_TO)),
+ builder.getAttr<omp::VariableCaptureKindAttr>(
+ omp::VariableCaptureKind::ByRef),
+ /*var_ptr_ptr=*/mlir::Value{},
+ /*members=*/SmallVector<Value>{},
+ /*members_index=*/ArrayAttr{}, bounds,
+ /*mapperId=*/mlir::FlatSymbolRefAttr(),
+ globalOp.getSymNameAttr(), builder.getBoolAttr(false));
+ clauses.mapVars.push_back(mapInfo);
+ builder.create<omp::TargetEnterDataOp>(storeOp.getLoc(),
clauses);
+ }
+
+ for (auto loadOp : freememloads) {
+ builder.setInsertionPoint(loadOp);
+ SmallVector<Value> bounds;
+ if (needsBoundsOps(loadOp.getMemref()))
+ genBoundsOps(builder, loadOp.getMemref(), bounds);
+
+ omp::TargetEnterExitUpdateDataOperands clauses;
+ mlir::omp::MapInfoOp mapInfo = mlir::omp::MapInfoOp::create(
+ builder, loadOp.getLoc(), loadOp.getMemref().getType(),
+ loadOp.getMemref(),
+ TypeAttr::get(
+ fir::unwrapRefType(loadOp.getMemref().getType())),
+ builder.getIntegerAttr(
+ builder.getIntegerType(64, false),
+ static_cast<unsigned>(
+ llvm::omp::OpenMPOffloadMappingFlags::
+ OMP_MAP_DELETE)),
+ builder.getAttr<omp::VariableCaptureKindAttr>(
+ omp::VariableCaptureKind::ByRef),
+ /*var_ptr_ptr=*/mlir::Value{},
+ /*members=*/SmallVector<Value>{},
+ /*members_index=*/ArrayAttr{}, bounds,
+ /*mapperId=*/mlir::FlatSymbolRefAttr(),
+ globalOp.getSymNameAttr(), builder.getBoolAttr(false));
+ clauses.mapVars.push_back(mapInfo);
+ builder.create<omp::TargetExitDataOp>(loadOp.getLoc(), clauses);
+ }
+ }
+ }
+};
+} // namespace
diff --git a/flang/lib/Optimizer/OpenMP/CMakeLists.txt
b/flang/lib/Optimizer/OpenMP/CMakeLists.txt
index e31543328a9f9..afe90985e54fd 100644
--- a/flang/lib/Optimizer/OpenMP/CMakeLists.txt
+++ b/flang/lib/Optimizer/OpenMP/CMakeLists.txt
@@ -1,6 +1,7 @@
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
add_flang_library(FlangOpenMPTransforms
+ AutomapToTargetData.cpp
DoConcurrentConversion.cpp
FunctionFiltering.cpp
GenericLoopConversion.cpp
diff --git a/flang/lib/Optimizer/Passes/Pipelines.cpp
b/flang/lib/Optimizer/Passes/Pipelines.cpp
index ca8e820608688..c0a3e3020e88e 100644
--- a/flang/lib/Optimizer/Passes/Pipelines.cpp
+++ b/flang/lib/Optimizer/Passes/Pipelines.cpp
@@ -316,13 +316,13 @@ void createOpenMPFIRPassPipeline(mlir::PassManager &pm,
pm.addPass(flangomp::createDoConcurrentConversionPass(
opts.doConcurrentMappingKind == DoConcurrentMappingKind::DCMK_Device));
- // The MapsForPrivatizedSymbols pass needs to run before
- // MapInfoFinalizationPass because the former creates new
- // MapInfoOp instances, typically for descriptors.
- // MapInfoFinalizationPass adds MapInfoOp instances for the descriptors
- // underlying data which is necessary to access the data on the offload
- // target device.
+ // The MapsForPrivatizedSymbols and AutomapToTargetDataPass pass needs to run
+ // before MapInfoFinalizationPass because the former creates new MapInfoOp
+ // instances, typically for descriptors. MapInfoFinalizationPass adds
+ // MapInfoOp instances for the descriptors underlying data which is necessary
+ // to access the data on the offload target device.
pm.addPass(flangomp::createMapsForPrivatizedSymbolsPass());
+ pm.addPass(flangomp::createAutomapToTargetDataPass());
pm.addPass(flangomp::createMapInfoFinalizationPass());
pm.addPass(flangomp::createMarkDeclareTargetPass());
pm.addPass(flangomp::createGenericLoopConversionPass());
diff --git a/flang/test/Transforms/omp-automap-to-target-data.fir
b/flang/test/Transforms/omp-automap-to-target-data.fir
new file mode 100644
index 0000000000000..30c6fc163ed24
--- /dev/null
+++ b/flang/test/Transforms/omp-automap-to-target-data.fir
@@ -0,0 +1,40 @@
+// RUN: fir-opt --omp-automap-to-target-data %s | FileCheck %s
+// Test OMP AutomapToTargetData pass.
+
+module {
+ fir.global
+ @_QMtestEarr{omp.declare_target = #omp.declaretarget<device_type = (any),
+ capture_clause = (enter), automap = true>} target
+ : !fir.box<!fir.heap<!fir.array<?xi32>>>
+
+ func.func @automap() {
+ %c0 = arith.constant 0 : index
+ %c10 = arith.constant 10 : i32
+ %addr = fir.address_of(@_QMtestEarr) :
!fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
+ %decl:2 = hlfir.declare %addr {fortran_attrs = #fir.var_attrs<allocatable,
target>, uniq_name = "_QMtestEarr"} :
(!fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>) ->
(!fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>,
!fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>)
+ %idx = fir.convert %c10 : (i32) -> index
+ %cond = arith.cmpi sgt, %idx, %c0 : index
+ %n = arith.select %cond, %idx, %c0 : index
+ %mem = fir.allocmem !fir.array<?xi32>, %n {fir.must_be_heap = true}
+ %shape = fir.shape %n : (index) -> !fir.shape<1>
+ %box = fir.embox %mem(%shape) : (!fir.heap<!fir.array<?xi32>>,
!fir.shape<1>) -> !fir.box<!fir.heap<!fir.array<?xi32>>>
+ fir.store %box to %decl#0 :
!fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
+ %ld = fir.load %decl#0 : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
+ %base = fir.box_addr %ld : (!fir.box<!fir.heap<!fir.array<?xi32>>>) ->
!fir.heap<!fir.array<?xi32>>
+ fir.freemem %base : !fir.heap<!fir.array<?xi32>>
+ %undef = fir.zero_bits !fir.heap<!fir.array<?xi32>>
+ %sh0 = fir.shape %c0 : (index) -> !fir.shape<1>
+ %empty = fir.embox %undef(%sh0) : (!fir.heap<!fir.array<?xi32>>,
!fir.shape<1>) -> !fir.box<!fir.heap<!fir.array<?xi32>>>
+ fir.store %empty to %decl#0 :
!fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
+ return
+ }
+}
+
+// CHECK-LABEL: func.func @automap()
+// CHECK: fir.allocmem
+// CHECK: fir.store
+// CHECK: omp.map.info {{.*}}map_clauses(to)
+// CHECK: omp.target_enter_data
+// CHECK: omp.map.info {{.*}}map_clauses(delete)
+// CHECK: omp.target_exit_data
+// CHECK: fir.freemem
diff --git a/offload/test/offloading/fortran/declare-target-automap.f90
b/offload/test/offloading/fortran/declare-target-automap.f90
new file mode 100644
index 0000000000000..50e8c124c25fc
--- /dev/null
+++ b/offload/test/offloading/fortran/declare-target-automap.f90
@@ -0,0 +1,36 @@
+!Offloading test for AUTOMAP modifier in declare target enter
+! REQUIRES: flang, amdgpu
+
+program automap_program
+ use iso_c_binding, only: c_loc
+ use omp_lib, only: omp_get_default_device, omp_target_is_present
+ integer, parameter :: N = 10
+ integer :: i
+ integer, allocatable, target :: automap_array(:)
+ !$omp declare target enter(automap:automap_array)
+
+ ! false since the storage is not present even though the descriptor is
present
+ write (*, *) omp_target_is_present(c_loc(automap_array),
omp_get_default_device())
+ ! CHECK: 0
+
+ allocate (automap_array(N))
+ ! true since the storage should be allocated and reference count
incremented by the allocate
+ write (*, *) omp_target_is_present(c_loc(automap_array),
omp_get_default_device())
+ ! CHECK: 1
+
+ ! since storage is present this should not be a runtime error
+ !$omp target teams loop
+ do i = 1, N
+ automap_array(i) = i
+ end do
+
+ !$omp target update from(automap_array)
+ write (*, *) automap_array
+ ! CHECK: 1 2 3 4 5 6 7 8 9 10
+
+ deallocate (automap_array)
+
+ ! automap_array should have it's storage unmapped on device here
+ write (*, *) omp_target_is_present(c_loc(automap_array),
omp_get_default_device())
+ ! CHECK: 0
+end program
>From 7198579d30bfdcab3afcd0fd3daec2f8d7c71478 Mon Sep 17 00:00:00 2001
From: Akash Banerjee <akash.baner...@amd.com>
Date: Thu, 7 Aug 2025 18:19:27 +0100
Subject: [PATCH 2/2] Address reviewer comments.
---
flang/include/flang/Support/OpenMP-utils.h | 35 ++++
.../Optimizer/OpenMP/AutomapToTargetData.cpp | 157 +++++++-----------
.../OpenMP/MapsForPrivatizedSymbols.cpp | 35 +---
flang/lib/Optimizer/Passes/Pipelines.cpp | 4 +-
.../Transforms/omp-automap-to-target-data.fir | 20 ++-
5 files changed, 109 insertions(+), 142 deletions(-)
diff --git a/flang/include/flang/Support/OpenMP-utils.h
b/flang/include/flang/Support/OpenMP-utils.h
index 6d9db2b682c50..464046eebe9ff 100644
--- a/flang/include/flang/Support/OpenMP-utils.h
+++ b/flang/include/flang/Support/OpenMP-utils.h
@@ -9,8 +9,13 @@
#ifndef FORTRAN_SUPPORT_OPENMP_UTILS_H_
#define FORTRAN_SUPPORT_OPENMP_UTILS_H_
+#include "flang/Optimizer/Builder/DirectivesCommon.h"
+#include "flang/Optimizer/Builder/FIRBuilder.h"
+#include "flang/Optimizer/Builder/HLFIRTools.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
#include "flang/Semantics/symbol.h"
+#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
#include "mlir/IR/Builders.h"
#include "mlir/IR/Value.h"
@@ -72,6 +77,36 @@ struct EntryBlockArgs {
/// \param [in] region - Empty region in which to create the entry block.
mlir::Block *genEntryBlock(
mlir::OpBuilder &builder, const EntryBlockArgs &args, mlir::Region
®ion);
+
+// Returns true if the variable has a dynamic size and therefore requires
+// bounds operations to describe its extents.
+static bool needsBoundsOps(mlir::Value var) {
+ assert(mlir::isa<mlir::omp::PointerLikeType>(var.getType()) &&
+ "only pointer like types expected");
+ mlir::Type t = fir::unwrapRefType(var.getType());
+ if (mlir::Type inner = fir::dyn_cast_ptrOrBoxEleTy(t)) {
+ return fir::hasDynamicSize(inner);
+ }
+ return fir::hasDynamicSize(t);
+}
+
+// Generate MapBoundsOp operations for the variable if required.
+static void genBoundsOps(fir::FirOpBuilder &builder, mlir::Value var,
+ llvm::SmallVectorImpl<mlir::Value> &boundsOps) {
+ mlir::Location loc = var.getLoc();
+ fir::factory::AddrAndBoundsInfo info =
+ fir::factory::getDataOperandBaseAddr(builder, var,
+ /*isOptional=*/false, loc);
+ fir::ExtendedValue exv =
+ hlfir::translateToExtendedValue(loc, builder, hlfir::Entity{info.addr},
+ /*contiguousHint=*/true)
+ .first;
+ llvm::SmallVector<mlir::Value> tmp =
+ fir::factory::genImplicitBoundsOps<mlir::omp::MapBoundsOp,
+ mlir::omp::MapBoundsType>(
+ builder, info, exv, /*dataExvIsAssumedSize=*/false, loc);
+ llvm::append_range(boundsOps, tmp);
+}
} // namespace Fortran::common::openmp
#endif // FORTRAN_SUPPORT_OPENMP_UTILS_H_
diff --git a/flang/lib/Optimizer/OpenMP/AutomapToTargetData.cpp
b/flang/lib/Optimizer/OpenMP/AutomapToTargetData.cpp
index c4937f1e90ee3..e6d4ce41a3939 100644
--- a/flang/lib/Optimizer/OpenMP/AutomapToTargetData.cpp
+++ b/flang/lib/Optimizer/OpenMP/AutomapToTargetData.cpp
@@ -6,18 +6,21 @@
//
//===----------------------------------------------------------------------===//
-#include "flang/Optimizer/Builder/DirectivesCommon.h"
#include "flang/Optimizer/Builder/FIRBuilder.h"
#include "flang/Optimizer/Builder/HLFIRTools.h"
#include "flang/Optimizer/Dialect/FIROps.h"
#include "flang/Optimizer/Dialect/FIRType.h"
#include "flang/Optimizer/Dialect/Support/KindMapping.h"
#include "flang/Optimizer/HLFIR/HLFIROps.h"
+#include "flang/Support/OpenMP-utils.h"
+
+#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
+#include "mlir/Dialect/OpenMP/OpenMPInterfaces.h"
#include "mlir/IR/BuiltinAttributes.h"
+#include "mlir/IR/Operation.h"
#include "mlir/Pass/Pass.h"
+
#include "llvm/Frontend/OpenMP/OMPConstants.h"
-#include <mlir/Dialect/OpenMP/OpenMPInterfaces.h>
-#include <mlir/IR/Operation.h>
namespace flangomp {
#define GEN_PASS_DEF_AUTOMAPTOTARGETDATAPASS
@@ -25,43 +28,15 @@ namespace flangomp {
} // namespace flangomp
using namespace mlir;
+using namespace Fortran::common::openmp;
namespace {
class AutomapToTargetDataPass
: public flangomp::impl::AutomapToTargetDataPassBase<
AutomapToTargetDataPass> {
- // Returns true if the variable has a dynamic size and therefore requires
- // bounds operations to describe its extents.
- bool needsBoundsOps(Value var) {
- assert(isa<omp::PointerLikeType>(var.getType()) &&
- "only pointer like types expected");
- Type t = fir::unwrapRefType(var.getType());
- if (Type inner = fir::dyn_cast_ptrOrBoxEleTy(t))
- return fir::hasDynamicSize(inner);
- return fir::hasDynamicSize(t);
- }
-
- // Generate MapBoundsOp operations for the variable if required.
- void genBoundsOps(fir::FirOpBuilder &builder, Value var,
- SmallVectorImpl<Value> &boundsOps) {
- Location loc = var.getLoc();
- fir::factory::AddrAndBoundsInfo info =
- fir::factory::getDataOperandBaseAddr(builder, var,
- /*isOptional=*/false, loc);
- fir::ExtendedValue exv =
- hlfir::translateToExtendedValue(loc, builder, hlfir::Entity{info.addr},
- /*contiguousHint=*/true)
- .first;
- SmallVector<Value> tmp =
- fir::factory::genImplicitBoundsOps<mlir::omp::MapBoundsOp,
- mlir::omp::MapBoundsType>(
- builder, info, exv, /*dataExvIsAssumedSize=*/false, loc);
- llvm::append_range(boundsOps, tmp);
- }
-
void findRelatedAllocmemFreemem(fir::AddrOfOp addressOfOp,
- llvm::SmallVector<fir::StoreOp> &allocmems,
- llvm::SmallVector<fir::LoadOp> &freemems) {
+ llvm::DenseSet<fir::StoreOp> &allocmems,
+ llvm::DenseSet<fir::LoadOp> &freemems) {
assert(addressOfOp->hasOneUse() && "op must have single use");
auto declaredRef =
@@ -72,14 +47,14 @@ class AutomapToTargetDataPass
if (auto emboxOp = storeOp.getValue().getDefiningOp<fir::EmboxOp>())
if (auto allocmemOp =
emboxOp.getOperand(0).getDefiningOp<fir::AllocMemOp>())
- allocmems.push_back(storeOp);
+ allocmems.insert(storeOp);
if (auto loadOp = dyn_cast<fir::LoadOp>(refUser))
for (Operation *loadUser : loadOp.getResult().getUsers())
if (auto boxAddrOp = dyn_cast<fir::BoxAddrOp>(loadUser))
for (Operation *boxAddrUser : boxAddrOp.getResult().getUsers())
if (auto freememOp = dyn_cast<fir::FreeMemOp>(boxAddrUser))
- freemems.push_back(loadOp);
+ freemems.insert(loadOp);
}
}
@@ -99,73 +74,57 @@ class AutomapToTargetDataPass
module.walk([&](fir::GlobalOp globalOp) {
if (auto iface =
dyn_cast<omp::DeclareTargetInterface>(globalOp.getOperation()))
- if (iface.isDeclareTarget() && iface.getDeclareTargetAutomap())
+ if (iface.isDeclareTarget() && iface.getDeclareTargetAutomap() &&
+ iface.getDeclareTargetDeviceType() !=
+ omp::DeclareTargetDeviceType::host)
automapGlobals.insert(globalOp);
});
- for (fir::GlobalOp globalOp : automapGlobals)
- if (auto uses = globalOp.getSymbolUses(module.getOperation()))
+ auto addMapInfo = [&](auto globalOp, auto memOp) {
+ builder.setInsertionPointAfter(memOp);
+ SmallVector<Value> bounds;
+ if (needsBoundsOps(memOp.getMemref()))
+ genBoundsOps(builder, memOp.getMemref(), bounds);
+
+ omp::TargetEnterExitUpdateDataOperands clauses;
+ mlir::omp::MapInfoOp mapInfo = mlir::omp::MapInfoOp::create(
+ builder, memOp.getLoc(), memOp.getMemref().getType(),
+ memOp.getMemref(),
+ TypeAttr::get(fir::unwrapRefType(memOp.getMemref().getType())),
+ builder.getIntegerAttr(
+ builder.getIntegerType(64, false),
+ static_cast<unsigned>(
+ isa<fir::StoreOp>(memOp)
+ ? llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_TO
+ : llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_DELETE)),
+ builder.getAttr<omp::VariableCaptureKindAttr>(
+ omp::VariableCaptureKind::ByCopy),
+ /*var_ptr_ptr=*/mlir::Value{},
+ /*members=*/SmallVector<Value>{},
+ /*members_index=*/ArrayAttr{}, bounds,
+ /*mapperId=*/mlir::FlatSymbolRefAttr(), globalOp.getSymNameAttr(),
+ builder.getBoolAttr(false));
+ clauses.mapVars.push_back(mapInfo);
+ isa<fir::StoreOp>(memOp)
+ ? builder.create<omp::TargetEnterDataOp>(memOp.getLoc(), clauses)
+ : builder.create<omp::TargetExitDataOp>(memOp.getLoc(), clauses);
+ };
+
+ for (fir::GlobalOp globalOp : automapGlobals) {
+ if (auto uses = globalOp.getSymbolUses(module.getOperation())) {
+ llvm::DenseSet<fir::StoreOp> allocmemStores;
+ llvm::DenseSet<fir::LoadOp> freememloads;
for (auto &x : *uses)
- if (auto addrOp = dyn_cast<fir::AddrOfOp>(x.getUser())) {
- llvm::SmallVector<fir::StoreOp> allocstores;
- llvm::SmallVector<fir::LoadOp> freememloads;
- findRelatedAllocmemFreemem(addrOp, allocstores, freememloads);
-
- for (auto storeOp : allocstores) {
- builder.setInsertionPointAfter(storeOp);
- SmallVector<Value> bounds;
- if (needsBoundsOps(storeOp.getMemref()))
- genBoundsOps(builder, storeOp.getMemref(), bounds);
-
- omp::TargetEnterExitUpdateDataOperands clauses;
- mlir::omp::MapInfoOp mapInfo = mlir::omp::MapInfoOp::create(
- builder, storeOp.getLoc(), storeOp.getMemref().getType(),
- storeOp.getMemref(),
- TypeAttr::get(
- fir::unwrapRefType(storeOp.getMemref().getType())),
- builder.getIntegerAttr(
- builder.getIntegerType(64, false),
- static_cast<unsigned>(
- llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_TO)),
- builder.getAttr<omp::VariableCaptureKindAttr>(
- omp::VariableCaptureKind::ByRef),
- /*var_ptr_ptr=*/mlir::Value{},
- /*members=*/SmallVector<Value>{},
- /*members_index=*/ArrayAttr{}, bounds,
- /*mapperId=*/mlir::FlatSymbolRefAttr(),
- globalOp.getSymNameAttr(), builder.getBoolAttr(false));
- clauses.mapVars.push_back(mapInfo);
- builder.create<omp::TargetEnterDataOp>(storeOp.getLoc(),
clauses);
- }
-
- for (auto loadOp : freememloads) {
- builder.setInsertionPoint(loadOp);
- SmallVector<Value> bounds;
- if (needsBoundsOps(loadOp.getMemref()))
- genBoundsOps(builder, loadOp.getMemref(), bounds);
-
- omp::TargetEnterExitUpdateDataOperands clauses;
- mlir::omp::MapInfoOp mapInfo = mlir::omp::MapInfoOp::create(
- builder, loadOp.getLoc(), loadOp.getMemref().getType(),
- loadOp.getMemref(),
- TypeAttr::get(
- fir::unwrapRefType(loadOp.getMemref().getType())),
- builder.getIntegerAttr(
- builder.getIntegerType(64, false),
- static_cast<unsigned>(
- llvm::omp::OpenMPOffloadMappingFlags::
- OMP_MAP_DELETE)),
- builder.getAttr<omp::VariableCaptureKindAttr>(
- omp::VariableCaptureKind::ByRef),
- /*var_ptr_ptr=*/mlir::Value{},
- /*members=*/SmallVector<Value>{},
- /*members_index=*/ArrayAttr{}, bounds,
- /*mapperId=*/mlir::FlatSymbolRefAttr(),
- globalOp.getSymNameAttr(), builder.getBoolAttr(false));
- clauses.mapVars.push_back(mapInfo);
- builder.create<omp::TargetExitDataOp>(loadOp.getLoc(), clauses);
- }
- }
+ if (auto addrOp = dyn_cast<fir::AddrOfOp>(x.getUser()))
+ findRelatedAllocmemFreemem(addrOp, allocmemStores, freememloads);
+
+ for (auto storeOp : allocmemStores)
+ addMapInfo(globalOp, storeOp);
+
+ for (auto loadOp : freememloads)
+ addMapInfo(globalOp, loadOp);
+ }
+ }
}
};
} // namespace
diff --git a/flang/lib/Optimizer/OpenMP/MapsForPrivatizedSymbols.cpp
b/flang/lib/Optimizer/OpenMP/MapsForPrivatizedSymbols.cpp
index 3a802ef0a96cb..bf9189a268033 100644
--- a/flang/lib/Optimizer/OpenMP/MapsForPrivatizedSymbols.cpp
+++ b/flang/lib/Optimizer/OpenMP/MapsForPrivatizedSymbols.cpp
@@ -29,6 +29,7 @@
#include "flang/Optimizer/Dialect/Support/KindMapping.h"
#include "flang/Optimizer/HLFIR/HLFIROps.h"
#include "flang/Optimizer/OpenMP/Passes.h"
+#include "flang/Support/OpenMP-utils.h"
#include "mlir/Dialect/Func/IR/FuncOps.h"
#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
@@ -47,6 +48,7 @@ namespace flangomp {
} // namespace flangomp
using namespace mlir;
+using namespace Fortran::common::openmp;
namespace {
class MapsForPrivatizedSymbolsPass
@@ -171,38 +173,5 @@ class MapsForPrivatizedSymbolsPass
}
}
}
- // As the name suggests, this function examines var to determine if
- // it has dynamic size. If true, this pass'll have to extract these
- // bounds from descriptor of var and add the bounds to the resultant
- // MapInfoOp.
- bool needsBoundsOps(mlir::Value var) {
- assert(mlir::isa<omp::PointerLikeType>(var.getType()) &&
- "needsBoundsOps can deal only with pointer types");
- mlir::Type t = fir::unwrapRefType(var.getType());
- // t could be a box, so look inside the box
- auto innerType = fir::dyn_cast_ptrOrBoxEleTy(t);
- if (innerType)
- return fir::hasDynamicSize(innerType);
- return fir::hasDynamicSize(t);
- }
-
- void genBoundsOps(fir::FirOpBuilder &builder, mlir::Value var,
- llvm::SmallVector<mlir::Value> &boundsOps) {
- mlir::Location loc = var.getLoc();
- fir::factory::AddrAndBoundsInfo info =
- fir::factory::getDataOperandBaseAddr(builder, var,
- /*isOptional=*/false, loc);
- fir::ExtendedValue extendedValue =
- hlfir::translateToExtendedValue(loc, builder, hlfir::Entity{info.addr},
- /*continguousHint=*/true)
- .first;
- llvm::SmallVector<mlir::Value> boundsOpsVec =
- fir::factory::genImplicitBoundsOps<mlir::omp::MapBoundsOp,
- mlir::omp::MapBoundsType>(
- builder, info, extendedValue,
- /*dataExvIsAssumedSize=*/false, loc);
- for (auto bounds : boundsOpsVec)
- boundsOps.push_back(bounds);
- }
};
} // namespace
diff --git a/flang/lib/Optimizer/Passes/Pipelines.cpp
b/flang/lib/Optimizer/Passes/Pipelines.cpp
index c0a3e3020e88e..9f02d2df43e68 100644
--- a/flang/lib/Optimizer/Passes/Pipelines.cpp
+++ b/flang/lib/Optimizer/Passes/Pipelines.cpp
@@ -316,8 +316,8 @@ void createOpenMPFIRPassPipeline(mlir::PassManager &pm,
pm.addPass(flangomp::createDoConcurrentConversionPass(
opts.doConcurrentMappingKind == DoConcurrentMappingKind::DCMK_Device));
- // The MapsForPrivatizedSymbols and AutomapToTargetDataPass pass needs to run
- // before MapInfoFinalizationPass because the former creates new MapInfoOp
+ // The MapsForPrivatizedSymbols and AutomapToTargetDataPass pass need to run
+ // before MapInfoFinalizationPass because they create new MapInfoOp
// instances, typically for descriptors. MapInfoFinalizationPass adds
// MapInfoOp instances for the descriptors underlying data which is necessary
// to access the data on the offload target device.
diff --git a/flang/test/Transforms/omp-automap-to-target-data.fir
b/flang/test/Transforms/omp-automap-to-target-data.fir
index 30c6fc163ed24..7dd01bfbc2fee 100644
--- a/flang/test/Transforms/omp-automap-to-target-data.fir
+++ b/flang/test/Transforms/omp-automap-to-target-data.fir
@@ -30,11 +30,15 @@ module {
}
}
-// CHECK-LABEL: func.func @automap()
-// CHECK: fir.allocmem
-// CHECK: fir.store
-// CHECK: omp.map.info {{.*}}map_clauses(to)
-// CHECK: omp.target_enter_data
-// CHECK: omp.map.info {{.*}}map_clauses(delete)
-// CHECK: omp.target_exit_data
-// CHECK: fir.freemem
+// CHECK: fir.global @[[AUTOMAP:.*]] {{{.*}} automap = true
+// CHECK-LABEL: func.func @automap()
+// CHECK: %[[AUTOMAP_ADDR:.*]] = fir.address_of(@[[AUTOMAP]])
+// CHECK: %[[AUTOMAP_DECL:.*]]:2 = hlfir.declare %[[AUTOMAP_ADDR]]
+// CHECK: fir.allocmem
+// CHECK: fir.store {{.*}} to %[[AUTOMAP_DECL]]#0
+// CHECK: %[[ENTER_MAP:.*]] = omp.map.info
var_ptr(%[[AUTOMAP_DECL]]#0 {{.*}} map_clauses(to) capture(ByCopy)
+// CHECK: omp.target_enter_data map_entries(%[[ENTER_MAP]]
+// CHECK: %[[LOAD:.*]] = fir.load %[[AUTOMAP_DECL]]#0
+// CHECK: %[[EXIT_MAP:.*]] = omp.map.info
var_ptr(%[[AUTOMAP_DECL]]#0 {{.*}} map_clauses(delete) capture(ByCopy)
+// CHECK: omp.target_exit_data map_entries(%[[EXIT_MAP]]
+// CHECK: fir.freemem
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
