@@ -45,6 +45,13 @@ extern GFXCORE_FAMILY renderCoreFamily;
4545#define TGLLP_TYPED_TEST (method )
4646#define TGLLP_SUPPORTED_TEST (cmdSetBase ) false
4747#endif
48+ #ifdef TESTS_XE_HP_CORE
49+ #define XEHP_TYPED_TEST (method ) method<typename NEO::GfxFamilyMapper<IGFX_XE_HP_CORE>::GfxFamily>();
50+ #define XEHP_SUPPORTED_TEST (cmdSetBase ) NEO::GfxFamilyMapper<IGFX_XE_HP_CORE>::GfxFamily::supportsCmdSet(cmdSetBase)
51+ #else
52+ #define XEHP_TYPED_TEST (method )
53+ #define XEHP_SUPPORTED_TEST (cmdSetBase ) false
54+ #endif
4855
4956#define FAMILY_SELECTOR (family, methodName ) \
5057 switch (family) { \
@@ -60,6 +67,9 @@ extern GFXCORE_FAMILY renderCoreFamily;
6067 case IGFX_GEN12LP_CORE: \
6168 TGLLP_TYPED_TEST (methodName) \
6269 break ; \
70+ case IGFX_XE_HP_CORE: \
71+ XEHP_TYPED_TEST (methodName) \
72+ break ; \
6373 default : \
6474 ASSERT_TRUE ((false && " Unknown hardware family" )); \
6575 break ; \
@@ -346,6 +356,9 @@ extern GFXCORE_FAMILY renderCoreFamily;
346356 case IGFX_GEN12LP_CORE: \
347357 supported = TGLLP_SUPPORTED_TEST (cmdSetBase); \
348358 break ; \
359+ case IGFX_XE_HP_CORE: \
360+ supported = XEHP_SUPPORTED_TEST (cmdSetBase); \
361+ break ; \
349362 default : \
350363 ASSERT_TRUE ((false && " Unknown hardware family" )); \
351364 break ; \
@@ -779,6 +792,10 @@ extern GFXCORE_FAMILY renderCoreFamily;
779792#define GEN12LPTEST_F (test_fixture, test_name ) GENTEST_F(IGFX_GEN12LP_CORE, test_fixture, test_name)
780793#define GEN12LPTEST_P (test_fixture, test_name ) GENTEST_P(IGFX_GEN12LP_CORE, test_fixture, test_name)
781794#endif
795+ #ifdef TESTS_XE_HP_CORE
796+ #define XE_HP_CORE_TEST_F (test_fixture, test_name ) GENTEST_F(IGFX_XE_HP_CORE, test_fixture, test_name)
797+ #define XE_HP_CORE_TEST_P (test_fixture, test_name ) GENTEST_P(IGFX_XE_HP_CORE, test_fixture, test_name)
798+ #endif
782799#ifdef TESTS_GEN8
783800#define BDWTEST_F (test_fixture, test_name ) \
784801 FAMILYTEST_TEST_ (test_fixture, test_name, test_fixture, \
@@ -909,6 +926,16 @@ extern GFXCORE_FAMILY renderCoreFamily;
909926 IGFX_GEN12LP_CORE, \
910927 IGFX_ALDERLAKE_S)
911928#endif
929+ #ifdef TESTS_XEHP
930+ #define XEHPTEST_F (test_fixture, test_name ) \
931+ FAMILYTEST_TEST_ (test_fixture, test_name, test_fixture, \
932+ ::testing::internal::GetTypeId<test_fixture>(), \
933+ IGFX_XE_HP_CORE, IGFX_XE_HP_SDV)
934+ #define XEHPTEST_P (test_suite_name, test_name ) \
935+ FAMILYTEST_TEST_P (test_suite_name, test_name, \
936+ IGFX_XE_HP_CORE, \
937+ IGFX_XE_HP_SDV)
938+ #endif
912939#define HWTEST_TYPED_TEST (CaseName, TestName ) \
913940 CHECK_TEST_NAME_LENGTH (CaseName, TestName) \
914941 template <typename gtest_TypeParam_> \
@@ -1068,13 +1095,16 @@ using IsGen9 = IsGfxCore<IGFX_GEN9_CORE>;
10681095using IsGen11HP = IsGfxCore<IGFX_GEN11_CORE>;
10691096using IsGen11LP = IsGfxCore<IGFX_GEN11LP_CORE>;
10701097using IsGen12LP = IsGfxCore<IGFX_GEN12LP_CORE>;
1098+ using IsXeHpCore = IsGfxCore<IGFX_XE_HP_CORE>;
10711099
10721100using IsAtMostGen11 = IsAtMostGfxCore<IGFX_GEN11LP_CORE>;
10731101
10741102using IsAtMostGen12lp = IsAtMostGfxCore<IGFX_GEN12LP_CORE>;
10751103
10761104using IsAtLeastGen12lp = IsAtLeastGfxCore<IGFX_GEN12LP_CORE>;
10771105
1106+ using IsAtLeastXeHpCore = IsAtLeastGfxCore<IGFX_XE_HP_CORE>;
1107+
10781108using IsADLS = IsProduct<IGFX_ALDERLAKE_S>;
10791109using IsBXT = IsProduct<IGFX_BROXTON>;
10801110using IsCFL = IsProduct<IGFX_COFFEELAKE>;
@@ -1087,3 +1117,4 @@ using IsLKF = IsProduct<IGFX_LAKEFIELD>;
10871117using IsSKL = IsProduct<IGFX_SKYLAKE>;
10881118using IsTGLLP = IsProduct<IGFX_TIGERLAKE_LP>;
10891119using IsRKL = IsProduct<IGFX_ROCKETLAKE>;
1120+ using IsXEHP = IsProduct<IGFX_XE_HP_SDV>;
0 commit comments