SWDEV-479138 - Enable different address modes

Enable different address modes in tests

Change-Id: Idf69477718172614ba9c349735d3230ae765923b


[ROCm/hip-tests commit: 58d4bd27a3]

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

@@ -56,10 +56,6 @@ TEMPLATE_TEST_CASE("Unit_tex2D_Positive_ReadModeElementType", "", char, unsigned
   params.extent = make_hipExtent(16, 4, 0);
   params.num_subdivisions = 4;
   params.GenerateTextureDesc();
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1]) {
-    INFO("Different address modes on X, Y aren't supported. Skipped.");
-    return;
-  }
 
   TextureTestFixture<TestType> fixture{params};
 
@@ -127,10 +123,6 @@ TEMPLATE_TEST_CASE("Unit_tex2D_Positive_ReadModeNormalizedFloat", "", char, unsi
   params.extent = make_hipExtent(16, 4, 0);
   params.num_subdivisions = 4;
   params.GenerateTextureDesc(hipReadModeNormalizedFloat);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1]) {
-    INFO("Different address modes on X, Y aren't supported. Skipped.");
-    return;
-  }
 
   TextureTestFixture<TestType, true> fixture{params};
 

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

@@ -56,10 +56,7 @@ TEMPLATE_TEST_CASE("Unit_tex2DGrad_Positive_ReadModeElementType", "", char, unsi
   params.extent = make_hipExtent(16, 4, 0);
   params.num_subdivisions = 4;
   params.GenerateTextureDesc();
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1]) {
-    INFO("Different address modes on X, Y aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, false, false> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(32, params.NumItersX());
@@ -127,10 +124,7 @@ TEMPLATE_TEST_CASE("Unit_tex2DGrad_Positive_ReadModeNormalizedFloat", "", char,
   params.extent = make_hipExtent(16, 4, 0);
   params.num_subdivisions = 4;
   params.GenerateTextureDesc(hipReadModeNormalizedFloat);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1]) {
-    INFO("Different address modes on X, Y aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, true, false> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(32, params.NumItersX());

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

@@ -57,10 +57,7 @@ TEMPLATE_TEST_CASE("Unit_tex2DLayered_Positive_ReadModeElementType", "", char, u
   params.layers = 2;
   params.num_subdivisions = 4;
   params.GenerateTextureDesc();
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1]) {
-    INFO("Different address modes on X, Y aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(32, params.NumItersX());
@@ -132,10 +129,7 @@ TEMPLATE_TEST_CASE("Unit_tex2DLayered_Positive_ReadModeNormalizedFloat", "", cha
   params.layers = 2;
   params.num_subdivisions = 4;
   params.GenerateTextureDesc(hipReadModeNormalizedFloat);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1]) {
-    INFO("Different address modes on X, Y aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(32, params.NumItersX());

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

@@ -57,10 +57,7 @@ TEMPLATE_TEST_CASE("Unit_tex2DLayeredGrad_Positive_ReadModeElementType", "", cha
   params.layers = 2;
   params.num_subdivisions = 4;
   params.GenerateTextureDesc();
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1]) {
-    INFO("Different address modes on X, Y aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, false, false> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(32, params.NumItersX());
@@ -132,10 +129,7 @@ TEMPLATE_TEST_CASE("Unit_tex2DLayeredGrad_Positive_ReadModeNormalizedFloat", "",
   params.layers = 2;
   params.num_subdivisions = 4;
   params.GenerateTextureDesc(hipReadModeNormalizedFloat);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1]) {
-    INFO("Different address modes on X, Y aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, true, false> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(32, params.NumItersX());

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

@@ -57,10 +57,7 @@ TEMPLATE_TEST_CASE("Unit_tex2DLayeredLod_Positive_ReadModeElementType", "", char
   params.layers = 2;
   params.num_subdivisions = 4;
   params.GenerateTextureDesc(hipReadModeElementType, true);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1]) {
-    INFO("Different address modes on X, Y aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, false, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(32, params.NumItersX());
@@ -132,10 +129,7 @@ TEMPLATE_TEST_CASE("Unit_tex2DLayeredLod_Positive_ReadModeNormalizedFloat", "",
   params.layers = 2;
   params.num_subdivisions = 4;
   params.GenerateTextureDesc(hipReadModeNormalizedFloat, true);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1]) {
-    INFO("Different address modes on X, Y aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, true, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(32, params.NumItersX());

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

@@ -56,10 +56,7 @@ TEMPLATE_TEST_CASE("Unit_tex2DLod_Positive_ReadModeElementType", "", char, unsig
   params.extent = make_hipExtent(16, 4, 0);
   params.num_subdivisions = 4;
   params.GenerateTextureDesc(hipReadModeElementType, true);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1]) {
-    INFO("Different address modes on X, Y aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, false, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(32, params.NumItersX());
@@ -127,10 +124,7 @@ TEMPLATE_TEST_CASE("Unit_tex2DLod_Positive_ReadModeNormalizedFloat", "", char, u
   params.extent = make_hipExtent(16, 4, 0);
   params.num_subdivisions = 4;
   params.GenerateTextureDesc(hipReadModeNormalizedFloat, true);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1]) {
-    INFO("Different address modes on X, Y aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, true, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(32, params.NumItersX());

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

@@ -56,10 +56,7 @@ TEMPLATE_TEST_CASE("Unit_tex2Dgather_Positive_ReadModeElementType", "", char, un
   params.extent = make_hipExtent(16, 4, 0);
   params.num_subdivisions = 4;
   params.GenerateTextureDesc();
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1]) {
-    INFO("Different address modes on X, Y aren't supported. Skipped.");
-    return;
-  }
+
   if (params.tex_desc.filterMode == hipFilterModeLinear) return;
   TextureTestFixture<TestType> fixture{params};
 

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

@@ -58,11 +58,7 @@ TEMPLATE_TEST_CASE("Unit_tex3D_Positive_ReadModeElementType", "", char, unsigned
   params.extent = make_hipExtent(2, 4, 2);
   params.num_subdivisions = 2;
   params.GenerateTextureDesc();
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());
@@ -139,11 +135,7 @@ TEMPLATE_TEST_CASE("Unit_tex3D_Positive_ReadModeNormalizedFloat", "", char, unsi
   params.extent = make_hipExtent(2, 2, 2);
   params.num_subdivisions = 2;
   params.GenerateTextureDesc(hipReadModeNormalizedFloat);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());

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

@@ -56,11 +56,7 @@ TEMPLATE_TEST_CASE("Unit_tex3DGrad_Positive_ReadModeElementType", "", char, unsi
   params.extent = make_hipExtent(2, 2, 2);
   params.num_subdivisions = 2;
   params.GenerateTextureDesc();
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, false, false> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());
@@ -137,11 +133,7 @@ TEMPLATE_TEST_CASE("Unit_tex3DGrad_Positive_ReadModeNormalizedFloat", "", char,
   params.extent = make_hipExtent(2, 2, 2);
   params.num_subdivisions = 2;
   params.GenerateTextureDesc(hipReadModeNormalizedFloat);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, true, false> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());

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

@@ -56,11 +56,7 @@ TEMPLATE_TEST_CASE("Unit_tex3DLod_Positive_ReadModeElementType", "", char, unsig
   params.extent = make_hipExtent(2, 2, 2);
   params.num_subdivisions = 2;
   params.GenerateTextureDesc(hipReadModeElementType, true);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, false, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());
@@ -137,11 +133,7 @@ TEMPLATE_TEST_CASE("Unit_tex3DLod_Positive_ReadModeNormalizedFloat", "", char, u
   params.extent = make_hipExtent(2, 2, 2);
   params.num_subdivisions = 2;
   params.GenerateTextureDesc(hipReadModeNormalizedFloat, true);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, true, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());

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

@@ -58,11 +58,7 @@ TEMPLATE_TEST_CASE("Unit_texCubemap_Positive_ReadModeElementType", "", char, uns
   params.num_subdivisions = 4;
   params.cubemap = true;
   params.GenerateTextureDesc();
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());
@@ -145,11 +141,7 @@ TEMPLATE_TEST_CASE("Unit_texCubemap_Positive_ReadModeNormalizedFloat", "", char,
   params.num_subdivisions = 4;
   params.cubemap = true;
   params.GenerateTextureDesc(hipReadModeNormalizedFloat);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());

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

@@ -58,11 +58,7 @@ TEMPLATE_TEST_CASE("Unit_texCubemapGrad_Positive_ReadModeElementType", "", char,
   params.num_subdivisions = 4;
   params.cubemap = true;
   params.GenerateTextureDesc();
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, false, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());
@@ -145,11 +141,7 @@ TEMPLATE_TEST_CASE("Unit_texCubemapGrad_Positive_ReadModeNormalizedFloat", "", c
   params.num_subdivisions = 4;
   params.cubemap = true;
   params.GenerateTextureDesc(hipReadModeNormalizedFloat);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, true, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());

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

@@ -59,11 +59,7 @@ TEMPLATE_TEST_CASE("Unit_texCubemapLayered_Positive_ReadModeElementType", "", ch
   params.layers = 1;
   params.cubemap = true;
   params.GenerateTextureDesc();
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());
@@ -149,11 +145,7 @@ TEMPLATE_TEST_CASE("Unit_texCubemapLayered_Positive_ReadModeNormalizedFloat", ""
   params.layers = 1;
   params.cubemap = true;
   params.GenerateTextureDesc(hipReadModeNormalizedFloat);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());

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

@@ -59,11 +59,7 @@ TEMPLATE_TEST_CASE("Unit_texCubemapLayeredGrad_Positive_ReadModeElementType", ""
   params.layers = 1;
   params.cubemap = true;
   params.GenerateTextureDesc();
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, false, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());
@@ -150,11 +146,7 @@ TEMPLATE_TEST_CASE("Unit_texCubemapLayeredGrad_Positive_ReadModeNormalizedFloat"
   params.layers = 1;
   params.cubemap = true;
   params.GenerateTextureDesc(hipReadModeNormalizedFloat);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, true, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());

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

@@ -59,11 +59,7 @@ TEMPLATE_TEST_CASE("Unit_texCubemapLayeredLod_Positive_ReadModeElementType", "",
   params.layers = 1;
   params.cubemap = true;
   params.GenerateTextureDesc(hipReadModeElementType, true);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, false, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());
@@ -150,11 +146,7 @@ TEMPLATE_TEST_CASE("Unit_texCubemapLayeredLod_Positive_ReadModeNormalizedFloat",
   params.layers = 1;
   params.cubemap = true;
   params.GenerateTextureDesc(hipReadModeNormalizedFloat);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, true, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());

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

@@ -58,11 +58,7 @@ TEMPLATE_TEST_CASE("Unit_texCubemapLod_Positive_ReadModeElementType", "", char,
   params.num_subdivisions = 4;
   params.cubemap = true;
   params.GenerateTextureDesc(hipReadModeElementType, true);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, false, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());
@@ -146,11 +142,7 @@ TEMPLATE_TEST_CASE("Unit_texCubemapLod_Positive_ReadModeNormalizedFloat", "", ch
   params.num_subdivisions = 4;
   params.cubemap = true;
   params.GenerateTextureDesc(hipReadModeNormalizedFloat);
-  if (params.tex_desc.addressMode[0] != params.tex_desc.addressMode[1] ||
-      params.tex_desc.addressMode[0] != params.tex_desc.addressMode[2]) {
-    INFO("Different address modes on X, Y, Z aren't supported. Skipped.");
-    return;
-  }
+
   TextureTestFixture<TestType, true, true> fixture{params};
 
   const auto [num_threads_x, num_blocks_x] = GetLaunchConfig(10, params.NumItersX());