Skip to content

Commit 5700619

Browse files
JablonskiMateuszCompute-Runtime-Automation
JablonskiMateusz
authored and
Compute-Runtime-Automation
committed
Refactor test.h header
move platform/core specific definitions to separated files Signed-off-by: Mateusz Jablonski <[email protected]>
1 parent 80ed37f commit 5700619

File tree

6 files changed

+1250
-1189
lines changed

6 files changed

+1250
-1189
lines changed

‎shared/test/common/test_macros/header/common_matchers.h‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/*
2+
* Copyright (C) 2021 Intel Corporation
3+
*
4+
* SPDX-License-Identifier: MIT
5+
*
6+
*/
7+
8+
#pragma once
9+
10+
using IsGen8 = IsGfxCore<IGFX_GEN8_CORE>;
11+
using IsGen9 = IsGfxCore<IGFX_GEN9_CORE>;
12+
using IsGen11HP = IsGfxCore<IGFX_GEN11_CORE>;
13+
using IsGen11LP = IsGfxCore<IGFX_GEN11LP_CORE>;
14+
using IsGen12LP = IsGfxCore<IGFX_GEN12LP_CORE>;
15+
using IsXeHpCore = IsGfxCore<IGFX_XE_HP_CORE>;
16+
using IsXeHpgCore = IsGfxCore<IGFX_XE_HPG_CORE>;
17+
using IsXeHpcCore = IsGfxCore<IGFX_XE_HPC_CORE>;
18+
19+
using IsAtMostGen11 = IsAtMostGfxCore<IGFX_GEN11LP_CORE>;
20+
21+
using IsAtMostGen12lp = IsAtMostGfxCore<IGFX_GEN12LP_CORE>;
22+
23+
using IsAtLeastGen12lp = IsAtLeastGfxCore<IGFX_GEN12LP_CORE>;
24+
25+
using IsWithinXeGfxFamily = IsWithinGfxCore<IGFX_XE_HP_CORE, IGFX_XE_HPC_CORE>;
26+
27+
using IsAtLeastXeHpCore = IsAtLeastGfxCore<IGFX_XE_HP_CORE>;
28+
using IsAtMostXeHpCore = IsAtMostGfxCore<IGFX_XE_HP_CORE>;
29+
30+
using IsAtLeastXeHpgCore = IsAtLeastGfxCore<IGFX_XE_HPG_CORE>;
31+
using IsAtMostXeHpgCore = IsAtMostGfxCore<IGFX_XE_HPG_CORE>;
32+
33+
using IsAtLeastXeHpcCore = IsAtLeastGfxCore<IGFX_XE_HPC_CORE>;
34+
35+
using IsSKL = IsProduct<IGFX_SKYLAKE>;
36+
using IsKBL = IsProduct<IGFX_KABYLAKE>;
37+
using IsCFL = IsProduct<IGFX_COFFEELAKE>;
38+
39+
using IsBXT = IsProduct<IGFX_BROXTON>;
40+
using IsGLK = IsProduct<IGFX_GEMINILAKE>;
41+
42+
using IsICLLP = IsProduct<IGFX_ICELAKE_LP>;
43+
using IsEHL = IsProduct<IGFX_ELKHARTLAKE>;
44+
using IsLKF = IsProduct<IGFX_LAKEFIELD>;
45+
46+
using IsTGLLP = IsProduct<IGFX_TIGERLAKE_LP>;
47+
using IsDG1 = IsProduct<IGFX_DG1>;
48+
using IsADLS = IsProduct<IGFX_ALDERLAKE_S>;
49+
using IsADLP = IsProduct<IGFX_ALDERLAKE_P>;
50+
using IsRKL = IsProduct<IGFX_ROCKETLAKE>;
51+
52+
using IsXEHP = IsProduct<IGFX_XE_HP_SDV>;
53+
54+
using IsDG2 = IsProduct<IGFX_DG2>;
55+
56+
using IsPVC = IsProduct<IGFX_PVC>;

‎shared/test/common/test_macros/header/per_product_test_definitions.h‎

