[AMDGPU] comgr: Preserve drain s_wait_dscnt in bumpNextWaitDscnt#2584
Merged
Conversation
xintin
added
comgr
xintin
force-pushed
the
hotswap-ds-drain-wait-fix
branch
from
839a3c6 to
89555a7
Compare
Follow-up to llvm#2369. The split-aware wait bump was incrementing drains (s_wait_dscnt 0) along with bounded waits, relaxing them and letting split halves escape into a downstream data hazard. Skip the bump when imm == 0; non-drain waits still bump by +1. Signed-off-by: xintin <gaurav.verma@amd.com>
xintin
force-pushed
the
hotswap-ds-drain-wait-fix
branch
from
89555a7 to
3f5e244
Compare
jmmartinez
reviewed
May 19, 2026
jmmartinez
left a comment
jmmartinez
left a comment
There was a problem hiding this comment.
Minor comment, otherwise it looks good to me.
chinmaydd
reviewed
May 19, 2026
Signed-off-by: xintin <gaurav.verma@amd.com
jmmartinez
approved these changes
May 20, 2026
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
3 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.
Follow-up to #2369. The split-aware wait bump was incrementing drains (s_wait_dscnt 0) along with bounded waits, relaxing them and letting split halves escape into a downstream data hazard.
Skip the bump when imm == 0; non-drain waits still bump by +1.
This will unlock PR #2281.
(follow-up #2585): a small dataflow pass at the wait site computing the bump from
(outstanding-count-at-wait, K). It would subsume the drain special-case naturally and remove the// TODO:marker left inbumpNextWaitDscnt.