Skip to content

[rocjitsu] Fix DirectToLDS missing workgroup LDS base offset #5747

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
atgutier merged 1 commit into from
May 5, 2026
Merged

[rocjitsu] Fix DirectToLDS missing workgroup LDS base offset #5747

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
2 changes: 1 addition & 1 deletion experimental/rocjitsu/lib/python/amdisa/codegen/_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3862,7 +3862,7 @@ def _gen_buffer_load(self, dst: list[str], src: list[str], sem: InstructionSeman
L.append(f' d->num_elems = {ne};')
L.append(' d->is_load = true;')
L.append(' d->lds_dst = true;')
L.append(' d->lds_base = wf.m0();')
L.append(' d->lds_base = wf.m0() + wf.lds_base();')
L.append(f' d->mtype = {self._mtype_expr()};')
L.append(f' d->non_temporal = {nt};')
L.append(f' {addr_fn}(inst_, wf, *d);')
Expand Down
28 changes: 14 additions & 14 deletions experimental/rocjitsu/lib/rocjitsu/src/rocjitsu/isa/arch/amdgpu/cdna1/mubuf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ void BufferLoadUbyteMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -424,7 +424,7 @@ void BufferLoadSbyteMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -467,7 +467,7 @@ void BufferLoadUshortMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -509,7 +509,7 @@ void BufferLoadSshortMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -552,7 +552,7 @@ void BufferLoadDwordMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -594,7 +594,7 @@ void BufferLoadDwordx2Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 2;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -636,7 +636,7 @@ void BufferLoadDwordx3Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 3;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -678,7 +678,7 @@ void BufferLoadDwordx4Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 4;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1030,7 +1030,7 @@ void BufferLoadUbyteD16Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1073,7 +1073,7 @@ void BufferLoadUbyteD16HiMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1116,7 +1116,7 @@ void BufferLoadSbyteD16Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1160,7 +1160,7 @@ void BufferLoadSbyteD16HiMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1204,7 +1204,7 @@ void BufferLoadShortD16Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1247,7 +1247,7 @@ void BufferLoadShortD16HiMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down
28 changes: 14 additions & 14 deletions experimental/rocjitsu/lib/rocjitsu/src/rocjitsu/isa/arch/amdgpu/cdna2/mubuf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ void BufferLoadUbyteMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -442,7 +442,7 @@ void BufferLoadSbyteMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -486,7 +486,7 @@ void BufferLoadUshortMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -529,7 +529,7 @@ void BufferLoadSshortMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -573,7 +573,7 @@ void BufferLoadDwordMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -616,7 +616,7 @@ void BufferLoadDwordx2Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 2;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -659,7 +659,7 @@ void BufferLoadDwordx3Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 3;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -702,7 +702,7 @@ void BufferLoadDwordx4Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 4;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1077,7 +1077,7 @@ void BufferLoadUbyteD16Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1121,7 +1121,7 @@ void BufferLoadUbyteD16HiMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1165,7 +1165,7 @@ void BufferLoadSbyteD16Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1210,7 +1210,7 @@ void BufferLoadSbyteD16HiMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1255,7 +1255,7 @@ void BufferLoadShortD16Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1299,7 +1299,7 @@ void BufferLoadShortD16HiMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx9(inst_.glc);
d->non_temporal = 0;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down
28 changes: 14 additions & 14 deletions experimental/rocjitsu/lib/rocjitsu/src/rocjitsu/isa/arch/amdgpu/cdna3/mubuf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ void BufferLoadUbyteMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx940(inst_.sc0, inst_.sc1, inst_.nt);
d->non_temporal = inst_.nt;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -443,7 +443,7 @@ void BufferLoadSbyteMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx940(inst_.sc0, inst_.sc1, inst_.nt);
d->non_temporal = inst_.nt;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -487,7 +487,7 @@ void BufferLoadUshortMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx940(inst_.sc0, inst_.sc1, inst_.nt);
d->non_temporal = inst_.nt;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -530,7 +530,7 @@ void BufferLoadSshortMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx940(inst_.sc0, inst_.sc1, inst_.nt);
d->non_temporal = inst_.nt;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -574,7 +574,7 @@ void BufferLoadDwordMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx940(inst_.sc0, inst_.sc1, inst_.nt);
d->non_temporal = inst_.nt;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -617,7 +617,7 @@ void BufferLoadDwordx2Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 2;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx940(inst_.sc0, inst_.sc1, inst_.nt);
d->non_temporal = inst_.nt;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -660,7 +660,7 @@ void BufferLoadDwordx3Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 3;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx940(inst_.sc0, inst_.sc1, inst_.nt);
d->non_temporal = inst_.nt;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -703,7 +703,7 @@ void BufferLoadDwordx4Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 4;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx940(inst_.sc0, inst_.sc1, inst_.nt);
d->non_temporal = inst_.nt;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1078,7 +1078,7 @@ void BufferLoadUbyteD16Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx940(inst_.sc0, inst_.sc1, inst_.nt);
d->non_temporal = inst_.nt;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1122,7 +1122,7 @@ void BufferLoadUbyteD16HiMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx940(inst_.sc0, inst_.sc1, inst_.nt);
d->non_temporal = inst_.nt;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1166,7 +1166,7 @@ void BufferLoadSbyteD16Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx940(inst_.sc0, inst_.sc1, inst_.nt);
d->non_temporal = inst_.nt;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1211,7 +1211,7 @@ void BufferLoadSbyteD16HiMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx940(inst_.sc0, inst_.sc1, inst_.nt);
d->non_temporal = inst_.nt;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1256,7 +1256,7 @@ void BufferLoadShortD16Mubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx940(inst_.sc0, inst_.sc1, inst_.nt);
d->non_temporal = inst_.nt;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down Expand Up @@ -1300,7 +1300,7 @@ void BufferLoadShortD16HiMubuf::execute_impl(amdgpu::Wavefront &wf) {
d->num_elems = 1;
d->is_load = true;
d->lds_dst = true;
d->lds_base = wf.m0();
d->lds_base = wf.m0() + wf.lds_base();
d->mtype = amdgpu::mtype_from_flags_gfx940(inst_.sc0, inst_.sc1, inst_.nt);
d->non_temporal = inst_.nt;
mubuf_calculate_addresses(inst_, wf, *d);
Expand Down
Loading
Loading