From 24cc1bc2bba9147550b9cbfa41a2d42f917c5cfe Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Fri, 24 Feb 2023 07:09:36 +0530
Subject: [PATCH] SWDEV-370742 - Check image support before using image APIs.
 (#3143)

Change-Id: I2fc086256bca605385f2f6a94119b46741020afa
---
 tests/src/runtimeApi/memory/hipMemcpy2D.cpp   | 1 +
 tests/src/runtimeApi/memory/hipMemcpy3D.cpp   | 1 +
 tests/src/runtimeApi/memory/hipMemcpyAtoH.cpp | 1 +
 tests/src/runtimeApi/memory/hipMemcpyHtoA.cpp | 1 +
 tests/src/runtimeApi/memory/hipMemset2D.cpp   | 1 +
 tests/src/runtimeApi/memory/hipMemset3D.cpp   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/tests/src/runtimeApi/memory/hipMemcpy2D.cpp b/tests/src/runtimeApi/memory/hipMemcpy2D.cpp
index 328bf4b6e7..b1ec178b4c 100644
--- a/tests/src/runtimeApi/memory/hipMemcpy2D.cpp
+++ b/tests/src/runtimeApi/memory/hipMemcpy2D.cpp
@@ -315,6 +315,7 @@ bool Memcpy2D::Memcpy2D_NegativeTest_SizeCheck() {
 
 int main(int argc, char* argv[]) {
   bool TestPassed = true;
+  checkImageSupport();
   Memcpy2D Memcpy2DObj;
   HipTest::parseStandardArguments(argc, argv, false);
   if (p_tests == 1) {
diff --git a/tests/src/runtimeApi/memory/hipMemcpy3D.cpp b/tests/src/runtimeApi/memory/hipMemcpy3D.cpp
index d7e06299ab..59277a2bc0 100644
--- a/tests/src/runtimeApi/memory/hipMemcpy3D.cpp
+++ b/tests/src/runtimeApi/memory/hipMemcpy3D.cpp
@@ -100,6 +100,7 @@ void runTest(int width,int height,int depth, hipChannelFormatKind formatKind)
 
 int main(int argc, char **argv)
 {
+    checkImageSupport();
     for(int i=1;i<25;i++)
     {
         runTest<float>(i,i,i, hipChannelFormatKindFloat);
diff --git a/tests/src/runtimeApi/memory/hipMemcpyAtoH.cpp b/tests/src/runtimeApi/memory/hipMemcpyAtoH.cpp
index 08d3e6b66f..f7c6f34adf 100644
--- a/tests/src/runtimeApi/memory/hipMemcpyAtoH.cpp
+++ b/tests/src/runtimeApi/memory/hipMemcpyAtoH.cpp
@@ -202,6 +202,7 @@ bool MemcpyAtoH<T>::hipMemcpyAtoH_NegativeTests() {
 
 int main(int argc, char **argv) {
   bool TestPassed = true;
+  checkImageSupport();
   HipTest::parseStandardArguments(argc, argv, false);
   MemcpyAtoH<float> AtoH_obj;
   if (p_tests == 1) {
diff --git a/tests/src/runtimeApi/memory/hipMemcpyHtoA.cpp b/tests/src/runtimeApi/memory/hipMemcpyHtoA.cpp
index 245ac2f13c..3dc15181bb 100644
--- a/tests/src/runtimeApi/memory/hipMemcpyHtoA.cpp
+++ b/tests/src/runtimeApi/memory/hipMemcpyHtoA.cpp
@@ -214,6 +214,7 @@ bool MemcpyHtoA<T>::hipMemcpyHtoA_NegativeTests() {
 
 int main(int argc, char **argv) {
   bool TestPassed = true;
+  checkImageSupport();
   HipTest::parseStandardArguments(argc, argv, false);
   MemcpyHtoA<float> HtoA_obj;
   if (p_tests == 1) {
diff --git a/tests/src/runtimeApi/memory/hipMemset2D.cpp b/tests/src/runtimeApi/memory/hipMemset2D.cpp
index 140a18f4a8..15b762476f 100644
--- a/tests/src/runtimeApi/memory/hipMemset2D.cpp
+++ b/tests/src/runtimeApi/memory/hipMemset2D.cpp
@@ -204,6 +204,7 @@ int main(int argc, char *argv[]) {
   int extraArgs = 0;
   bool testResult = true;
 
+  checkImageSupport();
   HIPCHECK(hipSetDevice(p_gpuDevice));
   extraArgs = HipTest::parseStandardArguments(argc, argv, false);
   parseExtraArguments(extraArgs, argv);
diff --git a/tests/src/runtimeApi/memory/hipMemset3D.cpp b/tests/src/runtimeApi/memory/hipMemset3D.cpp
index e307303fa0..e4662f4d7d 100644
--- a/tests/src/runtimeApi/memory/hipMemset3D.cpp
+++ b/tests/src/runtimeApi/memory/hipMemset3D.cpp
@@ -132,6 +132,7 @@ bool testhipMemset3DAsync(int memsetval,int p_gpuDevice)
 
 int main(int argc, char *argv[])
 {
+    checkImageSupport();
     HipTest::parseStandardArguments(argc, argv, true);
     HIPCHECK(hipSetDevice(p_gpuDevice));
     bool testResult = true;