Skip to content

[flang][cuda] fix parsing of cuda_kernel #89613

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 4 commits into from
Apr 22, 2024
Merged

[flang][cuda] fix parsing of cuda_kernel #89613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77d0089
fix parsing of cuda_kernel
Apr 22, 2024
31cbddb
Update flang/lib/Optimizer/Dialect/FIROps.cpp
ImanHosseini Apr 22, 2024
9dc5be3
Update flang/lib/Optimizer/Dialect/FIROps.cpp
ImanHosseini Apr 22, 2024
749d4c2
Update FIROps.cpp
ImanHosseini Apr 22, 2024
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
8 changes: 7 additions & 1 deletion flang/lib/Optimizer/Dialect/FIROps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3907,19 +3907,25 @@ mlir::ParseResult parseCUFKernelValues(
if (mlir::succeeded(parser.parseOptionalStar()))
return mlir::success();

if (parser.parseOptionalLParen()) {
if (mlir::succeeded(parser.parseOptionalLParen())) {
if (mlir::failed(parser.parseCommaSeparatedList(
mlir::AsmParser::Delimiter::None, [&]() {
if (parser.parseOperand(values.emplace_back()))
return mlir::failure();
return mlir::success();
})))
return mlir::failure();
auto builder = parser.getBuilder();
for (size_t i = 0; i < values.size(); i++) {
types.emplace_back(builder.getI32Type());
}
if (parser.parseRParen())
return mlir::failure();
} else {
if (parser.parseOperand(values.emplace_back()))
return mlir::failure();
auto builder = parser.getBuilder();
types.emplace_back(builder.getI32Type());
return mlir::success();
}
return mlir::success();
Expand Down
1 change: 1 addition & 0 deletions flang/test/Lower/CUDA/cuda-kernel-loop-directive.cuf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
! RUN: bbc -emit-hlfir -fcuda %s -o - | FileCheck %s
! RUN: bbc -emit-hlfir -fcuda %s -o - | fir-opt | FileCheck %s

! Test lowering of CUDA kernel loop directive.

Expand Down