[comgr][hotswap] Make branch-island allocation transactional - #3677
Merged
harsh-amd merged 1 commit intoJul 29, 2026
Merged
Conversation
github-actions
Bot
added
comgr
harsh-amd
marked this pull request as ready for review
July 29, 2026 16:45
paulzzy
enabled auto-merge (squash)
July 29, 2026 16:48
YashDeshpande25
disabled auto-merge
July 29, 2026 16:53
paulzzy
self-requested a review
July 29, 2026 16:53
lamb-j
added a commit
to ROCm/TheRock
that referenced
this pull request
Jul 29, 2026
…ing) (#6980) ## Summary Bumps `compiler/amd-llvm` from `8f497e09` to `4a4173e7`, bringing the two comgr **hotswap** commits that landed on `amd-staging` after 23.14. Cherry-picked on top of the current pin, in `amd-staging` landed order: | PR | Title | |----|-------| | ROCm/llvm-project#3583 | `comgr: accept validated data-only hotswap objects` | | ROCm/llvm-project#3677 | `[comgr][hotswap] Make branch-island allocation transactional` | Each carries a `(cherry picked from ...)` provenance line; both applied cleanly with no conflicts. Neither adds gfx1251/gfx12-5-generic coverage, and neither reintroduces the system-googletest StringRef trap (#3677 adds no `SCOPED_TRACE`; #3583's gtest additions stream `llvm::toString(...)`). ### Numbering Follows SMP 23.14 (the current pin `8f497e09`), so this is **SMP 23.15**. ISSUE ID: #6235
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Supersedes #3609 with a focused implementation on current
amd-staging.Scope
directional lookup instead of rescanning every sled.
inventory unchanged when routing fails.
an occupied instruction word cannot be reused.
behavior, and function ownership.
Pair-backed/source-tail promotion remains separate in #3611.
This change has no unmerged PR dependency.
Tests
On
mi300x, for exact headd66e2a72cdaf4e89bcf7949fd414d6878fd918f0:git diff --check: clean.The complete COMGR/ASAN suites, differential corpus gate, and MI400 matrix
remain pending. This PR is intentionally a draft until those landing gates
complete.