From bf1b8a7c6b5c01d3934329dd1b042836bfa0deb2 Mon Sep 17 00:00:00 2001 From: Rahul Manocha Date: Tue, 18 Jun 2024 11:45:49 -0700 Subject: [PATCH] [SWDEV-468537] - Add check for image support for memcpy tests Change-Id: Idc1fcf9256f1d6bc44d687271016c106d41f6ca1 [ROCm/hip-tests commit: 196953a148a6824e96f7147b168102fdc564ffcb] --- projects/hip-tests/catch/hipTestMain/config/config_amd_linux | 2 -- projects/hip-tests/catch/hipTestMain/config/config_amd_windows | 2 -- .../catch/unit/memory/hipMemcpy2DFromArrayAsync_old.cc | 1 + projects/hip-tests/catch/unit/memory/hipMemcpyParam2D.cc | 1 + projects/hip-tests/catch/unit/memory/hipMemcpyParam2DAsync.cc | 1 + 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux index 291f9ffde8..542afedcd5 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux @@ -226,8 +226,6 @@ "Unit_hipGraphMemcpyNodeSetParams_Negative_Parameters", "Unit_hipMemcpy3D_Positive_Synchronization_Behavior", "Unit_hipMemcpyParam2D_Positive_Synchronization_Behavior", - "Unit_hipMemcpyParam2D_Positive_Array", - "Unit_hipMemcpyParam2DAsync_Positive_Array", "Unit_hipMemcpy2D_Positive_Synchronization_Behavior", "Unit_hipMemcpyAsync_Positive_Synchronization_Behavior", "Unit_hipDrvMemcpy3D_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 a4a07b0159..0220ce3a5d 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows @@ -366,8 +366,6 @@ "Unit_hipGraphMemcpyNodeSetParams_Negative_Parameters", "Unit_hipMemcpy3D_Positive_Synchronization_Behavior", "Unit_hipMemcpyParam2D_Positive_Synchronization_Behavior", - "Unit_hipMemcpyParam2D_Positive_Array", - "Unit_hipMemcpyParam2DAsync_Positive_Array", "Unit_hipMemcpy2D_Positive_Synchronization_Behavior", "Unit_hipMemcpyAsync_Positive_Synchronization_Behavior", "Unit_hipDrvMemcpy3D_Positive_Synchronization_Behavior", diff --git a/projects/hip-tests/catch/unit/memory/hipMemcpy2DFromArrayAsync_old.cc b/projects/hip-tests/catch/unit/memory/hipMemcpy2DFromArrayAsync_old.cc index 172691f73a..f725e99453 100644 --- a/projects/hip-tests/catch/unit/memory/hipMemcpy2DFromArrayAsync_old.cc +++ b/projects/hip-tests/catch/unit/memory/hipMemcpy2DFromArrayAsync_old.cc @@ -396,6 +396,7 @@ TEST_CASE("Unit_hipMemcpy2DFromArrayAsync_Negative") { * - HIP_VERSION >= 6.0 */ TEST_CASE("Unit_hipMemcpy2DFromArrayAsync_capturehipMemcpy2DFromArrayAsync") { + CHECK_IMAGE_SUPPORT int rows, cols; rows = GENERATE(3, 4, 100); cols = GENERATE(3, 4, 100); diff --git a/projects/hip-tests/catch/unit/memory/hipMemcpyParam2D.cc b/projects/hip-tests/catch/unit/memory/hipMemcpyParam2D.cc index e1f7006626..7fc78c797c 100644 --- a/projects/hip-tests/catch/unit/memory/hipMemcpyParam2D.cc +++ b/projects/hip-tests/catch/unit/memory/hipMemcpyParam2D.cc @@ -86,6 +86,7 @@ TEST_CASE("Unit_hipMemcpyParam2D_Positive_Parameters") { } TEST_CASE("Unit_hipMemcpyParam2D_Positive_Array") { + CHECK_IMAGE_SUPPORT constexpr bool async = false; SECTION("Array from/to Host") { MemcpyParam2DArrayHostShell(MemcpyParam2DAdapter()); diff --git a/projects/hip-tests/catch/unit/memory/hipMemcpyParam2DAsync.cc b/projects/hip-tests/catch/unit/memory/hipMemcpyParam2DAsync.cc index 5240eb056c..53e47fb1da 100644 --- a/projects/hip-tests/catch/unit/memory/hipMemcpyParam2DAsync.cc +++ b/projects/hip-tests/catch/unit/memory/hipMemcpyParam2DAsync.cc @@ -107,6 +107,7 @@ TEST_CASE("Unit_hipMemcpyParam2DAsync_Positive_Parameters") { } TEST_CASE("Unit_hipMemcpyParam2DAsync_Positive_Array") { + CHECK_IMAGE_SUPPORT constexpr bool async = true; SECTION("Array from/to Host") { MemcpyParam2DArrayHostShell(MemcpyParam2DAdapter());