[Mlir-commits] [mlir] [mlir][rocdl] Add more gfx12 wait intrinsics (PR #149984)
Ivan Butygin
llvmlistbot at llvm.org
Tue Jul 22 08:33:17 PDT 2025
https://github.com/Hardcode84 updated https://github.com/llvm/llvm-project/pull/149984
>From 83c40b5e3b8ab578946921d8f8ffa7138e90b909 Mon Sep 17 00:00:00 2001
From: Ivan Butygin <ivan.butygin at gmail.com>
Date: Tue, 22 Jul 2025 11:18:51 +0200
Subject: [PATCH 1/4] [mlir][rocdl] Add more gfx12 wait intrinsics
---
mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td | 24 +++++++++++++++++---
mlir/test/Target/LLVMIR/rocdl.mlir | 21 +++++++++++++++++
2 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td b/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
index 906aaca21187b..eb9745a1b0425 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
@@ -284,10 +284,28 @@ def ROCDL_BarrierWaitOp : ROCDL_ConcreteNonMemIntrOp<"s.barrier.wait", [], 0, [0
let assemblyFormat = "$id attr-dict";
}
-def ROCDL_WaitDscntOp: ROCDL_ConcreteNonMemIntrOp<"s.wait.dscnt", [], 0, [0], ["id"]>,
- Arguments<(ins I16Attr:$id)> {
+def ROCDL_WaitDscntOp: ROCDL_ConcreteNonMemIntrOp<"s.wait.dscnt", [], 0, [0], ["count"]>,
+ Arguments<(ins I16Attr:$count)> {
let results = (outs);
- let assemblyFormat = "$id attr-dict";
+ let assemblyFormat = "$count attr-dict";
+}
+
+def ROCDL_WaitLoadcntOp: ROCDL_ConcreteNonMemIntrOp<"s.wait.loadcnt", [], 0, [0], ["count"]>,
+ Arguments<(ins I16Attr:$count)> {
+ let results = (outs);
+ let assemblyFormat = "$count attr-dict";
+}
+
+def ROCDL_WaitStorecntOp: ROCDL_ConcreteNonMemIntrOp<"s.wait.storecnt", [], 0, [0], ["count"]>,
+ Arguments<(ins I16Attr:$count)> {
+ let results = (outs);
+ let assemblyFormat = "$count attr-dict";
+}
+
+def ROCDL_WaitExpcntOp: ROCDL_ConcreteNonMemIntrOp<"s.wait.expcnt", [], 0, [0], ["count"]>,
+ Arguments<(ins I16Attr:$count)> {
+ let results = (outs);
+ let assemblyFormat = "$count attr-dict";
}
def ROCDL_SetPrioOp : ROCDL_ConcreteNonMemIntrOp<"s.setprio", [], 0, [0], ["priority"]>,
diff --git a/mlir/test/Target/LLVMIR/rocdl.mlir b/mlir/test/Target/LLVMIR/rocdl.mlir
index 0742eb3620a7c..740990a6e589b 100644
--- a/mlir/test/Target/LLVMIR/rocdl.mlir
+++ b/mlir/test/Target/LLVMIR/rocdl.mlir
@@ -196,6 +196,27 @@ llvm.func @rocdl.s.wait.dscnt() {
llvm.return
}
+llvm.func @rocdl.s.wait.loadcnt() {
+ // CHECK-LABEL: rocdl.s.wait.loadcnt
+ // CHECK-NEXT: call void @llvm.amdgcn.s.wait.loadcnt(i16 0)
+ rocdl.s.wait.loadcnt 0
+ llvm.return
+}
+
+llvm.func @rocdl.s.wait.storecnt() {
+ // CHECK-LABEL: rocdl.s.wait.storecnt
+ // CHECK-NEXT: call void @llvm.amdgcn.s.wait.storecnt(i16 0)
+ rocdl.s.wait.storecnt 0
+ llvm.return
+}
+
+llvm.func @rocdl.s.wait.expcnt() {
+ // CHECK-LABEL: rocdl.s.wait.expcnt
+ // CHECK-NEXT: call void @llvm.amdgcn.s.wait.expcnt(i16 0)
+ rocdl.s.wait.expcnt 0
+ llvm.return
+}
+
llvm.func @rocdl.setprio() {
// CHECK: call void @llvm.amdgcn.s.setprio(i16 0)
rocdl.s.setprio 0
>From 501bd7a65a9c19752a1c90f07d109348c682a447 Mon Sep 17 00:00:00 2001
From: Ivan Butygin <ivan.butygin at gmail.com>
Date: Tue, 22 Jul 2025 17:12:36 +0200
Subject: [PATCH 2/4] ops printing/parsing test
---
mlir/test/Dialect/LLVMIR/rocdl.mlir | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/mlir/test/Dialect/LLVMIR/rocdl.mlir b/mlir/test/Dialect/LLVMIR/rocdl.mlir
index a6a29bf858e59..a2b2f84606ba0 100644
--- a/mlir/test/Dialect/LLVMIR/rocdl.mlir
+++ b/mlir/test/Dialect/LLVMIR/rocdl.mlir
@@ -958,6 +958,27 @@ llvm.func @rocdl.s.wait.dscnt() {
llvm.return
}
+llvm.func @rocdl.s.wait.loadcnt() {
+ // CHECK-LABEL: rocdl.s.wait.loadcnt
+ // CHECK: rocdl.s.wait.loadcnt 0
+ rocdl.s.wait.loadcnt 0
+ llvm.return
+}
+
+llvm.func @rocdl.s.wait.storecnt() {
+ // CHECK-LABEL: rocdl.s.wait.storecnt
+ // CHECK: rocdl.s.wait.storecnt 0
+ rocdl.s.wait.storecnt 0
+ llvm.return
+}
+
+llvm.func @rocdl.s.wait.expcnt() {
+ // CHECK-LABEL: rocdl.s.wait.expcnt
+ // CHECK: rocdl.s.wait.expcnt 0
+ rocdl.s.wait.expcnt 0
+ llvm.return
+}
+
// -----
llvm.func @rocdl.readlane(%src : f32) -> f32 {
>From e30cec19e9ec170bcc819fcbc04dc1e397df178d Mon Sep 17 00:00:00 2001
From: Ivan Butygin <ivan.butygin at gmail.com>
Date: Tue, 22 Jul 2025 17:29:14 +0200
Subject: [PATCH 3/4] add descriptions
---
mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td | 28 ++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td b/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
index eb9745a1b0425..83fad0dbeb9bb 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
@@ -286,24 +286,52 @@ def ROCDL_BarrierWaitOp : ROCDL_ConcreteNonMemIntrOp<"s.barrier.wait", [], 0, [0
def ROCDL_WaitDscntOp: ROCDL_ConcreteNonMemIntrOp<"s.wait.dscnt", [], 0, [0], ["count"]>,
Arguments<(ins I16Attr:$count)> {
+ let summary = "Wait until DSCNT is less than or equal to `count`";
+ let description = [{
+ Wait for the counter specified to be less-than or equal-to the `count`
+ before continuing
+
+ Available on gfx12+.
+ }];
let results = (outs);
let assemblyFormat = "$count attr-dict";
}
def ROCDL_WaitLoadcntOp: ROCDL_ConcreteNonMemIntrOp<"s.wait.loadcnt", [], 0, [0], ["count"]>,
Arguments<(ins I16Attr:$count)> {
+ let summary = "Wait until LOADCNT is less than or equal to `count`";
+ let description = [{
+ Wait for the counter specified to be less-than or equal-to the `count`
+ before continuing
+
+ Available on gfx12+.
+ }];
let results = (outs);
let assemblyFormat = "$count attr-dict";
}
def ROCDL_WaitStorecntOp: ROCDL_ConcreteNonMemIntrOp<"s.wait.storecnt", [], 0, [0], ["count"]>,
Arguments<(ins I16Attr:$count)> {
+ let summary = "Wait until STORECNT is less than or equal to `count`";
+ let description = [{
+ Wait for the counter specified to be less-than or equal-to the `count`
+ before continuing
+
+ Available on gfx12+.
+ }];
let results = (outs);
let assemblyFormat = "$count attr-dict";
}
def ROCDL_WaitExpcntOp: ROCDL_ConcreteNonMemIntrOp<"s.wait.expcnt", [], 0, [0], ["count"]>,
Arguments<(ins I16Attr:$count)> {
+ let summary = "Wait until EXPCNT is less than or equal to `count`";
+ let description = [{
+ Wait for the counter specified to be less-than or equal-to the `count`
+ before continuing
+
+ Available on gfx12+.
+ }];
let results = (outs);
let assemblyFormat = "$count attr-dict";
}
>From 5a2dd708ff12aac0fbd107b6a539d3c4a8391482 Mon Sep 17 00:00:00 2001
From: Ivan Butygin <ivan.butygin at gmail.com>
Date: Tue, 22 Jul 2025 17:32:57 +0200
Subject: [PATCH 4/4] text
---
mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td b/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
index 83fad0dbeb9bb..04a0b58a85211 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
@@ -289,7 +289,7 @@ def ROCDL_WaitDscntOp: ROCDL_ConcreteNonMemIntrOp<"s.wait.dscnt", [], 0, [0], ["
let summary = "Wait until DSCNT is less than or equal to `count`";
let description = [{
Wait for the counter specified to be less-than or equal-to the `count`
- before continuing
+ before continuing.
Available on gfx12+.
}];
@@ -302,7 +302,7 @@ def ROCDL_WaitLoadcntOp: ROCDL_ConcreteNonMemIntrOp<"s.wait.loadcnt", [], 0, [0]
let summary = "Wait until LOADCNT is less than or equal to `count`";
let description = [{
Wait for the counter specified to be less-than or equal-to the `count`
- before continuing
+ before continuing.
Available on gfx12+.
}];
@@ -315,7 +315,7 @@ def ROCDL_WaitStorecntOp: ROCDL_ConcreteNonMemIntrOp<"s.wait.storecnt", [], 0, [
let summary = "Wait until STORECNT is less than or equal to `count`";
let description = [{
Wait for the counter specified to be less-than or equal-to the `count`
- before continuing
+ before continuing.
Available on gfx12+.
}];
@@ -328,7 +328,7 @@ def ROCDL_WaitExpcntOp: ROCDL_ConcreteNonMemIntrOp<"s.wait.expcnt", [], 0, [0],
let summary = "Wait until EXPCNT is less than or equal to `count`";
let description = [{
Wait for the counter specified to be less-than or equal-to the `count`
- before continuing
+ before continuing.
Available on gfx12+.
}];
More information about the Mlir-commits
mailing list