SWDEV-273235 - catch2 windows build (#2422)

Change-Id: I331c6c2525a65746e2d0799ec8dc2f608af1176a

[ROCm/hip commit: 0d361c5621]

projects/hip/tests/catch/unit/memory/CMakeLists.txt

@@ -5,8 +5,6 @@ set(TEST_SRC
     malloc.cc
     hipMemcpy2DToArray.cc
     hipMemcpy2DToArrayAsync.cc
-    hipMemcpyPeer.cc
-    hipMemcpyPeerAsync.cc
     hipMemcpy3D.cc
     hipMemcpy3DAsync.cc
     hipMemcpyParam2D.cc
@@ -17,37 +15,25 @@ set(TEST_SRC
     hipMemcpy2DFromArrayAsync.cc
     hipMemcpyAtoH.cc
     hipMemcpyHtoA.cc
-    hipMemcpyDtoD.cc
-    hipMemcpyDtoDAsync.cc
-    hipMemcpyAsync.cc
-    hipMemcpy.cc
-    hipMemcpyWithStream.cc
     hipMemcpyAllApiNegative.cc
-    hipMemcpyWithStreamMultiThread.cc
     hipMemcpy_MultiThread.cc
-    hipHostMalloc.cc
     hipHostRegister.cc
     hipMemPtrGetInfo.cc
     hipPointerGetAttributes.cc
     hipHostGetFlags.cc
-    hipMemoryAllocateCoherent.cc
     hipMallocManaged_MultiScenario.cc
     hipMemsetInvalidPtr.cc
     hipMemset.cc
     hipMemsetAsyncMultiThread.cc
-    hipMemsetAsyncAndKernel.cc
     hipMemset3D.cc
     hipMemset2D.cc
-    hipMemset2DAsyncMultiThreadAndKernel.cc
     hipHostMallocTests.cc
-    hipMallocConcurrency.cc
     hipMemset3DFunctional.cc
     hipMemset3DNegative.cc
     hipMemset3DRegressMultiThread.cc
     hipMallocManagedFlagsTst.cc
     hipMemPrefetchAsyncExtTsts.cc
     hipMemAdviseMmap.cc
-    hipMallocManaged.cc
     hipMemCoherencyTst.cc
 )
 else()
@@ -56,8 +42,6 @@ set(TEST_SRC
     malloc.cc
     hipMemcpy2DToArray.cc
     hipMemcpy2DToArrayAsync.cc
-    hipMemcpyPeer.cc
-    hipMemcpyPeerAsync.cc
     hipMemcpy3D.cc
     hipMemcpy3DAsync.cc
     hipMemcpyParam2D.cc
@@ -68,39 +52,45 @@ set(TEST_SRC
     hipMemcpy2DFromArrayAsync.cc
     hipMemcpyAtoH.cc
     hipMemcpyHtoA.cc
-    hipMemcpyDtoD.cc
-    hipMemcpyDtoDAsync.cc
-    hipMemcpyAsync.cc
-    hipMemcpy.cc
-    hipMemcpyWithStream.cc
     hipMemcpyAllApiNegative.cc
-    hipMemcpyWithStreamMultiThread.cc
     hipMemcpy_MultiThread.cc
-    hipHostMalloc.cc
     hipHostRegister.cc
     hipHostGetFlags.cc
-    hipMemoryAllocateCoherent.cc
     hipMallocManaged_MultiScenario.cc
     hipMemsetInvalidPtr.cc
     hipMemset.cc
     hipMemsetAsyncMultiThread.cc
-    hipMemsetAsyncAndKernel.cc
     hipMemset3D.cc
     hipMemset2D.cc
-    hipMemset2DAsyncMultiThreadAndKernel.cc
     hipHostMallocTests.cc
-    hipMallocConcurrency.cc
     hipMemset3DFunctional.cc
     hipMemset3DNegative.cc
     hipMemset3DRegressMultiThread.cc
     hipMallocManagedFlagsTst.cc
     hipMemPrefetchAsyncExtTsts.cc
     hipMemAdviseMmap.cc
-    hipMallocManaged.cc
-    hipMemCoherencyTst.cc
 )
 endif()
 
+#skipped in windows -duplicate HipTest::vectorADD sym (compiler issue)
+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)
+endif()
+
 hip_add_exe_to_target(NAME MemoryTest
                       TEST_SRC ${TEST_SRC}
                       TEST_TARGET_NAME build_tests)

projects/hip/tests/catch/unit/memory/hipMemcpy.cc

@@ -572,7 +572,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpy_PinnedRegMemWithKernelLaunch",
     HipTest::checkVectorADD(A_h, B_h, C_h, NUM_ELM);
 
     unsigned int seed = time(0);
-    HIP_CHECK(hipSetDevice(rand_r(&seed) % (numDevices-1)+1));
+    HIP_CHECK(hipSetDevice(HipTest::RAND_R(&seed) % (numDevices-1)+1));
 
     int device;
     hipGetDevice(&device);

projects/hip/tests/catch/unit/memory/hipMemcpyAsync.cc

@@ -350,7 +350,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpyAsync_PinnedRegMemWithKernelLaunch",
     HipTest::checkVectorADD(A_h, B_h, C_h, NUM_ELM);
 
     unsigned int seed = time(0);
-    HIP_CHECK(hipSetDevice(rand_r(&seed) % (numDevices-1)+1));
+    HIP_CHECK(hipSetDevice(HipTest::RAND_R(&seed) % (numDevices-1)+1));
 
     int device;
     HIP_CHECK(hipGetDevice(&device));

projects/hip/tests/catch/unit/memory/hipMemset3DFunctional.cc

@@ -236,7 +236,7 @@ static void seekAndSet3DArraySlice(bool bAsync) {
 
   // select random slice for memset
   unsigned int seed = time(nullptr);
-  int slice_index = rand_r(&seed) % ZSIZE_S;
+  int slice_index = HipTest::RAND_R(&seed) % ZSIZE_S;
 
   INFO("memset3d for sliceindex " << slice_index);
 

projects/hip/tests/catch/unit/memory/hipPointerGetAttributes.cc

@@ -148,7 +148,7 @@ void clusterAllocs(int numAllocs, size_t minSize, size_t maxSize) {
   }
   for (int i = 0; i < numAllocs; i++) {
     unsigned rand_seed = time(NULL);
-    bool isDevice = rand_r(&rand_seed) & 0x1;
+    bool isDevice = HipTest::RAND_R(&rand_seed) & 0x1;
     reference[i]._sizeBytes = zrand(maxSize - minSize) + minSize;
 
     reference[i]._attrib.device = zrand(numDevices);