[mlir][OpenMP] Allow 'cancel taskgroup' inside taskloop region #138634
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-mlir-openmp @llvm/pr-subscribers-flang-openmp Author: Kaviya Rajendiran (kaviya2510) ChangesPreviously, Full diff: https://github.com/llvm/llvm-project/pull/138634.diff 2 Files Affected:
diff --git a/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp b/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
index 0f65ace0186db..186f14de22f70 100644
--- a/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
+++ b/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
@@ -3217,7 +3217,8 @@ LogicalResult CancelOp::verify() {
}
}
if ((cct == ClauseCancellationConstructType::Taskgroup) &&
- !mlir::isa<omp::TaskOp>(structuralParent)) {
+ (!mlir::isa<omp::TaskOp>(structuralParent) &&
+ !mlir::isa<omp::TaskloopOp>(structuralParent->getParentOp()))) {
return emitOpError() << "cancel taskgroup must appear "
<< "inside a task region";
}
diff --git a/mlir/test/Dialect/OpenMP/ops.mlir b/mlir/test/Dialect/OpenMP/ops.mlir
index a3c591799b27e..b7e16b7ec35e2 100644
--- a/mlir/test/Dialect/OpenMP/ops.mlir
+++ b/mlir/test/Dialect/OpenMP/ops.mlir
@@ -2215,6 +2215,18 @@ func.func @omp_cancel_taskgroup() -> () {
return
}
+func.func @omp_taskloop_cancel_taskgroup(%lb : index, %ub : index, %step : index) {
+ omp.taskloop {
+ omp.loop_nest (%iv) : index = (%lb) to (%ub) step (%step) {
+ // CHECK: omp.cancel cancellation_construct_type(taskgroup)
+ omp.cancel cancellation_construct_type(taskgroup)
+ // CHECK: omp.yield
+ omp.yield
+ }
+ }
+ return
+}
+
func.func @omp_cancel_parallel_nested(%if_cond : i1) -> () {
omp.parallel {
scf.if %if_cond {
|
|
@llvm/pr-subscribers-mlir Author: Kaviya Rajendiran (kaviya2510) ChangesPreviously, Full diff: https://github.com/llvm/llvm-project/pull/138634.diff 2 Files Affected:
diff --git a/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp b/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
index 0f65ace0186db..186f14de22f70 100644
--- a/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
+++ b/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
@@ -3217,7 +3217,8 @@ LogicalResult CancelOp::verify() {
}
}
if ((cct == ClauseCancellationConstructType::Taskgroup) &&
- !mlir::isa<omp::TaskOp>(structuralParent)) {
+ (!mlir::isa<omp::TaskOp>(structuralParent) &&
+ !mlir::isa<omp::TaskloopOp>(structuralParent->getParentOp()))) {
return emitOpError() << "cancel taskgroup must appear "
<< "inside a task region";
}
diff --git a/mlir/test/Dialect/OpenMP/ops.mlir b/mlir/test/Dialect/OpenMP/ops.mlir
index a3c591799b27e..b7e16b7ec35e2 100644
--- a/mlir/test/Dialect/OpenMP/ops.mlir
+++ b/mlir/test/Dialect/OpenMP/ops.mlir
@@ -2215,6 +2215,18 @@ func.func @omp_cancel_taskgroup() -> () {
return
}
+func.func @omp_taskloop_cancel_taskgroup(%lb : index, %ub : index, %step : index) {
+ omp.taskloop {
+ omp.loop_nest (%iv) : index = (%lb) to (%ub) step (%step) {
+ // CHECK: omp.cancel cancellation_construct_type(taskgroup)
+ omp.cancel cancellation_construct_type(taskgroup)
+ // CHECK: omp.yield
+ omp.yield
+ }
+ }
+ return
+}
+
func.func @omp_cancel_parallel_nested(%if_cond : i1) -> () {
omp.parallel {
scf.if %if_cond {
|
|
This changes is required to fix the testcase taskloop-cancel.f90 , which is part of the PR #138646 |
GeorgeARM
pushed a commit
to GeorgeARM/llvm-project
that referenced
this pull request
May 7, 2025
…138634) Added support which allows "cancel taskgroup" inside taskloop region.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously,
cancel taskgroupwas only permitted withinomp.taskregion.This change allowscancel taskgroupinsidetaskloopregion as well.