Skip to content

[ROCDL] Added s_wakeup_barrier (GFX1250) #172320

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
ravil-mobile merged 1 commit into from
Dec 16, 2025
+73 −48
Merged

[ROCDL] Added s_wakeup_barrier (GFX1250) #172320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 24 additions & 13 deletions mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,28 +328,28 @@ def ROCDL_BarrierOp : ROCDL_Op<"barrier"> {
def ROCDLGlobalBuffer : LLVM_PointerInAddressSpace<1>;
def ROCDLBufferLDS : LLVM_PointerInAddressSpace<3>;

def ROCDL_BarrierInitOp : ROCDL_IntrOp<"s.barrier.init", [], [], [], 0, 0, 0, 0, [1], ["id"]>,
Arguments<(ins Arg<ROCDLBufferLDS, "", []>:$ptr, I32Attr:$id)> {
def ROCDL_BarrierInitOp : ROCDL_IntrOp<"s.barrier.init", [], [], [], 0, 0, 0, 0, [1], ["memberCnt"]>,
Arguments<(ins Arg<ROCDLBufferLDS, "", []>:$ptr, I32Attr:$memberCnt)> {
let description = [{
Available on gfx1250+.
}];
let results = (outs);
let assemblyFormat = "$ptr `,` $id attr-dict";
let assemblyFormat = "$ptr `member_cnt` `=` $memberCnt attr-dict `:` qualified(type($ptr))";
}

def ROCDL_BarrierSignalOp : ROCDL_ConcreteNonMemIntrOp<"s.barrier.signal", [], 0, [0], ["id"]>,
Arguments<(ins I32Attr:$id)> {
let results = (outs);
let assemblyFormat = "$id attr-dict";
let assemblyFormat = "`id` `=` $id attr-dict";
}

def ROCDL_BarrierSignalVarOp : ROCDL_IntrOp<"s.barrier.signal.var", [], [], [], 0, 0, 0, 0, [1], ["id"]>,
Arguments<(ins Arg<ROCDLBufferLDS, "", []>:$ptr, I32Attr:$id)> {
def ROCDL_BarrierSignalVarOp : ROCDL_IntrOp<"s.barrier.signal.var", [], [], [], 0, 0, 0, 0, [1], ["memberCnt"]>,
Arguments<(ins Arg<ROCDLBufferLDS, "", []>:$ptr, I32Attr:$memberCnt)> {
let description = [{
Available on gfx1250+.
}];
let results = (outs);
let assemblyFormat = "$ptr `,` $id attr-dict";
let assemblyFormat = "$ptr `member_cnt` `=` $memberCnt attr-dict `:` qualified(type($ptr))";
}

def ROCDL_BarrierJoinOp : ROCDL_IntrOp<"s.barrier.join", [], [], [], 0>,
Expand All @@ -358,7 +358,7 @@ def ROCDL_BarrierJoinOp : ROCDL_IntrOp<"s.barrier.join", [], [], [], 0>,
Available on gfx1250+.
}];
let results = (outs);
let assemblyFormat = "$ptr attr-dict";
let assemblyFormat = "$ptr attr-dict `:` qualified(type($ptr))";
}

def ROCDL_BarrierLeaveOp : ROCDL_ConcreteNonMemIntrOp<"s.barrier.leave", [], 0, [0], ["id"]>,
Expand All @@ -367,13 +367,13 @@ def ROCDL_BarrierLeaveOp : ROCDL_ConcreteNonMemIntrOp<"s.barrier.leave", [], 0,
Available on gfx1250+.
}];
let results = (outs);
let assemblyFormat = "$id attr-dict";
let assemblyFormat = "`id` `=` $id attr-dict";
}

def ROCDL_BarrierWaitOp : ROCDL_ConcreteNonMemIntrOp<"s.barrier.wait", [], 0, [0], ["id"]>,
Arguments<(ins I16Attr:$id)> {
let results = (outs);
let assemblyFormat = "$id attr-dict";
let assemblyFormat = "`id` `=` $id attr-dict";
}

