fix(stinkytofu): add SAtomicCmpswapX2 to logical IR and rocisa adaptor shim by KKyang · Pull Request #11533 · ROCm/rocm-libraries

KKyang · 2026-09-01T14:53:45Z

JIRA ID : AIHPBLAS-4621

Motivation

from rocisa.instruction import SAtomicCmpswapX2 in SdmaRingEmitter.py raised
ImportError: cannot import name 'SAtomicCmpswapX2' from 'rocisa_stinkytofu_adaptor.instruction'.
Real rocisa's C++ backend already implements s_atomic_cmpswap_x2
(rocisa/rocisa/include/instruction/mem.hpp, exercised by rocisa/test/test_atomics.py),
but the gfx1250 StinkyTofu path was missing it in two places: stinkytofu's own
logical IR (LogicalInstructionDefs.inc) never defined SAtomicCmpswapX2, and the
Python adaptor shim (rocisa_stinkytofu_adaptor/instruction.py) that stands in for
rocisa on gfx1250 never mirrored it, unlike its siblings SAtomicInc/SAtomicDec.

Technical Details

shared/stinkytofu/src/ir/logical/LogicalInstructionDefs.inc: added an
SAtomicCmpswapX2 entry (numSrcs=2, hasDest=true, category "Memory Scalar",
flag IF_SMemAtomic), mirroring the existing SAtomicInc/SAtomicDec entries.
Rebuilding runs tablegen, which regenerates the C++ IR class and the nanobind
Python bindings from this single definition.
shared/stinkytofu/tests/unit/logical/LogicalToAsmMultiArchTest.cpp: added the
matching factory case and coverage-list entry so the new opcode is exercised by
the exhaustive logical-IR test.
projects/hipblaslt/tensilelite/rocisa_stinkytofu_adaptor/rocisa_stinkytofu_adaptor/instruction.py:
added an SAtomicCmpswapX2 shim class mirroring SAtomicInc/SAtomicDec
(s_atomic_cmpswap_x2 dst, base, soffset, with to_stinky_logical() forwarding
to the new stinkytofu.SAtomicCmpswapX2).

Test Plan

Rebuilt stinkytofu (invoke build) to regenerate tablegen output; confirmed
stinkytofu.SAtomicCmpswapX2 is now importable from the built Python module.
./tests/unit_tests --gtest_filter="*LogicalToAsm*" — all pass, 369/369 factory
cases covered.
pytest rocisa_stinkytofu_adaptor/tests/test_instruction.py — 268 passed / 785
subtests passed (no regressions).
Manually instantiated the new adaptor shim class end-to-end: string rendering
matches real rocisa's test_atomics.py expected output
(s_atomic_cmpswap_x2 s[4:7], s[8:9], s12 offset:64 glc), to_stinky_logical()
produces a valid stinkytofu.LogicalInstruction, and deepcopy round-trips.

Test Result

All of the above passed with no failures or regressions.

Submission Checklist

Look over the contributing guidelines at https://github.com/ROCm/ROCm/blob/develop/CONTRIBUTING.md#pull-requests.

Risk level

Low — additive-only change (new instruction definition + new shim class), no
existing behavior modified; verified against the existing test suites above.

…r shim Close AIHPBLAS-4621

therock-pr-bot · 2026-09-01T14:59:23Z

✅ All Checks Passed — Ready for Review

Check	Status	Details
📝 PR Description	✅ Pass	—
⛔ Forbidden Files	✅ Pass	—
🧪 Unit Test	⚠️ Warning	Error: Source/code files changed without an accompanying unit test. Expected: add at least one test file named like `test_<name>.py` / `test_<name>.cpp` (or `<name>_test.`). Current:* code file(s) changed: `projects/hipblaslt/tensilelite/rocisa_stinkytofu_adaptor/rocisa_stinkytofu_adaptor/instruction.py`, `shared/stinkytofu/tests/unit/logical/LogicalToAsmMultiArchTest.cpp`; no test file found
🔎 pre-commit	✅ Pass	—
🚫 Draft PR	🔜 To Be Enabled	—
🚩 Feature Flag	🔜 To Be Enabled	—
📊 Code Coverage	🔜 To Be Enabled	—
🤖 therock-pr-bot	✅ Pass	—

🎉 All checks passed! This PR is ready for review.

📖 Need help? See the Policy FAQ for details on every check and how to fix failures.

🙋 Wish to Override Policy?

therock-pr-bot · 2026-09-01T14:59:26Z

