Skip to content

[mlir][acc] Use consistent name for device_num operand #136745

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 2 commits into from
Apr 23, 2025
Merged

[mlir][acc] Use consistent name for device_num operand #136745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82a81a4
[mlir][acc] Use consistent name for device_num operand
Apr 22, 2025
1a14808
Fix clang OpenACC lowering for the name change
erichkeane Apr 22, 2025
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
7 changes: 1 addition & 6 deletions clang/lib/CIR/CodeGen/CIRGenStmtOpenACC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,12 +291,7 @@ class OpenACCClauseCIREmitter final
}

void VisitDeviceNumClause(const OpenACCDeviceNumClause &clause) {
if constexpr (isOneOfTypes<OpTy, InitOp, ShutdownOp>) {
operation.getDeviceNumOperandMutable().append(
createIntExpr(clause.getIntExpr()));
} else if constexpr (isOneOfTypes<OpTy, SetOp>) {
// This is only a separate case because the getter name is different in
// 'set' for some reason.
if constexpr (isOneOfTypes<OpTy, InitOp, ShutdownOp, SetOp>) {
operation.getDeviceNumMutable().append(
createIntExpr(clause.getIntExpr()));
} else {
Expand Down
8 changes: 4 additions & 4 deletions mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2611,11 +2611,11 @@ def OpenACC_InitOp : OpenACC_Op<"init", [AttrSizedOperandSegments]> {
}];

let arguments = (ins OptionalAttr<TypedArrayAttrBase<OpenACC_DeviceTypeAttr, "Device type attributes">>:$device_types,
Optional<IntOrIndex>:$deviceNumOperand,
Optional<IntOrIndex>:$deviceNum,
Optional<I1>:$ifCond);

let assemblyFormat = [{
oilist(`device_num` `(` $deviceNumOperand `:` type($deviceNumOperand) `)`
oilist(`device_num` `(` $deviceNum `:` type($deviceNum) `)`
| `if` `(` $ifCond `)`
) attr-dict-with-keyword
}];
Expand All @@ -2642,11 +2642,11 @@ def OpenACC_ShutdownOp : OpenACC_Op<"shutdown", [AttrSizedOperandSegments]> {
}];

let arguments = (ins OptionalAttr<TypedArrayAttrBase<OpenACC_DeviceTypeAttr, "Device type attributes">>:$device_types,
Optional<IntOrIndex>:$deviceNumOperand,
Optional<IntOrIndex>:$deviceNum,
Optional<I1>:$ifCond);

let assemblyFormat = [{
oilist(`device_num` `(` $deviceNumOperand `:` type($deviceNumOperand) `)`
oilist(`device_num` `(` $deviceNum `:` type($deviceNum) `)`
|`if` `(` $ifCond `)`
) attr-dict-with-keyword
}];
Expand Down
Loading