def ROCDL_BarrierSignalIsfirstOp : ROCDL_ConcreteNonMemIntrOp<"s.barrier.signal.isfirst", [], 1, [0], ["id"]>,
Expand All @@ -382,7 +382,7 @@ def ROCDL_BarrierSignalIsfirstOp : ROCDL_ConcreteNonMemIntrOp<"s.barrier.signal.
Available on gfx1250+.
}];
let results = (outs I1:$res);
let assemblyFormat = "$id attr-dict `:` type($res)";
let assemblyFormat = "`id` `=` $id attr-dict `->` type($res)";
}

def ROCDL_GetBarrierStateOp : ROCDL_ConcreteNonMemIntrOp<"s.get.barrier.state", [], 1, [0], ["id"]>,
Expand All @@ -391,7 +391,7 @@ def ROCDL_GetBarrierStateOp : ROCDL_ConcreteNonMemIntrOp<"s.get.barrier.state",
Available on gfx1250+.
}];
let results = (outs I32:$res);
let assemblyFormat = "$id attr-dict `:` type($res)";
let assemblyFormat = "`id` `=` $id attr-dict `->` type($res)";
}

def ROCDL_GetNamedBarrierStateOp : ROCDL_ConcreteNonMemIntrOp<"s.get.named.barrier.state", [], 1, [], []>,
Expand All @@ -400,7 +400,18 @@ def ROCDL_GetNamedBarrierStateOp : ROCDL_ConcreteNonMemIntrOp<"s.get.named.barri
Available on gfx1250+.
}];
let results = (outs I32:$res);
let assemblyFormat = "$ptr attr-dict `:` type($res)";
let assemblyFormat = "$ptr attr-dict `:` qualified(type($ptr)) `->` type($res)";
}

def ROCDL_WakeupBarrierOp : ROCDL_ConcreteNonMemIntrOp<"s.wakeup.barrier", [], 0, [], []>,
Arguments<(ins Arg<ROCDLBufferLDS, "", []>:$ptr)> {
let description = [{
Copy link
Contributor

@krzysz00 krzysz00 Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bit more description of what this does could be useful?

Copy link
Contributor Author

@ravil-mobile ravil-mobile Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. Added

Wakes up waves associated with a given named barrier. Note, This op does not release waves waiting
at the barrier. It just signal other waves in the same work-group waiting on the indicated named barrier
to wake up.
Available on gfx1250+.
}];
let assemblyFormat = "$ptr attr-dict `:` qualified(type($ptr))";
}

