[flang][openacc] Fix wait clause printer #137263
Merged
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
llvmbot
added
mlir
flang
Member
|
@llvm/pr-subscribers-openacc @llvm/pr-subscribers-mlir Author: Valentin Clement (バレンタイン クレメン) (clementval) Changeswait clause printer is failing with case like: Full diff: https://github.com/llvm/llvm-project/pull/137263.diff 2 Files Affected:
diff --git a/flang/test/Lower/OpenACC/acc-serial.f90 b/flang/test/Lower/OpenACC/acc-serial.f90
index 3ee1278a8a9d1..9ba44ce6b9197 100644
--- a/flang/test/Lower/OpenACC/acc-serial.f90
+++ b/flang/test/Lower/OpenACC/acc-serial.f90
@@ -87,6 +87,11 @@ subroutine acc_serial
! CHECK: acc.yield
! CHECK-NEXT: }
+ !$acc serial device_type(nvidia) wait
+ !$acc end serial
+
+! CHECK: acc.serial wait([#acc.device_type<nvidia>])
+
!$acc serial wait(1)
!$acc end serial
diff --git a/mlir/lib/Dialect/OpenACC/IR/OpenACC.cpp b/mlir/lib/Dialect/OpenACC/IR/OpenACC.cpp
index 8f150cb33e6f3..06a1f9ef0c8cb 100644
--- a/mlir/lib/Dialect/OpenACC/IR/OpenACC.cpp
+++ b/mlir/lib/Dialect/OpenACC/IR/OpenACC.cpp
@@ -1411,20 +1411,22 @@ static void printWaitClause(mlir::OpAsmPrinter &p, mlir::Operation *op,
if (hasDeviceTypeValues(keywordOnly) && hasDeviceTypeValues(deviceTypes))
p << ", ";
- unsigned opIdx = 0;
- llvm::interleaveComma(llvm::enumerate(*deviceTypes), p, [&](auto it) {
- p << "{";
- auto boolAttr = mlir::dyn_cast<mlir::BoolAttr>((*hasDevNum)[it.index()]);
- if (boolAttr && boolAttr.getValue())
- p << "devnum: ";
- llvm::interleaveComma(
- llvm::seq<int32_t>(0, (*segments)[it.index()]), p, [&](auto it) {
- p << operands[opIdx] << " : " << operands[opIdx].getType();
- ++opIdx;
- });
- p << "}";
- printSingleDeviceType(p, it.value());
- });
+ if (hasDeviceTypeValues(deviceTypes)) {
+ unsigned opIdx = 0;
+ llvm::interleaveComma(llvm::enumerate(*deviceTypes), p, [&](auto it) {
+ p << "{";
+ auto boolAttr = mlir::dyn_cast<mlir::BoolAttr>((*hasDevNum)[it.index()]);
+ if (boolAttr && boolAttr.getValue())
+ p << "devnum: ";
+ llvm::interleaveComma(
+ llvm::seq<int32_t>(0, (*segments)[it.index()]), p, [&](auto it) {
+ p << operands[opIdx] << " : " << operands[opIdx].getType();
+ ++opIdx;
+ });
+ p << "}";
+ printSingleDeviceType(p, it.value());
+ });
+ }
p << ")";
}
|
Member
|
@llvm/pr-subscribers-flang-fir-hlfir Author: Valentin Clement (バレンタイン クレメン) (clementval) Changeswait clause printer is failing with case like: Full diff: https://github.com/llvm/llvm-project/pull/137263.diff 2 Files Affected:
diff --git a/flang/test/Lower/OpenACC/acc-serial.f90 b/flang/test/Lower/OpenACC/acc-serial.f90
index 3ee1278a8a9d1..9ba44ce6b9197 100644
--- a/flang/test/Lower/OpenACC/acc-serial.f90
+++ b/flang/test/Lower/OpenACC/acc-serial.f90
@@ -87,6 +87,11 @@ subroutine acc_serial
! CHECK: acc.yield
! CHECK-NEXT: }
+ !$acc serial device_type(nvidia) wait
+ !$acc end serial
+
+! CHECK: acc.serial wait([#acc.device_type<nvidia>])
+
!$acc serial wait(1)
!$acc end serial
diff --git a/mlir/lib/Dialect/OpenACC/IR/OpenACC.cpp b/mlir/lib/Dialect/OpenACC/IR/OpenACC.cpp
index 8f150cb33e6f3..06a1f9ef0c8cb 100644
--- a/mlir/lib/Dialect/OpenACC/IR/OpenACC.cpp
+++ b/mlir/lib/Dialect/OpenACC/IR/OpenACC.cpp
@@ -1411,20 +1411,22 @@ static void printWaitClause(mlir::OpAsmPrinter &p, mlir::Operation *op,
if (hasDeviceTypeValues(keywordOnly) && hasDeviceTypeValues(deviceTypes))
p << ", ";
- unsigned opIdx = 0;
- llvm::interleaveComma(llvm::enumerate(*deviceTypes), p, [&](auto it) {
- p << "{";
- auto boolAttr = mlir::dyn_cast<mlir::BoolAttr>((*hasDevNum)[it.index()]);
- if (boolAttr && boolAttr.getValue())
- p << "devnum: ";
- llvm::interleaveComma(
- llvm::seq<int32_t>(0, (*segments)[it.index()]), p, [&](auto it) {
- p << operands[opIdx] << " : " << operands[opIdx].getType();
- ++opIdx;
- });
- p << "}";
- printSingleDeviceType(p, it.value());
- });
+ if (hasDeviceTypeValues(deviceTypes)) {
+ unsigned opIdx = 0;
+ llvm::interleaveComma(llvm::enumerate(*deviceTypes), p, [&](auto it) {
+ p << "{";
+ auto boolAttr = mlir::dyn_cast<mlir::BoolAttr>((*hasDevNum)[it.index()]);
+ if (boolAttr && boolAttr.getValue())
+ p << "devnum: ";
+ llvm::interleaveComma(
+ llvm::seq<int32_t>(0, (*segments)[it.index()]), p, [&](auto it) {
+ p << operands[opIdx] << " : " << operands[opIdx].getType();
+ ++opIdx;
+ });
+ p << "}";
+ printSingleDeviceType(p, it.value());
+ });
+ }
p << ")";
}
|
erichkeane
approved these changes
Apr 25, 2025
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
wait clause printer is failing with case like: ``` !$acc serial device_type(nvidia) wait !$acc end serial ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
wait clause printer is failing with case like: