SWDEV-299127 - Merge 'develop' into 'amd-staging'

Change-Id: Ia68c81c3b7639e02abfc1b0230aabb4558fc4c50

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"
 	]
 
 }

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)

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