def ROCDL_WaitDscntOp: ROCDL_ConcreteNonMemIntrOp<"s.wait.dscnt", [], 0, [0], ["count"]>,
Expand Down
4 changes: 2 additions & 2 deletions mlir/test/Conversion/AMDGPUToROCDL/amdgpu-to-rocdl.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,8 +419,8 @@ func.func @lds_barrier() {
// GFX942-NEXT: rocdl.s.barrier
// GFX10-NEXT: rocdl.s.barrier
// GFX11-NEXT: rocdl.s.barrier
// GFX12-NEXT: rocdl.s.barrier.signal -1
// GFX12-NEXT: rocdl.s.barrier.wait -1
// GFX12-NEXT: rocdl.s.barrier.signal id = -1
// GFX12-NEXT: rocdl.s.barrier.wait id = -1
// CHECK-NEXT: llvm.fence syncscope("workgroup") acquire {llvm.mmra = #[[$MMRA_TAG]]}
amdgpu.lds_barrier
func.return
Expand Down
43 changes: 25 additions & 18 deletions mlir/test/Dialect/LLVMIR/rocdl.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1199,64 +1199,71 @@ llvm.func @rocdl.s.barrier() {

llvm.func @rocdl.s.barrier.init(%ptr : !llvm.ptr<3>) {
// CHECK-LABEL: rocdl.s.barrier.init
// CHECK: rocdl.s.barrier.init %[[PTR:.+]], 1
rocdl.s.barrier.init %ptr, 1
// CHECK: rocdl.s.barrier.init %{{.*}} member_cnt = 1 : !llvm.ptr<3>
rocdl.s.barrier.init %ptr member_cnt = 1 : !llvm.ptr<3>
llvm.return
}

llvm.func @rocdl.s.barrier.signal() {
// CHECK-LABEL: rocdl.s.barrier.signal
// CHECK: rocdl.s.barrier.signal -1
rocdl.s.barrier.signal -1
// CHECK: rocdl.s.barrier.signal id = -1
rocdl.s.barrier.signal id = -1
llvm.return
}

llvm.func @rocdl.s.barrier.signal.var(%ptr : !llvm.ptr<3>) {
// CHECK-LABEL: rocdl.s.barrier.signal.var
// CHECK: rocdl.s.barrier.signal.var %[[PTR:.+]], 1
rocdl.s.barrier.signal.var %ptr, 1
// CHECK: rocdl.s.barrier.signal.var %{{.*}} member_cnt = 1 : !llvm.ptr<3>
rocdl.s.barrier.signal.var %ptr member_cnt = 1 : !llvm.ptr<3>
llvm.return
}

llvm.func @rocdl.s.barrier.join(%ptr : !llvm.ptr<3>) {
// CHECK-LABEL: rocdl.s.barrier.join
// CHECK: rocdl.s.barrier.join %[[PTR:.+]]
rocdl.s.barrier.join %ptr
// CHECK: rocdl.s.barrier.join %{{.*}} : !llvm.ptr<3>
rocdl.s.barrier.join %ptr : !llvm.ptr<3>
llvm.return
}

llvm.func @rocdl.s.barrier.leave() {
// CHECK-LABEL: rocdl.s.barrier.leave
// CHECK: rocdl.s.barrier.leave 1
rocdl.s.barrier.leave 1
// CHECK: rocdl.s.barrier.leave id = 1
rocdl.s.barrier.leave id = 1
llvm.return
}

llvm.func @rocdl.s.barrier.wait() {
// CHECK-LABEL: rocdl.s.barrier.wait
// CHECK: rocdl.s.barrier.wait -1
rocdl.s.barrier.wait -1
// CHECK: rocdl.s.barrier.wait id = -1
rocdl.s.barrier.wait id = -1
llvm.return
}

llvm.func @rocdl.s.barrier.signal.isfirst() {
// CHECK-LABEL: rocdl.s.barrier.signal.isfirst
// CHECK: rocdl.s.barrier.signal.isfirst 1
%0 = rocdl.s.barrier.signal.isfirst 1 : i1
// CHECK: rocdl.s.barrier.signal.isfirst id = 1 -> i1
%0 = rocdl.s.barrier.signal.isfirst id = 1 -> i1
llvm.return
}

llvm.func @rocdl.s.get.barrier.state() {
// CHECK-LABEL: rocdl.s.get.barrier.state
// CHECK: rocdl.s.get.barrier.state 1
%0 = rocdl.s.get.barrier.state 1 : i32
// CHECK: rocdl.s.get.barrier.state id = 1 -> i32
%0 = rocdl.s.get.barrier.state id = 1 -> i32
llvm.return
}

llvm.func @rocdl.s.get.named.barrier.state(%ptr : !llvm.ptr<3>) {
// CHECK-LABEL: rocdl.s.get.named.barrier.state
// CHECK: rocdl.s.get.named.barrier.state %[[PTR:.+]]
%0 = rocdl.s.get.named.barrier.state %ptr : i32
// CHECK: rocdl.s.get.named.barrier.state %{{.*}} : !llvm.ptr<3> -> i32
%0 = rocdl.s.get.named.barrier.state %ptr : !llvm.ptr<3> -> i32
llvm.return
}

llvm.func @rocdl.s.wakeup.barrier(%ptr : !llvm.ptr<3>) {
// CHECK-LABEL: rocdl.s.wakeup.barrier
// CHECK: rocdl.s.wakeup.barrier %{{.*}} : !llvm.ptr<3>
rocdl.s.wakeup.barrier %ptr : !llvm.ptr<3>
llvm.return
}

Expand Down
37 changes: 22 additions & 15 deletions mlir/test/Target/LLVMIR/rocdl.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,64 +253,71 @@ llvm.func @rocdl.barrier() {

llvm.func @rocdl.s.barrier.init(%ptr : !llvm.ptr<3>) {
// CHECK-LABEL: rocdl.s.barrier.init
// CHECK: call void @llvm.amdgcn.s.barrier.init(ptr addrspace(3) %[[PTR:.+]], i32 1)
rocdl.s.barrier.init %ptr, 1
// CHECK: call void @llvm.amdgcn.s.barrier.init(ptr addrspace(3) %{{.*}}, i32 1)
rocdl.s.barrier.init %ptr member_cnt = 1 : !llvm.ptr<3>
llvm.return
}

llvm.func @rocdl.s.barrier.signal() {
// CHECK-LABEL: rocdl.s.barrier.signal
// CHECK-NEXT: call void @llvm.amdgcn.s.barrier.signal(i32 -1)
rocdl.s.barrier.signal -1
rocdl.s.barrier.signal id = -1
llvm.return
}

llvm.func @rocdl.s.barrier.signal.var(%ptr : !llvm.ptr<3>) {
// CHECK-LABEL: rocdl.s.barrier.signal.var
// CHECK: call void @llvm.amdgcn.s.barrier.signal.var(ptr addrspace(3) %[[PTR:.+]], i32 1)
rocdl.s.barrier.signal.var %ptr, 1
// CHECK: call void @llvm.amdgcn.s.barrier.signal.var(ptr addrspace(3) %{{.*}}, i32 1)
rocdl.s.barrier.signal.var %ptr member_cnt = 1 : !llvm.ptr<3>
llvm.return
}

llvm.func @rocdl.s.barrier.join(%ptr : !llvm.ptr<3>) {
// CHECK-LABEL: rocdl.s.barrier.join
// CHECK: call void @llvm.amdgcn.s.barrier.join(ptr addrspace(3) %[[PTR:.+]])
rocdl.s.barrier.join %ptr
// CHECK: call void @llvm.amdgcn.s.barrier.join(ptr addrspace(3) %{{.*}})
rocdl.s.barrier.join %ptr : !llvm.ptr<3>
llvm.return
}

llvm.func @rocdl.s.barrier.leave() {
// CHECK-LABEL: rocdl.s.barrier.leave
// CHECK: call void @llvm.amdgcn.s.barrier.leave(i16 1)
rocdl.s.barrier.leave 1
rocdl.s.barrier.leave id = 1
llvm.return
}

llvm.func @rocdl.s.barrier.wait() {
// CHECK-LABEL: rocdl.s.barrier.wait
// CHECK-NEXT: call void @llvm.amdgcn.s.barrier.wait(i16 -1)
rocdl.s.barrier.wait -1
rocdl.s.barrier.wait id = -1
llvm.return
}

llvm.func @rocdl.s.barrier.signal.isfirst() {
// CHECK-LABEL: rocdl.s.barrier.signal.isfirst
// CHECK: %[[OUT:.+]] = call i1 @llvm.amdgcn.s.barrier.signal.isfirst(i32 1)
%0 = rocdl.s.barrier.signal.isfirst 1 : i1
// CHECK: %{{.*}} = call i1 @llvm.amdgcn.s.barrier.signal.isfirst(i32 1)
%0 = rocdl.s.barrier.signal.isfirst id = 1 -> i1
llvm.return
}

llvm.func @rocdl.s.get.barrier.state() {
// CHECK-LABEL: rocdl.s.get.barrier.state
// CHECK: %[[STATE:.+]] = call i32 @llvm.amdgcn.s.get.barrier.state(i32 1)
%0 = rocdl.s.get.barrier.state 1 : i32
// CHECK: %{{.*}} = call i32 @llvm.amdgcn.s.get.barrier.state(i32 1)
%0 = rocdl.s.get.barrier.state id = 1 -> i32
llvm.return
}

llvm.func @rocdl.s.get.named.barrier.state(%ptr : !llvm.ptr<3>) {
// CHECK-LABEL: rocdl.s.get.named.barrier.state
// CHECK: %[[STATE:.+]] = call i32 @llvm.amdgcn.s.get.named.barrier.state(ptr addrspace(3) %[[PTR:.+]])
%0 = rocdl.s.get.named.barrier.state %ptr : i32
// CHECK: %{{.*}} = call i32 @llvm.amdgcn.s.get.named.barrier.state(ptr addrspace(3) %{{.*}})
%0 = rocdl.s.get.named.barrier.state %ptr : !llvm.ptr<3> -> i32
llvm.return
}

llvm.func @rocdl.s.wakeup.barrier(%ptr : !llvm.ptr<3>) {
// CHECK-LABEL: rocdl.s.wakeup.barrier
// CHECK: call void @llvm.amdgcn.s.wakeup.barrier(ptr addrspace(3) %{{.*}})
rocdl.s.wakeup.barrier %ptr : !llvm.ptr<3>
llvm.return
}

Expand Down