diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows.json b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows.json index 55af77e7df..a5b6edab67 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows.json +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows.json @@ -65,7 +65,8 @@ "Unit_hipHostMalloc_NonCoherent", "Unit_hipHostMalloc_Coherent", "Unit_hipHostMalloc_Default", - "Unit_hipStreamCreate_MultistreamBasicFunctionalities" + "Unit_hipStreamCreate_MultistreamBasicFunctionalities", + "Unit_hipEventIpc" ] } diff --git a/projects/hip-tests/catch/unit/deviceLib/CMakeLists.txt b/projects/hip-tests/catch/unit/deviceLib/CMakeLists.txt index 84be08bc33..89027dcbf5 100644 --- a/projects/hip-tests/catch/unit/deviceLib/CMakeLists.txt +++ b/projects/hip-tests/catch/unit/deviceLib/CMakeLists.txt @@ -10,17 +10,11 @@ set(TEST_SRC popc.cc ldg.cc threadfence_system.cc + syncthreadsand.cc + syncthreadscount.cc + syncthreadsor.cc ) -# skipped for windows compiler issue - Illegal instruction detected -if(UNIX) - set(TEST_SRC ${TEST_SRC} - syncthreadsand.cc - syncthreadscount.cc - syncthreadsor.cc) -endif() - - # AMD only tests set(AMD_TEST_SRC unsafeAtomicAdd.cc diff --git a/projects/hip-tests/catch/unit/event/CMakeLists.txt b/projects/hip-tests/catch/unit/event/CMakeLists.txt index 6b6ef7c3c4..fae1b4264c 100644 --- a/projects/hip-tests/catch/unit/event/CMakeLists.txt +++ b/projects/hip-tests/catch/unit/event/CMakeLists.txt @@ -3,15 +3,10 @@ set(TEST_SRC Unit_hipEvent_Negative.cc Unit_hipEvent.cc Unit_hipEventElapsedTime.cc + Unit_hipEventRecord.cc + Unit_hipEventIpc.cc ) -# skipped for windows due to duplicate symbols -if(UNIX) - set(TEST_SRC ${TEST_SRC} - Unit_hipEventRecord.cc - Unit_hipEventIpc.cc) -endif() - hip_add_exe_to_target(NAME EventTest TEST_SRC ${TEST_SRC} TEST_TARGET_NAME build_tests) diff --git a/projects/hip-tests/catch/unit/stream/CMakeLists.txt b/projects/hip-tests/catch/unit/stream/CMakeLists.txt index a9d3c35d10..cf316734dd 100644 --- a/projects/hip-tests/catch/unit/stream/CMakeLists.txt +++ b/projects/hip-tests/catch/unit/stream/CMakeLists.txt @@ -10,15 +10,9 @@ set(TEST_SRC hipStreamGetCUMask.cc hipAPIStreamDisable.cc streamCommon.cc -) - -#skipped in windows - duplicate HipTest::vector_square sym (compiler issue) -if(UNIX) - set(TEST_SRC ${TEST_SRC} - hipStreamWithCUMask.cc - hipStreamACb_MultiThread.cc) -endif() - + hipStreamWithCUMask.cc + hipStreamACb_MultiThread.cc + ) else() set(TEST_SRC hipStreamCreate.cc @@ -31,7 +25,7 @@ set(TEST_SRC hipStreamCreateWithPriority.cc hipAPIStreamDisable.cc streamCommon.cc -) + ) endif() hip_add_exe_to_target(NAME StreamTest