Skip to content

[MLIR][OpenMP] Add missing clauses to OpenMP op definitions #99507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2024
Merged

[MLIR][OpenMP] Add missing clauses to OpenMP op definitions #99507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions mlir/include/mlir/Dialect/OpenMP/OpenMPClauseOperands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,10 @@ using ParallelOperands =
using SectionsOperands = detail::Clauses<AllocateClauseOps, NowaitClauseOps,
PrivateClauseOps, ReductionClauseOps>;

// TODO `linear` clause.
using SimdOperands =
detail::Clauses<AlignedClauseOps, IfClauseOps, NontemporalClauseOps,
OrderClauseOps, PrivateClauseOps, ReductionClauseOps,
SafelenClauseOps, SimdlenClauseOps>;
detail::Clauses<AlignedClauseOps, IfClauseOps, LinearClauseOps,
NontemporalClauseOps, OrderClauseOps, PrivateClauseOps,
ReductionClauseOps, SafelenClauseOps, SimdlenClauseOps>;

using SingleOperands = detail::Clauses<AllocateClauseOps, CopyprivateClauseOps,
NowaitClauseOps, PrivateClauseOps>;
Expand Down
52 changes: 28 additions & 24 deletions mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,9 @@ def TerminatorOp : OpenMP_Op<"terminator", [Terminator, Pure]> {
def TeamsOp : OpenMP_Op<"teams", traits = [
AttrSizedOperandSegments, RecursiveMemoryEffects
], clauses = [
// TODO: Complete clause list (private).
// TODO: Sort clauses alphabetically.
OpenMP_NumTeamsClause, OpenMP_IfClause, OpenMP_ThreadLimitClause,
OpenMP_AllocateClause, OpenMP_ReductionClause
OpenMP_AllocateClause, OpenMP_ReductionClause, OpenMP_PrivateClause
], singleRegion = true> {
let summary = "teams construct";
let description = [{
Expand Down Expand Up @@ -238,9 +237,9 @@ def SectionOp : OpenMP_Op<"section", [HasParent<"SectionsOp">],
def SectionsOp : OpenMP_Op<"sections", traits = [
AttrSizedOperandSegments
], clauses = [
// TODO: Complete clause list (private).
// TODO: Sort clauses alphabetically.
OpenMP_ReductionClause, OpenMP_AllocateClause, OpenMP_NowaitClause
OpenMP_ReductionClause, OpenMP_AllocateClause, OpenMP_NowaitClause,
OpenMP_PrivateClause
], singleRegion = true> {
let summary = "sections construct";
let description = [{
Expand Down Expand Up @@ -271,8 +270,8 @@ def SectionsOp : OpenMP_Op<"sections", traits = [
def SingleOp : OpenMP_Op<"single", traits = [
AttrSizedOperandSegments
], clauses = [
// TODO: Complete clause list (private).
OpenMP_AllocateClause, OpenMP_CopyprivateClause, OpenMP_NowaitClause
OpenMP_AllocateClause, OpenMP_CopyprivateClause, OpenMP_NowaitClause,
OpenMP_PrivateClause
], singleRegion = true> {
let summary = "single directive";
let description = [{
Expand Down Expand Up @@ -363,14 +362,15 @@ def WsloopOp : OpenMP_Op<"wsloop", traits = [
AttrSizedOperandSegments, DeclareOpInterfaceMethods<LoopWrapperInterface>,
RecursiveMemoryEffects, SingleBlock
], clauses = [
// TODO: Complete clause list (allocate, private).
// TODO: Sort clauses alphabetically.
OpenMP_LinearClauseSkip<assemblyFormat = true>,
OpenMP_ReductionClauseSkip<assemblyFormat = true>,
OpenMP_ScheduleClauseSkip<assemblyFormat = true>,
OpenMP_NowaitClauseSkip<assemblyFormat = true>,
OpenMP_OrderedClauseSkip<assemblyFormat = true>,
OpenMP_OrderClauseSkip<assemblyFormat = true>
OpenMP_OrderClauseSkip<assemblyFormat = true>,
OpenMP_AllocateClauseSkip<assemblyFormat = true>,
OpenMP_PrivateClauseSkip<assemblyFormat = true>
], singleRegion = true> {
let summary = "worksharing-loop construct";
let description = [{
Expand Down Expand Up @@ -417,6 +417,13 @@ def WsloopOp : OpenMP_Op<"wsloop", traits = [
|`nowait` $nowait
|`ordered` `(` $ordered `)`
|`order` `(` custom<OrderClause>($order, $order_mod) `)`
|`allocate` `(`
custom<AllocateAndAllocator>(
$allocate_vars, type($allocate_vars), $allocator_vars,
type($allocator_vars)) `)`
|`private` `(`
custom<PrivateList>(
$private_vars, type($private_vars), $private_syms) `)`
) custom<Wsloop>($region, $reduction_vars, type($reduction_vars),
$reduction_byref, $reduction_syms) attr-dict
}];
Expand All @@ -432,9 +439,9 @@ def SimdOp : OpenMP_Op<"simd", traits = [
AttrSizedOperandSegments, DeclareOpInterfaceMethods<LoopWrapperInterface>,
RecursiveMemoryEffects, SingleBlock
], clauses = [
// TODO: Complete clause list (linear, private, reduction).
OpenMP_AlignedClause, OpenMP_IfClause, OpenMP_NontemporalClause,
OpenMP_OrderClause, OpenMP_SafelenClause, OpenMP_SimdlenClause
OpenMP_AlignedClause, OpenMP_IfClause, OpenMP_LinearClause,
OpenMP_NontemporalClause, OpenMP_OrderClause, OpenMP_PrivateClause,
OpenMP_ReductionClause, OpenMP_SafelenClause, OpenMP_SimdlenClause
], singleRegion = true> {
let summary = "simd construct";
let description = [{
Expand Down Expand Up @@ -499,9 +506,9 @@ def DistributeOp : OpenMP_Op<"distribute", traits = [
AttrSizedOperandSegments, DeclareOpInterfaceMethods<LoopWrapperInterface>,
RecursiveMemoryEffects, SingleBlock
], clauses = [
// TODO: Complete clause list (private).
// TODO: Sort clauses alphabetically.
OpenMP_DistScheduleClause, OpenMP_AllocateClause, OpenMP_OrderClause
OpenMP_DistScheduleClause, OpenMP_AllocateClause, OpenMP_OrderClause,
OpenMP_PrivateClause
], singleRegion = true> {
let summary = "distribute construct";
let description = [{
Expand Down Expand Up @@ -552,11 +559,12 @@ def TaskOp : OpenMP_Op<"task", traits = [
AttrSizedOperandSegments, AutomaticAllocationScope,
OutlineableOpenMPOpInterface
], clauses = [
// TODO: Complete clause list (affinity, detach, private).
// TODO: Complete clause list (affinity, detach).
// TODO: Sort clauses alphabetically.
OpenMP_IfClause, OpenMP_FinalClause, OpenMP_UntiedClause,
OpenMP_MergeableClause, OpenMP_InReductionClause,
OpenMP_PriorityClause, OpenMP_DependClause, OpenMP_AllocateClause
OpenMP_PriorityClause, OpenMP_DependClause, OpenMP_AllocateClause,
OpenMP_PrivateClause
], singleRegion = true> {
let summary = "task construct";
let description = [{
Expand Down Expand Up @@ -589,14 +597,13 @@ def TaskloopOp : OpenMP_Op<"taskloop", traits = [
DeclareOpInterfaceMethods<LoopWrapperInterface>, RecursiveMemoryEffects,
SingleBlock
], clauses = [
// TODO: Complete clause list (private).
// TODO: Sort clauses alphabetically.
OpenMP_IfClause, OpenMP_FinalClause, OpenMP_UntiedClause,
OpenMP_MergeableClause,
OpenMP_InReductionClauseSkip<extraClassDeclaration = true>,
OpenMP_ReductionClauseSkip<extraClassDeclaration = true>,
OpenMP_PriorityClause, OpenMP_AllocateClause, OpenMP_GrainsizeClause,
OpenMP_NumTasksClause, OpenMP_NogroupClause
OpenMP_NumTasksClause, OpenMP_NogroupClause, OpenMP_PrivateClause
], singleRegion = true> {
let summary = "taskloop construct";
let description = [{
Expand Down Expand Up @@ -1076,12 +1083,12 @@ def TargetUpdateOp: OpenMP_Op<"target_update", traits = [
def TargetOp : OpenMP_Op<"target", traits = [
AttrSizedOperandSegments, IsolatedFromAbove, OutlineableOpenMPOpInterface
], clauses = [
// TODO: Complete clause list (allocate, defaultmap, in_reduction,
// uses_allocators).
// TODO: Complete clause list (defaultmap, uses_allocators).
// TODO: Sort clauses alphabetically.
OpenMP_IfClause, OpenMP_DeviceClause, OpenMP_ThreadLimitClause,
OpenMP_DependClause, OpenMP_NowaitClause, OpenMP_IsDevicePtrClause,
OpenMP_HasDeviceAddrClause, OpenMP_MapClause, OpenMP_PrivateClause
OpenMP_HasDeviceAddrClause, OpenMP_MapClause, OpenMP_PrivateClause,
OpenMP_AllocateClause, OpenMP_InReductionClause
], singleRegion = true> {
let summary = "target construct";
let description = [{
Expand Down Expand Up @@ -1207,7 +1214,7 @@ def OrderedRegionOp : OpenMP_Op<"ordered.region", clauses = [
//===----------------------------------------------------------------------===//

def TaskwaitOp : OpenMP_Op<"taskwait", clauses = [
// TODO: Complete clause list (depend, nowait).
OpenMP_DependClause, OpenMP_NowaitClause
]> {
let summary = "taskwait construct";
let description = [{
Expand All @@ -1218,9 +1225,6 @@ def TaskwaitOp : OpenMP_Op<"taskwait", clauses = [
let builders = [
OpBuilder<(ins CArg<"const TaskwaitOperands &">:$clauses)>
];

// TODO: Remove overriden `assemblyFormat` once a clause is added.
let assemblyFormat = "attr-dict";
}

//===----------------------------------------------------------------------===//
Expand Down
49 changes: 32 additions & 17 deletions mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1451,13 +1451,15 @@ void TargetOp::build(OpBuilder &builder, OperationState &state,
const TargetOperands &clauses) {
MLIRContext *ctx = builder.getContext();
// TODO Store clauses in op: allocateVars, allocatorVars, inReductionVars,
// inReduceVarByRef, inReductionDeclSymbols, reductionVars, reduceVarByRef,
// reductionDeclSymbols.
// inReductionByref, inReductionSyms.
TargetOp::build(builder, state, clauses.ifVar, clauses.device,
clauses.threadLimit, makeArrayAttr(ctx, clauses.dependKinds),
clauses.dependVars, clauses.nowait, clauses.isDevicePtrVars,
clauses.hasDeviceAddrVars, clauses.mapVars,
clauses.privateVars, makeArrayAttr(ctx, clauses.privateSyms));
clauses.privateVars, makeArrayAttr(ctx, clauses.privateSyms),
/*allocate_vars=*/{}, /*allocator_vars=*/{},
/*in_reduction_vars=*/{}, /*in_reduction_byref=*/nullptr,
/*in_reduction_syms=*/nullptr);
}

LogicalResult TargetOp::verify() {
Expand Down Expand Up @@ -1584,7 +1586,8 @@ void TeamsOp::build(OpBuilder &builder, OperationState &state,
clauses.ifVar, clauses.threadLimit, clauses.allocateVars,
clauses.allocatorVars, clauses.reductionVars,
makeDenseBoolArrayAttr(ctx, clauses.reductionByref),
makeArrayAttr(ctx, clauses.reductionSyms));
makeArrayAttr(ctx, clauses.reductionSyms), /*private_vars=*/{},
/*private_syms=*/nullptr);
}

LogicalResult TeamsOp::verify() {
Expand Down Expand Up @@ -1630,8 +1633,8 @@ void SectionsOp::build(OpBuilder &builder, OperationState &state,
SectionsOp::build(builder, state, clauses.reductionVars,
makeDenseBoolArrayAttr(ctx, clauses.reductionByref),
makeArrayAttr(ctx, clauses.reductionSyms),
clauses.allocateVars, clauses.allocatorVars,
clauses.nowait);
clauses.allocateVars, clauses.allocatorVars, clauses.nowait,
/*private_vars=*/{}, /*private_syms=*/nullptr);
}

LogicalResult SectionsOp::verify() {
Expand Down Expand Up @@ -1664,7 +1667,8 @@ void SingleOp::build(OpBuilder &builder, OperationState &state,
// TODO Store clauses in op: privateVars, privateSyms.
SingleOp::build(builder, state, clauses.allocateVars, clauses.allocatorVars,
clauses.copyprivateVars,
makeArrayAttr(ctx, clauses.copyprivateSyms), clauses.nowait);
makeArrayAttr(ctx, clauses.copyprivateSyms), clauses.nowait,
/*private_vars=*/{}, /*private_syms=*/nullptr);
}

LogicalResult SingleOp::verify() {
Expand Down Expand Up @@ -1716,7 +1720,9 @@ void WsloopOp::build(OpBuilder &builder, OperationState &state,
/*reduction_byref=*/nullptr, /*reduction_syms=*/nullptr,
/*schedule_kind=*/nullptr, /*schedule_chunk=*/nullptr,
/*schedule_mod=*/nullptr, /*schedule_simd=*/false, /*nowait=*/false,
/*ordered=*/nullptr, /*order=*/nullptr, /*order_mod=*/nullptr);
/*ordered=*/nullptr, /*order=*/nullptr, /*order_mod=*/nullptr,
/*allocate_vars=*/{}, /*allocator_vars=*/{}, /*private_vars=*/{},
/*private_syms=*/nullptr);
state.addAttributes(attributes);
}

Expand All @@ -1731,7 +1737,9 @@ void WsloopOp::build(OpBuilder &builder, OperationState &state,
makeArrayAttr(ctx, clauses.reductionSyms),
clauses.scheduleKind, clauses.scheduleChunk,
clauses.scheduleMod, clauses.scheduleSimd, clauses.nowait,
clauses.ordered, clauses.order, clauses.orderMod);
clauses.ordered, clauses.order, clauses.orderMod,
/*allocate_vars=*/{}, /*allocator_vars=*/{},
/*private_vars=*/{}, /*private_syms=*/nullptr);
}

LogicalResult WsloopOp::verify() {
Expand All @@ -1756,12 +1764,15 @@ LogicalResult WsloopOp::verify() {
void SimdOp::build(OpBuilder &builder, OperationState &state,
const SimdOperands &clauses) {
MLIRContext *ctx = builder.getContext();
// TODO Store clauses in op: privateVars, privateSyms, reductionVars,
// reduceVarByRef, reductionDeclSymbols.
// TODO Store clauses in op: linearVars, linearStepVars, privateVars,
// privateSyms, reductionVars, reductionByref, reductionSyms.
SimdOp::build(builder, state, clauses.alignedVars,
makeArrayAttr(ctx, clauses.alignments), clauses.ifVar,
/*linear_vars=*/{}, /*linear_step_vars=*/{},
clauses.nontemporalVars, clauses.order, clauses.orderMod,
clauses.safelen, clauses.simdlen);
/*private_vars=*/{}, /*private_syms=*/nullptr,
/*reduction_vars=*/{}, /*reduction_byref=*/nullptr,
/*reduction_syms=*/nullptr, clauses.safelen, clauses.simdlen);
}

LogicalResult SimdOp::verify() {
Expand Down Expand Up @@ -1795,7 +1806,8 @@ void DistributeOp::build(OpBuilder &builder, OperationState &state,
// TODO Store clauses in op: privateVars, privateSyms.
DistributeOp::build(builder, state, clauses.distScheduleStatic,
clauses.distScheduleChunkSize, clauses.allocateVars,
clauses.allocatorVars, clauses.order, clauses.orderMod);
clauses.allocatorVars, clauses.order, clauses.orderMod,
/*private_vars=*/{}, /*private_syms=*/nullptr);
}

LogicalResult DistributeOp::verify() {
Expand Down Expand Up @@ -1927,7 +1939,8 @@ void TaskOp::build(OpBuilder &builder, OperationState &state,
makeDenseBoolArrayAttr(ctx, clauses.inReductionByref),
makeArrayAttr(ctx, clauses.inReductionSyms), clauses.priority,
makeArrayAttr(ctx, clauses.dependKinds), clauses.dependVars,
clauses.allocateVars, clauses.allocatorVars);
clauses.allocateVars, clauses.allocatorVars,
/*private_vars=*/{}, /*private_syms=*/nullptr);
}

LogicalResult TaskOp::verify() {
Expand Down Expand Up @@ -1975,7 +1988,8 @@ void TaskloopOp::build(OpBuilder &builder, OperationState &state,
makeDenseBoolArrayAttr(ctx, clauses.reductionByref),
makeArrayAttr(ctx, clauses.reductionSyms), clauses.priority,
clauses.allocateVars, clauses.allocatorVars,
clauses.grainsize, clauses.numTasks, clauses.nogroup);
clauses.grainsize, clauses.numTasks, clauses.nogroup,
/*private_vars=*/{}, /*private_syms=*/nullptr);
}

SmallVector<Value> TaskloopOp::getAllReductionVars() {
Expand Down Expand Up @@ -2225,8 +2239,9 @@ LogicalResult OrderedRegionOp::verify() {

void TaskwaitOp::build(OpBuilder &builder, OperationState &state,
const TaskwaitOperands &clauses) {
// TODO Store clauses in op: dependTypeAttrs, dependVars, nowaitAttr.
TaskwaitOp::build(builder, state);
// TODO Store clauses in op: dependKinds, dependVars, nowait.
TaskwaitOp::build(builder, state, /*depend_kinds=*/nullptr,
/*depend_vars=*/{}, /*nowait=*/nullptr);
}

//===----------------------------------------------------------------------===//
Expand Down
Loading
Loading