From 51b60fd04a040531c5aac632d1b9696b02309812 Mon Sep 17 00:00:00 2001
From: Christophe Paquot <christophe.paquot@amd.com>
Date: Wed, 6 May 2020 10:36:53 -0700
Subject: [PATCH] Skip iHipWaitActiveStreams if stream is NonBlocking

SWDEV-234484

Change-Id: I279bdc8485d8218e0aaa89d094c08a84f002a608


[ROCm/clr commit: 0a103a5c492110cb328b045468d475167334bed1]
---
 projects/clr/hipamd/rocclr/hip_context.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/clr/hipamd/rocclr/hip_context.cpp b/projects/clr/hipamd/rocclr/hip_context.cpp
index 2f75d07b8a..2d0abc6add 100755
--- a/projects/clr/hipamd/rocclr/hip_context.cpp
+++ b/projects/clr/hipamd/rocclr/hip_context.cpp
@@ -84,7 +84,9 @@ amd::HostQueue* getQueue(hipStream_t stream) {
   } else {
     constexpr bool WaitNullStreamOnly = true;
     amd::HostQueue* queue = reinterpret_cast<hip::Stream*>(stream)->asHostQueue();
-    iHipWaitActiveStreams(queue, WaitNullStreamOnly);
+    if (!(reinterpret_cast<hip::Stream*>(stream)->Flags() & hipStreamNonBlocking)) {
+      iHipWaitActiveStreams(queue, WaitNullStreamOnly);
+    }
     return queue;
   }
 }