oilist

Hardcode84 · Hardcode84 · commit a8569157e299 · 2025-07-22T17:54:34.000+02:00
Signed-off-by: Ivan Butygin &lt;ivan.butygin@gmail.com&gt;
diff --git a/mlir/include/mlir/Dialect/AMDGPU/IR/AMDGPU.td b/mlir/include/mlir/Dialect/AMDGPU/IR/AMDGPU.td
@@ -735,7 +735,7 @@ def AMDGPU_WaitcntOp :
     supported values.
   }];
   let assemblyFormat = [{
-    (`vmcnt` `(` $vmcnt^ `)` )? (`expcnt` `(` $expcnt^ `)` )? (`lgkmcnt` `(` $lgkmcnt^ `)`)? attr-dict
+    oilist( `vmcnt` `(` $vmcnt `)` | `expcnt` `(` $expcnt `)` | `lgkmcnt` `(` $lgkmcnt `)` ) attr-dict
   }];
 }
 
diff --git a/mlir/test/Dialect/AMDGPU/ops.mlir b/mlir/test/Dialect/AMDGPU/ops.mlir
@@ -552,10 +552,12 @@ func.func @gather_to_lds(%idx1 : index, %idx2 : index, %mem1 : memref<32xf16>, %
 // CHECK-LABEL: func @waitcnt
 func.func @waitcnt() {
   // CHECK: amdgpu.waitcnt vmcnt(1) expcnt(2) lgkmcnt(3)
+  // CHECK: amdgpu.waitcnt vmcnt(3) expcnt(2) lgkmcnt(1)
   // CHECK: amdgpu.waitcnt vmcnt(1)
   // CHECK: amdgpu.waitcnt expcnt(2)
   // CHECK: amdgpu.waitcnt lgkmcnt(3)
   amdgpu.waitcnt vmcnt(1) expcnt(2) lgkmcnt(3)
+  amdgpu.waitcnt lgkmcnt(1) expcnt(2) vmcnt(3)
   amdgpu.waitcnt vmcnt(1)
   amdgpu.waitcnt expcnt(2)
   amdgpu.waitcnt lgkmcnt(3)

Original file line number	Diff line number	Diff line change
`@@ -735,7 +735,7 @@ def AMDGPU_WaitcntOp :`
`735`	`735`	`supported values.`
`736`	`736`	`}];`
`737`	`737`	`let assemblyFormat = [{`
`738`		- (`vmcnt` `(` $vmcnt^ `)` )? (`expcnt` `(` $expcnt^ `)` )? (`lgkmcnt` `(` $lgkmcnt^ `)`)? attr-dict
	`738`	+ oilist( `vmcnt` `(` $vmcnt `)` \| `expcnt` `(` $expcnt `)` \| `lgkmcnt` `(` $lgkmcnt `)` ) attr-dict
`739`	`739`	`}];`
`740`	`740`	`}`
`741`	`741`