From 84c7cc50b4654231b792efc3e9476a1efab3b823 Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Thu, 28 Apr 2022 04:08:07 +0530
Subject: [PATCH 1/2] SWDEV-327563 - Windows: Enable most of the  memory tests
 skipped before (#2643)

Change-Id: Ibdaf22d139f4d2772c152b2f4455676a7adbc6bd
---
 .../config/config_amd_windows.json            |  6 ++-
 tests/catch/unit/memory/CMakeLists.txt        | 46 ++++++++++++-------
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/tests/catch/hipTestMain/config/config_amd_windows.json b/tests/catch/hipTestMain/config/config_amd_windows.json
index e84d88bf85..55af77e7df 100644
--- a/tests/catch/hipTestMain/config/config_amd_windows.json
+++ b/tests/catch/hipTestMain/config/config_amd_windows.json
@@ -61,7 +61,11 @@
 	   "Unit_hipGraphExecMemcpyNodeSetParamsFromSymbol_Functional",
 	   "Unit_hipPtrGetAttribute_Simple",
 	   "Unit_hipStreamCreateWithPriority_ValidateWithEvents",
-	   "Unit_hipEvent"
+	   "Unit_hipEvent",
+	   "Unit_hipHostMalloc_NonCoherent",
+	   "Unit_hipHostMalloc_Coherent",
+	   "Unit_hipHostMalloc_Default",
+	   "Unit_hipStreamCreate_MultistreamBasicFunctionalities"
 	]
 
 }
diff --git a/tests/catch/unit/memory/CMakeLists.txt b/tests/catch/unit/memory/CMakeLists.txt
index 4a9f3f9607..64fa0bcf62 100644
--- a/tests/catch/unit/memory/CMakeLists.txt
+++ b/tests/catch/unit/memory/CMakeLists.txt
@@ -62,6 +62,19 @@ set(TEST_SRC
     hipMemcpyToSymbol.cc
     hipMemcpyToSymbolAsync.cc
     hipPtrGetAttribute.cc
+    hipMemcpyPeer.cc
+    hipMemcpyPeerAsync.cc
+    hipMemcpyWithStream.cc
+    hipMemcpyWithStreamMultiThread.cc
+    hipMemsetAsyncAndKernel.cc
+    hipMemset2DAsyncMultiThreadAndKernel.cc
+    hipMallocManaged.cc
+    hipMallocConcurrency.cc
+    hipMemcpyDtoD.cc
+    hipMemcpyDtoDAsync.cc
+    hipHostMalloc.cc
+    hipMemcpy.cc
+    hipMemcpyAsync.cc
 )
 else()
 set(TEST_SRC
@@ -103,27 +116,28 @@ set(TEST_SRC
     hipMemcpyToSymbol.cc
     hipMemcpyToSymbolAsync.cc
     hipPtrGetAttribute.cc
+    hipMemcpyPeer.cc
+    hipMemcpyPeerAsync.cc
+    hipMemcpyWithStream.cc
+    hipMemcpyWithStreamMultiThread.cc
+    hipMemsetAsyncAndKernel.cc
+    hipMemset2DAsyncMultiThreadAndKernel.cc
+    hipMallocManaged.cc
+    hipMallocConcurrency.cc
+    hipMemcpyDtoD.cc
+    hipMemcpyDtoDAsync.cc
+    hipHostMalloc.cc
+    hipMemcpy.cc
+    hipMemcpyAsync.cc
 )
 endif()
 
-#skipped in windows -duplicate HipTest::vectorADD sym (compiler issue)
+# skipped due to os related code in tests
+# need to work on them when all the tests are enabled
 if(UNIX)
     set(TEST_SRC ${TEST_SRC}
-                 hipMemcpyPeer.cc
-                 hipMemcpyPeerAsync.cc
-                 hipMemcpyWithStream.cc
-                 hipMemcpyWithStreamMultiThread.cc
-                 hipMemsetAsyncAndKernel.cc
-                 hipMemset2DAsyncMultiThreadAndKernel.cc
-                 hipMallocManaged.cc
-                 hipMallocConcurrency.cc
-                 hipMemcpyDtoD.cc
-                 hipMemcpyDtoDAsync.cc
-                 hipMemoryAllocateCoherent.cc
-                 hipHostMalloc.cc
-                 hipMemcpy.cc
-                 hipMemcpyAsync.cc
-                 hipHmmOvrSubscriptionTst.cc)
+                 hipHmmOvrSubscriptionTst.cc
+                 hipMemoryAllocateCoherent.cc)
 endif()
 
 hip_add_exe_to_target(NAME MemoryTest

From a4e5868b8f56959fee8a1750547c10b5bfedf642 Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Fri, 29 Apr 2022 00:37:01 +0530
Subject: [PATCH 2/2] SWDEV-327563 - Windows: enable hiprtc tests (#2629)

Change-Id: If6df6188d15aecedbe536de0ca1a95dc64f3f1b5
---
 tests/catch/unit/CMakeLists.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tests/catch/unit/CMakeLists.txt b/tests/catch/unit/CMakeLists.txt
index 7dd03f79a9..9ebff9b9de 100644
--- a/tests/catch/unit/CMakeLists.txt
+++ b/tests/catch/unit/CMakeLists.txt
@@ -18,11 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# build fails in windows
-if (UNIX)
-  add_subdirectory(rtc)
-endif()
-
+add_subdirectory(rtc)
 add_subdirectory(deviceLib)
 add_subdirectory(graph)
 add_subdirectory(memory)