SWDEV-564392 - Clean up image tests (#1694)

Remove unnecessary checking.
Enable all disabled tests.
Move Mipmap test files into Windows section.

projects/hip-tests/catch/hipTestMain/config/config_amd_linux

@@ -567,9 +567,6 @@
         "Unit_hipGraphInstantiateWithFlags_StreamCaptureDeviceContextChg",
         "=== SWDEV-457316 Below tests are disabled temporarily to avoid combined PSDB ===",
         "Unit_hipGraphAddMemFreeNode_Negative_NotSupported",
-        "=== SWDEV-475482 - Disable tests to merge clr change ===",
-        "Unit_hipCreateTextureObject_LinearResource",
-        "Unit_hipCreateTextureObject_Pitch2DResource",
         "=== SWDEV-511679 : Below tests fail in stress test ===",
         "Unit_hipIpcOpenMemHandle_Negative_Open_In_Two_Contexts_Same_Device",
         "Unit_hipIpcCloseMemHandle_Positive_Reference_Counting",
@@ -591,7 +588,6 @@
         "=== SWDEV-556658 multiple test failures ===",
         "Unit_hipGraphExecMemcpyNodeSetParams_Positive_Basic",
         "Unit_hipGraph_PerfCheck_hipGraphExecChildGraphNodeSetParams",
-        "Unit_TexObjectCreate_TypePitch2D_IncompleteInit",
         "=== SWDEV-553920 disabled until multi device graph issues are resolved ===",
         "Unit_hipGraphUpload_Functional_multidevice_test",
     #endif

projects/hip-tests/catch/hipTestMain/config/config_amd_windows

@@ -337,241 +337,6 @@
         "Unit_hipModuleLaunchKernel_Negative_Parameters",
         "Unit_hipExtModuleLaunchKernel_Negative_Parameters",
         "Unit_hipLaunchKernel_Negative_Parameters",
-        "Unit_tex1Dfetch_Positive_ReadModeElementType - char",
-        "Unit_tex1Dfetch_Positive_ReadModeElementType - unsigned char",
-        "Unit_tex1Dfetch_Positive_ReadModeElementType - short",
-        "Unit_tex1Dfetch_Positive_ReadModeElementType - unsigned short",
-        "Unit_tex1Dfetch_Positive_ReadModeElementType - int",
-        "Unit_tex1Dfetch_Positive_ReadModeElementType - unsigned int",
-        "Unit_tex1Dfetch_Positive_ReadModeElementType - float",
-        "Unit_tex1Dfetch_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex1Dfetch_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex1Dfetch_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex1Dfetch_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_tex1D_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex1D_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex1D_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex1D_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_tex1DLayered_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex1DLayered_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex1DLayered_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex1DLayered_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_tex1DGrad_Positive_ReadModeElementType - char",
-        "Unit_tex1DGrad_Positive_ReadModeElementType - unsigned char",
-        "Unit_tex1DGrad_Positive_ReadModeElementType - short",
-        "Unit_tex1DGrad_Positive_ReadModeElementType - unsigned short",
-        "Unit_tex1DGrad_Positive_ReadModeElementType - int",
-        "Unit_tex1DGrad_Positive_ReadModeElementType - unsigned int",
-        "Unit_tex1DGrad_Positive_ReadModeElementType - float",
-        "Unit_tex1DGrad_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex1DGrad_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex1DGrad_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex1DGrad_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_tex1DLayeredGrad_Positive_ReadModeElementType - char",
-        "Unit_tex1DLayeredGrad_Positive_ReadModeElementType - unsigned char",
-        "Unit_tex1DLayeredGrad_Positive_ReadModeElementType - short",
-        "Unit_tex1DLayeredGrad_Positive_ReadModeElementType - unsigned short",
-        "Unit_tex1DLayeredGrad_Positive_ReadModeElementType - int",
-        "Unit_tex1DLayeredGrad_Positive_ReadModeElementType - unsigned int",
-        "Unit_tex1DLayeredGrad_Positive_ReadModeElementType - float",
-        "Unit_tex1DLayeredGrad_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex1DLayeredGrad_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex1DLayeredGrad_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex1DLayeredGrad_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_tex1DLayeredLod_Positive_ReadModeElementType - char",
-        "Unit_tex1DLayeredLod_Positive_ReadModeElementType - unsigned char",
-        "Unit_tex1DLayeredLod_Positive_ReadModeElementType - short",
-        "Unit_tex1DLayeredLod_Positive_ReadModeElementType - unsigned short",
-        "Unit_tex1DLayeredLod_Positive_ReadModeElementType - int",
-        "Unit_tex1DLayeredLod_Positive_ReadModeElementType - unsigned int",
-        "Unit_tex1DLayeredLod_Positive_ReadModeElementType - float",
-        "Unit_tex1DLayeredLod_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex1DLayeredLod_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex1DLayeredLod_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex1DLayeredLod_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_tex1DLod_Positive_ReadModeElementType - char",
-        "Unit_tex1DLod_Positive_ReadModeElementType - unsigned char",
-        "Unit_tex1DLod_Positive_ReadModeElementType - short",
-        "Unit_tex1DLod_Positive_ReadModeElementType - unsigned short",
-        "Unit_tex1DLod_Positive_ReadModeElementType - int",
-        "Unit_tex1DLod_Positive_ReadModeElementType - unsigned int",
-        "Unit_tex1DLod_Positive_ReadModeElementType - float",
-        "Unit_tex1DLod_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex1DLod_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex1DLod_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex1DLod_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_tex3D_Positive_ReadModeElementType - char",
-        "Unit_tex3D_Positive_ReadModeElementType - unsigned char",
-        "Unit_tex3D_Positive_ReadModeElementType - short",
-        "Unit_tex3D_Positive_ReadModeElementType - unsigned short",
-        "Unit_tex3D_Positive_ReadModeElementType - int",
-        "Unit_tex3D_Positive_ReadModeElementType - unsigned int",
-        "Unit_tex3D_Positive_ReadModeElementType - float",
-        "Unit_tex3D_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex3D_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex3D_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex3D_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_tex3DLod_Positive_ReadModeElementType - char",
-        "Unit_tex3DLod_Positive_ReadModeElementType - unsigned char",
-        "Unit_tex3DLod_Positive_ReadModeElementType - short",
-        "Unit_tex3DLod_Positive_ReadModeElementType - unsigned short",
-        "Unit_tex3DLod_Positive_ReadModeElementType - int",
-        "Unit_tex3DLod_Positive_ReadModeElementType - unsigned int",
-        "Unit_tex3DLod_Positive_ReadModeElementType - float",
-        "Unit_tex3DLod_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex3DLod_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex3DLod_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex3DLod_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_tex3DGrad_Positive_ReadModeElementType - char",
-        "Unit_tex3DGrad_Positive_ReadModeElementType - unsigned char",
-        "Unit_tex3DGrad_Positive_ReadModeElementType - short",
-        "Unit_tex3DGrad_Positive_ReadModeElementType - unsigned short",
-        "Unit_tex3DGrad_Positive_ReadModeElementType - int",
-        "Unit_tex3DGrad_Positive_ReadModeElementType - unsigned int",
-        "Unit_tex3DGrad_Positive_ReadModeElementType - float",
-        "Unit_tex3DGrad_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex3DGrad_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex3DGrad_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex3DGrad_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_texCubemap_Positive_ReadModeElementType - char",
-        "Unit_texCubemap_Positive_ReadModeElementType - unsigned char",
-        "Unit_texCubemap_Positive_ReadModeElementType - short",
-        "Unit_texCubemap_Positive_ReadModeElementType - unsigned short",
-        "Unit_texCubemap_Positive_ReadModeElementType - int",
-        "Unit_texCubemap_Positive_ReadModeElementType - unsigned int",
-        "Unit_texCubemap_Positive_ReadModeElementType - float",
-        "Unit_texCubemap_Positive_ReadModeNormalizedFloat - char",
-        "Unit_texCubemap_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_texCubemap_Positive_ReadModeNormalizedFloat - short",
-        "Unit_texCubemap_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_texCubemapLod_Positive_ReadModeElementType - char",
-        "Unit_texCubemapLod_Positive_ReadModeElementType - unsigned char",
-        "Unit_texCubemapLod_Positive_ReadModeElementType - short",
-        "Unit_texCubemapLod_Positive_ReadModeElementType - unsigned short",
-        "Unit_texCubemapLod_Positive_ReadModeElementType - int",
-        "Unit_texCubemapLod_Positive_ReadModeElementType - unsigned int",
-        "Unit_texCubemapLod_Positive_ReadModeElementType - float",
-        "Unit_texCubemapLod_Positive_ReadModeNormalizedFloat - char",
-        "Unit_texCubemapLod_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_texCubemapLod_Positive_ReadModeNormalizedFloat - short",
-        "Unit_texCubemapLod_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_texCubemapGrad_Positive_ReadModeElementType - char",
-        "Unit_texCubemapGrad_Positive_ReadModeElementType - unsigned char",
-        "Unit_texCubemapGrad_Positive_ReadModeElementType - short",
-        "Unit_texCubemapGrad_Positive_ReadModeElementType - unsigned short",
-        "Unit_texCubemapGrad_Positive_ReadModeElementType - int",
-        "Unit_texCubemapGrad_Positive_ReadModeElementType - unsigned int",
-        "Unit_texCubemapGrad_Positive_ReadModeElementType - float",
-        "Unit_texCubemapGrad_Positive_ReadModeNormalizedFloat - char",
-        "Unit_texCubemapGrad_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_texCubemapGrad_Positive_ReadModeNormalizedFloat - short",
-        "Unit_texCubemapGrad_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_texCubemapLayered_Positive_ReadModeElementType - char",
-        "Unit_texCubemapLayered_Positive_ReadModeElementType - unsigned char",
-        "Unit_texCubemapLayered_Positive_ReadModeElementType - short",
-        "Unit_texCubemapLayered_Positive_ReadModeElementType - unsigned short",
-        "Unit_texCubemapLayered_Positive_ReadModeElementType - int",
-        "Unit_texCubemapLayered_Positive_ReadModeElementType - unsigned int",
-        "Unit_texCubemapLayered_Positive_ReadModeElementType - float",
-        "Unit_texCubemapLayered_Positive_ReadModeNormalizedFloat - char",
-        "Unit_texCubemapLayered_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_texCubemapLayered_Positive_ReadModeNormalizedFloat - short",
-        "Unit_texCubemapLayered_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_texCubemapLayeredLod_Positive_ReadModeElementType - char",
-        "Unit_texCubemapLayeredLod_Positive_ReadModeElementType - unsigned char",
-        "Unit_texCubemapLayeredLod_Positive_ReadModeElementType - short",
-        "Unit_texCubemapLayeredLod_Positive_ReadModeElementType - unsigned short",
-        "Unit_texCubemapLayeredLod_Positive_ReadModeElementType - int",
-        "Unit_texCubemapLayeredLod_Positive_ReadModeElementType - unsigned int",
-        "Unit_texCubemapLayeredLod_Positive_ReadModeElementType - float",
-        "Unit_texCubemapLayeredLod_Positive_ReadModeNormalizedFloat - char",
-        "Unit_texCubemapLayeredLod_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_texCubemapLayeredLod_Positive_ReadModeNormalizedFloat - short",
-        "Unit_texCubemapLayeredLod_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_texCubemapLayeredGrad_Positive_ReadModeElementType - char",
-        "Unit_texCubemapLayeredGrad_Positive_ReadModeElementType - unsigned char",
-        "Unit_texCubemapLayeredGrad_Positive_ReadModeElementType - short",
-        "Unit_texCubemapLayeredGrad_Positive_ReadModeElementType - unsigned short",
-        "Unit_texCubemapLayeredGrad_Positive_ReadModeElementType - int",
-        "Unit_texCubemapLayeredGrad_Positive_ReadModeElementType - unsigned int",
-        "Unit_texCubemapLayeredGrad_Positive_ReadModeElementType - float",
-        "Unit_texCubemapLayeredGrad_Positive_ReadModeNormalizedFloat - char",
-        "Unit_texCubemapLayeredGrad_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_texCubemapLayeredGrad_Positive_ReadModeNormalizedFloat - short",
-        "Unit_texCubemapLayeredGrad_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_tex2Dgather_Positive_ReadModeElementType - char",
-        "Unit_tex2Dgather_Positive_ReadModeElementType - unsigned char",
-        "Unit_tex2Dgather_Positive_ReadModeElementType - short",
-        "Unit_tex2Dgather_Positive_ReadModeElementType - unsigned short",
-        "Unit_tex2Dgather_Positive_ReadModeElementType - int",
-        "Unit_tex2Dgather_Positive_ReadModeElementType - unsigned int",
-        "Unit_tex2Dgather_Positive_ReadModeElementType - float",
-        "Unit_tex2D_Positive_ReadModeElementType - char",
-        "Unit_tex2D_Positive_ReadModeElementType - unsigned char",
-        "Unit_tex2D_Positive_ReadModeElementType - short",
-        "Unit_tex2D_Positive_ReadModeElementType - unsigned short",
-        "Unit_tex2D_Positive_ReadModeElementType - int",
-        "Unit_tex2D_Positive_ReadModeElementType - unsigned int",
-        "Unit_tex2D_Positive_ReadModeElementType - float",
-        "Unit_tex2D_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex2D_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex2D_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex2D_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_tex2DLayered_Positive_ReadModeElementType - char",
-        "Unit_tex2DLayered_Positive_ReadModeElementType - unsigned char",
-        "Unit_tex2DLayered_Positive_ReadModeElementType - short",
-        "Unit_tex2DLayered_Positive_ReadModeElementType - unsigned short",
-        "Unit_tex2DLayered_Positive_ReadModeElementType - int",
-        "Unit_tex2DLayered_Positive_ReadModeElementType - unsigned int",
-        "Unit_tex2DLayered_Positive_ReadModeElementType - float",
-        "Unit_tex2DLayered_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex2DLayered_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex2DLayered_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex2DLayered_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_tex2DGrad_Positive_ReadModeElementType - char",
-        "Unit_tex2DGrad_Positive_ReadModeElementType - unsigned char",
-        "Unit_tex2DGrad_Positive_ReadModeElementType - short",
-        "Unit_tex2DGrad_Positive_ReadModeElementType - unsigned short",
-        "Unit_tex2DGrad_Positive_ReadModeElementType - int",
-        "Unit_tex2DGrad_Positive_ReadModeElementType - unsigned int",
-        "Unit_tex2DGrad_Positive_ReadModeElementType - float",
-        "Unit_tex2DGrad_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex2DGrad_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex2DGrad_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex2DGrad_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_tex2DLayeredGrad_Positive_ReadModeElementType - char",
-        "Unit_tex2DLayeredGrad_Positive_ReadModeElementType - unsigned char",
-        "Unit_tex2DLayeredGrad_Positive_ReadModeElementType - short",
-        "Unit_tex2DLayeredGrad_Positive_ReadModeElementType - unsigned short",
-        "Unit_tex2DLayeredGrad_Positive_ReadModeElementType - int",
-        "Unit_tex2DLayeredGrad_Positive_ReadModeElementType - unsigned int",
-        "Unit_tex2DLayeredGrad_Positive_ReadModeElementType - float",
-        "Unit_tex2DLayeredGrad_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex2DLayeredGrad_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex2DLayeredGrad_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex2DLayeredGrad_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_tex2DLod_Positive_ReadModeElementType - char",
-        "Unit_tex2DLod_Positive_ReadModeElementType - unsigned char",
-        "Unit_tex2DLod_Positive_ReadModeElementType - short",
-        "Unit_tex2DLod_Positive_ReadModeElementType - unsigned short",
-        "Unit_tex2DLod_Positive_ReadModeElementType - int",
-        "Unit_tex2DLod_Positive_ReadModeElementType - unsigned int",
-        "Unit_tex2DLod_Positive_ReadModeElementType - float",
-        "Unit_tex2DLod_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex2DLod_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex2DLod_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex2DLod_Positive_ReadModeNormalizedFloat - unsigned short",
-        "Unit_tex2DLayeredLod_Positive_ReadModeElementType - char",
-        "Unit_tex2DLayeredLod_Positive_ReadModeElementType - unsigned char",
-        "Unit_tex2DLayeredLod_Positive_ReadModeElementType - short",
-        "Unit_tex2DLayeredLod_Positive_ReadModeElementType - unsigned short",
-        "Unit_tex2DLayeredLod_Positive_ReadModeElementType - int",
-        "Unit_tex2DLayeredLod_Positive_ReadModeElementType - unsigned int",
-        "Unit_tex2DLayeredLod_Positive_ReadModeElementType - float",
-        "Unit_tex2DLayeredLod_Positive_ReadModeNormalizedFloat - char",
-        "Unit_tex2DLayeredLod_Positive_ReadModeNormalizedFloat - unsigned char",
-        "Unit_tex2DLayeredLod_Positive_ReadModeNormalizedFloat - short",
-        "Unit_tex2DLayeredLod_Positive_ReadModeNormalizedFloat - unsigned short",
         "Unit_hipModuleLaunchKernel_Negative_Parameters",
         "Unit_hipModuleGetTexRef_Positive_Basic",
         "Unit_Kernel_Launch_bounds_Negative_OutOfBounds",
@@ -904,10 +669,7 @@
         "Unit_Coalesced_Group_Tiled_Partition_Shfl_Down_Positive_Basic - unsigned long long",
         "Unit_Coalesced_Group_Tiled_Partition_Shfl_Down_Positive_Basic - float",
         "Unit_Coalesced_Group_Tiled_Partition_Shfl_Down_Positive_Basic - double",
-        "=== SWDEV-475482 - Disable tests to merge clr change",
-        "Unit_hipCreateTextureObject_LinearResource",
-        "Unit_hipCreateTextureObject_Pitch2DResource",
-        "========================================================================================",
+       "========================================================================================",
         "=== SWDEV-468258 Below tests are temporarily disabled - windows PSDB failed",
         "Unit_hipHostAlloc_Basic",
         "Unit_hipHostAlloc_Default",
@@ -933,14 +695,10 @@
         "Unit_hipGraphAddMemAllocNode_Negative_Free_Alloc_Memory_Again",
         "====================================================",
          "==================SWDEV-555665==================================",
-        "Unit_hipTexRefSetGetMipmappedArray",
         "Unit_hipMemSetAccessHostDevice_hostalloc",
         "Unit_hipClock64_Positive_Basic",
         "Unit_hipClock_Positive_Basic",
         "====================================================",
-        "==================SWDEV-556645==================================",
-        "Unit_TexObjectCreate_TypePitch2D_IncompleteInit",
-        "====================================================",
         "Unit_hipEventRecord",
     #endif
         "=== Following tests disabled as it should be a local perf test",

projects/hip-tests/catch/unit/memory/hipArrayCreate.cc

@@ -76,11 +76,6 @@ static void ArrayCreate_DiffSizes(int gpu) {
 TEST_CASE("Unit_hipArrayCreate_DiffSizes") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   ArrayCreate_DiffSizes(0);
   HIP_CHECK_THREAD_FINALIZE();
 }
@@ -93,11 +88,6 @@ and verifies the hipArrayCreate API with small and big chunks data
 TEST_CASE("Unit_hipArrayCreate_MultiThread") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   std::vector<std::thread> threadlist;
   int devCnt = 0;
 
@@ -214,11 +204,6 @@ TEMPLATE_TEST_CASE("Unit_hipArrayCreate_happy", "", uint, int, int4, ushort, sho
                    char4, float, float2, float4) {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   using vec_info = vector_info<TestType>;
   DriverContext ctx;
 
@@ -244,11 +229,6 @@ TEMPLATE_TEST_CASE("Unit_hipArrayCreate_maxTexture", "", uint, int, int4, ushort
                    uchar2, char4, float, float2, float4) {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   using vec_info = vector_info<TestType>;
   DriverContext ctx;
 
@@ -309,11 +289,6 @@ TEMPLATE_TEST_CASE("Unit_hipArrayCreate_maxTexture", "", uint, int, int4, ushort
 TEST_CASE("Unit_hipArrayCreate_ZeroWidth") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   DriverContext ctx;
   HIP_ARRAY_DESCRIPTOR desc;
   desc.Format = driverFormats[0];
@@ -330,11 +305,6 @@ TEST_CASE("Unit_hipArrayCreate_ZeroWidth") {
 TEST_CASE("Unit_hipArrayCreate_Nullptr") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   DriverContext ctx;
   SECTION("Null array") {
     HIP_ARRAY_DESCRIPTOR desc;
@@ -355,11 +325,6 @@ TEST_CASE("Unit_hipArrayCreate_Nullptr") {
 TEST_CASE("Unit_hipArrayCreate_BadNumberChannelElement") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   DriverContext ctx;
   HIP_ARRAY_DESCRIPTOR desc;
   desc.Format = GENERATE(from_range(std::begin(driverFormats), std::end(driverFormats)));
@@ -378,11 +343,6 @@ TEST_CASE("Unit_hipArrayCreate_BadNumberChannelElement") {
 TEST_CASE("Unit_hipArrayCreate_BadChannelFormat") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   DriverContext ctx;
   HIP_ARRAY_DESCRIPTOR desc;
 

projects/hip-tests/catch/unit/surface/surf1D.cc

@@ -247,11 +247,6 @@ TEMPLATE_TEST_CASE("Unit_surf1Dread_Positive_Basic", "", char, uchar, short, ush
                    uint4, float4) {
   CHECK_IMAGE_SUPPORT;
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   const int width = GENERATE(31, 67, 131, 263);
   runTestR<TestType>(width);
 }
@@ -273,11 +268,6 @@ TEMPLATE_TEST_CASE("Unit_surf1Dwrite_Positive_Basic", "", char, uchar, short, us
                    uint4, float4) {
   CHECK_IMAGE_SUPPORT;
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   const int width = GENERATE(31, 67, 131, 263);
   runTestW<TestType>(width);
 }
@@ -299,11 +289,6 @@ TEMPLATE_TEST_CASE("Unit_surf1D_Positive_ReadWrite", "", char, uchar, short, ush
                    uint4, float4) {
   CHECK_IMAGE_SUPPORT;
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   const int width = GENERATE(31, 67, 131, 263);
   runTestRW<TestType>(width);
 }

projects/hip-tests/catch/unit/surface/surf1DLayered.cc

@@ -35,7 +35,7 @@ THE SOFTWARE.
 
 template <typename T>
 __global__ void surf1DLayeredKernelR(hipSurfaceObject_t surfaceObject, T* outputData, int width) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   if (x < width) {
     surf1DLayeredread(outputData + x, surfaceObject, x * sizeof(T), 0);
@@ -45,7 +45,7 @@ __global__ void surf1DLayeredKernelR(hipSurfaceObject_t surfaceObject, T* output
 
 template <typename T>
 __global__ void surf1DLayeredKernelW(hipSurfaceObject_t surfaceObject, T* inputData, int width) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   if (x < width) {
     surf1DLayeredwrite(inputData[x], surfaceObject, x * sizeof(T), 0);
@@ -56,7 +56,7 @@ __global__ void surf1DLayeredKernelW(hipSurfaceObject_t surfaceObject, T* inputD
 template <typename T> __global__ void surf1DLayeredKernelRW(hipSurfaceObject_t surfaceObject,
                                                             hipSurfaceObject_t outputSurfObj,
                                                             int width) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   if (x < width) {
     T data;

projects/hip-tests/catch/unit/surface/surf2D.cc

@@ -286,11 +286,6 @@ TEMPLATE_TEST_CASE("Unit_surf2Dread_Positive_Basic", "", char, uchar, short, ush
                    uint4, float4) {
   CHECK_IMAGE_SUPPORT;
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   const int width = GENERATE(31, 67);
   const int height = GENERATE(131, 263);
   runTestR<TestType>(width, height);
@@ -313,11 +308,6 @@ TEMPLATE_TEST_CASE("Unit_surf2Dwrite_Positive_Basic", "", char, uchar, short, us
                    uint4, float4) {
   CHECK_IMAGE_SUPPORT;
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   const int width = GENERATE(31, 67);
   const int height = GENERATE(131, 263);
   runTestW<TestType>(width, height);
@@ -340,11 +330,6 @@ TEMPLATE_TEST_CASE("Unit_surf2D_Positive_ReadWrite", "", char, uchar, short, ush
                    uint4, float4) {
   CHECK_IMAGE_SUPPORT;
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   const int width = GENERATE(31, 67);
   const int height = GENERATE(131, 263);
   runTestRW<TestType>(width, height);

projects/hip-tests/catch/unit/surface/surf2DLayered.cc

@@ -37,7 +37,7 @@ THE SOFTWARE.
 
 template <typename T> __global__ void surf2DLayeredKernelR(hipSurfaceObject_t surfaceObject,
                                                            T* outputData, int width, int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   if (x < width && y < height) {
@@ -48,7 +48,7 @@ template <typename T> __global__ void surf2DLayeredKernelR(hipSurfaceObject_t su
 
 template <typename T> __global__ void surf2DLayeredKernelW(hipSurfaceObject_t surfaceObject,
                                                            T* inputData, int width, int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   if (x < width && y < height) {
@@ -60,7 +60,7 @@ template <typename T> __global__ void surf2DLayeredKernelW(hipSurfaceObject_t su
 template <typename T> __global__ void surf2DLayeredKernelRW(hipSurfaceObject_t surfaceObject,
                                                             hipSurfaceObject_t outputSurfObj,
                                                             int width, int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   if (x < width && y < height) {

projects/hip-tests/catch/unit/surface/surf3D.cc

@@ -332,11 +332,6 @@ TEMPLATE_TEST_CASE("Unit_surf3Dread_Positive_Basic", "", char, uchar, short, ush
                    uint4, float4) {
   CHECK_IMAGE_SUPPORT;
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   const int width = GENERATE(31, 67);
   const int height = GENERATE(131, 263);
   const int depth = GENERATE(4, 11);
@@ -360,11 +355,6 @@ TEMPLATE_TEST_CASE("Unit_surf3Dwrite_Positive_Basic", "", char, uchar, short, us
                    uint4, float4) {
   CHECK_IMAGE_SUPPORT;
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   const int width = GENERATE(31, 67);
   const int height = GENERATE(131, 263);
   const int depth = GENERATE(4, 11);
@@ -388,11 +378,6 @@ TEMPLATE_TEST_CASE("Unit_surf3D_Positive_ReadWrite", "", char, uchar, short, ush
                    uint4, float4) {
   CHECK_IMAGE_SUPPORT;
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   const int width = GENERATE(31, 67);
   const int height = GENERATE(131, 263);
   const int depth = GENERATE(4, 11);

projects/hip-tests/catch/unit/surface/surfCubemap.cc

@@ -37,7 +37,7 @@ THE SOFTWARE.
 
 template <typename T> __global__ void surfCubemapKernelR(hipSurfaceObject_t surfaceObject,
                                                          T* outputData, int width, int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   if (x < width && y < height) {
@@ -48,7 +48,7 @@ template <typename T> __global__ void surfCubemapKernelR(hipSurfaceObject_t surf
 
 template <typename T> __global__ void surfCubemapKernelW(hipSurfaceObject_t surfaceObject,
                                                          T* inputData, int width, int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   if (x < width && y < height) {
@@ -60,7 +60,7 @@ template <typename T> __global__ void surfCubemapKernelW(hipSurfaceObject_t surf
 template <typename T> __global__ void surfCubemapKernelRW(hipSurfaceObject_t surfaceObject,
                                                           hipSurfaceObject_t outputSurfObj,
                                                           int width, int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   if (x < width && y < height) {

projects/hip-tests/catch/unit/surface/surfCubemapLayered.cc

@@ -38,7 +38,7 @@ THE SOFTWARE.
 template <typename T> __global__ void surfCubemapLayeredKernelR(hipSurfaceObject_t surfaceObject,
                                                                 T* outputData, int width,
                                                                 int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   if (x < width && y < height) {
@@ -50,7 +50,7 @@ template <typename T> __global__ void surfCubemapLayeredKernelR(hipSurfaceObject
 template <typename T> __global__ void surfCubemapLayeredKernelW(hipSurfaceObject_t surfaceObject,
                                                                 T* inputData, int width,
                                                                 int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   if (x < width && y < height) {
@@ -62,7 +62,7 @@ template <typename T> __global__ void surfCubemapLayeredKernelW(hipSurfaceObject
 template <typename T> __global__ void surfCubemapLayeredKernelRW(hipSurfaceObject_t surfaceObject,
                                                                  hipSurfaceObject_t outputSurfObj,
                                                                  int width, int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   if (x < width && y < height) {

projects/hip-tests/catch/unit/texture/CMakeLists.txt

@@ -65,10 +65,6 @@ set(TEST_SRC
     hipTexRefSetAddressMode.cc
     hipTexRefGetAddressMode.cc
     hipTexRefSetGetFilterMode.cc
-    hipTexRefSetGetMipmapFilterMode.cc
-    hipTexRefSetGetMipmapLevelBias.cc
-    hipTexRefSetGetMipmapLevelClamp.cc
-    hipTexRefSetGetMipmappedArray.cc
     hipDeviceGetTexture1DLinearMaxWidth.cc
 )
 
@@ -147,6 +143,10 @@ set(TEST_SRC
     tex2DLod.cc
     tex2DLayeredLod.cc
     tex3DLod.cc
+    hipTexRefSetGetMipmapFilterMode.cc
+    hipTexRefSetGetMipmapLevelBias.cc
+    hipTexRefSetGetMipmapLevelClamp.cc
+    hipTexRefSetGetMipmappedArray.cc
 )
 endif()
 

projects/hip-tests/catch/unit/texture/hipBindTexture.cc

@@ -61,11 +61,6 @@ TEST_CASE("Unit_hipBindTexture_Positive") {
 TEST_CASE("Unit_hipBindTexture_1DfetchVerification") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   float* tex_buf;
   float val[N], output[N];
   size_t offset = 0;

projects/hip-tests/catch/unit/texture/hipBindTexture2D.cc

@@ -52,11 +52,6 @@ TEST_CASE("Unit_hipBindTexture2D_Positive") {
 
 TEST_CASE("Unit_hipBindTexture2D_Pitch") {
   CHECK_IMAGE_SUPPORT
-
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
   (void) hipGetLastError();  // Prevent negative tests affecting this
 
   float* b;

projects/hip-tests/catch/unit/texture/hipBindTextureToMipmappedArray.cc

@@ -137,11 +137,6 @@ static void runMipMapTest(unsigned int width, unsigned int height, unsigned int
 TEST_CASE("Unit_hipTextureMipmapRef2D_Positive_Check") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   // Height Width Vector
   std::vector<unsigned int> hw_vec = {2048, 1024, 512, 256, 64};
   std::vector<unsigned int> mip_vec = {8, 4, 2, 1};
@@ -182,11 +177,6 @@ TEST_CASE("Unit_hipTextureMipmapRef2D_Positive_Check") {
 TEST_CASE("Unit_hipTextureMipmapRef2D_Negative_Parameters") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
 #if defined(_WIN32)
   unsigned int width = 64;
   unsigned int height = 64;

projects/hip-tests/catch/unit/texture/hipNormalizedFloatValueTex.cc

@@ -138,11 +138,6 @@ static void runTest_hipTextureFilterMode() {
 TEST_CASE("Unit_hipNormalizedFloatValueTex_CheckModes") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
 #if HT_AMD
   hipDeviceProp_t props;
   HIP_CHECK(hipGetDeviceProperties(&props, 0));

projects/hip-tests/catch/unit/texture/hipSimpleTexture1DLayered.cc

@@ -62,11 +62,6 @@ TEMPLATE_TEST_CASE("Unit_Layered1DTexture_Check_HostBufferToFromLayered1DArray",
                    uchar4, short4, ushort4, int4, uint4, float4) {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   constexpr int SIZE = 512;
   constexpr int num_layers = 5;
   constexpr unsigned int width = SIZE;
@@ -210,11 +205,6 @@ TEMPLATE_TEST_CASE("Unit_Layered1DTexture_Check_DeviceBufferToFromLayered1DArray
                    uchar4, short4, ushort4, int4, uint4, float4) {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   constexpr int SIZE = 512;
   constexpr int num_layers = 5;
   constexpr unsigned int width = SIZE;

projects/hip-tests/catch/unit/texture/hipSimpleTexture2DLayered.cc

@@ -64,11 +64,6 @@ TEMPLATE_TEST_CASE("Unit_Layered2DTexture_Check_HostBufferToFromLayered2DArray",
                    uchar4, short4, ushort4, int4, uint4, float4) {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   constexpr int SIZE = 512;
   constexpr int num_layers = 5;
   constexpr unsigned int width = SIZE;
@@ -215,11 +210,6 @@ TEMPLATE_TEST_CASE("Unit_Layered2DTexture_Check_DeviceBufferToFromLayered2DArray
                    uchar4, short4, ushort4, int4, uint4, float4) {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   constexpr int SIZE = 512;
   constexpr int num_layers = 5;
   constexpr unsigned int width = SIZE;

projects/hip-tests/catch/unit/texture/hipSimpleTexture3D.cc

@@ -115,10 +115,6 @@ static void runSimpleTexture3D_Check(int width, int height, int depth,
 TEST_CASE("Unit_hipSimpleTexture3D_Check_DataTypes") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
 
   for (int i = 1; i < 25; i++) {
     runSimpleTexture3D_Check<float>(i, i, i, &texf);

projects/hip-tests/catch/unit/texture/hipTex1DFetchCheckModes.cc

@@ -105,11 +105,6 @@ static void runTest(hipTextureAddressMode addressMode, hipTextureFilterMode filt
 
 TEST_CASE("Unit_tex1Dfetch_CheckModes") {
   CHECK_IMAGE_SUPPORT
-
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
   (void) hipGetLastError();  // Prevent negative tests affecting this
 
   SECTION("hipAddressModeClamp AND hipFilterModePoint") {

projects/hip-tests/catch/unit/texture/hipTexObjPitch.cc

@@ -58,12 +58,7 @@ static __global__ void texture2dCopyKernel(hipTextureObject_t texObj, TYPE_t* ds
 TEMPLATE_TEST_CASE("Unit_hipTexObjPitch_texture2D", "", char, unsigned char, short, unsigned short,
                    int, unsigned int, float) {
   CHECK_IMAGE_SUPPORT
-
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-  (void) hipGetLastError();  // Prevent negative tests affecting this
+  (void)hipGetLastError();  // Prevent negative tests affecting this
 
   TestType* B;
   TestType* A;

projects/hip-tests/catch/unit/texture/hipTextureMipmapObj1D.cc

@@ -311,11 +311,6 @@ TEMPLATE_TEST_CASE("Unit_hipTextureMipmapObj1D_Check - hipReadModeElementType",
                    short4, ushort4, int4, uint4, float4) {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION(
       "Unit_hipTextureMipmapObj1D_Check - hipReadModeElementType, hipFilterModePoint, "
       "hipAddressModeClamp 23") {
@@ -365,11 +360,6 @@ TEMPLATE_TEST_CASE("Unit_hipTextureMipmapObj1D_Check - hipReadModeNormalizedFloa
                    char4, uchar4, short4, ushort4) {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION(
       "Unit_hipTextureMipmapObj1D_Check - hipReadModeNormalizedFloat, hipFilterModePoint, "
       "hipAddressModeClamp 23") {
@@ -443,11 +433,6 @@ TEMPLATE_TEST_CASE("Unit_hipTextureMipmapObj1D_Check - hipReadModeElementType fl
                    float, float1, float2, float4) {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION(
       "Unit_hipTextureMipmapObj1D_Check - hipReadModeElementType, hipFilterModeLinear, "
       "hipAddressModeClamp 23, 0.") {

projects/hip-tests/catch/unit/texture/hipTextureMipmapObj2D.cc

@@ -344,11 +344,6 @@ TEMPLATE_TEST_CASE("Unit_hipTextureMipmapObj2D_Check - hipReadModeElementType",
                    short4, ushort4, int4, uint4, float4) {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION(
       "Unit_hipTextureMipmapObj2D_Check - hipReadModeElementType, hipFilterModePoint, "
       "hipAddressModeClamp 23, 21") {
@@ -398,11 +393,6 @@ TEMPLATE_TEST_CASE("Unit_hipTextureMipmapObj2D_Check - hipReadModeNormalizedFloa
                    char4, uchar4, short4, ushort4) {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION(
       "Unit_hipTextureMipmapObj2D_Check - hipReadModeNormalizedFloat, hipFilterModePoint, "
       "hipAddressModeClamp 23, 21") {
@@ -476,11 +466,6 @@ TEMPLATE_TEST_CASE("Unit_hipTextureMipmapObj2D_Check - hipReadModeElementType fl
                    float, float1, float2, float4) {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION(
       "Unit_hipTextureMipmapObj2D_Check - hipReadModeElementType, hipFilterModeLinear, "
       "hipAddressModeClamp 23, 17, 0., 0.") {

projects/hip-tests/catch/unit/texture/hipTextureMipmapObj3D.cc

@@ -366,11 +366,6 @@ TEMPLATE_TEST_CASE("Unit_hipTextureMipmapObj3D_Check - hipReadModeElementType",
                    short4, ushort4, int4, uint4, float4) {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION(
       "Unit_hipTextureMipmapObj3D_Check - hipReadModeElementType, hipFilterModePoint, "
       "hipAddressModeClamp 23, 21, 47") {
@@ -420,11 +415,6 @@ TEMPLATE_TEST_CASE("Unit_hipTextureMipmapObj3D_Check - hipReadModeNormalizedFloa
                    char4, uchar4, short4, ushort4) {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION(
       "Unit_hipTextureMipmapObj3D_Check - hipReadModeNormalizedFloat, hipFilterModePoint, "
       "hipAddressModeClamp 23, 21, 67") {
@@ -498,11 +488,6 @@ TEMPLATE_TEST_CASE("Unit_hipTextureMipmapObj3D_Check - hipReadModeElementType fl
                    float, float1, float2, float4) {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION(
       "Unit_hipTextureMipmapObj3D_Check - hipReadModeElementType, hipFilterModeLinear, "
       "hipAddressModeClamp 23, 17, 301, 0., 0., 0.") {

projects/hip-tests/catch/unit/texture/hipTextureObj1DCheckModes.cc

@@ -124,11 +124,6 @@ static void runTest(const int width, const float offsetX) {
 TEST_CASE("Unit_hipTextureObj1DCheckModes") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION("hipAddressModeClamp, hipFilterModePoint, regularCoords") {
     runTest<hipAddressModeClamp, hipFilterModePoint, false>(256, -3);
     runTest<hipAddressModeClamp, hipFilterModePoint, false>(256, 4);

projects/hip-tests/catch/unit/texture/hipTextureObj1DCheckSRGBModes.cc

@@ -174,11 +174,6 @@ line1:
 TEST_CASE("Unit_hipTextureObj1DCheckRGBAModes - array") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION("RGBA 1D hipAddressModeClamp, hipFilterModePoint, hipResourceTypeArray, regularCoords") {
     runTest<hipAddressModeClamp, hipFilterModePoint, hipResourceTypeArray, false>(255, -3.9);
     runTest<hipAddressModeClamp, hipFilterModePoint, hipResourceTypeArray, false>(255, 4.4);
@@ -235,11 +230,6 @@ TEST_CASE("Unit_hipTextureObj1DCheckRGBAModes - array") {
 TEST_CASE("Unit_hipTextureObj1DCheckSRGBAModes - array") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION("SRGBA 1D hipAddressModeClamp, hipFilterModePoint, hipResourceTypeArray, regularCoords") {
     runTest<hipAddressModeClamp, hipFilterModePoint, hipResourceTypeArray, false, true>(255, -3.9);
     runTest<hipAddressModeClamp, hipFilterModePoint, hipResourceTypeArray, false, true>(255, 4.4);
@@ -299,11 +289,6 @@ TEST_CASE("Unit_hipTextureObj1DCheckSRGBAModes - array") {
 TEST_CASE("Unit_hipTextureObj1DCheckRGBAModes - buffer") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION("RGBA 1D hipAddressModeClamp, hipFilterModePoint, hipResourceTypeLinear, regularCoords") {
     runTest<hipAddressModeClamp, hipFilterModePoint, hipResourceTypeLinear, false, false>(255);
   }
@@ -317,11 +302,6 @@ TEST_CASE("Unit_hipTextureObj1DCheckRGBAModes - buffer") {
 TEST_CASE("Unit_hipTextureObj1DCheckSRGBAModes - buffer") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION(
       "SRGBA 1D hipAddressModeClamp, hipFilterModePoint, hipResourceTypeLinear, regularCoords") {
     runTest<hipAddressModeClamp, hipFilterModePoint, hipResourceTypeLinear, false, true>(255);

projects/hip-tests/catch/unit/texture/hipTextureObj1DFetch.cc

@@ -34,11 +34,6 @@ static __global__ void tex1dKernel(float* val, hipTextureObject_t obj) {
 
 TEST_CASE("Unit_hipCreateTextureObject_tex1DfetchVerification") {
   CHECK_IMAGE_SUPPORT
-
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
   (void) hipGetLastError();  // Prevent negative tests affecting this
 
   // Allocating the required buffer on gpu device

projects/hip-tests/catch/unit/texture/hipTextureObj2D.cc

@@ -49,11 +49,6 @@ __global__ void tex2DKernel(float* outputData, hipTextureObject_t textureObject,
 TEST_CASE("Unit_hipTextureObj2D_Check") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   constexpr int SIZE = 256;
   constexpr unsigned int width = SIZE;
   constexpr unsigned int height = SIZE;

projects/hip-tests/catch/unit/texture/hipTextureObj2DCheckModes.cc

@@ -134,11 +134,6 @@ line1:
 TEST_CASE("Unit_hipTextureObj2DCheckModes") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION("hipAddressModeClamp, hipFilterModePoint, regularCoords") {
     runTest<hipAddressModeClamp, hipFilterModePoint, false>(256, 256, -3.9, 6.1);
     runTest<hipAddressModeClamp, hipFilterModePoint, false>(256, 256, 4.4, -7.0);

projects/hip-tests/catch/unit/texture/hipTextureObj2DCheckSRGBModes.cc

@@ -154,11 +154,6 @@ line1:
 
 TEST_CASE("Unit_hipTextureObj2DCheckRGBAModes") {
   CHECK_IMAGE_SUPPORT
-
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
   (void) hipGetLastError();  // Prevent negative tests affecting this
 
   SECTION("RGBA 2D hipAddressModeClamp, hipFilterModePoint, regularCoords") {
@@ -206,11 +201,6 @@ TEST_CASE("Unit_hipTextureObj2DCheckRGBAModes") {
 TEST_CASE("Unit_hipTextureObj2DCheckSRGBAModes") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   SECTION("SRGBA 2D hipAddressModeClamp, hipFilterModePoint, regularCoords") {
     runTest<hipAddressModeClamp, hipFilterModePoint, false, true>(256, 256, -3.9, 6.1);
     runTest<hipAddressModeClamp, hipFilterModePoint, false, true>(256, 256, 4.4, -7.0);

projects/hip-tests/catch/unit/texture/hipTextureObj3DCheckModes.cc

@@ -173,11 +173,6 @@ line1:
 TEST_CASE("Unit_hipTextureObj3DCheckModes") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   int device = 0;
   hipDeviceProp_t props;
   HIPCHECK(hipGetDeviceProperties(&props, device));

projects/hip-tests/catch/unit/texture/hipTextureObjFetchVector.cc

@@ -131,11 +131,6 @@ template <typename T> bool runTest() {
 TEST_CASE("Unit_hipTextureFetch_vector") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   // test for char
   runTest<char1>();
   runTest<char2>();

projects/hip-tests/catch/unit/texture/hipTextureRef2D.cc

@@ -36,11 +36,6 @@ __global__ void tex2DKernel(float* outputData, int width) {
 TEST_CASE("Unit_hipTextureRef2D_Check") {
   CHECK_IMAGE_SUPPORT
 
-#if __HIP_NO_IMAGE_SUPPORT
-  HipTest::HIP_SKIP_TEST("__HIP_NO_IMAGE_SUPPORT is set");
-  return;
-#endif
-
   constexpr int SIZE = 256;
   constexpr unsigned int width = SIZE;
   constexpr unsigned int height = SIZE;

projects/hip-tests/catch/unit/texture/tex1Dfetch.cc

@@ -90,7 +90,7 @@ TEMPLATE_TEST_CASE("Unit_tex1Dfetch_Positive_ReadModeElementType", "", char, uns
 
   for (auto i = 0u; i < out_alloc_h.size(); ++i) {
     const auto ref_val = tex_h[i];
-    if (out_alloc_h[i] != ref_val) {
+    if (!(out_alloc_h[i] == ref_val)) {
       INFO("Index: " << i);
       REQUIRE(false);
     }
@@ -154,7 +154,7 @@ TEMPLATE_TEST_CASE("Unit_tex1Dfetch_Positive_ReadModeNormalizedFloat", "", char,
 
   for (auto i = 0u; i < out_alloc_h.size(); ++i) {
     const auto ref_val = Vec4Map(tex_h[i]);
-    if (out_alloc_h[i] != ref_val) {
+    if (!(out_alloc_h[i] == ref_val)) {
       INFO("Index: " << i);
       REQUIRE(false);
     }

projects/hip-tests/samples/2_Cookbook/11_texture_driver/tex2dKernel.cpp

@@ -23,7 +23,7 @@ THE SOFTWARE.
 
 extern "C" __global__ void tex2dKernelChar(char* outputData, hipTextureObject_t texObj, int width,
                                            int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   outputData[y * width + x] = tex2D<char>(texObj, x, y);
@@ -32,7 +32,7 @@ extern "C" __global__ void tex2dKernelChar(char* outputData, hipTextureObject_t
 
 extern "C" __global__ void tex2dKernelShort(short* outputData, hipTextureObject_t texObj, int width,
                                             int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   outputData[y * width + x] = tex2D<short>(texObj, x, y);
@@ -41,7 +41,7 @@ extern "C" __global__ void tex2dKernelShort(short* outputData, hipTextureObject_
 
 extern "C" __global__ void tex2dKernelInt(int* outputData, hipTextureObject_t texObj, int width,
                                           int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   outputData[y * width + x] = tex2D<int>(texObj, x, y);
@@ -50,7 +50,7 @@ extern "C" __global__ void tex2dKernelInt(int* outputData, hipTextureObject_t te
 
 extern "C" __global__ void tex2dKernelFloat(float* outputData, hipTextureObject_t texObj, int width,
                                             int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   outputData[y * width + x] = tex2D<float>(texObj, x, y);
@@ -59,7 +59,7 @@ extern "C" __global__ void tex2dKernelFloat(float* outputData, hipTextureObject_
 
 extern "C" __global__ void tex2dKernelChar4(char4* outputData, hipTextureObject_t texObj, int width,
                                             int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   outputData[y * width + x] = tex2D<char4>(texObj, x, y);
@@ -68,7 +68,7 @@ extern "C" __global__ void tex2dKernelChar4(char4* outputData, hipTextureObject_
 
 extern "C" __global__ void tex2dKernelShort4(short4* outputData, hipTextureObject_t texObj,
                                              int width, int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   outputData[y * width + x] = tex2D<short4>(texObj, x, y);
@@ -77,7 +77,7 @@ extern "C" __global__ void tex2dKernelShort4(short4* outputData, hipTextureObjec
 
 extern "C" __global__ void tex2dKernelInt4(int4* outputData, hipTextureObject_t texObj, int width,
                                            int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   outputData[y * width + x] = tex2D<int4>(texObj, x, y);
@@ -86,7 +86,7 @@ extern "C" __global__ void tex2dKernelInt4(int4* outputData, hipTextureObject_t
 
 extern "C" __global__ void tex2dKernelFloat4(float4* outputData, hipTextureObject_t texObj,
                                              int width, int height) {
-#if !defined(__HIP_NO_IMAGE_SUPPORT) || !__HIP_NO_IMAGE_SUPPORT
+#if !__HIP_NO_IMAGE_SUPPORT
   int x = blockIdx.x * blockDim.x + threadIdx.x;
   int y = blockIdx.y * blockDim.y + threadIdx.y;
   outputData[y * width + x] = tex2D<float4>(texObj, x, y);