Enable gen specific test excludes

smorek-intel · Compute-Runtime-Automation · commit 038da95cf4b8 · 2021-07-05T20:12:42.000+02:00
Resolves: NEO-6007


Signed-off-by: Szymon Morek &lt;szymon.morek@intel.com&gt;
diff --git a/level_zero/core/test/unit_tests/sources/event/test_event.cpp b/level_zero/core/test/unit_tests/sources/event/test_event.cpp
@@ -676,8 +676,7 @@ HWCMDTEST_F(IGFX_GEN9_CORE, TimestampEventCreate, givenEventTimestampsWhenQueryK
     EXPECT_EQ(data.globalEnd, result.global.kernelEnd);
 }
 
-HWTEST_EXCLUDE_PRODUCT(TimestampEventCreate, givenEventTimestampsWhenQueryKernelTimestampThenCorrectDataAreSet, IGFX_TIGERLAKE_LP);
-HWTEST_EXCLUDE_PRODUCT(TimestampEventCreate, givenEventTimestampsWhenQueryKernelTimestampThenCorrectDataAreSet, IGFX_DG1);
+HWTEST_EXCLUDE_PRODUCT(TimestampEventCreate, givenEventTimestampsWhenQueryKernelTimestampThenCorrectDataAreSet, IGFX_GEN12LP_CORE);
 
 TEST_F(TimestampEventCreate, givenEventWhenQueryKernelTimestampThenNotReadyReturned) {
     struct MockEventQuery : public EventImp<uint32_t> {
diff --git a/opencl/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp b/opencl/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp
@@ -64,4 +64,4 @@ EHLTEST_F(EhlHwInfo, givenBoolWhenCallEhlHardwareInfoSetupThenFeatureTableAndWor
     }
 }
 
-HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ELKHARTLAKE);
+HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ELKHARTLAKE);
diff --git a/opencl/test/unit_test/gen12lp/CMakeLists.txt b/opencl/test/unit_test/gen12lp/CMakeLists.txt
@@ -5,7 +5,13 @@
 #
 
 if(TESTS_GEN12LP)
+  set(IGDRCL_SRCS_tests_gen12lp_excludes
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_gen12lp.cpp
+  )
+  set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen12lp_excludes})
+
   set(IGDRCL_SRCS_tests_gen12lp
+      ${IGDRCL_SRCS_tests_gen12lp_excludes}
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_tests_gen12lp.inl
       ${CMAKE_CURRENT_SOURCE_DIR}/buffer_tests_gen12lp.inl
diff --git a/opencl/test/unit_test/gen12lp/adls/CMakeLists.txt b/opencl/test/unit_test/gen12lp/adls/CMakeLists.txt
@@ -5,10 +5,15 @@
 #
 
 if(TESTS_ADLS)
+  set(IGDRCL_SRCS_tests_gen12lp_adls_excludes
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_adls.cpp
+  )
+  set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen12lp_adls_excludes})
+
   set(IGDRCL_SRCS_tests_gen12lp_adls
+      ${IGDRCL_SRCS_tests_gen12lp_adls_excludes}
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_adls.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_adls.cpp
   )
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen12lp_adls})
   add_subdirectories()
diff --git a/opencl/test/unit_test/gen12lp/adls/excludes_adls.cpp b/opencl/test/unit_test/gen12lp/adls/excludes_adls.cpp
@@ -7,24 +7,4 @@
 
 #include "test.h"
 
