From d492bdd82c1c8a5c4d0094b11f1d9b0ec4639cbb Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Tue, 1 Nov 2022 10:38:38 +0530
Subject: [PATCH] SWDEV-347670 - Enable GPU StreamWrite and StreamWait tests on
 Windows (#3031)

This patch skips Unit_hipStreamValue_*_Blocking test cases because of a soft hang
Stream write and stream wait passing tests can be enabled in the device
attribute.

Unit_hipStreamValue_*_Blocking tests will be enabled when the hang is fixed

Change-Id: Ieea831162208c4ec172b35a0421c66f6b1a21ed7


[ROCm/hip commit: b0d68926920a6ab0c936ce6ed46728ed5ad21124]
---
 .../config/config_amd_windows_MI2xx.json      | 19 ++++++++++++++++++-
 .../config/config_amd_windows_common.json     | 19 ++++++++++++++++++-
 .../catch/unit/event/Unit_hipEventIpc.cc      |  6 +++++-
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/projects/hip/tests/catch/hipTestMain/config/config_amd_windows_MI2xx.json b/projects/hip/tests/catch/hipTestMain/config/config_amd_windows_MI2xx.json
index e6b4364a87..013f7c67d8 100644
--- a/projects/hip/tests/catch/hipTestMain/config/config_amd_windows_MI2xx.json
+++ b/projects/hip/tests/catch/hipTestMain/config/config_amd_windows_MI2xx.json
@@ -71,6 +71,23 @@
 		"Unit_hipStreamSynchronize_FinishWork",
 		"Unit_hipStreamSynchronize_NullStreamAndStreamPerThread",
 		"Unit_hipMultiThreadDevice_NearZero",
-		"Unit_hipStreamPerThread_DeviceReset_1"
+		"Unit_hipStreamPerThread_DeviceReset_1",
+		"Unit_hipStreamValue_Wait32_Blocking_Mask_Gte",
+		"Unit_hipStreamValue_Wait32_Blocking_Mask_Eq_1",
+		"Unit_hipStreamValue_Wait32_Blocking_Mask_Eq_2",
+		"Unit_hipStreamValue_Wait32_Blocking_Mask_And",
+		"Unit_hipStreamValue_Wait32_Blocking_NoMask_Eq",
+		"Unit_hipStreamValue_Wait32_Blocking_NoMask_Gte",
+		"Unit_hipStreamValue_Wait32_Blocking_NoMask_And",
+		"Unit_hipStreamValue_Wait32_Blocking_NoMask_Nor",
+		"Unit_hipStreamValue_Wait64_Blocking_Mask_Gte_1",
+		"Unit_hipStreamValue_Wait64_Blocking_Mask_Gte_2",
+		"Unit_hipStreamValue_Wait64_Blocking_Mask_Eq_1",
+		"Unit_hipStreamValue_Wait64_Blocking_Mask_Eq_2",
+		"Unit_hipStreamValue_Wait64_Blocking_Mask_And",
+		"Unit_hipStreamValue_Wait64_Blocking_NoMask_Gte",
+		"Unit_hipStreamValue_Wait64_Blocking_NoMask_Eq",
+		"Unit_hipStreamValue_Wait64_Blocking_NoMask_And",
+		"Unit_hipStreamValue_Wait64_Blocking_NoMask_Nor" 
 	]
 }
diff --git a/projects/hip/tests/catch/hipTestMain/config/config_amd_windows_common.json b/projects/hip/tests/catch/hipTestMain/config/config_amd_windows_common.json
index 002666b345..07a4714117 100644
--- a/projects/hip/tests/catch/hipTestMain/config/config_amd_windows_common.json
+++ b/projects/hip/tests/catch/hipTestMain/config/config_amd_windows_common.json
@@ -78,6 +78,23 @@
 	   "Unit_hipGraphMemcpyNodeSetParamsToSymbol_Functional",
 	   "Unit_hipStreamQuery_WithPendingWork",
 	   "Unit_hipStreamWaitEvent_DifferentStreams",
-	   "Unit_hipStreamQuery_WithFinishedWork"
+	   "Unit_hipStreamQuery_WithFinishedWork",
+	   "Unit_hipStreamValue_Wait32_Blocking_Mask_Gte",
+	   "Unit_hipStreamValue_Wait32_Blocking_Mask_Eq_1",
+	   "Unit_hipStreamValue_Wait32_Blocking_Mask_Eq_2",
+	   "Unit_hipStreamValue_Wait32_Blocking_Mask_And",
+	   "Unit_hipStreamValue_Wait32_Blocking_NoMask_Eq",
+	   "Unit_hipStreamValue_Wait32_Blocking_NoMask_Gte",
+	   "Unit_hipStreamValue_Wait32_Blocking_NoMask_And",
+	   "Unit_hipStreamValue_Wait32_Blocking_NoMask_Nor",
+	   "Unit_hipStreamValue_Wait64_Blocking_Mask_Gte_1",
+	   "Unit_hipStreamValue_Wait64_Blocking_Mask_Gte_2",
+	   "Unit_hipStreamValue_Wait64_Blocking_Mask_Eq_1",
+	   "Unit_hipStreamValue_Wait64_Blocking_Mask_Eq_2",
+	   "Unit_hipStreamValue_Wait64_Blocking_Mask_And",
+	   "Unit_hipStreamValue_Wait64_Blocking_NoMask_Gte",
+	   "Unit_hipStreamValue_Wait64_Blocking_NoMask_Eq",
+	   "Unit_hipStreamValue_Wait64_Blocking_NoMask_And",
+	   "Unit_hipStreamValue_Wait64_Blocking_NoMask_Nor"
 	]
 }
diff --git a/projects/hip/tests/catch/unit/event/Unit_hipEventIpc.cc b/projects/hip/tests/catch/unit/event/Unit_hipEventIpc.cc
index cc0d70ae71..1081327f8c 100644
--- a/projects/hip/tests/catch/unit/event/Unit_hipEventIpc.cc
+++ b/projects/hip/tests/catch/unit/event/Unit_hipEventIpc.cc
@@ -91,9 +91,13 @@ TEST_CASE("Unit_hipEventIpc") {
     hipEvent_t ipc_event;
     hipError_t err = hipIpcOpenEventHandle(&ipc_event, ipc_handle);
 
+    #if HT_WIN
+    // always different process Id on Windows
+    HIP_CHECK(err);
+    #else
     // hipIpcOpenEventHandle() should be called in a different process, hence it should fail here
     REQUIRE(err == hipErrorInvalidContext);
-
+    #endif
     HIP_CHECK(hipEventDestroy(start));
     HIP_CHECK(hipEventDestroy(stop));