Skip to content

Commit 5ee42b2

Browse files
committed
[flang][acc] Revert assemblyFormat changes; asyncOnly is an attribute, no need to handle it
1 parent 1a0bac6 commit 5ee42b2

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,8 +1307,8 @@ def OpenACC_ParallelOp : OpenACC_Op<"parallel",
13071307
( `combined` `(` `loop` `)` $combined^)?
13081308
oilist(
13091309
`dataOperands` `(` $dataClauseOperands `:` type($dataClauseOperands) `)`
1310-
| `async` `(` custom<DeviceTypeOperandsWithKeywordOnly>($asyncOperands,
1311-
type($asyncOperands), $asyncOperandsDeviceType, $asyncOnly) `)`
1310+
| `async` `(` custom<DeviceTypeOperands>($asyncOperands,
1311+
type($asyncOperands), $asyncOperandsDeviceType) `)`
13121312
| `firstprivate` `(` custom<SymOperandList>($firstprivateOperands,
13131313
type($firstprivateOperands), $firstprivatizations)
13141314
`)`
@@ -1449,8 +1449,8 @@ def OpenACC_SerialOp : OpenACC_Op<"serial",
14491449
( `combined` `(` `loop` `)` $combined^)?
14501450
oilist(
14511451
`dataOperands` `(` $dataClauseOperands `:` type($dataClauseOperands) `)`
1452-
| `async` `(` custom<DeviceTypeOperandsWithKeywordOnly>($asyncOperands,
1453-
type($asyncOperands), $asyncOperandsDeviceType, $asyncOnly) `)`
1452+
| `async` `(` custom<DeviceTypeOperands>($asyncOperands,
1453+
type($asyncOperands), $asyncOperandsDeviceType) `)`
14541454
| `firstprivate` `(` custom<SymOperandList>($firstprivateOperands,
14551455
type($firstprivateOperands), $firstprivatizations)
14561456
`)`
@@ -1618,8 +1618,8 @@ def OpenACC_KernelsOp : OpenACC_Op<"kernels",
16181618
( `combined` `(` `loop` `)` $combined^)?
16191619
oilist(
16201620
`dataOperands` `(` $dataClauseOperands `:` type($dataClauseOperands) `)`
1621-
| `async` `(` custom<DeviceTypeOperandsWithKeywordOnly>($asyncOperands,
1622-
type($asyncOperands), $asyncOperandsDeviceType, $asyncOnly) `)`
1621+
| `async` `(` custom<DeviceTypeOperands>($asyncOperands,
1622+
type($asyncOperands), $asyncOperandsDeviceType) `)`
16231623
| `num_gangs` `(` custom<NumGangs>($numGangs,
16241624
type($numGangs), $numGangsDeviceType, $numGangsSegments) `)`
16251625
| `num_workers` `(` custom<DeviceTypeOperands>($numWorkers,
@@ -1741,8 +1741,8 @@ def OpenACC_DataOp : OpenACC_Op<"data",
17411741
let assemblyFormat = [{
17421742
oilist(
17431743
`if` `(` $ifCond `)`
1744-
| `async` `(` custom<DeviceTypeOperandsWithKeywordOnly>($asyncOperands,
1745-
type($asyncOperands), $asyncOperandsDeviceType, $asyncOnly) `)`
1744+
| `async` `(` custom<DeviceTypeOperands>($asyncOperands,
1745+
type($asyncOperands), $asyncOperandsDeviceType) `)`
17461746
| `dataOperands` `(` $dataClauseOperands `:` type($dataClauseOperands) `)`
17471747
| `wait` `` custom<WaitClause>($waitOperands, type($waitOperands),
17481748
$waitOperandsDeviceType, $waitOperandsSegments, $hasWaitDevnum,
@@ -1802,7 +1802,6 @@ def OpenACC_EnterDataOp : OpenACC_Op<"enter_data",
18021802
Value getDataOperand(unsigned i);
18031803
}];
18041804

1805-
// TODO: Show $async and $wait.
18061805
let assemblyFormat = [{
18071806
oilist(
18081807
`if` `(` $ifCond `)`
@@ -1855,7 +1854,6 @@ def OpenACC_ExitDataOp : OpenACC_Op<"exit_data",
18551854
Value getDataOperand(unsigned i);
18561855
}];
18571856

1858-
// TODO: Show $async and $wait.
18591857
let assemblyFormat = [{
18601858
oilist(
18611859
`if` `(` $ifCond `)`
@@ -2774,8 +2772,8 @@ def OpenACC_UpdateOp : OpenACC_Op<"update",
27742772
let assemblyFormat = [{
27752773
oilist(
27762774
`if` `(` $ifCond `)`
2777-
| `async` `(` custom<DeviceTypeOperandsWithKeywordOnly>($asyncOperands,
2778-
type($asyncOperands), $asyncOperandsDeviceType, $asyncOnly) `)`
2775+
| `async` `(` custom<DeviceTypeOperands>($asyncOperands,
2776+
type($asyncOperands), $asyncOperandsDeviceType) `)`
27792777
| `wait` `` custom<WaitClause>($waitOperands, type($waitOperands),
27802778
$waitOperandsDeviceType, $waitOperandsSegments, $hasWaitDevnum,
27812779
$waitOnly)
@@ -2818,7 +2816,6 @@ def OpenACC_WaitOp : OpenACC_Op<"wait", [AttrSizedOperandSegments]> {
28182816
UnitAttr:$async,
28192817
Optional<I1>:$ifCond);
28202818

2821-
// TODO: Show $async.
28222819
let assemblyFormat = [{
28232820
( `(` $waitOperands^ `:` type($waitOperands) `)` )?
28242821
oilist(`async` `(` $asyncOperand `:` type($asyncOperand) `)`

0 commit comments

Comments
 (0)