From 0cdff99dd04f9733562a619c12f45acdb95c5efb Mon Sep 17 00:00:00 2001
From: German Andryeyev <German.Andryeyev@amd.com>
Date: Fri, 16 Oct 2020 10:50:54 -0400
Subject: [PATCH] Add an early exit if it's a null stream wait

Change-Id: I577f5da2f928bff172d64d511a60e08eda28c81d


[ROCm/clr commit: d4e642203ce80d336d85726802043503aadcb307]
---
 projects/clr/hipamd/rocclr/hip_stream.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/projects/clr/hipamd/rocclr/hip_stream.cpp b/projects/clr/hipamd/rocclr/hip_stream.cpp
index 7f74136080..109e8c8b7d 100755
--- a/projects/clr/hipamd/rocclr/hip_stream.cpp
+++ b/projects/clr/hipamd/rocclr/hip_stream.cpp
@@ -168,6 +168,10 @@ void iHipWaitActiveStreams(amd::HostQueue* blocking_queue, bool wait_null_stream
             command->release();
           }
         }
+        // Nullstream, hence there is nothing else to wait
+        if (wait_null_stream) {
+          break;
+        }
       }
     }
   }