Lines changed: 214 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
1+
/*
2+
* Copyright (C) 2021 Intel Corporation
3+
*
4+
* SPDX-License-Identifier: MIT
5+
*
6+
*/
7+
8+
#pragma once
9+
10+
#ifdef TESTS_GEN8
11+
#define GEN8TEST_F(test_fixture, test_name) GENTEST_F(IGFX_GEN8_CORE, test_fixture, test_name)
12+
#define GEN8TEST_P(test_fixture, test_name) GENTEST_P(IGFX_GEN8_CORE, test_fixture, test_name)
13+
#endif
14+
#ifdef TESTS_GEN9
15+
#define GEN9TEST_F(test_fixture, test_name) GENTEST_F(IGFX_GEN9_CORE, test_fixture, test_name)
16+
#define GEN9TEST_P(test_fixture, test_name) GENTEST_P(IGFX_GEN9_CORE, test_fixture, test_name)
17+
#endif
18+
#ifdef TESTS_GEN11
19+
#define GEN11TEST_F(test_fixture, test_name) GENTEST_F(IGFX_GEN11_CORE, test_fixture, test_name)
20+
#define GEN11TEST_P(test_fixture, test_name) GENTEST_P(IGFX_GEN11_CORE, test_fixture, test_name)
21+
#endif
22+
#ifdef TESTS_XE_HP_CORE
23+
#define XE_HP_CORE_TEST_F(test_fixture, test_name) GENTEST_F(IGFX_XE_HP_CORE, test_fixture, test_name)
24+
#define XE_HP_CORE_TEST_P(test_fixture, test_name) GENTEST_P(IGFX_XE_HP_CORE, test_fixture, test_name)
25+
#endif
26+
#ifdef TESTS_XE_HPG_CORE
27+
#define XE_HPG_CORETEST_F(test_fixture, test_name) GENTEST_F(IGFX_XE_HPG_CORE, test_fixture, test_name)
28+
#define XE_HPG_CORETEST_P(test_fixture, test_name) GENTEST_P(IGFX_XE_HPG_CORE, test_fixture, test_name)
29+
#endif
30+
#ifdef TESTS_XE_HPC_CORE
31+
#define XE_HPC_CORETEST_F(test_fixture, test_name) GENTEST_F(IGFX_XE_HPC_CORE, test_fixture, test_name)
32+
#define XE_HPC_CORETEST_P(test_fixture, test_name) GENTEST_P(IGFX_XE_HPC_CORE, test_fixture, test_name)
33+
#endif
34+
#ifdef TESTS_GEN12LP
35+
#define GEN12LPTEST_F(test_fixture, test_name) GENTEST_F(IGFX_GEN12LP_CORE, test_fixture, test_name)
36+
#define GEN12LPTEST_P(test_fixture, test_name) GENTEST_P(IGFX_GEN12LP_CORE, test_fixture, test_name)
37+
#endif
38+
#ifdef TESTS_GEN8
39+
#define BDWTEST_F(test_fixture, test_name) \
40+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
41+
::testing::internal::GetTypeId<test_fixture>(), \
42+
IGFX_GEN8_CORE, IGFX_BROADWELL)
43+
#define BDWTEST_P(test_suite_name, test_name) \
44+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
45+
IGFX_GEN8_CORE, \
46+
IGFX_BROADWELL)
47+
#endif
48+
49+
#ifdef TESTS_SKL
50+
#define SKLTEST_F(test_fixture, test_name) \
51+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
52+
::testing::internal::GetTypeId<test_fixture>(), \
53+
IGFX_GEN9_CORE, IGFX_SKYLAKE)
54+
#define SKLTEST_P(test_suite_name, test_name) \
55+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
56+
IGFX_GEN9_CORE, \
57+
IGFX_SKYLAKE)
58+
#endif
59+
#ifdef TESTS_KBL
60+
#define KBLTEST_F(test_fixture, test_name) \
61+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
62+
::testing::internal::GetTypeId<test_fixture>(), \
63+
IGFX_GEN9_CORE, IGFX_KABYLAKE)
64+
#define KBLTEST_P(test_suite_name, test_name) \
65+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
66+
IGFX_GEN9_CORE, \
67+
IGFX_KABYLAKE)
68+
#endif
69+
#ifdef TESTS_CFL
70+
#define CFLTEST_F(test_fixture, test_name) \
71+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
72+
::testing::internal::GetTypeId<test_fixture>(), \
73+
IGFX_GEN9_CORE, IGFX_COFFEELAKE)
74+
#define CFLTEST_P(test_suite_name, test_name) \
75+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
76+
IGFX_GEN9_CORE, \
77+
IGFX_COFFEELAKE)
78+
#endif
79+
80+
#ifdef TESTS_GLK
81+
#define GLKTEST_F(test_fixture, test_name) \
82+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
83+
::testing::internal::GetTypeId<test_fixture>(), \
84+
IGFX_GEN9_CORE, IGFX_GEMINILAKE)
85+
#define GLKTEST_P(test_suite_name, test_name) \
86+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
87+
IGFX_GEN9_CORE, \
88+
IGFX_GEMINILAKE)
89+
#endif
90+
#ifdef TESTS_BXT
91+
#define BXTTEST_F(test_fixture, test_name) \
92+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
93+
::testing::internal::GetTypeId<test_fixture>(), \
94+
IGFX_GEN9_CORE, IGFX_BROXTON)
95+
#define BXTTEST_P(test_suite_name, test_name) \
96+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
97+
IGFX_GEN9_CORE, \
98+
IGFX_BROXTON)
99+
#endif
100+
101+
#ifdef TESTS_ICLLP
102+
#define ICLLPTEST_F(test_fixture, test_name) \
103+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
104+
::testing::internal::GetTypeId<test_fixture>(), \
105+
IGFX_GEN11_CORE, IGFX_ICELAKE_LP)
106+
#define ICLLPTEST_P(test_suite_name, test_name) \
107+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
108+
IGFX_GEN11_CORE, \
109+
IGFX_ICELAKE_LP)
110+
#endif
111+
#ifdef TESTS_LKF
112+
#define LKFTEST_F(test_fixture, test_name) \
113+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
114+
::testing::internal::GetTypeId<test_fixture>(), \
115+
IGFX_GEN11_CORE, IGFX_LAKEFIELD)
116+
#define LKFTEST_P(test_suite_name, test_name) \
117+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
118+
IGFX_GEN11_CORE, \
119+
IGFX_LAKEFIELD)
120+
#endif
121+
#ifdef TESTS_EHL
122+
#define EHLTEST_F(test_fixture, test_name) \
123+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
124+
::testing::internal::GetTypeId<test_fixture>(), \
125+
IGFX_GEN11_CORE, IGFX_ELKHARTLAKE)
126+
#define EHLTEST_P(test_suite_name, test_name) \
127+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
128+
IGFX_GEN11_CORE, \
129+
IGFX_ELKHARTLAKE)
130+
#endif
131+
132+
#ifdef TESTS_TGLLP
133+
#define TGLLPTEST_F(test_fixture, test_name) \
134+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
135+
::testing::internal::GetTypeId<test_fixture>(), \
136+
IGFX_GEN12LP_CORE, IGFX_TIGERLAKE_LP)
137+
#define TGLLPTEST_P(test_suite_name, test_name) \
138+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
139+
IGFX_GEN12LP_CORE, \
140+
IGFX_TIGERLAKE_LP)
141+
#endif
142+
#ifdef TESTS_DG1
143+
#define DG1TEST_F(test_fixture, test_name) \
144+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
145+
::testing::internal::GetTypeId<test_fixture>(), \
146+
IGFX_GEN12LP_CORE, IGFX_DG1)
147+
#define DG1TEST_P(test_suite_name, test_name) \
148+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
149+
IGFX_GEN12LP_CORE, \
150+
IGFX_DG1)
151+
#endif
152+
#ifdef TESTS_RKL
153+
#define RKLTEST_F(test_fixture, test_name) \
154+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
155+
::testing::internal::GetTypeId<test_fixture>(), \
156+
IGFX_GEN12LP_CORE, IGFX_ROCKETLAKE)
157+
#define RKLTEST_P(test_suite_name, test_name) \
158+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
159+
IGFX_GEN12LP_CORE, \
160+
IGFX_ROCKETLAKE)
161+
#endif
162+
#ifdef TESTS_ADLS
163+
#define ADLSTEST_F(test_fixture, test_name) \
164+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
165+
::testing::internal::GetTypeId<test_fixture>(), \
166+
IGFX_GEN12LP_CORE, IGFX_ALDERLAKE_S)
167+
#define ADLSTEST_P(test_suite_name, test_name) \
168+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
169+
IGFX_GEN12LP_CORE, \
170+
IGFX_ALDERLAKE_S)
171+
#endif
172+
#ifdef TESTS_ADLP
173+
#define ADLPTEST_F(test_fixture, test_name) \
174+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
175+
::testing::internal::GetTypeId<test_fixture>(), \
176+
IGFX_GEN12LP_CORE, IGFX_ALDERLAKE_P)
177+
#define ADLPTEST_P(test_suite_name, test_name) \
178+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
179+
IGFX_GEN12LP_CORE, \
180+
IGFX_ALDERLAKE_P)
181+
#endif
182+
183+
#ifdef TESTS_XE_HP_SDV
184+
#define XEHPTEST_F(test_fixture, test_name) \
185+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
186+
::testing::internal::GetTypeId<test_fixture>(), \
187+
IGFX_XE_HP_CORE, IGFX_XE_HP_SDV)
188+
#define XEHPTEST_P(test_suite_name, test_name) \
189+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
190+
IGFX_XE_HP_CORE, \
191+
IGFX_XE_HP_SDV)
192+
#endif
193+
194+
#ifdef TESTS_DG2
195+
#define DG2TEST_F(test_fixture, test_name) \
196+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
197+
::testing::internal::GetTypeId<test_fixture>(), \
198+
IGFX_XE_HPG_CORE, IGFX_DG2)
199+
#define DG2TEST_P(test_suite_name, test_name) \
200+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
201+
IGFX_XE_HPG_CORE, \
202+
IGFX_DG2)
203+
#endif
204+
205+
#ifdef TESTS_PVC
206+
#define PVCTEST_F(test_fixture, test_name) \
207+
FAMILYTEST_TEST_(test_fixture, test_name, test_fixture, \
208+
::testing::internal::GetTypeId<test_fixture>(), \
209+
IGFX_XE_HPC_CORE, IGFX_PVC)
210+
#define PVCTEST_P(test_suite_name, test_name) \
211+
FAMILYTEST_TEST_P(test_suite_name, test_name, \
212+
IGFX_XE_HPC_CORE, \
213+
IGFX_PVC)
214+
#endif