-namespace NEO {
-HWTEST_EXCLUDE_PRODUCT(ProfilingTests, GivenCommandQueueBlockedWithProfilingWhenWalkerIsDispatchedThenMiStoreRegisterMemIsPresentInCS, IGFX_ALDERLAKE_S);
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingTests, GivenCommandQueueWithProflingWhenWalkerIsDispatchedThenMiStoreRegisterMemIsPresentInCS, IGFX_ALDERLAKE_S);
-
-HWTEST_EXCLUDE_PRODUCT(EventProfilingTest, givenEventWhenCompleteIsZeroThenCalcProfilingDataSetsEndTimestampInCompleteTimestampAndDoesntCallOsTimeMethods, IGFX_ALDERLAKE_S);
-
-HWTEST_EXCLUDE_PRODUCT(EventProfilingTests, givenRawTimestampsDebugModeWhenDataIsQueriedThenRawDataIsReturned, IGFX_ALDERLAKE_S);
-
-HWTEST_EXCLUDE_PRODUCT(EventProfilingTest, givenRawTimestampsDebugModeWhenStartTimeStampLTQueueTimeStampThenIncreaseStartTimeStamp, IGFX_ALDERLAKE_S);
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingWithPerfCountersTests, GivenCommandQueueWithProfilingPerfCountersWhenWalkerIsDispatchedThenRegisterStoresArePresentInCS, IGFX_ALDERLAKE_S);
-
-HWTEST_EXCLUDE_PRODUCT(TimestampEventCreate, givenEventTimestampsWhenQueryKernelTimestampThenCorrectDataAreSet, IGFX_ALDERLAKE_S);
-} // namespace NEO
-
 HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ALDERLAKE_S);
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingCommandsTest, givenKernelWhenProfilingCommandStartIsTakenThenTimeStampAddressIsProgrammedCorrectly, IGFX_ALDERLAKE_S);
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingCommandsTest, givenKernelWhenProfilingCommandStartIsNotTakenThenTimeStampAddressIsProgrammedCorrectly, IGFX_ALDERLAKE_S);
diff --git a/opencl/test/unit_test/gen12lp/dg1/CMakeLists.txt b/opencl/test/unit_test/gen12lp/dg1/CMakeLists.txt
@@ -1,17 +1,22 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(TESTS_DG1)
+  set(IGDRCL_SRCS_tests_gen12lp_dg1_excludes
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_dg1.cpp
+  )
+  set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen12lp_dg1_excludes})
+
   set(IGDRCL_SRCS_tests_dg1
+      ${IGDRCL_SRCS_tests_gen12lp_dg1_excludes}
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_dg1.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_tests_dg1.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_dg1.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_dg1.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_dg1.cpp
   )
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_dg1})
   add_subdirectories()
diff --git a/opencl/test/unit_test/gen12lp/dg1/excludes_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/excludes_dg1.cpp
@@ -7,26 +7,5 @@
 
 #include "test.h"
 
-namespace NEO {
-HWTEST_EXCLUDE_PRODUCT(ProfilingTests, GivenCommandQueueBlockedWithProfilingWhenWalkerIsDispatchedThenMiStoreRegisterMemIsPresentInCS, IGFX_DG1);
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingTests, GivenCommandQueueWithProflingWhenWalkerIsDispatchedThenMiStoreRegisterMemIsPresentInCS, IGFX_DG1);
-
-HWTEST_EXCLUDE_PRODUCT(EventProfilingTest, givenEventWhenCompleteIsZeroThenCalcProfilingDataSetsEndTimestampInCompleteTimestampAndDoesntCallOsTimeMethods, IGFX_DG1);
-
-HWTEST_EXCLUDE_PRODUCT(EventProfilingTests, givenRawTimestampsDebugModeWhenDataIsQueriedThenRawDataIsReturned, IGFX_DG1);
-
-HWTEST_EXCLUDE_PRODUCT(EventProfilingTest, givenRawTimestampsDebugModeWhenStartTimeStampLTQueueTimeStampThenIncreaseStartTimeStamp, IGFX_DG1);
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingWithPerfCountersTests, GivenCommandQueueWithProfilingPerfCountersWhenWalkerIsDispatchedThenRegisterStoresArePresentInCS, IGFX_DG1);
-
-HWTEST_EXCLUDE_PRODUCT(TimestampEventCreate, givenEventTimestampsWhenQueryKernelTimestampThenCorrectDataAreSet, IGFX_DG1);
-} // namespace NEO
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingCommandsTest, givenKernelWhenProfilingCommandStartIsTakenThenTimeStampAddressIsProgrammedCorrectly, IGFX_DG1);
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingCommandsTest, givenKernelWhenProfilingCommandStartIsNotTakenThenTimeStampAddressIsProgrammedCorrectly, IGFX_DG1);
-
 HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_DG1)
-
 HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_DG1);
diff --git a/opencl/test/unit_test/gen12lp/excludes_gen12lp.cpp b/opencl/test/unit_test/gen12lp/excludes_gen12lp.cpp
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2021 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "test.h"
+
+HWTEST_EXCLUDE_PRODUCT(ProfilingTests, GivenCommandQueueBlockedWithProfilingWhenWalkerIsDispatchedThenMiStoreRegisterMemIsPresentInCS, IGFX_GEN12LP_CORE);
+HWTEST_EXCLUDE_PRODUCT(ProfilingTests, GivenCommandQueueWithProflingWhenWalkerIsDispatchedThenMiStoreRegisterMemIsPresentInCS, IGFX_GEN12LP_CORE);
+HWTEST_EXCLUDE_PRODUCT(EventProfilingTest, givenEventWhenCompleteIsZeroThenCalcProfilingDataSetsEndTimestampInCompleteTimestampAndDoesntCallOsTimeMethods, IGFX_GEN12LP_CORE);
+HWTEST_EXCLUDE_PRODUCT(EventProfilingTests, givenRawTimestampsDebugModeWhenDataIsQueriedThenRawDataIsReturned, IGFX_GEN12LP_CORE);
+HWTEST_EXCLUDE_PRODUCT(EventProfilingTest, givenRawTimestampsDebugModeWhenStartTimeStampLTQueueTimeStampThenIncreaseStartTimeStamp, IGFX_GEN12LP_CORE);
+HWTEST_EXCLUDE_PRODUCT(ProfilingWithPerfCountersTests, GivenCommandQueueWithProfilingPerfCountersWhenWalkerIsDispatchedThenRegisterStoresArePresentInCS, IGFX_GEN12LP_CORE);
+HWTEST_EXCLUDE_PRODUCT(ProfilingCommandsTest, givenKernelWhenProfilingCommandStartIsTakenThenTimeStampAddressIsProgrammedCorrectly, IGFX_GEN12LP_CORE);
+HWTEST_EXCLUDE_PRODUCT(ProfilingCommandsTest, givenKernelWhenProfilingCommandStartIsNotTakenThenTimeStampAddressIsProgrammedCorrectly, IGFX_GEN12LP_CORE);
diff --git a/opencl/test/unit_test/gen12lp/rkl/CMakeLists.txt b/opencl/test/unit_test/gen12lp/rkl/CMakeLists.txt
@@ -5,10 +5,15 @@
 #
 
 if(TESTS_RKL)
+  set(IGDRCL_SRCS_tests_gen12lp_rkl_excludes
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_rkl.cpp
+  )
+  set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen12lp_rkl_excludes})
+
   set(IGDRCL_SRCS_tests_gen12lp_rkl
+      ${IGDRCL_SRCS_tests_gen12lp_rkl_excludes}
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_helper_rkl.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_rkl.cpp
   )
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen12lp_rkl})
   add_subdirectories()
diff --git a/opencl/test/unit_test/gen12lp/rkl/excludes_rkl.cpp b/opencl/test/unit_test/gen12lp/rkl/excludes_rkl.cpp
@@ -7,28 +7,6 @@
 
 #include "test.h"
 
-namespace NEO {
-HWTEST_EXCLUDE_PRODUCT(ProfilingTests, GivenCommandQueueBlockedWithProfilingWhenWalkerIsDispatchedThenMiStoreRegisterMemIsPresentInCS, IGFX_ROCKETLAKE);
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingTests, GivenCommandQueueWithProflingWhenWalkerIsDispatchedThenMiStoreRegisterMemIsPresentInCS, IGFX_ROCKETLAKE);
-
-HWTEST_EXCLUDE_PRODUCT(EventProfilingTest, givenEventWhenCompleteIsZeroThenCalcProfilingDataSetsEndTimestampInCompleteTimestampAndDoesntCallOsTimeMethods, IGFX_ROCKETLAKE);
-
-HWTEST_EXCLUDE_PRODUCT(EventProfilingTests, givenRawTimestampsDebugModeWhenDataIsQueriedThenRawDataIsReturned, IGFX_ROCKETLAKE);
-
-HWTEST_EXCLUDE_PRODUCT(EventProfilingTest, givenRawTimestampsDebugModeWhenStartTimeStampLTQueueTimeStampThenIncreaseStartTimeStamp, IGFX_ROCKETLAKE);
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingWithPerfCountersTests, GivenCommandQueueWithProfilingPerfCountersWhenWalkerIsDispatchedThenRegisterStoresArePresentInCS, IGFX_ROCKETLAKE);
-
-HWTEST_EXCLUDE_PRODUCT(TimestampEventCreate, givenEventTimestampsWhenQueryKernelTimestampThenCorrectDataAreSet, IGFX_ROCKETLAKE);
-} // namespace NEO
-
 HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ROCKETLAKE);
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingCommandsTest, givenKernelWhenProfilingCommandStartIsTakenThenTimeStampAddressIsProgrammedCorrectly, IGFX_ROCKETLAKE);
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingCommandsTest, givenKernelWhenProfilingCommandStartIsNotTakenThenTimeStampAddressIsProgrammedCorrectly, IGFX_ROCKETLAKE);
-
 HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_ROCKETLAKE)
-
-HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_ROCKETLAKE);
+HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_ROCKETLAKE);
diff --git a/opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt b/opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt
@@ -1,16 +1,21 @@
 #
-# Copyright (C) 2019-2020 Intel Corporation
+# Copyright (C) 2019-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(TESTS_TGLLP)
+  set(IGDRCL_SRCS_tests_gen12lp_tgllp_excludes
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_tgllp.cpp
+  )
+  set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen12lp_tgllp_excludes})
+
   set(IGDRCL_SRCS_tests_gen12lp_tgllp
+      ${IGDRCL_SRCS_tests_gen12lp_tgllp_excludes}
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/kernel_tests_tgllp.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_helper_tgllp.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_tgllp.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_tgllp.cpp
   )
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen12lp_tgllp})
   add_subdirectories()
diff --git a/opencl/test/unit_test/gen12lp/tgllp/excludes_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/excludes_tgllp.cpp
@@ -7,26 +7,5 @@
 
 #include "test.h"
 
-namespace NEO {
-HWTEST_EXCLUDE_PRODUCT(ProfilingTests, GivenCommandQueueBlockedWithProfilingWhenWalkerIsDispatchedThenMiStoreRegisterMemIsPresentInCS, IGFX_TIGERLAKE_LP);
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingTests, GivenCommandQueueWithProflingWhenWalkerIsDispatchedThenMiStoreRegisterMemIsPresentInCS, IGFX_TIGERLAKE_LP);
-
-HWTEST_EXCLUDE_PRODUCT(EventProfilingTest, givenEventWhenCompleteIsZeroThenCalcProfilingDataSetsEndTimestampInCompleteTimestampAndDoesntCallOsTimeMethods, IGFX_TIGERLAKE_LP);
-
-HWTEST_EXCLUDE_PRODUCT(EventProfilingTests, givenRawTimestampsDebugModeWhenDataIsQueriedThenRawDataIsReturned, IGFX_TIGERLAKE_LP);
-
-HWTEST_EXCLUDE_PRODUCT(EventProfilingTest, givenRawTimestampsDebugModeWhenStartTimeStampLTQueueTimeStampThenIncreaseStartTimeStamp, IGFX_TIGERLAKE_LP);
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingWithPerfCountersTests, GivenCommandQueueWithProfilingPerfCountersWhenWalkerIsDispatchedThenRegisterStoresArePresentInCS, IGFX_TIGERLAKE_LP);
-
-HWTEST_EXCLUDE_PRODUCT(TimestampEventCreate, givenEventTimestampsWhenQueryKernelTimestampThenCorrectDataAreSet, IGFX_TIGERLAKE_LP);
-} // namespace NEO
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingCommandsTest, givenKernelWhenProfilingCommandStartIsTakenThenTimeStampAddressIsProgrammedCorrectly, IGFX_TIGERLAKE_LP);
-
-HWTEST_EXCLUDE_PRODUCT(ProfilingCommandsTest, givenKernelWhenProfilingCommandStartIsNotTakenThenTimeStampAddressIsProgrammedCorrectly, IGFX_TIGERLAKE_LP);
-
 HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_TIGERLAKE_LP)
-
 HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_TIGERLAKE_LP);
diff --git a/shared/test/common/test_macros/header/test.h b/shared/test/common/test_macros/header/test.h
@@ -92,7 +92,7 @@ extern GFXCORE_FAMILY renderCoreFamily;
     } test_suite_name##test_name##_PLATFORM_EXCLUDES_EXCLUDE_##family##_init;
 
 #define IS_TEST_EXCLUDED(test_suite_name, test_name) \
-    NEO::TestExcludes::isTestExcluded(#test_suite_name #test_name, ::productFamily)
+    NEO::TestExcludes::isTestExcluded(#test_suite_name #test_name, ::productFamily, ::renderCoreFamily)
 
 #ifdef TEST_F
 #undef TEST_F
diff --git a/shared/test/common/test_macros/test_excludes.cpp b/shared/test/common/test_macros/test_excludes.cpp
@@ -16,22 +16,34 @@
 
 using namespace NEO;
 
-static std::unique_ptr<std::map<std::string, std::unordered_set<uint32_t>>> pExcludesPerTest;
+static std::unique_ptr<std::map<std::string, std::unordered_set<uint32_t>>> pProductExcludesPerTest;
+static std::unique_ptr<std::map<std::string, std::unordered_set<uint32_t>>> pGfxExcludesPerTest;
 
-bool TestExcludes::isTestExcluded(const char *testName, const uint32_t product) {
+bool isExcluded(const char *testName, const uint32_t family, std::unique_ptr<std::map<std::string, std::unordered_set<uint32_t>>> &pExcludesPerTest) {
     if ((pExcludesPerTest == nullptr) || pExcludesPerTest->count(testName) == 0) {
         return false;
     }
-    return (pExcludesPerTest->at(testName).count(product) > 0);
+    return (pExcludesPerTest->at(testName).count(family) > 0);
 }
 
-void TestExcludes::addTestExclude(const char *testName, const uint32_t product) {
+void addExclude(const char *testName, const uint32_t family, std::unique_ptr<std::map<std::string, std::unordered_set<uint32_t>>> &pExcludesPerTest) {
     if (pExcludesPerTest == nullptr) {
         pExcludesPerTest = std::make_unique<std::map<std::string, std::unordered_set<uint32_t>>>();
     }
     if (pExcludesPerTest->count(testName) == 0) {
         pExcludesPerTest->insert(std::make_pair(testName, std::unordered_set<uint32_t>{}));
     }
-    DEBUG_BREAK_IF(pExcludesPerTest->at(testName).count(product) != 0);
-    pExcludesPerTest->at(testName).insert(product);
+    pExcludesPerTest->at(testName).insert(family);
+}
+
+bool TestExcludes::isTestExcluded(const char *testName, const PRODUCT_FAMILY productFamily, const GFXCORE_FAMILY gfxFamily) {
+    return (isExcluded(testName, productFamily, pProductExcludesPerTest) || isExcluded(testName, gfxFamily, pGfxExcludesPerTest));
+}
+
+void TestExcludes::addTestExclude(const char *testName, const PRODUCT_FAMILY family) {
+    addExclude(testName, family, pProductExcludesPerTest);
+}
+
+void TestExcludes::addTestExclude(const char *testName, const GFXCORE_FAMILY family) {
+    addExclude(testName, family, pGfxExcludesPerTest);
 }
diff --git a/shared/test/common/test_macros/test_excludes.h b/shared/test/common/test_macros/test_excludes.h
@@ -6,14 +6,15 @@
  */
 
 #pragma once
+#include "igfxfmid.h"
 
 #include <cstdint>
 
 namespace NEO {
 namespace TestExcludes {
 
-bool isTestExcluded(const char *testName, const uint32_t product);
-void addTestExclude(const char *testName, const uint32_t product);
-
+bool isTestExcluded(const char *testName, const PRODUCT_FAMILY productFamily, const GFXCORE_FAMILY gfxFamily);
+void addTestExclude(const char *testName, const PRODUCT_FAMILY family);
+void addTestExclude(const char *testName, const GFXCORE_FAMILY family);
 } // namespace TestExcludes
 } // namespace NEO

Original file line number	Diff line number	Diff line change
`@@ -676,8 +676,7 @@ HWCMDTEST_F(IGFX_GEN9_CORE, TimestampEventCreate, givenEventTimestampsWhenQueryK`
`676`	`676`	`EXPECT_EQ(data.globalEnd, result.global.kernelEnd);`
`677`	`677`	`}`
`678`	`678`
`679`		`-HWTEST_EXCLUDE_PRODUCT(TimestampEventCreate, givenEventTimestampsWhenQueryKernelTimestampThenCorrectDataAreSet, IGFX_TIGERLAKE_LP);`
`680`		`-HWTEST_EXCLUDE_PRODUCT(TimestampEventCreate, givenEventTimestampsWhenQueryKernelTimestampThenCorrectDataAreSet, IGFX_DG1);`
	`679`	`+HWTEST_EXCLUDE_PRODUCT(TimestampEventCreate, givenEventTimestampsWhenQueryKernelTimestampThenCorrectDataAreSet, IGFX_GEN12LP_CORE);`
`681`	`680`
`682`	`681`	`TEST_F(TimestampEventCreate, givenEventWhenQueryKernelTimestampThenNotReadyReturned) {`
`683`	`682`	`struct MockEventQuery : public EventImp<uint32_t> {`
Original file line number	Diff line number	Diff line change
`@@ -64,4 +64,4 @@ EHLTEST_F(EhlHwInfo, givenBoolWhenCallEhlHardwareInfoSetupThenFeatureTableAndWor`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`-HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ELKHARTLAKE);`
	`67`	`+HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ELKHARTLAKE);`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,22 @@`
`1`	`1`	`#`
`2`		`-# Copyright (C) 2020 Intel Corporation`
	`2`	`+# Copyright (C) 2020-2021 Intel Corporation`
`3`	`3`	`#`
`4`	`4`	`# SPDX-License-Identifier: MIT`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`if(TESTS_DG1)`
	`8`	`+ set(IGDRCL_SRCS_tests_gen12lp_dg1_excludes`
	`9`	`+ ${CMAKE_CURRENT_SOURCE_DIR}/excludes_dg1.cpp`
	`10`	`+ )`
	`11`	`+ set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen12lp_dg1_excludes})`
	`12`	`+`
`8`	`13`	`set(IGDRCL_SRCS_tests_dg1`
	`14`	`+ ${IGDRCL_SRCS_tests_gen12lp_dg1_excludes}`
`9`	`15`	`${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt`
`10`	`16`	`${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_dg1.cpp`
`11`	`17`	`${CMAKE_CURRENT_SOURCE_DIR}/hw_info_tests_dg1.cpp`
`12`	`18`	`${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_dg1.cpp`
`13`	`19`	`${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_dg1.cpp`
`14`		`- ${CMAKE_CURRENT_SOURCE_DIR}/excludes_dg1.cpp`
`15`	`20`	`)`
`16`	`21`	`target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_dg1})`
`17`	`22`	`add_subdirectories()`