test: move image support matcher and unify

damian-tomczak-intel · Compute-Runtime-Automation · commit 135f21557437 · 2025-11-12T10:15:31.000+01:00
Related-to: NEO-16156

Signed-off-by: Damian Tomczak &lt;damian.tomczak@intel.com&gt;
diff --git a/level_zero/core/test/unit_tests/sources/image/test_image.cpp b/level_zero/core/test/unit_tests/sources/image/test_image.cpp
@@ -1783,13 +1783,6 @@ HWTEST_F(ImageCreate, WhenImageViewCreateExtThenSuccessIsReturned) {
     zeImageDestroy(planeY);
 }
 
-struct ImageSupport {
-    template <PRODUCT_FAMILY productFamily>
-    static constexpr bool isMatched() {
-        return productFamily >= IGFX_SKYLAKE && NEO::HwMapper<productFamily>::GfxProduct::supportsSampler;
-    }
-};
-
 HWTEST2_F(ImageCreate, GivenNonBindlessImageWhenGettingDeviceOffsetThenErrorIsReturned, ImageSupport) {
     const size_t width = 32;
     const size_t height = 32;
diff --git a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp
@@ -513,13 +513,6 @@ TEST_F(KernelImpSetGroupSizeTest, givenValidGroupSizeWhenSetMultipleTimesThenSet
 
 using SetKernelArg = Test<ModuleFixture>;
 
-struct ImageSupport {
-    template <PRODUCT_FAMILY productFamily>
-    static constexpr bool isMatched() {
-        return productFamily >= IGFX_SKYLAKE && NEO::HwMapper<productFamily>::GfxProduct::supportsSampler;
-    }
-};
-
 HWTEST2_F(SetKernelArg, givenImageAndKernelWhenSetArgImageThenCrossThreadDataIsSet, ImageSupport) {
     createKernel();
 
diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp
@@ -168,7 +168,7 @@ struct AUBCopyImage
 
 using AUBCopyImageCCS = AUBCopyImage<false>;
 
-HWTEST2_P(AUBCopyImageCCS, WhenCopyingThenExpectationsMet, ImagesSupportedMatcher) {
+HWTEST2_P(AUBCopyImageCCS, WhenCopyingThenExpectationsMet, ImageSupport) {
     runAubTest<FamilyType>();
 }
 
@@ -182,7 +182,7 @@ INSTANTIATE_TEST_SUITE_P(AUBCopyImage_simple,
 
 using AUBCopyImageBCS = AUBCopyImage<true>;
 
-HWTEST2_P(AUBCopyImageBCS, WhenCopyingWithBlitterEnabledThenExpectationsMet, ImagesSupportedMatcher) {
+HWTEST2_P(AUBCopyImageBCS, WhenCopyingWithBlitterEnabledThenExpectationsMet, ImageSupport) {
     runAubTest<FamilyType>();
     ASSERT_EQ(pCmdQ->peekLatestSentEnqueueOperation(), EnqueueProperties::Operation::blit);
 }
diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp
@@ -292,7 +292,7 @@ struct AUBReadImage
 
 using AUBReadImageCCS = AUBReadImage<false>;
 
-HWTEST2_F(AUBReadImageCCS, GivenMisalignedHostPtrWhenReadingImageThenExpectationsAreMet, ImagesSupportedMatcher) {
+HWTEST2_F(AUBReadImageCCS, GivenMisalignedHostPtrWhenReadingImageThenExpectationsAreMet, ImageSupport) {
     const std::vector<size_t> pixelSizes = {1, 2, 4};
     const std::vector<size_t> offsets = {0, 4, 8, 12};
     const std::vector<size_t> sizes = {3, 2, 1};
@@ -306,7 +306,7 @@ HWTEST2_F(AUBReadImageCCS, GivenMisalignedHostPtrWhenReadingImageThenExpectation
     }
 }
 
-HWTEST2_P(AUBReadImageCCS, GivenUnalignedMemoryWhenReadingImageThenExpectationsAreMet, ImagesSupportedMatcher) {
+HWTEST2_P(AUBReadImageCCS, GivenUnalignedMemoryWhenReadingImageThenExpectationsAreMet, ImageSupport) {
     testReadImageUnaligned<FamilyType>();
 }
 
@@ -321,7 +321,7 @@ INSTANTIATE_TEST_SUITE_P(
 
 using AUBReadImageBCS = AUBReadImage<true>;
 
-HWTEST2_F(AUBReadImageBCS, GivenMisalignedHostPtrWhenReadingImageWithBlitterEnabledThenExpectationsAreMet, ImagesSupportedMatcher) {
+HWTEST2_F(AUBReadImageBCS, GivenMisalignedHostPtrWhenReadingImageWithBlitterEnabledThenExpectationsAreMet, ImageSupport) {
     const std::vector<size_t> pixelSizes = {1, 2, 4};
     const std::vector<size_t> offsets = {0, 4, 8, 12};
     const std::vector<size_t> sizes = {3, 2, 1};
@@ -336,7 +336,7 @@ HWTEST2_F(AUBReadImageBCS, GivenMisalignedHostPtrWhenReadingImageWithBlitterEnab
     }
 }
 
-HWTEST2_P(AUBReadImageBCS, GivenUnalignedMemoryWhenReadingImageWithBlitterEnabledThenExpectationsAreMet, ImagesSupportedMatcher) {
+HWTEST2_P(AUBReadImageBCS, GivenUnalignedMemoryWhenReadingImageWithBlitterEnabledThenExpectationsAreMet, ImageSupport) {
 
     auto &productHelper = pCmdQ->getDevice().getProductHelper();
     if (std::get<2>(GetParam()).imageType == CL_MEM_OBJECT_IMAGE3D &&
diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp
@@ -290,7 +290,7 @@ struct AUBWriteImage
 
 using AUBWriteImageCCS = AUBWriteImage<false>;
 
-HWTEST2_F(AUBWriteImageCCS, GivenMisalignedHostPtrWhenWritingImageThenExpectationsAreMet, ImagesSupportedMatcher) {
+HWTEST2_F(AUBWriteImageCCS, GivenMisalignedHostPtrWhenWritingImageThenExpectationsAreMet, ImageSupport) {
     const std::vector<size_t> pixelSizes = {1, 2, 4};
     const std::vector<size_t> offsets = {0, 4, 8, 12};
     const std::vector<size_t> sizes = {3, 2, 1};
@@ -304,7 +304,7 @@ HWTEST2_F(AUBWriteImageCCS, GivenMisalignedHostPtrWhenWritingImageThenExpectatio
     }
 }
 
-HWTEST2_P(AUBWriteImageCCS, GivenUnalignedMemoryWhenWritingImageThenExpectationsAreMet, ImagesSupportedMatcher) {
+HWTEST2_P(AUBWriteImageCCS, GivenUnalignedMemoryWhenWritingImageThenExpectationsAreMet, ImageSupport) {
     testWriteImageUnaligned<FamilyType>();
 }
 
@@ -319,7 +319,7 @@ INSTANTIATE_TEST_SUITE_P(AUBWriteImage_simple, AUBWriteImageCCS,
 
 using AUBWriteImageBCS = AUBWriteImage<true>;
 
-HWTEST2_F(AUBWriteImageBCS, GivenMisalignedHostPtrWhenWritingImageWithBlitterEnabledThenExpectationsAreMet, ImagesSupportedMatcher) {
+HWTEST2_F(AUBWriteImageBCS, GivenMisalignedHostPtrWhenWritingImageWithBlitterEnabledThenExpectationsAreMet, ImageSupport) {
     const std::vector<size_t> pixelSizes = {1, 2, 4};
     const std::vector<size_t> offsets = {0, 4, 8, 12};
     const std::vector<size_t> sizes = {3, 2, 1};
@@ -334,7 +334,7 @@ HWTEST2_F(AUBWriteImageBCS, GivenMisalignedHostPtrWhenWritingImageWithBlitterEna
     }
 }
 
-HWTEST2_P(AUBWriteImageBCS, GivenUnalignedMemoryWhenWritingImageWithBlitterEnabledThenExpectationsAreMet, ImagesSupportedMatcher) {
+HWTEST2_P(AUBWriteImageBCS, GivenUnalignedMemoryWhenWritingImageWithBlitterEnabledThenExpectationsAreMet, ImageSupport) {
     auto &productHelper = pCmdQ->getDevice().getProductHelper();
     if (std::get<2>(GetParam()).imageType == CL_MEM_OBJECT_IMAGE3D &&
         !(productHelper.isTile64With3DSurfaceOnBCSSupported(*defaultHwInfo))) {
diff --git a/opencl/test/unit_test/aub_tests/fixtures/image_aub_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/image_aub_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,13 +14,6 @@
 
 #include "test_traits_common.h"
 
-struct ImagesSupportedMatcher {
-    template <PRODUCT_FAMILY productFamily>
-    static constexpr bool isMatched() {
-        return TestTraits<NEO::ToGfxCoreFamily<productFamily>::get()>::imagesSupported;
-    }
-};
-
 namespace NEO {
 struct ImageAubFixture : public AUBCommandStreamFixture {
     typedef AUBCommandStreamFixture CommandStreamFixture;
diff --git a/shared/test/common/test_macros/header/common_matchers.h b/shared/test/common/test_macros/header/common_matchers.h
@@ -263,3 +263,10 @@ struct HeaplessSupport {
         }
     }
 };
+
+struct ImageSupport {
+    template <PRODUCT_FAMILY productFamily>
+    static constexpr bool isMatched() {
+        return TestTraits<NEO::ToGfxCoreFamily<productFamily>::get()>::imagesSupported;
+    }
+};

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ struct AUBCopyImage`
`168`	`168`
`169`	`169`	`using AUBCopyImageCCS = AUBCopyImage<false>;`
`170`	`170`
`171`		`-HWTEST2_P(AUBCopyImageCCS, WhenCopyingThenExpectationsMet, ImagesSupportedMatcher) {`
	`171`	`+HWTEST2_P(AUBCopyImageCCS, WhenCopyingThenExpectationsMet, ImageSupport) {`
`172`	`172`	`runAubTest<FamilyType>();`
`173`	`173`	`}`
`174`	`174`
`@@ -182,7 +182,7 @@ INSTANTIATE_TEST_SUITE_P(AUBCopyImage_simple,`
`182`	`182`
`183`	`183`	`using AUBCopyImageBCS = AUBCopyImage<true>;`
`184`	`184`
`185`		`-HWTEST2_P(AUBCopyImageBCS, WhenCopyingWithBlitterEnabledThenExpectationsMet, ImagesSupportedMatcher) {`
	`185`	`+HWTEST2_P(AUBCopyImageBCS, WhenCopyingWithBlitterEnabledThenExpectationsMet, ImageSupport) {`
`186`	`186`	`runAubTest<FamilyType>();`
`187`	`187`	`ASSERT_EQ(pCmdQ->peekLatestSentEnqueueOperation(), EnqueueProperties::Operation::blit);`
`188`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ struct AUBReadImage`
`292`	`292`
`293`	`293`	`using AUBReadImageCCS = AUBReadImage<false>;`
`294`	`294`
`295`		`-HWTEST2_F(AUBReadImageCCS, GivenMisalignedHostPtrWhenReadingImageThenExpectationsAreMet, ImagesSupportedMatcher) {`
	`295`	`+HWTEST2_F(AUBReadImageCCS, GivenMisalignedHostPtrWhenReadingImageThenExpectationsAreMet, ImageSupport) {`
`296`	`296`	`const std::vector<size_t> pixelSizes = {1, 2, 4};`
`297`	`297`	`const std::vector<size_t> offsets = {0, 4, 8, 12};`
`298`	`298`	`const std::vector<size_t> sizes = {3, 2, 1};`
`@@ -306,7 +306,7 @@ HWTEST2_F(AUBReadImageCCS, GivenMisalignedHostPtrWhenReadingImageThenExpectation`
`306`	`306`	`}`
`307`	`307`	`}`
`308`	`308`
`309`		`-HWTEST2_P(AUBReadImageCCS, GivenUnalignedMemoryWhenReadingImageThenExpectationsAreMet, ImagesSupportedMatcher) {`
	`309`	`+HWTEST2_P(AUBReadImageCCS, GivenUnalignedMemoryWhenReadingImageThenExpectationsAreMet, ImageSupport) {`
`310`	`310`	`testReadImageUnaligned<FamilyType>();`
`311`	`311`	`}`
`312`	`312`
`@@ -321,7 +321,7 @@ INSTANTIATE_TEST_SUITE_P(`
`321`	`321`
`322`	`322`	`using AUBReadImageBCS = AUBReadImage<true>;`
`323`	`323`
`324`		`-HWTEST2_F(AUBReadImageBCS, GivenMisalignedHostPtrWhenReadingImageWithBlitterEnabledThenExpectationsAreMet, ImagesSupportedMatcher) {`
	`324`	`+HWTEST2_F(AUBReadImageBCS, GivenMisalignedHostPtrWhenReadingImageWithBlitterEnabledThenExpectationsAreMet, ImageSupport) {`
`325`	`325`	`const std::vector<size_t> pixelSizes = {1, 2, 4};`
`326`	`326`	`const std::vector<size_t> offsets = {0, 4, 8, 12};`
`327`	`327`	`const std::vector<size_t> sizes = {3, 2, 1};`
`@@ -336,7 +336,7 @@ HWTEST2_F(AUBReadImageBCS, GivenMisalignedHostPtrWhenReadingImageWithBlitterEnab`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`
`339`		`-HWTEST2_P(AUBReadImageBCS, GivenUnalignedMemoryWhenReadingImageWithBlitterEnabledThenExpectationsAreMet, ImagesSupportedMatcher) {`
	`339`	`+HWTEST2_P(AUBReadImageBCS, GivenUnalignedMemoryWhenReadingImageWithBlitterEnabledThenExpectationsAreMet, ImageSupport) {`
`340`	`340`
`341`	`341`	`auto &productHelper = pCmdQ->getDevice().getProductHelper();`
`342`	`342`	`if (std::get<2>(GetParam()).imageType == CL_MEM_OBJECT_IMAGE3D &&`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ struct AUBWriteImage`
`290`	`290`
`291`	`291`	`using AUBWriteImageCCS = AUBWriteImage<false>;`
`292`	`292`
`293`		`-HWTEST2_F(AUBWriteImageCCS, GivenMisalignedHostPtrWhenWritingImageThenExpectationsAreMet, ImagesSupportedMatcher) {`
	`293`	`+HWTEST2_F(AUBWriteImageCCS, GivenMisalignedHostPtrWhenWritingImageThenExpectationsAreMet, ImageSupport) {`
`294`	`294`	`const std::vector<size_t> pixelSizes = {1, 2, 4};`
`295`	`295`	`const std::vector<size_t> offsets = {0, 4, 8, 12};`
`296`	`296`	`const std::vector<size_t> sizes = {3, 2, 1};`
`@@ -304,7 +304,7 @@ HWTEST2_F(AUBWriteImageCCS, GivenMisalignedHostPtrWhenWritingImageThenExpectatio`
`304`	`304`	`}`
`305`	`305`	`}`
`306`	`306`
`307`		`-HWTEST2_P(AUBWriteImageCCS, GivenUnalignedMemoryWhenWritingImageThenExpectationsAreMet, ImagesSupportedMatcher) {`
	`307`	`+HWTEST2_P(AUBWriteImageCCS, GivenUnalignedMemoryWhenWritingImageThenExpectationsAreMet, ImageSupport) {`
`308`	`308`	`testWriteImageUnaligned<FamilyType>();`
`309`	`309`	`}`
`310`	`310`
`@@ -319,7 +319,7 @@ INSTANTIATE_TEST_SUITE_P(AUBWriteImage_simple, AUBWriteImageCCS,`
`319`	`319`
`320`	`320`	`using AUBWriteImageBCS = AUBWriteImage<true>;`
`321`	`321`
`322`		`-HWTEST2_F(AUBWriteImageBCS, GivenMisalignedHostPtrWhenWritingImageWithBlitterEnabledThenExpectationsAreMet, ImagesSupportedMatcher) {`
	`322`	`+HWTEST2_F(AUBWriteImageBCS, GivenMisalignedHostPtrWhenWritingImageWithBlitterEnabledThenExpectationsAreMet, ImageSupport) {`
`323`	`323`	`const std::vector<size_t> pixelSizes = {1, 2, 4};`
`324`	`324`	`const std::vector<size_t> offsets = {0, 4, 8, 12};`
`325`	`325`	`const std::vector<size_t> sizes = {3, 2, 1};`
`@@ -334,7 +334,7 @@ HWTEST2_F(AUBWriteImageBCS, GivenMisalignedHostPtrWhenWritingImageWithBlitterEna`
`334`	`334`	`}`
`335`	`335`	`}`
`336`	`336`
`337`		`-HWTEST2_P(AUBWriteImageBCS, GivenUnalignedMemoryWhenWritingImageWithBlitterEnabledThenExpectationsAreMet, ImagesSupportedMatcher) {`
	`337`	`+HWTEST2_P(AUBWriteImageBCS, GivenUnalignedMemoryWhenWritingImageWithBlitterEnabledThenExpectationsAreMet, ImageSupport) {`
`338`	`338`	`auto &productHelper = pCmdQ->getDevice().getProductHelper();`
`339`	`339`	`if (std::get<2>(GetParam()).imageType == CL_MEM_OBJECT_IMAGE3D &&`
`340`	`340`	`!(productHelper.isTile64With3DSurfaceOnBCSSupported(*defaultHwInfo))) {`
Original file line number	Diff line number	Diff line change
`@@ -263,3 +263,10 @@ struct HeaplessSupport {`
`263`	`263`	`}`
`264`	`264`	`}`
`265`	`265`	`};`
	`266`	`+`
	`267`	`+struct ImageSupport {`
	`268`	`+ template <PRODUCT_FAMILY productFamily>`
	`269`	`+ static constexpr bool isMatched() {`
	`270`	`+ return TestTraits<NEO::ToGfxCoreFamily<productFamily>::get()>::imagesSupported;`
	`271`	`+ }`
	`272`	`+};`