From 0b05268be262bb51f04532ee41c5009e9ebca821 Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Wed, 15 Jun 2022 22:08:21 +0530
Subject: [PATCH] SWDEV-337331 - Windows initial graph tests (#2739)

Enables most of graph tests on Windows.

Change-Id: I32bd9a327168378776f89d7a6c4a83ba33861c01
---
 .../config/config_amd_windows.json            | 33 -------------------
 .../graph/hipGraphAddMemcpyNodeFromSymbol.cc  |  2 ++
 .../graph/hipGraphAddMemcpyNodeToSymbol.cc    |  2 ++
 catch/unit/graph/hipGraphClone.cc             |  1 +
 ...pGraphExecMemcpyNodeSetParamsFromSymbol.cc |  1 +
 5 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/catch/hipTestMain/config/config_amd_windows.json b/catch/hipTestMain/config/config_amd_windows.json
index 8602662d49..9fc36b8e4c 100644
--- a/catch/hipTestMain/config/config_amd_windows.json
+++ b/catch/hipTestMain/config/config_amd_windows.json
@@ -30,35 +30,9 @@
 	   "Unit_hipStreamPerThread_DeviceReset_1",
 	   "Unit_hipStreamPerThread_DeviceReset_2",
 	   "Unit_hipManagedKeyword_MultiGpu",
-	   "Unit_hipGraphAddDependencies_Functional",
-	   "Unit_hipGraph_BasicFunctional",
-	   "Unit_hipGraphClone_Functional",
-	   "Unit_hipGraphClone_MultiThreaded",
 	   "Unit_hipGraphAddHostNode_ClonedGraphwithHostNode",
-	   "Unit_hipGraphAddHostNode_VectorSquare",
-	   "Unit_hipGraphAddHostNode_BasicFunc",
-	   "Unit_hipGraphAddMemcpyNodeFromSymbol_GlobalMemory",
-	   "Unit_hipGraphAddMemcpyNodeFromSymbol_GlobalConstMemory",
-	   "Unit_hipGraphAddMemcpyNodeFromSymbol_GlobalMemoryWithKernel",
-	   "Unit_hipGraphExecHostNodeSetParams_Negative",
-	   "Unit_hipGraphExecHostNodeSetParams_ClonedGraphwithHostNode",
-	   "Unit_hipGraphExecHostNodeSetParams_BasicFunc",
-	   "Unit_hipGraphAddMemcpyNodeToSymbol_GlobalMemory",
-	   "Unit_hipGraphAddMemcpyNodeToSymbol_GlobalConstMemory",
-	   "Unit_hipGraphAddMemcpyNodeToSymbol_MemcpyToSymbolNodeWithKernel",
-	   "Unit_hipGraphDestroyNode_DestroyDependencyNode",
-	   "Unit_hipGraphGetNodes_Functional",
-	   "Unit_hipGraphGetRootNodes_Functional",
-	   "Unit_hipGraphHostNodeSetParams_ClonedGraphwithHostNode",
 	   "Unit_hipGraphAddChildGraphNode_OrgGraphAsChildGraph",
 	   "Unit_hipGraphAddChildGraphNode_SingleChildNode",
-	   "Unit_hipGraphExecMemcpyNodeSetParams1D_Functional",
-	   "Unit_hipGraphRemoveDependencies_ChangeComputeFunc",
-	   "Unit_hipGraphExecUpdate_Negative_CountDiffer",
-	   "Unit_hipGraphExecUpdate_Functional",
-	   "Unit_hipGraphExecEventRecordNodeSetEvent_Negative",
-	   "Unit_hipGraphExecMemcpyNodeSetParamsFromSymbol_Negative",
-	   "Unit_hipGraphExecMemcpyNodeSetParamsFromSymbol_Functional",
 	   "Unit_hipPtrGetAttribute_Simple",
 	   "Unit_hipStreamCreateWithPriority_ValidateWithEvents",
 	   "Unit_hipEvent",
@@ -67,15 +41,8 @@
 	   "Unit_hipHostMalloc_Default",
 	   "Unit_hipStreamCreate_MultistreamBasicFunctionalities",
 	   "Unit_hipEventIpc",
-	   "Unit_hipGraphAddDependencies_NegTest",
-	   "Unit_hipGraphAddEventRecordNode_Functional_WithoutFlags",
-	   "Unit_hipGraphAddEventRecordNode_Functional_ElapsedTime",
-	   "Unit_hipGraphAddEventRecordNode_Functional_WithFlags",
-	   "Unit_hipGraphAddEventRecordNode_MultipleRun",
 	   "Unit_hipMalloc3D_Negative",
 	   "Unit_hipPointerGetAttribute_MappedMem",
-	   "Unit_hipGraphAddMemcpyNode1D_Functional",
-	   "Unit_hipGraphAddMemcpyNode1D_Negative",
 	   "Unit_hipStreamBeginCapture_BasicFunctional",
 	   "Unit_hipStreamBeginCapture_hipStreamPerThread",
 	   "Unit_hiprtc_functional",
diff --git a/catch/unit/graph/hipGraphAddMemcpyNodeFromSymbol.cc b/catch/unit/graph/hipGraphAddMemcpyNodeFromSymbol.cc
index 7d9cbaffed..fa05c7fe66 100644
--- a/catch/unit/graph/hipGraphAddMemcpyNodeFromSymbol.cc
+++ b/catch/unit/graph/hipGraphAddMemcpyNodeFromSymbol.cc
@@ -273,6 +273,7 @@ void hipGraphAddMemcpyNodeFromSymbol_GlobalMemory(bool device_ctxchg = false,
   // Instantiate and launch the graph
   HIP_CHECK(hipGraphInstantiate(&graphExec, graph, nullptr, nullptr, 0));
   HIP_CHECK(hipGraphLaunch(graphExec, 0));
+  HIP_CHECK(hipStreamSynchronize(0));
 
   // Validating the result
   for (int i = 0; i < SIZE; i++) {
@@ -419,6 +420,7 @@ TEST_CASE("Unit_hipGraphAddMemcpyNodeFromSymbol_GlobalMemoryWithKernel") {
   // Instantiate and launch the graph
   HIP_CHECK(hipGraphInstantiate(&graphExec, graph, nullptr, nullptr, 0));
   HIP_CHECK(hipGraphLaunch(graphExec, 0));
+  HIP_CHECK(hipStreamSynchronize(0));
 
   // Validating the result
   for (int i = 0; i < SIZE; i++) {
diff --git a/catch/unit/graph/hipGraphAddMemcpyNodeToSymbol.cc b/catch/unit/graph/hipGraphAddMemcpyNodeToSymbol.cc
index 5a5b08f77e..a4d0bede3e 100644
--- a/catch/unit/graph/hipGraphAddMemcpyNodeToSymbol.cc
+++ b/catch/unit/graph/hipGraphAddMemcpyNodeToSymbol.cc
@@ -250,6 +250,7 @@ void hipGraphAddMemcpyNodeToSymbol_GlobalMemory(bool device_ctxchg = false,
   // Instantiate and launch the graph
   HIP_CHECK(hipGraphInstantiate(&graphExec, graph, nullptr, nullptr, 0));
   HIP_CHECK(hipGraphLaunch(graphExec, 0));
+  HIP_CHECK(hipStreamSynchronize(0));
 
   // Validating the result
   for (int i = 0; i < SIZE; i++) {
@@ -384,6 +385,7 @@ TEST_CASE("Unit_hipGraphAddMemcpyNodeToSymbol_MemcpyToSymbolNodeWithKernel") {
   // Instantiate and launch the graph
   HIP_CHECK(hipGraphInstantiate(&graphExec, graph, nullptr, nullptr, 0));
   HIP_CHECK(hipGraphLaunch(graphExec, 0));
+  HIP_CHECK(hipStreamSynchronize(0));
 
   // Validating the result
   for (int i = 0; i < SIZE; i++) {
diff --git a/catch/unit/graph/hipGraphClone.cc b/catch/unit/graph/hipGraphClone.cc
index 4a6cbc6ec9..75b83c82a0 100644
--- a/catch/unit/graph/hipGraphClone.cc
+++ b/catch/unit/graph/hipGraphClone.cc
@@ -295,6 +295,7 @@ TEST_CASE("Unit_hipGraphClone_MultiThreaded") {
     HIP_CHECK(hipGraphInstantiate(&graphExec, clonedgraph, nullptr,
           nullptr, 0));
     HIP_CHECK(hipGraphLaunch(graphExec, 0));
+    HIP_CHECK(hipStreamSynchronize(0));
 
     for (size_t i = 0; i < N; i++) {
       if (A_h[i] != B_h[i]) {
diff --git a/catch/unit/graph/hipGraphExecMemcpyNodeSetParamsFromSymbol.cc b/catch/unit/graph/hipGraphExecMemcpyNodeSetParamsFromSymbol.cc
index a40cc4d433..b2a92f94db 100644
--- a/catch/unit/graph/hipGraphExecMemcpyNodeSetParamsFromSymbol.cc
+++ b/catch/unit/graph/hipGraphExecMemcpyNodeSetParamsFromSymbol.cc
@@ -269,6 +269,7 @@ void hipGraphExecMemcpyNodeSetParamsFromSymbol_GlobalMem(bool useConstVar) {
   }
 
   HIP_CHECK(hipGraphLaunch(graphExec, 0));
+  HIP_CHECK(hipStreamSynchronize(0));
 
   // Validating the result
   for (int i = 0; i < SIZE; i++) {