🎉 All checks passed! This PR is ready for review.

codecov · 2026-09-01T15:41:26Z

Codecov Report

✅ All modified and coverable lines are covered by tests.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop   #11533      +/-   ##
===========================================
- Coverage    69.34%   69.33%   -0.01%     
===========================================
  Files         2817     2817              
  Lines       466948   467067     +119     
  Branches     68828    68858      +30     
===========================================
+ Hits        323765   323814      +49     
- Misses      119629   119677      +48     
- Partials     23554    23576      +22

Flag	Coverage Δ		*Carryforward flag
TensileLite-CPP	`38.26% <ø> (ø)`
TensileLite-Unit	`76.39% <ø> (ø)`
hipBLAS	`90.62% <ø> (ø)`		Carriedforward from 303568b
hipBLASLt	`35.25% <ø> (+0.03%)`	⬆️
hipCUB	`82.68% <ø> (ø)`		Carriedforward from 303568b
hipDNN	`86.95% <ø> (ø)`		Carriedforward from 303568b
hipFFT	`43.67% <ø> (ø)`		Carriedforward from 303568b
hipRAND	`76.12% <ø> (ø)`		Carriedforward from 303568b
hipSOLVER	`68.92% <ø> (ø)`		Carriedforward from 303568b
hipSPARSE	`86.99% <ø> (ø)`		Carriedforward from 303568b
rocBLAS	`48.29% <ø> (ø)`		Carriedforward from 303568b
rocFFT	`45.91% <ø> (ø)`		Carriedforward from 303568b
rocRAND	`56.91% <ø> (ø)`		Carriedforward from 303568b
rocSOLVER	`76.83% <ø> (ø)`		Carriedforward from 303568b
rocSPARSE	`74.60% <ø> (ø)`		Carriedforward from 303568b
rocThrust	`91.60% <ø> (ø)`		Carriedforward from 303568b

*This pull request uses carry forward flags. Click here to find out more.
see 4 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

jaopaulolc · 2026-09-01T17:54:17Z


+
+# logicalIR: SAtomicCmpswapX2
+class SAtomicCmpswapX2(Instruction):