‎shared/test/common/test_macros/header/per_product_test_selector.h‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
/*
2+
* Copyright (C) 2021 Intel Corporation
3+
*
4+
* SPDX-License-Identifier: MIT
5+
*
6+
*/
7+
8+
#pragma once
9+
10+
#include "shared/test/common/test_macros/header/per_product_test_selector_definitions.h"
11+
12+
#define FAMILY_SELECTOR(family, methodName) \
13+
switch (family) { \
14+
case IGFX_GEN8_CORE: \
15+
BDW_TYPED_TEST(methodName) \
16+
break; \
17+
case IGFX_GEN9_CORE: \
18+
SKL_TYPED_TEST(methodName) \
19+
break; \
20+
case IGFX_GEN11_CORE: \
21+
ICL_TYPED_TEST(methodName) \
22+
break; \
23+
case IGFX_GEN12LP_CORE: \
24+
TGLLP_TYPED_TEST(methodName) \
25+
break; \
26+
case IGFX_XE_HP_CORE: \
27+
XEHP_TYPED_TEST(methodName) \
28+
break; \
29+
case IGFX_XE_HPG_CORE: \
30+
XEHPG_TYPED_TEST(methodName) \
31+
break; \
32+
case IGFX_XE_HPC_CORE: \
33+
PVC_TYPED_TEST(methodName) \
34+
break; \
35+
default: \
36+
ASSERT_TRUE((false && "Unknown hardware family")); \
37+
break; \
38+
}
39+
40+
#define CALL_IF_SUPPORTED(cmdSetBase, expression) \
41+
{ \
42+
bool supported = false; \
43+
switch (::renderCoreFamily) { \
44+
case IGFX_GEN8_CORE: \
45+
supported = BDW_SUPPORTED_TEST(cmdSetBase); \
46+
break; \
47+
case IGFX_GEN9_CORE: \
48+
supported = SKL_SUPPORTED_TEST(cmdSetBase); \
49+
break; \
50+
case IGFX_GEN11_CORE: \
51+
supported = ICL_SUPPORTED_TEST(cmdSetBase); \
52+
break; \
53+
case IGFX_GEN12LP_CORE: \
54+
supported = TGLLP_SUPPORTED_TEST(cmdSetBase); \
55+
break; \
56+
case IGFX_XE_HP_CORE: \
57+
supported = XEHP_SUPPORTED_TEST(cmdSetBase); \
58+
break; \
59+
case IGFX_XE_HPG_CORE: \
60+
supported = XEHPG_SUPPORTED_TEST(cmdSetBase); \
61+
break; \
62+
case IGFX_XE_HPC_CORE: \
63+
supported = PVC_SUPPORTED_TEST(cmdSetBase); \
64+
break; \
65+
default: \
66+
ASSERT_TRUE((false && "Unknown hardware family")); \
67+
break; \
68+
} \
69+
if (supported) { \
70+
expression; \
71+
} \
72+
}

0 commit comments

Comments
 (0)