llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-flang-openmp Author: Sergio Afonso (skatrak) <details> <summary>Changes</summary> This patch adds the missing `OpenMP_Clause` definitions to all existing `OpenMP_Op`s and updates their operand structure based builders to initialize the new arguments. The result of this change is that operation operand structures are now based in the same list of clauses as their tablegen counterparts. This means that all of the information needed is now in place to automatically generate OpenMP operand structures from tablegen defitions. Since this change doesn't involve the introduction of actual support for these clauses, new arguments are not initialized from values stored in the corresponding operand structure fields but rather set to empty or null. Those should be updated when support for these clauses on the corresponding operation is added. --- Patch is 28.83 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/99507.diff 4 Files Affected: - (modified) mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td (+28-23) - (modified) mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp (+30-16) - (modified) mlir/test/Dialect/OpenMP/invalid.mlir (+20-20) - (modified) mlir/test/Dialect/OpenMP/ops.mlir (+13-13) ``````````diff diff --git a/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td b/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td index a4aeeacfea672..04af5dd61dac0 100644 --- a/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td +++ b/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td @@ -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 = [{ @@ -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 = [{ @@ -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 = [{ @@ -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 = [{ @@ -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 }]; @@ -432,9 +439,10 @@ def SimdOp : OpenMP_Op<"simd", traits = [ AttrSizedOperandSegments, DeclareOpInterfaceMethods<LoopWrapperInterface>, RecursiveMemoryEffects, SingleBlock ], clauses = [ - // TODO: Complete clause list (linear, private, reduction). + // TODO: Complete clause list (linear). OpenMP_AlignedClause, OpenMP_IfClause, OpenMP_NontemporalClause, - OpenMP_OrderClause, OpenMP_SafelenClause, OpenMP_SimdlenClause + OpenMP_OrderClause, OpenMP_PrivateClause, OpenMP_ReductionClause, + OpenMP_SafelenClause, OpenMP_SimdlenClause ], singleRegion = true> { let summary = "simd construct"; let description = [{ @@ -499,9 +507,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 = [{ @@ -552,11 +560,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 = [{ @@ -589,14 +598,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 = [{ @@ -1076,12 +1084,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 = [{ @@ -1209,7 +1217,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 = [{ @@ -1220,9 +1228,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"; } //===----------------------------------------------------------------------===// diff --git a/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp b/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp index 761eaa810038c..a1a51ed96e2c8 100644 --- a/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp +++ b/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp @@ -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() { @@ -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() { @@ -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() { @@ -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() { @@ -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); } @@ -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() { @@ -1757,11 +1765,13 @@ void SimdOp::build(OpBuilder &builder, OperationState &state, const SimdOperands &clauses) { MLIRContext *ctx = builder.getContext(); // TODO Store clauses in op: privateVars, privateSyms, reductionVars, - // reduceVarByRef, reductionDeclSymbols. + // reductionByref, reductionSyms. SimdOp::build(builder, state, clauses.alignedVars, makeArrayAttr(ctx, clauses.alignments), clauses.ifVar, 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() { @@ -1795,7 +1805,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() { @@ -1927,7 +1938,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() { @@ -1975,7 +1987,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() { @@ -2225,8 +2238,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); } //===----------------------------------------------------------------------===// diff --git a/mlir/test/Dialect/OpenMP/invalid.mlir b/mlir/test/Dialect/OpenMP/invalid.mlir index a29e34a9d5518..494dd96a757c1 100644 --- a/mlir/test/Dialect/OpenMP/invalid.mlir +++ b/mlir/test/Dialect/OpenMP/invalid.mlir @@ -421,7 +421,7 @@ func.func @omp_simd_aligned_mismatch(%arg0 : index, %arg1 : index, omp.yield } }) {alignments = [128], - operandSegmentSizes = array<i32: 2, 0, 0>} : (memref<i32>, memref<i32>) -> () + operandSegmentSizes = array<i32: 2, 0, 0, 0, 0>} : (memref<i32>, memref<i32>) -> () return } @@ -435,7 +435,7 @@ func.func @omp_simd_aligned_negative(%arg0 : index, %arg1 : index, omp.loop_nest (%iv) : index = (%arg0) to (%arg1) step (%arg2) { omp.yield } - }) {alignments = [-1, 128], operandSegmentSizes = array<i32: 2, 0, 0>} : (memref<i32>, memref<i32>) -> () + }) {alignments = [-1, 128], operandSegmentSizes = array<i32: 2, 0, 0, 0, 0>} : (memref<i32>, memref<i32>) -> () return } @@ -463,7 +463,7 @@ func.func @omp_simd_aligned_float(%arg0 : index, %arg1 : index, omp.loop_nest (%iv) : index = (%arg0) to (%arg1) step (%arg2) { omp.yield } - }) {alignments = [1.5, 128], operandSegmentSizes = array<i32: 2, 0, 0>} : (memref<i32>, memref<i32>) -> () + }) {alignments = [1.5, 128], operandSegmentSizes = array<i32: 2, 0, 0, 0, 0>} : (memref<i32>, memref<i32>) -> () return } @@ -477,7 +477,7 @@ func.func @omp_simd_aligned_the_same_var(%arg0 : index, %arg1 : index, omp.loop_nest (%iv) : index = (%arg0) to (%arg1) step (%arg2) { omp.yield } - }) {alignments = [1, 128], operandSegmentSizes = array<i32: 2, 0, 0>} : (memref<i32>, memref<i32>) -> () + }) {alignments = [1, 128], operandSegmentSizes = array<i32: 2, 0, 0, 0, 0>} : (memref<i32>, memref<i32>) -> () return } @@ -491,7 +491,7 @@ func.func @omp_simd_nontemporal_the_same_var(%arg0 : index, %arg1 : index, omp.loop_nest (%iv) : index = (%arg0) to (%arg1) step (%arg2) { omp.yield } - }) {operandSegmentSizes = array<i32: 0, 0, 2>} : (memref<i32>, memref<i32>) -> () + }) {operandSegmentSizes = array<i32: 0, 0, 2, 0, 0>} : (memref<i32>, memref<i32>) -> () return } @@ -1394,7 +1394,7 @@ func.func @omp_teams_allocate(%data_var : memref<i32>) { // expected-error @below {{expected equal sizes for allocate and allocator variables}} "omp.teams" (%data_var) ({ omp.terminator - }) {operandSegmentSizes = array<i32: 0,0,0,0,1,0,0>} : (memref<i32>) -> () + }) {operandSegmentSizes = array<i32: 0,0,0,0,1,0,0,0>} : (memref<i32>) -> () omp.terminator } return @@ -1407,7 +1407,7 @@ func.func @omp_teams_num_teams1(%lb : i32) { // expected-error @below {{expected num_teams upper bound to be defined if the lower bound is defined}} "omp.teams" (%lb) ({ omp.terminator - }) {operandSegmentSizes = array<i32: 1,0,0,0,0,0,0>} : (i32) -> () + }) {operandSegmentSizes = array<i32: 1,0,0,0,0,0,0,0>} : (i32) -> () omp.terminator } return @@ -1432,7 +1432,7 @@ func.func @omp_sections(%data_var : memref<i32>) -> () { // expected-error @below {{expected equal sizes for allocate and allocator variables}} "omp.sections" (%data_var) ({ omp.terminator - }) {operandSegmentSizes = array<i32: 0,1,0>} : (memref<i32>) -> () + }) {operandSegmentSizes = array<i32: 0,1,0,0>} : (memref<i32>) -> () return } @@ -1442,7 +1442,7 @@ func.func @omp_sections(%data_var : memref<i32>) -> () { // expected-error @below {{expected as many reduction symbol references as reduction variables}} "omp.sections" (%data_var) ({ omp.terminator - }) {operandSegmentSizes = array<i32: 1,0,0>} : (memref<i32>) -> () + }) {operandSegmentSizes = array<i32: 1,0,0,0>} : (memref<i32>) -> () return } @@ -1557,7 +1557,7 @@ func.func @omp_single(%data_var : memref<i32>) -> () { // expected-error @below {{expected equal sizes for allocate and allocator variables}} "omp.single" (%data_var) ({ omp.barrier - }) {operandSegmentSizes = array<i32: 1,0,0>} : (memref<i32>) -> () + }) {operandSegmentSizes = array<i32: 1,0,0,0>} : (memref<i32>) -> () return } @@ -1567,7 +1567,7 @@ func.func @omp_single_copyprivate(%data_var : memref<i32>) -> () { // expected-error @below {{inconsistent number of copyprivate vars (= 1) and functions (= 0), both must be equal}} "omp.single" (%data_var) ({ omp.barrier - }) {operandSegmentSizes = array<i32: 0,0,1>} : (memref<i32>) -> () + }) {operandSegmentSizes = array<i32: 0,0,1,0>} : (memref<i32>) -> () return } @@ -1623,7 +1623,7 @@ func.func @omp_task_depend(%data_var: memref<i32>) { // expected-error @below {{op expected as many depend values as depend variables}} "omp.task"(%data_var) ({ "omp.terminator"() : () -> () - }) {depend_kinds = [], operandSegmentSizes = array<i32: 0, 0, 0, 0, 1, 0, 0>} : (memref<i32>) -> () + }) {depend_kinds = [], operandSegmentSizes = array<i32: 0, 0, 0, 0, 1, 0, 0, 0>} : (memref<i32>) -> () "func.return"() : () -> () } @@ -1820,7 +1820,7 @@ func.func @taskloop(%lb: i32, %ub: i32, %step: i32) { omp.loop_nest (%i, %j) : i32 = (%lb, %ub) to (%ub, %lb) step (%step, %step) { omp.yield } - }) {operandSegmentSizes = array<i32: 0, 0, 0, 0, 0, 1, 0, 0, 0>} : (memref<i32>) -> () + }) {operandSegmentSizes = array<i32: 0, 0, 0, 0, 0, 1, 0, 0, 0, 0>} : (memref<i32>) -> () return } @@ -1834,7... [truncated] `````````` </details> https://github.com/llvm/llvm-project/pull/99507 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
