SWDEV-301667 - Optimize lock for graph global capture mode

Remove unneeded lock and add smaller scope Change-Id: I03a437057d54ce2d72c07a080bb872693b7f3f6c
ROCm · Mar 21, 2023 · 4209792 · 4209792
1 parent 0e37910
commit 4209792
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/hip_internal.hpp b/src/hip_internal.hpp
@@ -166,7 +166,6 @@ static  amd::Monitor g_hipInitlock{"hipInit lock"};
     if (hip::tls.capture_streams_.size() != 0) {                                                   \
       HIP_RETURN(hipErrorStreamCaptureUnsupported);                                                \
     }                                                                                              \
-    amd::ScopedLock lock(g_captureStreamsLock);                                                    \
     if (g_captureStreams.size() != 0) {                                                            \
       HIP_RETURN(hipErrorStreamCaptureUnsupported);                                                \
     }                                                                                              \

diff --git a/src/hip_stream.cpp b/src/hip_stream.cpp
@@ -470,10 +470,12 @@ hipError_t hipStreamDestroy(hipStream_t stream) {
   }
   s->GetDevice()->RemoveStreamFromPools(s);
 
-  amd::ScopedLock lock(g_captureStreamsLock);
-  const auto& g_it = std::find(g_captureStreams.begin(), g_captureStreams.end(), s);
-  if (g_it != g_captureStreams.end()) {
-    g_captureStreams.erase(g_it);
+  {
+    amd::ScopedLock lock(g_captureStreamsLock);
+    const auto& g_it = std::find(g_captureStreams.begin(), g_captureStreams.end(), s);
+    if (g_it != g_captureStreams.end()) {
+      g_captureStreams.erase(g_it);
+    }
   }
   const auto& l_it = std::find(hip::tls.capture_streams_.begin(),
                       hip::tls.capture_streams_.end(), s);