diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux index 532540f08e..3d7a078aaa 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux @@ -1519,6 +1519,9 @@ "Unit_Warp_Ballot_Positive_Basic", "Unit_Warp_Vote_Any_Positive_Basic", "Unit_Warp_Vote_All_Positive_Basic", + "=== Below Tests fail in stress test 06/11/24 ===", + "Unit_hipGraphExecMemcpyNodeSetParams_Negative_Changing_Memcpy_Direction", + "Unit_hipGraphExecMemcpyNodeSetParams1D_Negative_Changing_Memcpy_Direction", #endif #if defined gfx1030 "=== SWDEV-445961: These tests hang in PSDB stress test on 09/02/2024 ===", diff --git a/projects/hip-tests/catch/unit/graph/hipGraphExecMemcpyNodeSetParams.cc b/projects/hip-tests/catch/unit/graph/hipGraphExecMemcpyNodeSetParams.cc index e6cf8b7018..afab2ae53e 100644 --- a/projects/hip-tests/catch/unit/graph/hipGraphExecMemcpyNodeSetParams.cc +++ b/projects/hip-tests/catch/unit/graph/hipGraphExecMemcpyNodeSetParams.cc @@ -229,13 +229,14 @@ TEST_CASE("Unit_hipGraphExecMemcpyNodeSetParams_Negative_Parameters") { * - HIP_VERSION >= 5.2 */ TEST_CASE("Unit_hipGraphExecMemcpyNodeSetParams_Negative_Changing_Memcpy_Direction") { - int host; + + LinearAllocGuard host(LinearAllocs::hipHostMalloc, sizeof(int)); LinearAllocGuard dev(LinearAllocs::hipMalloc, sizeof(int)); const auto [dir, src, dst] = - GENERATE_REF(std::make_tuple(hipMemcpyHostToHost, &host, &host), - std::make_tuple(hipMemcpyHostToDevice, &host, dev.ptr()), - std::make_tuple(hipMemcpyDeviceToHost, dev.ptr(), &host), + GENERATE_REF(std::make_tuple(hipMemcpyHostToHost, host.ptr(), host.ptr()), + std::make_tuple(hipMemcpyHostToDevice, host.ptr(), dev.ptr()), + std::make_tuple(hipMemcpyDeviceToHost, dev.ptr(), host.ptr()), std::make_tuple(hipMemcpyDeviceToDevice, dev.ptr(), dev.ptr())); hipGraph_t graph = nullptr; @@ -251,7 +252,7 @@ TEST_CASE("Unit_hipGraphExecMemcpyNodeSetParams_Negative_Changing_Memcpy_Directi hipGraphExec_t graph_exec = nullptr; HIP_CHECK(hipGraphInstantiate(&graph_exec, graph, nullptr, nullptr, 0)); - const auto set_dir = GENERATE(hipMemcpyHostToHost, hipMemcpyHostToDevice, hipMemcpyDeviceToHost, + const auto set_dir = GENERATE(hipMemcpyHostToHost, hipMemcpyHostToDevice, hipMemcpyDeviceToHost, hipMemcpyDeviceToDevice, hipMemcpyDefault); if (dir == set_dir) { HIP_CHECK(hipGraphExecDestroy(graph_exec)); @@ -261,7 +262,6 @@ TEST_CASE("Unit_hipGraphExecMemcpyNodeSetParams_Negative_Changing_Memcpy_Directi params.kind = set_dir; HIP_CHECK_ERROR(hipGraphExecMemcpyNodeSetParams(graph_exec, node, ¶ms), hipErrorInvalidValue); - HIP_CHECK(hipGraphExecDestroy(graph_exec)); HIP_CHECK(hipGraphDestroy(graph)); } diff --git a/projects/hip-tests/catch/unit/graph/hipGraphExecMemcpyNodeSetParams1D.cc b/projects/hip-tests/catch/unit/graph/hipGraphExecMemcpyNodeSetParams1D.cc index ce60036828..8fa6a2da2b 100644 --- a/projects/hip-tests/catch/unit/graph/hipGraphExecMemcpyNodeSetParams1D.cc +++ b/projects/hip-tests/catch/unit/graph/hipGraphExecMemcpyNodeSetParams1D.cc @@ -218,14 +218,16 @@ TEST_CASE("Unit_hipGraphExecMemcpyNodeSetParams1D_Negative_Parameters") { * - HIP_VERSION >= 5.2 */ TEST_CASE("Unit_hipGraphExecMemcpyNodeSetParams1D_Negative_Changing_Memcpy_Direction") { - int host; - LinearAllocGuard dev(LinearAllocs::hipMalloc, sizeof(int)); + LinearAllocGuard host1(LinearAllocs::hipHostMalloc, sizeof(int)); + LinearAllocGuard host2(LinearAllocs::hipHostMalloc, sizeof(int)); + LinearAllocGuard dev1(LinearAllocs::hipMalloc, sizeof(int)); + LinearAllocGuard dev2(LinearAllocs::hipMalloc, sizeof(int)); const auto [dir, src, dst] = - GENERATE_REF(std::make_tuple(hipMemcpyHostToHost, &host, &host), - std::make_tuple(hipMemcpyHostToDevice, &host, dev.ptr()), - std::make_tuple(hipMemcpyDeviceToHost, dev.ptr(), &host), - std::make_tuple(hipMemcpyDeviceToDevice, dev.ptr(), dev.ptr())); + GENERATE_REF(std::make_tuple(hipMemcpyHostToHost, host1.ptr(), host2.ptr()), + std::make_tuple(hipMemcpyHostToDevice, host1.ptr(), dev1.ptr()), + std::make_tuple(hipMemcpyDeviceToHost, dev1.ptr(), host1.ptr()), + std::make_tuple(hipMemcpyDeviceToDevice, dev1.ptr(), dev2.ptr())); hipGraph_t graph = nullptr; HIP_CHECK(hipGraphCreate(&graph, 0));