From 55f417dceeb6bff09c3325e90163a7c44ef40cd7 Mon Sep 17 00:00:00 2001 From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com> Date: Tue, 19 Jul 2022 19:28:17 +0530 Subject: [PATCH] SWDEV-327563 - Enable fixed tests linux and windows (#2803) Change-Id: Icad90d01f796a8a8cf57884b86ca1a5a2b50ec64 [ROCm/hip-tests commit: 1458912363b78af3e1d249bc54f09dcb71b5fdc7] --- .../catch/hipTestMain/config/config_amd_linux.json | 5 +---- .../catch/hipTestMain/config/config_amd_windows.json | 6 ------ .../catch/unit/event/Unit_hipEvent_Negative.cc | 6 ------ .../graph/hipGraphMemcpyNodeSetParamsFromSymbol.cc | 1 + .../hip-tests/catch/unit/memory/hipHostUnregister.cc | 4 ---- .../hip-tests/catch/unit/memory/hipMallocArray.cc | 4 ---- .../hip-tests/catch/unit/memory/hipMemsetNegative.cc | 11 ----------- 7 files changed, 2 insertions(+), 35 deletions(-) diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux.json b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux.json index 91c89ae7dc..c11a1b823e 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux.json +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux.json @@ -1,10 +1,7 @@ { "DisabledTests": [ - "# Following test is related to ticket EXSWCPHIPT-41", - "Unit_hipStreamGetPriority_happy", - "Unit_hipStreamPerThread_DeviceReset_1", - "Unit_hipGraphAddKernelNode_Negative" + "Unit_hipStreamPerThread_DeviceReset_1" ] } 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 06aa6bd2db..732618451f 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows.json +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows.json @@ -7,8 +7,6 @@ "Unit_hipTextureMipmapObj2D_Check", "Unit_hipManagedKeyword_MultiGpu", "Unit_hipGraphAddHostNode_ClonedGraphwithHostNode", - "Unit_hipGraphAddChildGraphNode_OrgGraphAsChildGraph", - "Unit_hipGraphAddChildGraphNode_SingleChildNode", "Unit_hipEventIpc", "Unit_hipMalloc3D_Negative", "Unit_hipPointerGetAttribute_MappedMem", @@ -27,13 +25,9 @@ "Unit_hipMemPoolApi_Opportunistic", "Unit_hipMemPoolApi_Default", "Unit_hipDeviceGetUuid", - "Unit_hipGraphMemcpyNodeSetParamsFromSymbol_Functional", - "Unit_hipGraphExecEventWaitNodeSetEvent_Negative", - "Unit_hipGraphExecEventWaitNodeSetEvent_SetAndVerifyMemory", "Unit_hipGraphMemcpyNodeSetParams_Functional", "Unit_hipMalloc3D_ValidatePitch", "Unit_hipArrayCreate_happy", - "Unit_hipGraphAddKernelNode_Negative", "Unit_hipHostRegister_Negative - int", "Unit_hipHostRegister_Negative - float", "Unit_hipHostRegister_Negative - double", diff --git a/projects/hip-tests/catch/unit/event/Unit_hipEvent_Negative.cc b/projects/hip-tests/catch/unit/event/Unit_hipEvent_Negative.cc index 76b75d6c06..e315710bbd 100644 --- a/projects/hip-tests/catch/unit/event/Unit_hipEvent_Negative.cc +++ b/projects/hip-tests/catch/unit/event/Unit_hipEvent_Negative.cc @@ -49,12 +49,6 @@ TEST_CASE("Unit_hipEventDestroy_NullCheck") { TEST_CASE("Unit_hipEventCreate_IncompatibleFlags") { hipEvent_t event; - -#if HT_AMD - HipTest::HIP_SKIP_TEST("EXSWCPHIPT-106"); - return; -#endif - HIP_CHECK_ERROR(hipEventCreateWithFlags(&event, hipEventInterprocess), hipErrorInvalidValue); #if HT_AMD diff --git a/projects/hip-tests/catch/unit/graph/hipGraphMemcpyNodeSetParamsFromSymbol.cc b/projects/hip-tests/catch/unit/graph/hipGraphMemcpyNodeSetParamsFromSymbol.cc index 495685f4a0..1a6da7ff19 100644 --- a/projects/hip-tests/catch/unit/graph/hipGraphMemcpyNodeSetParamsFromSymbol.cc +++ b/projects/hip-tests/catch/unit/graph/hipGraphMemcpyNodeSetParamsFromSymbol.cc @@ -228,6 +228,7 @@ void hipGraphMemcpyNodeSetParamsFromSymbol_GlobalMem(bool useConstDeviceVar) { // 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/projects/hip-tests/catch/unit/memory/hipHostUnregister.cc b/projects/hip-tests/catch/unit/memory/hipHostUnregister.cc index 68a34122b9..2b54c10731 100644 --- a/projects/hip-tests/catch/unit/memory/hipHostUnregister.cc +++ b/projects/hip-tests/catch/unit/memory/hipHostUnregister.cc @@ -65,10 +65,6 @@ TEST_CASE("Unit_hipHostUnregister_MemoryNotAccessableAfterUnregister") { } TEST_CASE("Unit_hipHostUnregister_NullPtr") { -#if HT_AMD - HipTest::HIP_SKIP_TEST("EXSWCPHIPT-90"); - return; -#endif HIP_CHECK_ERROR(hipHostUnregister(nullptr), hipErrorInvalidValue); } diff --git a/projects/hip-tests/catch/unit/memory/hipMallocArray.cc b/projects/hip-tests/catch/unit/memory/hipMallocArray.cc index f1f6ebc9d2..24519f4b1a 100644 --- a/projects/hip-tests/catch/unit/memory/hipMallocArray.cc +++ b/projects/hip-tests/catch/unit/memory/hipMallocArray.cc @@ -494,10 +494,6 @@ TEMPLATE_TEST_CASE("Unit_hipMallocArray_MaxTexture_Default", "", uint, int4, ush // Arrays with channels of different size are not allowed. TEST_CASE("Unit_hipMallocArray_Negative_DifferentChannelSizes") { -#if HT_AMD - HipTest::HIP_SKIP_TEST("EXSWCPHIPT-129"); - return; -#endif const int bitsX = GENERATE(8, 16, 32); const int bitsY = GENERATE(8, 16, 32); const int bitsZ = GENERATE(8, 16, 32); diff --git a/projects/hip-tests/catch/unit/memory/hipMemsetNegative.cc b/projects/hip-tests/catch/unit/memory/hipMemsetNegative.cc index a06638904e..82a0c2879d 100644 --- a/projects/hip-tests/catch/unit/memory/hipMemsetNegative.cc +++ b/projects/hip-tests/catch/unit/memory/hipMemsetNegative.cc @@ -71,9 +71,6 @@ TEST_CASE("Unit_hipMemset_Negative_InvalidPtr") { TEST_CASE("Unit_hipMemset_Negative_OutOfBoundsSize") { -#if HT_AMD - HipTest::HIP_SKIP_TEST("EXSWCPHIPT-20"); -#endif #if !HT_AMD void* dst; @@ -112,10 +109,6 @@ TEST_CASE("Unit_hipMemset2D_Negative_InvalidPtr") { } TEST_CASE("Unit_hipMemset2D_Negative_InvalidSizes") { -#if HT_AMD - HipTest::HIP_SKIP_TEST("EXSWCPHIPT-52"); -#endif - void* dst; size_t realPitch; HIP_CHECK(hipMallocPitch(&dst, &realPitch, width, height)); @@ -181,10 +174,6 @@ TEST_CASE("Unit_hipMemset3D_Negative_ModifiedPtr") { } TEST_CASE("Unit_hipMemset3D_Negative_InvalidSizes") { -#if HT_AMD - HipTest::HIP_SKIP_TEST("EXSWCPHIPT-52"); -#endif - hipPitchedPtr pitchedDevPtr; HIP_CHECK(hipMalloc3D(&pitchedDevPtr, validExtent)); hipExtent invalidExtent{validExtent};