@@ -45,6 +45,13 @@ extern GFXCORE_FAMILY renderCoreFamily;
45
45
#define TGLLP_TYPED_TEST (method )
46
46
#define TGLLP_SUPPORTED_TEST (cmdSetBase ) false
47
47
#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
48
55
49
56
#define FAMILY_SELECTOR (family, methodName ) \
50
57
switch (family) { \
@@ -60,6 +67,9 @@ extern GFXCORE_FAMILY renderCoreFamily;
60
67
case IGFX_GEN12LP_CORE: \
61
68
TGLLP_TYPED_TEST (methodName) \
62
69
break ; \
70
+ case IGFX_XE_HP_CORE: \
71
+ XEHP_TYPED_TEST (methodName) \
72
+ break ; \
63
73
default : \
64
74
ASSERT_TRUE ((false && " Unknown hardware family" )); \
65
75
break ; \
@@ -346,6 +356,9 @@ extern GFXCORE_FAMILY renderCoreFamily;
346
356
case IGFX_GEN12LP_CORE: \
347
357
supported = TGLLP_SUPPORTED_TEST (cmdSetBase); \
348
358
break ; \
359
+ case IGFX_XE_HP_CORE: \
360
+ supported = XEHP_SUPPORTED_TEST (cmdSetBase); \
361
+ break ; \
349
362
default : \
350
363
ASSERT_TRUE ((false && " Unknown hardware family" )); \
351
364
break ; \
@@ -779,6 +792,10 @@ extern GFXCORE_FAMILY renderCoreFamily;
779
792
#define GEN12LPTEST_F (test_fixture, test_name ) GENTEST_F(IGFX_GEN12LP_CORE, test_fixture, test_name)
780
793
#define GEN12LPTEST_P (test_fixture, test_name ) GENTEST_P(IGFX_GEN12LP_CORE, test_fixture, test_name)
781
794
#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
782
799
#ifdef TESTS_GEN8
783
800
#define BDWTEST_F (test_fixture, test_name ) \
784
801
FAMILYTEST_TEST_ (test_fixture, test_name, test_fixture, \
@@ -909,6 +926,16 @@ extern GFXCORE_FAMILY renderCoreFamily;
909
926
IGFX_GEN12LP_CORE, \
910
927
IGFX_ALDERLAKE_S)
911
928
#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
912
939
#define HWTEST_TYPED_TEST (CaseName, TestName ) \
913
940
CHECK_TEST_NAME_LENGTH (CaseName, TestName) \
914
941
template <typename gtest_TypeParam_> \
@@ -1068,13 +1095,16 @@ using IsGen9 = IsGfxCore<IGFX_GEN9_CORE>;
1068
1095
using IsGen11HP = IsGfxCore<IGFX_GEN11_CORE>;
1069
1096
using IsGen11LP = IsGfxCore<IGFX_GEN11LP_CORE>;
1070
1097
using IsGen12LP = IsGfxCore<IGFX_GEN12LP_CORE>;
1098
+ using IsXeHpCore = IsGfxCore<IGFX_XE_HP_CORE>;
1071
1099
1072
1100
using IsAtMostGen11 = IsAtMostGfxCore<IGFX_GEN11LP_CORE>;
1073
1101
1074
1102
using IsAtMostGen12lp = IsAtMostGfxCore<IGFX_GEN12LP_CORE>;
1075
1103
1076
1104
using IsAtLeastGen12lp = IsAtLeastGfxCore<IGFX_GEN12LP_CORE>;
1077
1105
1106
+ using IsAtLeastXeHpCore = IsAtLeastGfxCore<IGFX_XE_HP_CORE>;
1107
+
1078
1108
using IsADLS = IsProduct<IGFX_ALDERLAKE_S>;
1079
1109
using IsBXT = IsProduct<IGFX_BROXTON>;
1080
1110
using IsCFL = IsProduct<IGFX_COFFEELAKE>;
@@ -1087,3 +1117,4 @@ using IsLKF = IsProduct<IGFX_LAKEFIELD>;
1087
1117
using IsSKL = IsProduct<IGFX_SKYLAKE>;
1088
1118
using IsTGLLP = IsProduct<IGFX_TIGERLAKE_LP>;
1089
1119
using IsRKL = IsProduct<IGFX_ROCKETLAKE>;
1120
+ using IsXEHP = IsProduct<IGFX_XE_HP_SDV>;
0 commit comments