Skip to content

[mlir][OpenMP] add attribute for privatization barrier #140089

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
May 22, 2025
Merged

[mlir][OpenMP] add attribute for privatization barrier #140089

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
5 changes: 4 additions & 1 deletion mlir/include/mlir/Dialect/OpenMP/OpenMPClauses.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,10 @@ class OpenMP_PrivateClauseSkip<

let arguments = (ins
Variadic<AnyType>:$private_vars,
OptionalAttr<SymbolRefArrayAttr>:$private_syms
OptionalAttr<SymbolRefArrayAttr>:$private_syms,
// Set this attribute if a barrier is needed after initialization and
// copying of lastprivate variables.
UnitAttr:$private_needs_barrier
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small nit: This attribute is already within private clause. Is private_needs_barrier a better name? In OpenMPDialect.cpp too, needsBarrier is used, which is self-sufficient I think.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The members for each clause are all combined into a structure containing elements for all arguments to the operation. Therefore there's a convention to prefix clause data with the name of the clause to avoid name collisions (e.g. if a needs_barrier attribute was added to REDUCTION).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the name of the clause to avoid name collisions (e.g. if a needs_barrier attribute was added to REDUCTION).

Oh okay thanks. Makes sense

);

// TODO: Add description.
Expand Down
37 changes: 19 additions & 18 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 @@ -213,8 +213,8 @@ def ParallelOp : OpenMP_Op<"parallel", traits = [

let assemblyFormat = clausesAssemblyFormat # [{
custom<PrivateReductionRegion>($region, $private_vars, type($private_vars),
$private_syms, $reduction_mod, $reduction_vars, type($reduction_vars), $reduction_byref,
$reduction_syms) attr-dict
$private_syms, $private_needs_barrier, $reduction_mod, $reduction_vars,
type($reduction_vars), $reduction_byref, $reduction_syms) attr-dict
}];

let hasVerifier = 1;
Expand Down Expand Up @@ -258,8 +258,8 @@ def TeamsOp : OpenMP_Op<"teams", traits = [

let assemblyFormat = clausesAssemblyFormat # [{
custom<PrivateReductionRegion>($region, $private_vars, type($private_vars),
$private_syms, $reduction_mod, $reduction_vars, type($reduction_vars), $reduction_byref,
$reduction_syms) attr-dict
$private_syms, $private_needs_barrier, $reduction_mod, $reduction_vars,
type($reduction_vars), $reduction_byref, $reduction_syms) attr-dict
}];

let hasVerifier = 1;
Expand Down Expand Up @@ -317,8 +317,8 @@ def SectionsOp : OpenMP_Op<"sections", traits = [

let assemblyFormat = clausesAssemblyFormat # [{
custom<PrivateReductionRegion>($region, $private_vars, type($private_vars),
$private_syms, $reduction_mod, $reduction_vars, type($reduction_vars), $reduction_byref,
$reduction_syms) attr-dict
$private_syms, $private_needs_barrier, $reduction_mod, $reduction_vars,
type($reduction_vars), $reduction_byref, $reduction_syms) attr-dict
}];

let hasVerifier = 1;
Expand Down Expand Up @@ -350,7 +350,7 @@ def SingleOp : OpenMP_Op<"single", traits = [

let assemblyFormat = clausesAssemblyFormat # [{
custom<PrivateRegion>($region, $private_vars, type($private_vars),
$private_syms) attr-dict
$private_syms, $private_needs_barrier) attr-dict
}];

let hasVerifier = 1;
Expand Down Expand Up @@ -505,8 +505,8 @@ def LoopOp : OpenMP_Op<"loop", traits = [

let assemblyFormat = clausesAssemblyFormat # [{
custom<PrivateReductionRegion>($region, $private_vars, type($private_vars),
$private_syms, $reduction_mod, $reduction_vars, type($reduction_vars), $reduction_byref,
$reduction_syms) attr-dict
$private_syms, $private_needs_barrier, $reduction_mod, $reduction_vars,
type($reduction_vars), $reduction_byref, $reduction_syms) attr-dict
}];

