Skip to content

ROCM-26531 - Fix capture graph leak on execution-context stream detach #7773

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

Open
victzhan wants to merge 2 commits into
base: develop
Choose a base branch
from
+9 −2
Open

ROCM-26531 - Fix capture graph leak on execution-context stream detach #7773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a9c1d6
[clr] Fix capture graph leak on execution-context stream detach
victzhan Jun 23, 2026
4e76387
Merge branch 'develop' into ROCM-26531/victzhan
victzhan Jun 25, 2026
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: 2 additions & 0 deletions projects/clr/hipamd/src/hip_internal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,8 @@ namespace hip {
}
/// Release graph when capture is invalidated
void ReleaseCaptureGraph();
/// Drop the capture-graph pointer without freeing it (forks alias the origin's graph).
void ClearCaptureGraph() { pCaptureGraph_ = nullptr; }
/// Generate and assign a new capture ID (used at BeginCapture)
void SetCaptureID() { captureID_ = GenerateCaptureID(); }
/// Inherit capture ID from the parent stream
Expand Down
9 changes: 7 additions & 2 deletions projects/clr/hipamd/src/hip_stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,13 @@ void Stream::Detach() {
if (captureStatus_ == hipStreamCaptureStatusActive) {
captureStatus_ = hipStreamCaptureStatusInvalidated;
for (auto s : parallelCaptureStreams_) {
reinterpret_cast<hip::Stream*>(s)->SetCaptureStatus(
hipStreamCaptureStatusInvalidated);
auto* fork = reinterpret_cast<hip::Stream*>(s);
fork->SetCaptureStatus(hipStreamCaptureStatusInvalidated);
fork->ClearCaptureGraph(); // fork only aliases origin's graph; avoid double free
}
// EndCapture's cleanup is now unreachable (detached), so free the graph here.
if (originStream_) {
ReleaseCaptureGraph();
}
}
detached_.store(true, std::memory_order_release);
Expand Down
Loading