From fb7d2b3d0680db9767eb29d227452f6aeb02a7eb Mon Sep 17 00:00:00 2001 From: Marko Arandjelovic Date: Mon, 8 Apr 2024 14:45:49 +0200 Subject: [PATCH] SWDEV-454663 Initialize graph node in test setup Change-Id: Iad44a2d3276e54c7a7d7e58af13e41ff305aa122 [ROCm/hip-tests commit: be2ee3b52d24bfd54d190e550f204b7fc5d7e48a] --- .../catch/hipTestMain/config/config_amd_linux | 1 - .../hipTestMain/config/config_amd_windows | 1 - .../unit/graph/hipGraphMemcpyNodeSetParams.cc | 31 ++++++++++--------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux index 4ef6c419d1..7384208945 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux @@ -221,7 +221,6 @@ "=== Below tests are failing PSDB ===", "Unit_hipGraphExecMemcpyNodeSetParams_Positive_Basic", "Unit_hipGraphExecMemcpyNodeSetParams_Negative_Parameters", - "Unit_hipGraphMemcpyNodeSetParams_Negative_Parameters", "Unit_hipMemcpy3D_Positive_Synchronization_Behavior", "Unit_hipMemcpyParam2D_Positive_Synchronization_Behavior", "Unit_hipMemcpyAsync_Positive_Synchronization_Behavior", diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows index b4fdc31f8d..28d52fee64 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows @@ -363,7 +363,6 @@ "Unit_hipFreeMipmappedArrayMultiTArray - int", "Unit_hipGraphExecMemcpyNodeSetParams_Positive_Basic", "Unit_hipGraphExecMemcpyNodeSetParams_Negative_Parameters", - "Unit_hipGraphMemcpyNodeSetParams_Negative_Parameters", "Unit_hipMemcpy3D_Positive_Synchronization_Behavior", "Unit_hipMemcpyParam2D_Positive_Synchronization_Behavior", "Unit_hipMemcpyAsync_Positive_Synchronization_Behavior", diff --git a/projects/hip-tests/catch/unit/graph/hipGraphMemcpyNodeSetParams.cc b/projects/hip-tests/catch/unit/graph/hipGraphMemcpyNodeSetParams.cc index 8ab72ceaf1..3fac61bab9 100644 --- a/projects/hip-tests/catch/unit/graph/hipGraphMemcpyNodeSetParams.cc +++ b/projects/hip-tests/catch/unit/graph/hipGraphMemcpyNodeSetParams.cc @@ -141,38 +141,41 @@ TEST_CASE("Unit_hipGraphMemcpyNodeSetParams_Negative_Parameters") { hipPos src_pos, hipExtent extent, hipMemcpyKind kind) { hipGraph_t graph = nullptr; HIP_CHECK(hipGraphCreate(&graph, 0)); + hipGraphNode_t node = nullptr; + auto params = GetMemcpy3DParms(dst_ptr, dst_pos, src_ptr, src_pos, extent, kind); + HIP_CHECK(hipGraphAddMemcpyNode(&node, graph, nullptr, 0, ¶ms)); SECTION("node == nullptr") { - auto params = GetMemcpy3DParms(dst_ptr, dst_pos, src_ptr, src_pos, extent, kind); + params = GetMemcpy3DParms(dst_ptr, dst_pos, src_ptr, src_pos, extent, kind); HIP_CHECK_ERROR(hipGraphMemcpyNodeSetParams(nullptr, ¶ms), hipErrorInvalidValue); } SECTION("dst_ptr.ptr == nullptr") { hipPitchedPtr invalid_ptr = dst_ptr; invalid_ptr.ptr = nullptr; - auto params = GetMemcpy3DParms(invalid_ptr, dst_pos, src_ptr, src_pos, extent, kind); + params = GetMemcpy3DParms(invalid_ptr, dst_pos, src_ptr, src_pos, extent, kind); HIP_CHECK_ERROR(hipGraphMemcpyNodeSetParams(node, ¶ms), hipErrorInvalidValue); } SECTION("src_ptr.ptr == nullptr") { hipPitchedPtr invalid_ptr = src_ptr; invalid_ptr.ptr = nullptr; - auto params = GetMemcpy3DParms(dst_ptr, dst_pos, invalid_ptr, src_pos, extent, kind); + params = GetMemcpy3DParms(dst_ptr, dst_pos, invalid_ptr, src_pos, extent, kind); HIP_CHECK_ERROR(hipGraphMemcpyNodeSetParams(node, ¶ms), hipErrorInvalidValue); } SECTION("dst_ptr.pitch < width") { hipPitchedPtr invalid_ptr = dst_ptr; invalid_ptr.pitch = extent.width - 1; - auto params = GetMemcpy3DParms(invalid_ptr, dst_pos, src_ptr, src_pos, extent, kind); + params = GetMemcpy3DParms(invalid_ptr, dst_pos, src_ptr, src_pos, extent, kind); HIP_CHECK_ERROR(hipGraphMemcpyNodeSetParams(node, ¶ms), hipErrorInvalidPitchValue); } SECTION("src_ptr.pitch < width") { hipPitchedPtr invalid_ptr = src_ptr; invalid_ptr.pitch = extent.width - 1; - auto params = GetMemcpy3DParms(dst_ptr, dst_pos, invalid_ptr, src_pos, extent, kind); + params = GetMemcpy3DParms(dst_ptr, dst_pos, invalid_ptr, src_pos, extent, kind); HIP_CHECK_ERROR(hipGraphMemcpyNodeSetParams(node, ¶ms), hipErrorInvalidPitchValue); } @@ -181,7 +184,7 @@ TEST_CASE("Unit_hipGraphMemcpyNodeSetParams_Negative_Parameters") { HIP_CHECK(hipDeviceGetAttribute(&attr, hipDeviceAttributeMaxPitch, 0)); hipPitchedPtr invalid_ptr = dst_ptr; invalid_ptr.pitch = attr; - auto params = GetMemcpy3DParms(invalid_ptr, dst_pos, src_ptr, src_pos, extent, kind); + params = GetMemcpy3DParms(invalid_ptr, dst_pos, src_ptr, src_pos, extent, kind); HIP_CHECK_ERROR(hipGraphMemcpyNodeSetParams(node, ¶ms), hipErrorInvalidValue); } @@ -190,54 +193,54 @@ TEST_CASE("Unit_hipGraphMemcpyNodeSetParams_Negative_Parameters") { HIP_CHECK(hipDeviceGetAttribute(&attr, hipDeviceAttributeMaxPitch, 0)); hipPitchedPtr invalid_ptr = src_ptr; invalid_ptr.pitch = attr; - auto params = GetMemcpy3DParms(dst_ptr, dst_pos, invalid_ptr, src_pos, extent, kind); + params = GetMemcpy3DParms(dst_ptr, dst_pos, invalid_ptr, src_pos, extent, kind); HIP_CHECK_ERROR(hipGraphMemcpyNodeSetParams(node, ¶ms), hipErrorInvalidValue); } SECTION("extent.width + dst_pos.x > dst_ptr.pitch") { hipPos invalid_pos = dst_pos; invalid_pos.x = dst_ptr.pitch - extent.width + 1; - auto params = GetMemcpy3DParms(dst_ptr, invalid_pos, src_ptr, src_pos, extent, kind); + params = GetMemcpy3DParms(dst_ptr, invalid_pos, src_ptr, src_pos, extent, kind); HIP_CHECK_ERROR(hipGraphMemcpyNodeSetParams(node, ¶ms), hipErrorInvalidValue); } SECTION("extent.width + src_pos.x > src_ptr.pitch") { hipPos invalid_pos = src_pos; invalid_pos.x = src_ptr.pitch - extent.width + 1; - auto params = GetMemcpy3DParms(dst_ptr, dst_pos, src_ptr, invalid_pos, extent, kind); + params = GetMemcpy3DParms(dst_ptr, dst_pos, src_ptr, invalid_pos, extent, kind); HIP_CHECK_ERROR(hipGraphMemcpyNodeSetParams(node, ¶ms), hipErrorInvalidValue); } SECTION("dst_pos.y out of bounds") { hipPos invalid_pos = dst_pos; invalid_pos.y = 1; - auto params = GetMemcpy3DParms(dst_ptr, invalid_pos, src_ptr, src_pos, extent, kind); + params = GetMemcpy3DParms(dst_ptr, invalid_pos, src_ptr, src_pos, extent, kind); HIP_CHECK_ERROR(hipGraphMemcpyNodeSetParams(node, ¶ms), hipErrorInvalidValue); } SECTION("src_pos.y out of bounds") { hipPos invalid_pos = src_pos; invalid_pos.y = 1; - auto params = GetMemcpy3DParms(dst_ptr, dst_pos, src_ptr, invalid_pos, extent, kind); + params = GetMemcpy3DParms(dst_ptr, dst_pos, src_ptr, invalid_pos, extent, kind); HIP_CHECK_ERROR(hipGraphMemcpyNodeSetParams(node, ¶ms), hipErrorInvalidValue); } SECTION("dst_pos.z out of bounds") { hipPos invalid_pos = dst_pos; invalid_pos.z = 1; - auto params = GetMemcpy3DParms(dst_ptr, invalid_pos, src_ptr, src_pos, extent, kind); + params = GetMemcpy3DParms(dst_ptr, invalid_pos, src_ptr, src_pos, extent, kind); HIP_CHECK_ERROR(hipGraphMemcpyNodeSetParams(node, ¶ms), hipErrorInvalidValue); } SECTION("src_pos.z out of bounds") { hipPos invalid_pos = src_pos; invalid_pos.z = 1; - auto params = GetMemcpy3DParms(dst_ptr, dst_pos, src_ptr, invalid_pos, extent, kind); + params = GetMemcpy3DParms(dst_ptr, dst_pos, src_ptr, invalid_pos, extent, kind); HIP_CHECK_ERROR(hipGraphMemcpyNodeSetParams(node, ¶ms), hipErrorInvalidValue); } SECTION("Invalid MemcpyKind") { - auto params = GetMemcpy3DParms(dst_ptr, dst_pos, src_ptr, src_pos, extent, + params = GetMemcpy3DParms(dst_ptr, dst_pos, src_ptr, src_pos, extent, static_cast(-1)); HIP_CHECK_ERROR(hipGraphMemcpyNodeSetParams(node, ¶ms), hipErrorInvalidMemcpyDirection); }