https://github.com/clementval updated
https://github.com/llvm/llvm-project/pull/101212
>From 77727fdf40e1164d9975378bb6951bc49baaf04a Mon Sep 17 00:00:00 2001
From: Valentin Clement <clement...@gmail.com>
Date: Mon, 29 Jul 2024 14:50:05 -0700
Subject: [PATCH 1/2] [flang] Add allocator_idx attribute on fir.embox and
fircg.ext_embox
---
.../include/flang/Optimizer/CodeGen/CGOps.td | 4 ++-
.../include/flang/Optimizer/Dialect/FIROps.td | 10 +++++--
.../flang/Runtime}/allocator-registry.h | 6 +++-
flang/lib/Optimizer/CodeGen/CodeGen.cpp | 28 ++++++++++++++-----
flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp | 4 +--
flang/runtime/allocator-registry.cpp | 2 +-
flang/runtime/descriptor.cpp | 2 +-
flang/test/Fir/embox.fir | 24 ++++++++++++++++
8 files changed, 64 insertions(+), 16 deletions(-)
rename flang/{runtime => include/flang/Runtime}/allocator-registry.h (90%)
diff --git a/flang/include/flang/Optimizer/CodeGen/CGOps.td
b/flang/include/flang/Optimizer/CodeGen/CGOps.td
index f4740a263ffd2..34c5dc07284f0 100644
--- a/flang/include/flang/Optimizer/CodeGen/CGOps.td
+++ b/flang/include/flang/Optimizer/CodeGen/CGOps.td
@@ -48,6 +48,7 @@ def fircg_XEmboxOp : fircg_Op<"ext_embox",
[AttrSizedOperandSegments]> {
- substring: A substring operator (offset, length) for CHARACTER.
- LEN type parameters: A vector of runtime LEN type parameters that
describe an correspond to the elemental derived type.
+ - allocator_idx: specify special allocator to use.
The memref and shape arguments are mandatory. The rest are optional.
}];
@@ -60,7 +61,8 @@ def fircg_XEmboxOp : fircg_Op<"ext_embox",
[AttrSizedOperandSegments]> {
Variadic<AnyCoordinateType>:$subcomponent,
Variadic<AnyIntegerType>:$substr,
Variadic<AnyIntegerType>:$lenParams,
- Optional<fir_ClassType>:$sourceBox
+ Optional<fir_ClassType>:$sourceBox,
+ OptionalAttr<I32Attr>:$allocator_idx
);
let results = (outs BoxOrClassType);
diff --git a/flang/include/flang/Optimizer/Dialect/FIROps.td
b/flang/include/flang/Optimizer/Dialect/FIROps.td
index bee8e8f603ce3..7856fa7d90184 100644
--- a/flang/include/flang/Optimizer/Dialect/FIROps.td
+++ b/flang/include/flang/Optimizer/Dialect/FIROps.td
@@ -783,6 +783,7 @@ def fir_EmboxOp : fir_Op<"embox", [NoMemoryEffect,
AttrSizedOperandSegments]> {
- slice: an array section can be described with a slice triple,
- typeparams: for emboxing a derived type with LEN type parameters,
- accessMap: unused/experimental.
+ - allocator_idx: specify special allocator to use.
}];
let arguments = (ins
@@ -791,7 +792,8 @@ def fir_EmboxOp : fir_Op<"embox", [NoMemoryEffect,
AttrSizedOperandSegments]> {
Optional<fir_SliceType>:$slice,
Variadic<AnyIntegerType>:$typeparams,
Optional<fir_ClassType>:$sourceBox,
- OptionalAttr<AffineMapAttr>:$accessMap
+ OptionalAttr<AffineMapAttr>:$accessMap,
+ OptionalAttr<I32Attr>:$allocator_idx
);
let results = (outs BoxOrClassType);
@@ -801,9 +803,11 @@ def fir_EmboxOp : fir_Op<"embox", [NoMemoryEffect,
AttrSizedOperandSegments]> {
"mlir::Value":$memref, CArg<"mlir::Value", "{}">:$shape,
CArg<"mlir::Value", "{}">:$slice,
CArg<"mlir::ValueRange", "{}">:$typeparams,
- CArg<"mlir::Value", "{}">:$sourceBox),
+ CArg<"mlir::Value", "{}">:$sourceBox,
+ CArg<"mlir::IntegerAttr", "{}">:$allocator_idx),
[{ return build($_builder, $_state, resultTypes, memref, shape, slice,
- typeparams, sourceBox, mlir::AffineMapAttr{}); }]>
+ typeparams, sourceBox, mlir::AffineMapAttr{},
+ allocator_idx); }]>
];
let assemblyFormat = [{
diff --git a/flang/runtime/allocator-registry.h
b/flang/include/flang/Runtime/allocator-registry.h
similarity index 90%
rename from flang/runtime/allocator-registry.h
rename to flang/include/flang/Runtime/allocator-registry.h
index 3243e1deab630..c481bec8e8e51 100644
--- a/flang/runtime/allocator-registry.h
+++ b/flang/include/flang/Runtime/allocator-registry.h
@@ -13,6 +13,8 @@
#include <cstdlib>
#include <vector>
+static constexpr unsigned kDefaultAllocator = 0;
+
#define MAX_ALLOCATOR 5
namespace Fortran::runtime {
@@ -37,7 +39,9 @@ struct AllocatorRegistry {
RT_API_ATTRS constexpr AllocatorRegistry()
: allocators{{&MallocWrapper, &FreeWrapper}} {}
#else
- constexpr AllocatorRegistry() { allocators[0] = {&std::malloc, &std::free};
};
+ constexpr AllocatorRegistry() {
+ allocators[kDefaultAllocator] = {&std::malloc, &std::free};
+ };
#endif
RT_API_ATTRS void Register(int, Allocator_t);
RT_API_ATTRS AllocFct GetAllocator(int pos);
diff --git a/flang/lib/Optimizer/CodeGen/CodeGen.cpp
b/flang/lib/Optimizer/CodeGen/CodeGen.cpp
index 4a98585c34c7d..412cc4f1a020c 100644
--- a/flang/lib/Optimizer/CodeGen/CodeGen.cpp
+++ b/flang/lib/Optimizer/CodeGen/CodeGen.cpp
@@ -23,6 +23,7 @@
#include "flang/Optimizer/Support/InternalNames.h"
#include "flang/Optimizer/Support/TypeCode.h"
#include "flang/Optimizer/Support/Utils.h"
+#include "flang/Runtime/allocator-registry.h"
#include "flang/Semantics/runtime-type-info.h"
#include "mlir/Conversion/ArithCommon/AttrToLLVMConverter.h"
#include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h"
@@ -1224,8 +1225,8 @@ struct EmboxCommonConversion : public
fir::FIROpConversion<OP> {
fir::BaseBoxType boxTy, mlir::Type inputType,
mlir::ConversionPatternRewriter &rewriter,
unsigned rank, mlir::Value eleSize,
- mlir::Value cfiTy,
- mlir::Value typeDesc) const {
+ mlir::Value cfiTy, mlir::Value typeDesc,
+ int allocatorIdx = 0) const {
auto llvmBoxTy = this->lowerTy().convertBoxTypeAsStruct(boxTy, rank);
bool isUnlimitedPolymorphic = fir::isUnlimitedPolymorphicType(boxTy);
bool useInputType = fir::isPolymorphicType(boxTy) ||
isUnlimitedPolymorphic;
@@ -1243,9 +1244,14 @@ struct EmboxCommonConversion : public
fir::FIROpConversion<OP> {
this->genI32Constant(loc, rewriter, getCFIAttr(boxTy)));
const bool hasAddendum = fir::boxHasAddendum(boxTy);
- descriptor =
- insertField(rewriter, loc, descriptor, {kExtraPosInBox},
- this->genI32Constant(loc, rewriter, hasAddendum ? 1 : 0));
+
+ Fortran::ISO::CFI_cdesc_t desc;
+ desc.extra = 0;
+ desc.SetAllocIdx(allocatorIdx);
+ if (hasAddendum)
+ desc.SetHasAddendum();
+ descriptor = insertField(rewriter, loc, descriptor, {kExtraPosInBox},
+ this->genI32Constant(loc, rewriter, desc.extra));
if (hasAddendum) {
unsigned typeDescFieldId = getTypeDescFieldId(boxTy);
@@ -1300,6 +1306,13 @@ struct EmboxCommonConversion : public
fir::FIROpConversion<OP> {
typeparams.push_back(substrParams[1]);
}
+ int allocatorIdx = 0;
+ if constexpr (std::is_same_v<BOX, fir::EmboxOp> ||
+ std::is_same_v<BOX, fir::cg::XEmboxOp>) {
+ if (box.getAllocatorIdx())
+ allocatorIdx = *box.getAllocatorIdx();
+ }
+
// Write each of the fields with the appropriate values.
// When emboxing an element to a polymorphic descriptor, use the
// input type since the destination descriptor type has not the exact
@@ -1321,8 +1334,9 @@ struct EmboxCommonConversion : public
fir::FIROpConversion<OP> {
cfiTy.getType(), rewriter, kTypePosInBox);
}
auto mod = box->template getParentOfType<mlir::ModuleOp>();
- mlir::Value descriptor = populateDescriptor(
- loc, mod, boxTy, inputType, rewriter, rank, eleSize, cfiTy, typeDesc);
+ mlir::Value descriptor =
+ populateDescriptor(loc, mod, boxTy, inputType, rewriter, rank, eleSize,
+ cfiTy, typeDesc, allocatorIdx);
return {boxTy, descriptor, eleSize};
}
diff --git a/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp
b/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp
index fdf24028c5f9b..86b81d8d652b2 100644
--- a/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp
+++ b/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp
@@ -109,7 +109,7 @@ class EmboxConversion : public
mlir::OpRewritePattern<fir::EmboxOp> {
auto xbox = rewriter.create<fir::cg::XEmboxOp>(
loc, embox.getType(), embox.getMemref(), shapeOpers, std::nullopt,
std::nullopt, std::nullopt, std::nullopt, embox.getTypeparams(),
- embox.getSourceBox());
+ embox.getSourceBox(), embox.getAllocatorIdxAttr());
LLVM_DEBUG(llvm::dbgs() << "rewriting " << embox << " to " << xbox <<
'\n');
rewriter.replaceOp(embox, xbox.getOperation()->getResults());
return mlir::success();
@@ -145,7 +145,7 @@ class EmboxConversion : public
mlir::OpRewritePattern<fir::EmboxOp> {
auto xbox = rewriter.create<fir::cg::XEmboxOp>(
loc, embox.getType(), embox.getMemref(), shapeOpers, shiftOpers,
sliceOpers, subcompOpers, substrOpers, embox.getTypeparams(),
- embox.getSourceBox());
+ embox.getSourceBox(), embox.getAllocatorIdxAttr());
LLVM_DEBUG(llvm::dbgs() << "rewriting " << embox << " to " << xbox <<
'\n');
rewriter.replaceOp(embox, xbox.getOperation()->getResults());
return mlir::success();
diff --git a/flang/runtime/allocator-registry.cpp
b/flang/runtime/allocator-registry.cpp
index 461756d2ba95d..f5670331d6dbe 100644
--- a/flang/runtime/allocator-registry.cpp
+++ b/flang/runtime/allocator-registry.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "allocator-registry.h"
+#include "flang/Runtime/allocator-registry.h"
#include "terminator.h"
namespace Fortran::runtime {
diff --git a/flang/runtime/descriptor.cpp b/flang/runtime/descriptor.cpp
index 25046f62ce017..7c3fbb9016e38 100644
--- a/flang/runtime/descriptor.cpp
+++ b/flang/runtime/descriptor.cpp
@@ -8,13 +8,13 @@
#include "flang/Runtime/descriptor.h"
#include "ISO_Fortran_util.h"
-#include "allocator-registry.h"
#include "derived.h"
#include "memory.h"
#include "stat.h"
#include "terminator.h"
#include "tools.h"
#include "type-info.h"
+#include "flang/Runtime/allocator-registry.h"
#include <cassert>
#include <cstdlib>
#include <cstring>
diff --git a/flang/test/Fir/embox.fir b/flang/test/Fir/embox.fir
index 049328501dcc9..960aa06d123f2 100644
--- a/flang/test/Fir/embox.fir
+++ b/flang/test/Fir/embox.fir
@@ -103,3 +103,27 @@ func.func @fir_dev_issue_1416(%arg0:
!fir.ref<!fir.array<40x?xf32>>, %low: index
fir.call @do_something(%3) : (!fir.box<!fir.array<?xf32>>) -> ()
return
}
+
+// CHECK-LABEL: define void @_QPtest_allocator1()
+func.func @_QPtest_allocator1() {
+ %c20 = arith.constant 20 : index
+ %0 = fir.alloca !fir.array<20xi32> {bindc_name = "x", uniq_name =
"_QFtest_sliceEx"}
+ %1 = fir.shape %c20 : (index) -> !fir.shape<1>
+ %3 = fir.embox %0(%1) {allocator_idx = 1 : i32} :
(!fir.ref<!fir.array<20xi32>>, !fir.shape<1>) -> !fir.box<!fir.array<?xi32>>
+ fir.call @_QPtest_callee(%3) : (!fir.box<!fir.array<?xi32>>) -> ()
+ return
+}
+
+// %{{.*}} = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } {
ptr undef, i64 ptrtoint (ptr getelementptr (i32, ptr null, i32 1) to i64), i32
20240719, i8 1, i8 9, i8 0, i8 2, [1 x [3 x i64]] [[3 x i64] [i64 1, i64 20,
i64 ptrtoint (ptr getelementptr (i32, ptr null, i32 1) to i64)]] }
+
+// CHECK-LABEL: define void @_QPtest_allocator2()
+func.func @_QPtest_allocator2() {
+ %c20 = arith.constant 20 : index
+ %0 = fir.alloca !fir.array<20xi32> {bindc_name = "x", uniq_name =
"_QFtest_sliceEx"}
+ %1 = fir.shape %c20 : (index) -> !fir.shape<1>
+ %3 = fir.embox %0(%1) {allocator_idx = 3 : i32} :
(!fir.ref<!fir.array<20xi32>>, !fir.shape<1>) -> !fir.box<!fir.array<?xi32>>
+ fir.call @_QPtest_callee(%3) : (!fir.box<!fir.array<?xi32>>) -> ()
+ return
+}
+
+// %{{.*}} = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } {
ptr undef, i64 ptrtoint (ptr getelementptr (i32, ptr null, i32 1) to i64), i32
20240719, i8 1, i8 9, i8 0, i8 6, [1 x [3 x i64]] [[3 x i64] [i64 1, i64 20,
i64 ptrtoint (ptr getelementptr (i32, ptr null, i32 1) to i64)]] }
>From 41330ae32e67c9d706d557a56c01d9807caac53e Mon Sep 17 00:00:00 2001
From: Valentin Clement <clement...@gmail.com>
Date: Tue, 30 Jul 2024 13:18:07 -0700
Subject: [PATCH 2/2] Add missing CHECK
---
flang/test/Fir/embox.fir | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flang/test/Fir/embox.fir b/flang/test/Fir/embox.fir
index 960aa06d123f2..cd13c5cfaaa9a 100644
--- a/flang/test/Fir/embox.fir
+++ b/flang/test/Fir/embox.fir
@@ -126,4 +126,4 @@ func.func @_QPtest_allocator2() {
return
}
-// %{{.*}} = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } {
ptr undef, i64 ptrtoint (ptr getelementptr (i32, ptr null, i32 1) to i64), i32
20240719, i8 1, i8 9, i8 0, i8 6, [1 x [3 x i64]] [[3 x i64] [i64 1, i64 20,
i64 ptrtoint (ptr getelementptr (i32, ptr null, i32 1) to i64)]] }
+// CHECK: %{{.*}} = insertvalue { ptr, i64, i32, i8, i8, i8, i8, [1 x [3 x
i64]] } { ptr undef, i64 ptrtoint (ptr getelementptr (i32, ptr null, i32 1) to
i64), i32 20240719, i8 1, i8 9, i8 0, i8 6
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