Thanks for picking this up — the SAtomicCmpswapX2 shim itself looks right (in particular getSrcParams() returning [base, soffset] matches native rocisa's AtomicReadWriteInstruction).

Heads-up though: this PR alone does not unblock the import. I applied it cleanly onto develop (6fdafda1d9a) and re-ran the failing import — it still raises, just pointing at a different class:

ImportError: cannot import name 'SAtomicUmaxX2' from 'rocisa_stinkytofu_adaptor.instruction'

The reason is that the SAtomicUmaxX2 instruction class sits on the same import statement as SAtomicCmpswapX2:

# Tensile/Components/SdmaRingEmitter.py:6-14 from rocisa.instruction import ( ... SStoreB32, SStoreB64, SStoreB128, SAtomicCmpswapX2, SAtomicUmaxX2, )

Python resolves that statement atomically, so one unresolvable class aborts the whole import regardless of the other 23 being present.

There is also a third instruction class missing on an adjacent path — SBfmB64, imported at module level by Tensile/Components/GlobalWriteBatch.py:32. Coverage after this PR:

Instruction class imported by present after this PR

SAtomicCmpswapX2 SdmaRingEmitter.py:13 ✅

SAtomicUmaxX2 SdmaRingEmitter.py:13 ❌

SBfmB64 GlobalWriteBatch.py:32 ❌

All three came in together with #10925 (59f8fd37e86), which landed one day after #11485 (13d7206ad42) made gfx1250 auto-select the adaptor backend — so the adaptor never grew the corresponding shim classes. Worth noting the blast radius: Signature.py:62 imports SdmaRingEmitter unconditionally, so this breaks every gfx1250 kernel, not just the fused-A2A path.

Would you be open to folding the remaining two into this PR? I have both shims written and verified locally — happy to hand them over or push the delta to your branch, whichever is easier for you.

fix(stinkytofu): add SAtomicCmpswapX2 to logical IR and rocisa adaptor shim (#11533) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit JIRA ID : AIHPBLAS-4621 ## Motivation `from rocisa.instruction import SAtomicCmpswapX2` in `SdmaRingEmitter.py` raised `ImportError: cannot import name 'SAtomicCmpswapX2' from 'rocisa_stinkytofu_adaptor.instruction'`. Real rocisa's C++ backend already implements `s_atomic_cmpswap_x2` (`rocisa/rocisa/include/instruction/mem.hpp`, exercised by `rocisa/test/test_atomics.py`), but the gfx1250 StinkyTofu path was missing it in two places: stinkytofu's own logical IR (`LogicalInstructionDefs.inc`) never defined `SAtomicCmpswapX2`, and the Python adaptor shim (`rocisa_stinkytofu_adaptor/instruction.py`) that stands in for rocisa on gfx1250 never mirrored it, unlike its siblings `SAtomicInc`/`SAtomicDec`. ## Technical Details - `shared/stinkytofu/src/ir/logical/LogicalInstructionDefs.inc`: added an `SAtomicCmpswapX2` entry (numSrcs=2, hasDest=true, category "Memory Scalar", flag `IF_SMemAtomic`), mirroring the existing `SAtomicInc`/`SAtomicDec` entries. Rebuilding runs tablegen, which regenerates the C++ IR class and the nanobind Python bindings from this single definition. - `shared/stinkytofu/tests/unit/logical/LogicalToAsmMultiArchTest.cpp`: added the matching factory case and coverage-list entry so the new opcode is exercised by the exhaustive logical-IR test. - `projects/hipblaslt/tensilelite/rocisa_stinkytofu_adaptor/rocisa_stinkytofu_adaptor/instruction.py`: added an `SAtomicCmpswapX2` shim class mirroring `SAtomicInc`/`SAtomicDec` (`s_atomic_cmpswap_x2 dst, base, soffset`, with `to_stinky_logical()` forwarding to the new `stinkytofu.SAtomicCmpswapX2`). ## Test Plan - Rebuilt stinkytofu (`invoke build`) to regenerate tablegen output; confirmed `stinkytofu.SAtomicCmpswapX2` is now importable from the built Python module. - `./tests/unit_tests --gtest_filter="*LogicalToAsm*"` — all pass, 369/369 factory cases covered. - `pytest rocisa_stinkytofu_adaptor/tests/test_instruction.py` — 268 passed / 785 subtests passed (no regressions). - Manually instantiated the new adaptor shim class end-to-end: string rendering matches real rocisa's `test_atomics.py` expected output (`s_atomic_cmpswap_x2 s[4:7], s[8:9], s12 offset:64 glc`), `to_stinky_logical()` produces a valid `stinkytofu.LogicalInstruction`, and `deepcopy` round-trips. ## Test Result All of the above passed with no failures or regressions. ## Submission Checklist - [x] Look over the contributing guidelines at https://github.com/ROCm/ROCm/blob/develop/CONTRIBUTING.md#pull-requests. ## Risk level Low — additive-only change (new instruction definition + new shim class), no existing behavior modified; verified against the existing test suites above.

…tor (#11592) JIRA ID : AIHPBLAS-4621 ## Motivation PR [#11178](#11178) added scalar atomic instructions (`SAtomicUmaxX2`, `SAtomicCmpswapX2`) and `SBfmB64` to native rocisa. A follow-up PR [#11533](#11533) added `SAtomicCmpswapX2` to the logical IR and adaptor, but missed `SAtomicUmaxX2` and `SBfmB64`. When the stinkytofu backend is active on gfx1250, importing these instructions from `rocisa.instruction` fails with `ImportError`.  ## Technical Details - **`SAtomicUmaxX2`**: Added logical IR definition in `LogicalInstructionDefs.inc` (numSrcs=2, hasDest=true, IF_SMemAtomic), full adaptor shim class with `to_stinky_logical()` in `instruction.py`, and test case in `LogicalToAsmMultiArchTest.cpp`. - **`SBfmB64`**: Added logical IR definition in `LogicalInstructionDefs.inc` (numSrcs=2, hasDest=true, IF_SALU), adaptor shim via `_make_scalar_alu_class` factory in `instruction.py`, and test case in `LogicalToAsmMultiArchTest.cpp`.  ## Test Plan gfx1250 YAML test suites (gemm, sparse, streamk, gradient, streamk_ext).  ## Test Result All gfx1250 YAML tests pass.  ## Submission Checklist - [V] Look over the contributing guidelines at https://github.com/ROCm/ROCm/blob/develop/CONTRIBUTING.md#pull-requests.

fix(stinkytofu): add SAtomicUmaxX2 and SBfmB64 to logical IR and adaptor (#11592) JIRA ID : AIHPBLAS-4621 ## Motivation PR [#11178](ROCm/rocm-libraries#11178) added scalar atomic instructions (`SAtomicUmaxX2`, `SAtomicCmpswapX2`) and `SBfmB64` to native rocisa. A follow-up PR [#11533](ROCm/rocm-libraries#11533) added `SAtomicCmpswapX2` to the logical IR and adaptor, but missed `SAtomicUmaxX2` and `SBfmB64`. When the stinkytofu backend is active on gfx1250, importing these instructions from `rocisa.instruction` fails with `ImportError`.  ## Technical Details - **`SAtomicUmaxX2`**: Added logical IR definition in `LogicalInstructionDefs.inc` (numSrcs=2, hasDest=true, IF_SMemAtomic), full adaptor shim class with `to_stinky_logical()` in `instruction.py`, and test case in `LogicalToAsmMultiArchTest.cpp`. - **`SBfmB64`**: Added logical IR definition in `LogicalInstructionDefs.inc` (numSrcs=2, hasDest=true, IF_SALU), adaptor shim via `_make_scalar_alu_class` factory in `instruction.py`, and test case in `LogicalToAsmMultiArchTest.cpp`.  ## Test Plan gfx1250 YAML test suites (gemm, sparse, streamk, gradient, streamk_ext).  ## Test Result All gfx1250 YAML tests pass.  ## Submission Checklist - [V] Look over the contributing guidelines at https://github.com/ROCm/ROCm/blob/develop/CONTRIBUTING.md#pull-requests.

assistant-librarian · 2026-09-02T22:08:14Z

TheRock Submodule Bump Activity

Newest first

2026-09-02 — Included in TheRock via ROCm/TheRock#7826.

fix(stinkytofu): add SAtomicCmpswapX2 to logical IR and rocisa adapto…

10a922e

…r shim Close AIHPBLAS-4621

KKyang requested review from a team as code owners September 1, 2026 14:53

github-actions Bot added project: hipblaslt project: hipsparselt ci:hipsparselt-fast shared: stinkytofu labels Sep 1, 2026

assistant-librarian Bot added the organization: ROCm label Sep 1, 2026

jaopaulolc reviewed Sep 1, 2026

View reviewed changes

jimbochi self-requested a review September 1, 2026 23:56

jimbochi approved these changes Sep 1, 2026

View reviewed changes

KKyang merged commit 1b52407 into develop Sep 2, 2026
104 of 116 checks passed

KKyang deleted the users/kkyang/satomic-cmpswap-x2 branch September 2, 2026 00:07

jimbochi mentioned this pull request Sep 2, 2026

fix(stinkytofu): add SAtomicUmaxX2 and SBfmB64 to logical IR and adaptor #11592

Merged

Navigation Menu

Repository navigation

fix(stinkytofu): add SAtomicCmpswapX2 to logical IR and rocisa adaptor shim - #11533

fix(stinkytofu): add SAtomicCmpswapX2 to logical IR and rocisa adaptor shim#11533
KKyang merged 1 commit into
developfrom
users/kkyang/satomic-cmpswap-x2

KKyang commented Sep 1, 2026

Uh oh!

therock-pr-bot Bot commented Sep 1, 2026 •

edited

Loading

Uh oh!

therock-pr-bot Bot commented Sep 1, 2026

Uh oh!

codecov Bot commented Sep 1, 2026 •

edited

Loading

Uh oh!

jaopaulolc Sep 1, 2026

Uh oh!

Uh oh!

assistant-librarian Bot commented Sep 2, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants



		# logicalIR: SAtomicCmpswapX2
		class SAtomicCmpswapX2(Instruction):

Instruction class	imported by	present after this PR
`SAtomicCmpswapX2`	`SdmaRingEmitter.py:13`	✅
`SAtomicUmaxX2`	`SdmaRingEmitter.py:13`	❌
`SBfmB64`	`GlobalWriteBatch.py:32`	❌

Conversation

KKyang commented Sep 1, 2026

Motivation

Technical Details

Test Plan

Test Result

Submission Checklist

Risk level

Uh oh!

therock-pr-bot Bot commented Sep 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ All Checks Passed — Ready for Review

Uh oh!

therock-pr-bot Bot commented Sep 1, 2026

Uh oh!

codecov Bot commented Sep 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

jaopaulolc Sep 1, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

assistant-librarian Bot commented Sep 2, 2026

TheRock Submodule Bump Activity

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

therock-pr-bot Bot commented Sep 1, 2026 •

edited

Loading

codecov Bot commented Sep 1, 2026 •

edited

Loading