https://github.com/TIFitis updated
https://github.com/llvm/llvm-project/pull/121005
>From c993ac570b1788867be44690f87cf8ccafb97534 Mon Sep 17 00:00:00 2001
From: Akash Banerjee <akash.baner...@amd.com>
Date: Mon, 23 Dec 2024 21:50:03 +0000
Subject: [PATCH 1/2] Add OpenMP to LLVM dialect conversion support for
DeclareMapperOp.
---
.../Fir/convert-to-llvm-openmp-and-fir.fir | 27 +++++++++--
.../Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp | 48 +++++++++++++++----
.../OpenMPToLLVM/convert-to-llvmir.mlir | 13 +++++
3 files changed, 74 insertions(+), 14 deletions(-)
diff --git a/flang/test/Fir/convert-to-llvm-openmp-and-fir.fir
b/flang/test/Fir/convert-to-llvm-openmp-and-fir.fir
index 8e4e1fe824d9f5b..82f2aea3ad983c9 100644
--- a/flang/test/Fir/convert-to-llvm-openmp-and-fir.fir
+++ b/flang/test/Fir/convert-to-llvm-openmp-and-fir.fir
@@ -936,9 +936,9 @@ func.func @omp_map_info_descriptor_type_conversion(%arg0 :
!fir.ref<!fir.box<!fi
%1 = omp.map.info var_ptr(%0 : !fir.llvm_ptr<!fir.ref<i32>>, i32)
map_clauses(tofrom) capture(ByRef) -> !fir.llvm_ptr<!fir.ref<i32>> {name = ""}
// CHECK: %[[DESC_MAP:.*]] = omp.map.info var_ptr(%[[ARG_0]] : !llvm.ptr,
!llvm.struct<(ptr, i64, i32, i8, i8, i8, i8)>) map_clauses(always, delete)
capture(ByRef) members(%[[MEMBER_MAP]] : [0] : !llvm.ptr) -> !llvm.ptr {name =
""}
%2 = omp.map.info var_ptr(%arg0 : !fir.ref<!fir.box<!fir.heap<i32>>>,
!fir.box<!fir.heap<i32>>) map_clauses(always, delete) capture(ByRef) members(%1
: [0] : !fir.llvm_ptr<!fir.ref<i32>>) -> !fir.ref<!fir.box<!fir.heap<i32>>>
{name = ""}
- // CHECK: omp.target_exit_data map_entries(%[[DESC_MAP]] : !llvm.ptr)
+ // CHECK: omp.target_exit_data map_entries(%[[DESC_MAP]] : !llvm.ptr)
omp.target_exit_data map_entries(%2 : !fir.ref<!fir.box<!fir.heap<i32>>>)
- return
+ return
}
// -----
@@ -956,8 +956,8 @@ func.func
@omp_map_info_derived_type_explicit_member_conversion(%arg0 : !fir.ref
%3 = fir.field_index real,
!fir.type<_QFderived_type{real:f32,array:!fir.array<10xi32>,int:i32}>
%4 = fir.coordinate_of %arg0, %3 :
(!fir.ref<!fir.type<_QFderived_type{real:f32,array:!fir.array<10xi32>,int:i32}>>,
!fir.field) -> !fir.ref<f32>
// CHECK: %[[MAP_MEMBER_2:.*]] = omp.map.info var_ptr(%[[GEP_2]] :
!llvm.ptr, f32) map_clauses(tofrom) capture(ByRef) -> !llvm.ptr {name =
"dtype%real"}
- %5 = omp.map.info var_ptr(%4 : !fir.ref<f32>, f32) map_clauses(tofrom)
capture(ByRef) -> !fir.ref<f32> {name = "dtype%real"}
- // CHECK: %[[MAP_PARENT:.*]] = omp.map.info var_ptr(%[[ARG_0]] : !llvm.ptr,
!llvm.struct<"_QFderived_type", (f32, array<10 x i32>, i32)>)
map_clauses(tofrom) capture(ByRef) members(%[[MAP_MEMBER_1]], %[[MAP_MEMBER_2]]
: [2], [0] : !llvm.ptr, !llvm.ptr) -> !llvm.ptr {name = "dtype", partial_map =
true}
+ %5 = omp.map.info var_ptr(%4 : !fir.ref<f32>, f32) map_clauses(tofrom)
capture(ByRef) -> !fir.ref<f32> {name = "dtype%real"}
+ // CHECK: %[[MAP_PARENT:.*]] = omp.map.info var_ptr(%[[ARG_0]] : !llvm.ptr,
!llvm.struct<"_QFderived_type", (f32, array<10 x i32>, i32)>)
map_clauses(tofrom) capture(ByRef) members(%[[MAP_MEMBER_1]], %[[MAP_MEMBER_2]]
: [2], [0] : !llvm.ptr, !llvm.ptr) -> !llvm.ptr {name = "dtype", partial_map =
true}
%6 = omp.map.info var_ptr(%arg0 :
!fir.ref<!fir.type<_QFderived_type{real:f32,array:!fir.array<10xi32>,int:i32}>>,
!fir.type<_QFderived_type{real:f32,array:!fir.array<10xi32>,int:i32}>)
map_clauses(tofrom) capture(ByRef) members(%2, %5 : [2], [0] : !fir.ref<i32>,
!fir.ref<f32>) ->
!fir.ref<!fir.type<_QFderived_type{real:f32,array:!fir.array<10xi32>,int:i32}>>
{name = "dtype", partial_map = true}
// CHECK: omp.target map_entries(%[[MAP_MEMBER_1]] -> %[[ARG_1:.*]],
%[[MAP_MEMBER_2]] -> %[[ARG_2:.*]], %[[MAP_PARENT]] -> %[[ARG_3:.*]] :
!llvm.ptr, !llvm.ptr, !llvm.ptr) {
omp.target map_entries(%2 -> %arg1, %5 -> %arg2, %6 -> %arg3 :
!fir.ref<i32>, !fir.ref<f32>,
!fir.ref<!fir.type<_QFderived_type{real:f32,array:!fir.array<10xi32>,int:i32}>>)
{
@@ -1275,3 +1275,22 @@ func.func @map_nested_dtype_alloca_mem2(%arg0 :
!fir.ref<!fir.type<_QFRecTy{i:f3
}
return
}
+
+// -----
+
+// CHECK-LABEL: omp.declare_mapper @my_mapper :
!llvm.struct<"_QFdeclare_mapperTmy_type", (i32)> {
+omp.declare_mapper @my_mapper : !fir.type<_QFdeclare_mapperTmy_type{data:i32}>
{
+// CHECK: ^bb0(%[[VAL_0:.*]]: !llvm.ptr):
+^bb0(%0: !fir.ref<!fir.type<_QFdeclare_mapperTmy_type{data:i32}>>):
+// CHECK: %[[VAL_1:.*]] = llvm.mlir.constant(0 : i32) : i32
+ %1 = fir.field_index data, !fir.type<_QFdeclare_mapperTmy_type{data:i32}>
+// CHECK: %[[VAL_2:.*]] = llvm.getelementptr %[[VAL_0]][0, 0] :
(!llvm.ptr) -> !llvm.ptr, !llvm.struct<"_QFdeclare_mapperTmy_type", (i32)>
+ %2 = fir.coordinate_of %0, %1 :
(!fir.ref<!fir.type<_QFdeclare_mapperTmy_type{data:i32}>>, !fir.field) ->
!fir.ref<i32>
+// CHECK: %[[VAL_3:.*]] = omp.map.info var_ptr(%[[VAL_2]] :
!llvm.ptr, i32) map_clauses(tofrom) capture(ByRef) -> !llvm.ptr {name =
"var%[[VAL_4:.*]]"}
+ %3 = omp.map.info var_ptr(%2 : !fir.ref<i32>, i32) map_clauses(tofrom)
capture(ByRef) -> !fir.ref<i32> {name = "var%data"}
+// CHECK: %[[VAL_5:.*]] = omp.map.info var_ptr(%[[VAL_0]] :
!llvm.ptr, !llvm.struct<"_QFdeclare_mapperTmy_type", (i32)>)
map_clauses(tofrom) capture(ByRef) members(%[[VAL_3]] : [0] : !llvm.ptr) ->
!llvm.ptr {name = "var", partial_map = true}
+ %4 = omp.map.info var_ptr(%0 :
!fir.ref<!fir.type<_QFdeclare_mapperTmy_type{data:i32}>>,
!fir.type<_QFdeclare_mapperTmy_type{data:i32}>) map_clauses(tofrom)
capture(ByRef) members(%3 : [0] : !fir.ref<i32>) ->
!fir.ref<!fir.type<_QFdeclare_mapperTmy_type{data:i32}>> {name = "var",
partial_map = true}
+// CHECK: omp.declare_mapper_info map_entries(%[[VAL_5]], %[[VAL_3]]
: !llvm.ptr, !llvm.ptr)
+ omp.declare_mapper_info map_entries(%4, %3 :
!fir.ref<!fir.type<_QFdeclare_mapperTmy_type{data:i32}>>, !fir.ref<i32>)
+// CHECK: }
+}
diff --git a/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp
b/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp
index 12e3c07669839d0..cc01d8aacf3cf72 100644
--- a/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp
+++ b/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp
@@ -186,6 +186,32 @@ struct MapInfoOpConversion : public
ConvertOpToLLVMPattern<omp::MapInfoOp> {
}
};
+struct DeclMapperOpConversion
+ : public ConvertOpToLLVMPattern<omp::DeclareMapperOp> {
+ using ConvertOpToLLVMPattern<omp::DeclareMapperOp>::ConvertOpToLLVMPattern;
+ LogicalResult
+ matchAndRewrite(omp::DeclareMapperOp curOp, OpAdaptor adaptor,
+ ConversionPatternRewriter &rewriter) const override {
+ const TypeConverter *converter = ConvertToLLVMPattern::getTypeConverter();
+ SmallVector<NamedAttribute> newAttrs;
+ newAttrs.emplace_back(curOp.getSymNameAttrName(), curOp.getSymNameAttr());
+ newAttrs.emplace_back(
+ curOp.getVarTypeAttrName(),
+ TypeAttr::get(converter->convertType(curOp.getVarType())));
+
+ auto newOp = rewriter.create<omp::DeclareMapperOp>(
+ curOp.getLoc(), TypeRange(), adaptor.getOperands(), newAttrs);
+ rewriter.inlineRegionBefore(curOp.getRegion(), newOp.getRegion(),
+ newOp.getRegion().end());
+ if (failed(rewriter.convertRegionTypes(&newOp.getRegion(),
+ *this->getTypeConverter())))
+ return failure();
+
+ rewriter.eraseOp(curOp);
+ return success();
+ }
+};
+
template <typename OpType>
struct MultiRegionOpConversion : public ConvertOpToLLVMPattern<OpType> {
using ConvertOpToLLVMPattern<OpType>::ConvertOpToLLVMPattern;
@@ -225,19 +251,20 @@ void mlir::configureOpenMPToLLVMConversionLegality(
ConversionTarget &target, const LLVMTypeConverter &typeConverter) {
target.addDynamicallyLegalOp<
omp::AtomicReadOp, omp::AtomicWriteOp, omp::CancellationPointOp,
- omp::CancelOp, omp::CriticalDeclareOp, omp::FlushOp, omp::MapBoundsOp,
- omp::MapInfoOp, omp::OrderedOp, omp::ScanOp, omp::TargetEnterDataOp,
- omp::TargetExitDataOp, omp::TargetUpdateOp, omp::ThreadprivateOp,
- omp::YieldOp>([&](Operation *op) {
+ omp::CancelOp, omp::CriticalDeclareOp, omp::DeclareMapperInfoOp,
+ omp::FlushOp, omp::MapBoundsOp, omp::MapInfoOp, omp::OrderedOp,
omp::ScanOp,
+ omp::TargetEnterDataOp, omp::TargetExitDataOp, omp::TargetUpdateOp,
+ omp::ThreadprivateOp, omp::YieldOp>([&](Operation *op) {
return typeConverter.isLegal(op->getOperandTypes()) &&
typeConverter.isLegal(op->getResultTypes());
});
target.addDynamicallyLegalOp<
- omp::AtomicUpdateOp, omp::CriticalOp, omp::DeclareReductionOp,
- omp::DistributeOp, omp::LoopNestOp, omp::LoopOp, omp::MasterOp,
- omp::OrderedRegionOp, omp::ParallelOp, omp::SectionOp, omp::SectionsOp,
- omp::SimdOp, omp::SingleOp, omp::TargetDataOp, omp::TargetOp,
- omp::TaskgroupOp, omp::TaskloopOp, omp::TaskOp, omp::TeamsOp,
+ omp::AtomicUpdateOp, omp::CriticalOp, omp::DeclareMapperOp,
+ omp::DeclareReductionOp, omp::DistributeOp, omp::LoopNestOp, omp::LoopOp,
+ omp::MasterOp, omp::OrderedRegionOp, omp::ParallelOp,
+ omp::PrivateClauseOp, omp::SectionOp, omp::SectionsOp, omp::SimdOp,
+ omp::SingleOp, omp::TargetDataOp, omp::TargetOp, omp::TaskgroupOp,
+ omp::TaskloopOp, omp::TaskOp, omp::TeamsOp,
omp::WsloopOp>([&](Operation *op) {
return std::all_of(op->getRegions().begin(), op->getRegions().end(),
[&](Region ®ion) {
@@ -267,12 +294,13 @@ void
mlir::populateOpenMPToLLVMConversionPatterns(LLVMTypeConverter &converter,
[&](omp::MapBoundsType type) -> Type { return type; });
patterns.add<
- AtomicReadOpConversion, MapInfoOpConversion,
+ AtomicReadOpConversion, DeclMapperOpConversion, MapInfoOpConversion,
MultiRegionOpConversion<omp::DeclareReductionOp>,
MultiRegionOpConversion<omp::PrivateClauseOp>,
RegionLessOpConversion<omp::CancellationPointOp>,
RegionLessOpConversion<omp::CancelOp>,
RegionLessOpConversion<omp::CriticalDeclareOp>,
+ RegionLessOpConversion<omp::DeclareMapperInfoOp>,
RegionLessOpConversion<omp::OrderedOp>,
RegionLessOpConversion<omp::ScanOp>,
RegionLessOpConversion<omp::TargetEnterDataOp>,
diff --git a/mlir/test/Conversion/OpenMPToLLVM/convert-to-llvmir.mlir
b/mlir/test/Conversion/OpenMPToLLVM/convert-to-llvmir.mlir
index 6f1ed73e778b434..9f21fcb2cb7b875 100644
--- a/mlir/test/Conversion/OpenMPToLLVM/convert-to-llvmir.mlir
+++ b/mlir/test/Conversion/OpenMPToLLVM/convert-to-llvmir.mlir
@@ -601,3 +601,16 @@ func.func @omp_taskloop(%arg0: index, %arg1 : memref<i32>)
{
}
return
}
+
+// -----
+
+// CHECK-LABEL: omp.declare_mapper @my_mapper :
!llvm.struct<"_QFdeclare_mapperTmy_type", (i32)> {
+omp.declare_mapper @my_mapper : !llvm.struct<"_QFdeclare_mapperTmy_type",
(i32)> {
+^bb0(%arg0: !llvm.ptr):
+ %0 = llvm.mlir.constant(0 : i32) : i32
+ %1 = llvm.getelementptr %arg0[0, 0] : (!llvm.ptr) -> !llvm.ptr,
!llvm.struct<"_QFdeclare_mapperTmy_type", (i32)>
+ %2 = omp.map.info var_ptr(%1 : !llvm.ptr, i32) map_clauses(tofrom)
capture(ByRef) -> !llvm.ptr {name = "var%data"}
+ %3 = omp.map.info var_ptr(%arg0 : !llvm.ptr,
!llvm.struct<"_QFdeclare_mapperTmy_type", (i32)>) map_clauses(tofrom)
capture(ByRef) members(%2 : [0] : !llvm.ptr) -> !llvm.ptr {name = "var",
partial_map = true}
+ // CHECK: omp.declare_mapper_info map_entries(%{{.*}}, %{{.*}} : !llvm.ptr,
!llvm.ptr)
+ omp.declare_mapper_info map_entries(%3, %2 : !llvm.ptr, !llvm.ptr)
+}
>From 3302435a4db2f6e2822e30bdf5a973e258530187 Mon Sep 17 00:00:00 2001
From: Akash Banerjee <akash.baner...@amd.com>
Date: Fri, 7 Feb 2025 17:42:05 +0000
Subject: [PATCH 2/2] Address reviewer comments.
---
.../test/Fir/convert-to-llvm-openmp-and-fir.fir | 4 ++--
.../Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp | 17 +++++++++--------
.../OpenMPToLLVM/convert-to-llvmir.mlir | 4 ++--
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/flang/test/Fir/convert-to-llvm-openmp-and-fir.fir
b/flang/test/Fir/convert-to-llvm-openmp-and-fir.fir
index 82f2aea3ad983c9..7cdcd2a10e97513 100644
--- a/flang/test/Fir/convert-to-llvm-openmp-and-fir.fir
+++ b/flang/test/Fir/convert-to-llvm-openmp-and-fir.fir
@@ -1290,7 +1290,7 @@ omp.declare_mapper @my_mapper :
!fir.type<_QFdeclare_mapperTmy_type{data:i32}> {
%3 = omp.map.info var_ptr(%2 : !fir.ref<i32>, i32) map_clauses(tofrom)
capture(ByRef) -> !fir.ref<i32> {name = "var%data"}
// CHECK: %[[VAL_5:.*]] = omp.map.info var_ptr(%[[VAL_0]] :
!llvm.ptr, !llvm.struct<"_QFdeclare_mapperTmy_type", (i32)>)
map_clauses(tofrom) capture(ByRef) members(%[[VAL_3]] : [0] : !llvm.ptr) ->
!llvm.ptr {name = "var", partial_map = true}
%4 = omp.map.info var_ptr(%0 :
!fir.ref<!fir.type<_QFdeclare_mapperTmy_type{data:i32}>>,
!fir.type<_QFdeclare_mapperTmy_type{data:i32}>) map_clauses(tofrom)
capture(ByRef) members(%3 : [0] : !fir.ref<i32>) ->
!fir.ref<!fir.type<_QFdeclare_mapperTmy_type{data:i32}>> {name = "var",
partial_map = true}
-// CHECK: omp.declare_mapper_info map_entries(%[[VAL_5]], %[[VAL_3]]
: !llvm.ptr, !llvm.ptr)
- omp.declare_mapper_info map_entries(%4, %3 :
!fir.ref<!fir.type<_QFdeclare_mapperTmy_type{data:i32}>>, !fir.ref<i32>)
+// CHECK: omp.declare_mapper.info map_entries(%[[VAL_5]], %[[VAL_3]]
: !llvm.ptr, !llvm.ptr)
+ omp.declare_mapper.info map_entries(%4, %3 :
!fir.ref<!fir.type<_QFdeclare_mapperTmy_type{data:i32}>>, !fir.ref<i32>)
// CHECK: }
}
diff --git a/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp
b/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp
index cc01d8aacf3cf72..7888745dc6920db 100644
--- a/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp
+++ b/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp
@@ -196,8 +196,8 @@ struct DeclMapperOpConversion
SmallVector<NamedAttribute> newAttrs;
newAttrs.emplace_back(curOp.getSymNameAttrName(), curOp.getSymNameAttr());
newAttrs.emplace_back(
- curOp.getVarTypeAttrName(),
- TypeAttr::get(converter->convertType(curOp.getVarType())));
+ curOp.getTypeAttrName(),
+ TypeAttr::get(converter->convertType(curOp.getType())));
auto newOp = rewriter.create<omp::DeclareMapperOp>(
curOp.getLoc(), TypeRange(), adaptor.getOperands(), newAttrs);
@@ -252,12 +252,13 @@ void mlir::configureOpenMPToLLVMConversionLegality(
target.addDynamicallyLegalOp<
omp::AtomicReadOp, omp::AtomicWriteOp, omp::CancellationPointOp,
omp::CancelOp, omp::CriticalDeclareOp, omp::DeclareMapperInfoOp,
- omp::FlushOp, omp::MapBoundsOp, omp::MapInfoOp, omp::OrderedOp,
omp::ScanOp,
- omp::TargetEnterDataOp, omp::TargetExitDataOp, omp::TargetUpdateOp,
- omp::ThreadprivateOp, omp::YieldOp>([&](Operation *op) {
- return typeConverter.isLegal(op->getOperandTypes()) &&
- typeConverter.isLegal(op->getResultTypes());
- });
+ omp::FlushOp, omp::MapBoundsOp, omp::MapInfoOp, omp::OrderedOp,
+ omp::ScanOp, omp::TargetEnterDataOp, omp::TargetExitDataOp,
+ omp::TargetUpdateOp, omp::ThreadprivateOp, omp::YieldOp>(
+ [&](Operation *op) {
+ return typeConverter.isLegal(op->getOperandTypes()) &&
+ typeConverter.isLegal(op->getResultTypes());
+ });
target.addDynamicallyLegalOp<
omp::AtomicUpdateOp, omp::CriticalOp, omp::DeclareMapperOp,
omp::DeclareReductionOp, omp::DistributeOp, omp::LoopNestOp, omp::LoopOp,
diff --git a/mlir/test/Conversion/OpenMPToLLVM/convert-to-llvmir.mlir
b/mlir/test/Conversion/OpenMPToLLVM/convert-to-llvmir.mlir
index 9f21fcb2cb7b875..d69de998346b538 100644
--- a/mlir/test/Conversion/OpenMPToLLVM/convert-to-llvmir.mlir
+++ b/mlir/test/Conversion/OpenMPToLLVM/convert-to-llvmir.mlir
@@ -611,6 +611,6 @@ omp.declare_mapper @my_mapper :
!llvm.struct<"_QFdeclare_mapperTmy_type", (i32)>
%1 = llvm.getelementptr %arg0[0, 0] : (!llvm.ptr) -> !llvm.ptr,
!llvm.struct<"_QFdeclare_mapperTmy_type", (i32)>
%2 = omp.map.info var_ptr(%1 : !llvm.ptr, i32) map_clauses(tofrom)
capture(ByRef) -> !llvm.ptr {name = "var%data"}
%3 = omp.map.info var_ptr(%arg0 : !llvm.ptr,
!llvm.struct<"_QFdeclare_mapperTmy_type", (i32)>) map_clauses(tofrom)
capture(ByRef) members(%2 : [0] : !llvm.ptr) -> !llvm.ptr {name = "var",
partial_map = true}
- // CHECK: omp.declare_mapper_info map_entries(%{{.*}}, %{{.*}} : !llvm.ptr,
!llvm.ptr)
- omp.declare_mapper_info map_entries(%3, %2 : !llvm.ptr, !llvm.ptr)
+ // CHECK: omp.declare_mapper.info map_entries(%{{.*}}, %{{.*}} : !llvm.ptr,
!llvm.ptr)
+ omp.declare_mapper.info map_entries(%3, %2 : !llvm.ptr, !llvm.ptr)
}
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
