SWDEV-436126 - hipStreamDestroy to remove stream from capture list

Anusha GodavarthySurya · Anusha Godavarthy Surya · commit 476dc4c87c28 · 2024-03-14T11:32:10.000-04:00
Change-Id: Ie735f27b9c5df4faf39bd4be10fbe4401fd88cdb
diff --git a/hipamd/src/hip_stream.cpp b/hipamd/src/hip_stream.cpp
@@ -496,6 +496,13 @@ hipError_t hipStreamDestroy(hipStream_t stream) {
       g_captureStreams.erase(g_it);
     }
   }
+  {
+    amd::ScopedLock lock(g_streamSetLock);
+    const auto& g_it = std::find(g_allCapturingStreams.begin(), g_allCapturingStreams.end(), s);
+    if (g_it != g_allCapturingStreams.end()) {
+      g_allCapturingStreams.erase(g_it);
+    }
+  }
   const auto& l_it = std::find(hip::tls.capture_streams_.begin(),
                       hip::tls.capture_streams_.end(), s);
   if (l_it != hip::tls.capture_streams_.end()) {

Original file line number	Diff line number	Diff line change
`@@ -496,6 +496,13 @@ hipError_t hipStreamDestroy(hipStream_t stream) {`
`496`	`496`	`g_captureStreams.erase(g_it);`
`497`	`497`	`}`
`498`	`498`	`}`
	`499`	`+ {`
	`500`	`+ amd::ScopedLock lock(g_streamSetLock);`
	`501`	`+ const auto& g_it = std::find(g_allCapturingStreams.begin(), g_allCapturingStreams.end(), s);`
	`502`	`+ if (g_it != g_allCapturingStreams.end()) {`
	`503`	`+ g_allCapturingStreams.erase(g_it);`
	`504`	`+ }`
	`505`	`+ }`
`499`	`506`	`const auto& l_it = std::find(hip::tls.capture_streams_.begin(),`
`500`	`507`	`hip::tls.capture_streams_.end(), s);`
`501`	`508`	`if (l_it != hip::tls.capture_streams_.end()) {`