let builders = [
Expand Down Expand Up @@ -557,8 +557,8 @@ def WsloopOp : OpenMP_Op<"wsloop", traits = [

let assemblyFormat = clausesAssemblyFormat # [{
custom<PrivateReductionRegion>($region, $private_vars, type($private_vars),
$private_syms, $reduction_mod, $reduction_vars, type($reduction_vars), $reduction_byref,
$reduction_syms) attr-dict
$private_syms, $private_needs_barrier, $reduction_mod, $reduction_vars,
type($reduction_vars), $reduction_byref, $reduction_syms) attr-dict
}];

let hasVerifier = 1;
Expand Down Expand Up @@ -611,8 +611,8 @@ def SimdOp : OpenMP_Op<"simd", traits = [

let assemblyFormat = clausesAssemblyFormat # [{
custom<PrivateReductionRegion>($region, $private_vars, type($private_vars),
$private_syms, $reduction_mod, $reduction_vars, type($reduction_vars), $reduction_byref,
$reduction_syms) attr-dict
$private_syms, $private_needs_barrier, $reduction_mod, $reduction_vars,
type($reduction_vars), $reduction_byref, $reduction_syms) attr-dict
}];

let hasVerifier = 1;
Expand Down Expand Up @@ -690,7 +690,7 @@ def DistributeOp : OpenMP_Op<"distribute", traits = [

let assemblyFormat = clausesAssemblyFormat # [{
custom<PrivateRegion>($region, $private_vars, type($private_vars),
$private_syms) attr-dict
$private_syms, $private_needs_barrier) attr-dict
}];

let hasVerifier = 1;
Expand Down Expand Up @@ -740,7 +740,7 @@ def TaskOp
custom<InReductionPrivateRegion>(
$region, $in_reduction_vars, type($in_reduction_vars),
$in_reduction_byref, $in_reduction_syms, $private_vars,
type($private_vars), $private_syms) attr-dict
type($private_vars), $private_syms, $private_needs_barrier) attr-dict
}];

let hasVerifier = 1;
Expand Down Expand Up @@ -816,8 +816,9 @@ def TaskloopOp : OpenMP_Op<"taskloop", traits = [
custom<InReductionPrivateReductionRegion>(
$region, $in_reduction_vars, type($in_reduction_vars),
$in_reduction_byref, $in_reduction_syms, $private_vars,
type($private_vars), $private_syms, $reduction_mod, $reduction_vars,
type($reduction_vars), $reduction_byref, $reduction_syms) attr-dict
type($private_vars), $private_syms, $private_needs_barrier,
$reduction_mod, $reduction_vars, type($reduction_vars),
$reduction_byref, $reduction_syms) attr-dict
}];

let extraClassDeclaration = [{
Expand Down Expand Up @@ -1324,7 +1325,7 @@ def TargetOp : OpenMP_Op<"target", traits = [
$host_eval_vars, type($host_eval_vars), $in_reduction_vars,
type($in_reduction_vars), $in_reduction_byref, $in_reduction_syms,
$map_vars, type($map_vars), $private_vars, type($private_vars),
$private_syms, $private_maps) attr-dict
$private_syms, $private_needs_barrier, $private_maps) attr-dict
}];

let hasVerifier = 1;
Expand Down
1 change: 1 addition & 0 deletions mlir/lib/Conversion/SCFToOpenMP/SCFToOpenMP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,7 @@ struct ParallelOpLowering : public OpRewritePattern<scf::ParallelOp> {
/* num_threads = */ numThreadsVar,
/* private_vars = */ ValueRange(),
/* private_syms = */ nullptr,
/* private_needs_barrier = */ nullptr,
/* proc_bind_kind = */ omp::ClauseProcBindKindAttr{},
/* reduction_mod = */ nullptr,
/* reduction_vars = */ llvm::SmallVector<Value>{},
Expand Down
Loading