@@ -58,6 +58,34 @@ macro(GEN_CONTAINS_PLATFORMS TYPE GEN_TYPE OUT_FLAG)
5858 endif ()
5959endmacro ()
6060
61+ macro (INIT_PRODUCTS_LIST TYPE )
62+ list (APPEND ALL_${TYPE} _PRODUCT_FAMILY " " )
63+ list (APPEND ALL_${TYPE} _PRODUCT_TO_PRODUCT_FAMILY " " )
64+ endmacro ()
65+
66+ macro (ADD_PRODUCT TYPE PRODUCT ITEM)
67+ list (APPEND ALL_${TYPE} _PRODUCT_FAMILY ${ITEM} )
68+ list (APPEND ALL_${TYPE} _PRODUCT_TO_PRODUCT_FAMILY ${PRODUCT} )
69+ endmacro ()
70+
71+ macro (GET_AVAILABLE_PRODUCTS TYPE PRODUCT_FAMILY_LIST DEFAULT_PRODUCT_FAMILY)
72+ list (REMOVE_ITEM ALL_${TYPE} _PRODUCT_FAMILY " " )
73+ list (REMOVE_ITEM ALL_${TYPE} _PRODUCT_TO_PRODUCT_FAMILY " " )
74+
75+ set (${PRODUCT_FAMILY_LIST} ${ALL_${TYPE} _PRODUCT_FAMILY})
76+ set (${DEFAULT_PRODUCT_FAMILY} )
77+
78+ if (NOT "${DEFAULT_${TYPE} _PLATFORM}" STREQUAL "" )
79+ list (FIND ALL_${TYPE} _PRODUCT_TO_PRODUCT_FAMILY ${DEFAULT_${TYPE} _PLATFORM} INDEX)
80+ if (${INDEX} EQUAL -1)
81+ message (FATAL_ERROR "${DEFAULT_${TYPE} _PLATFORM} not found in product families." )
82+ endif ()
83+
84+ list (GET ALL_${TYPE} _PRODUCT_FAMILY ${INDEX} DEFAULT)
85+ set (${DEFAULT_PRODUCT_FAMILY} ${DEFAULT} )
86+ endif ()
87+ endmacro ()
88+
6189macro (GET_AVAILABLE_PLATFORMS TYPE FLAG_NAME OUT_STR)
6290 set (${TYPE} _PLATFORM_LIST)
6391 set (${TYPE} _GEN_FLAGS_DEFINITONS)
@@ -189,6 +217,7 @@ INIT_LIST("PLATFORMS" "TESTED_APPVERIFIER")
189217INIT_LIST("CONFIGURATIONS" "UNIT_TESTS" )
190218INIT_LIST("CONFIGURATIONS" "AUB_TESTS" )
191219INIT_LIST("CONFIGURATIONS" "MT_TESTS" )
220+ INIT_PRODUCTS_LIST("TESTED" )
192221
193222# Add supported and tested platforms
194223if (SUPPORT_GEN8)
@@ -204,6 +233,7 @@ if(SUPPORT_GEN8)
204233 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" "GEN8" "bdw/1/3/8" )
205234 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "MT_TESTS" "GEN8" "bdw/1/3/8" )
206235 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN8" "bdw/1/3/8" )
236+ ADD_PRODUCT("TESTED" "BDW" "IGFX_BROADWELL" )
207237 endif ()
208238 endif ()
209239endif ()
@@ -224,6 +254,7 @@ if(SUPPORT_GEN9)
224254 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" "GEN9" "skl/1/3/8" )
225255 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "MT_TESTS" "GEN9" "skl/1/3/8" )
226256 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "skl/1/3/8" )
257+ ADD_PRODUCT("TESTED" "SKL" "IGFX_SKYLAKE" )
227258 endif ()
228259 endif ()
229260
@@ -234,6 +265,7 @@ if(SUPPORT_GEN9)
234265 if (TESTS_KBL)
235266 ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "KBL" )
236267 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "kbl/1/3/6" )
268+ ADD_PRODUCT("TESTED" "KBL" "IGFX_KABYLAKE" )
237269 endif ()
238270 endif ()
239271
@@ -243,6 +275,7 @@ if(SUPPORT_GEN9)
243275 if (TESTS_GLK)
244276 ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "GLK" )
245277 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "glk/1/3/6" )
278+ ADD_PRODUCT("TESTED" "GLK" "IGFX_GEMINILAKE" )
246279 endif ()
247280 endif ()
248281
@@ -253,6 +286,7 @@ if(SUPPORT_GEN9)
253286 if (TESTS_CFL)
254287 ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "CFL" )
255288 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "cfl/1/3/6" )
289+ ADD_PRODUCT("TESTED" "CFL" "IGFX_COFFEELAKE" )
256290 endif ()
257291 endif ()
258292
@@ -263,6 +297,7 @@ if(SUPPORT_GEN9)
263297 ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "BXT" )
264298 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" "GEN9" "bxt/1/3/6" )
265299 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "bxt/1/3/6" )
300+ ADD_PRODUCT("TESTED" "BXT" "IGFX_BROXTON" )
266301 endif ()
267302 endif ()
268303endif ()
@@ -282,6 +317,7 @@ if(SUPPORT_GEN11)
282317 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" "GEN11" "icllp/1/8/8" )
283318 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "MT_TESTS" "GEN11" "icllp/1/8/8" )
284319 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN11" "icllp/1/8/8" )
320+ ADD_PRODUCT("TESTED" "ICLLP" "IGFX_ICELAKE_LP" )
285321 endif ()
286322 endif ()
287323
@@ -290,6 +326,7 @@ if(SUPPORT_GEN11)
290326 if (TESTS_LKF)
291327 ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN11" "LKF" )
292328 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN11" "lkf/1/8/8" )
329+ ADD_PRODUCT("TESTED" "LKF" "IGFX_LAKEFIELD" )
293330 endif ()
294331 endif ()
295332
@@ -298,6 +335,7 @@ if(SUPPORT_GEN11)
298335 if (TESTS_EHL)
299336 ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN11" "EHL" )
300337 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN11" "ehl/1/4/8" )
338+ ADD_PRODUCT("TESTED" "EHL" "IGFX_ELKHARTLAKE" )
301339 endif ()
302340 endif ()
303341endif ()
@@ -315,6 +353,7 @@ if(SUPPORT_GEN12LP)
315353 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" "GEN12LP" "tgllp/1/6/16" )
316354 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "MT_TESTS" "GEN12LP" "tgllp/1/6/16" )
317355 ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN12LP" "tgllp/1/6/16" )
356+ ADD_PRODUCT("TESTED" "TGLLP" "IGFX_TIGERLAKE_LP" )
318357 endif ()
319358 endif ()
320359endif ()
@@ -323,12 +362,16 @@ endif()
323362# Get platform lists, flag definition and set default platforms
324363GET_AVAILABLE_PLATFORMS("SUPPORTED" "SUPPORT" ALL_AVAILABLE_SUPPORTED_PLATFORMS)
325364GET_AVAILABLE_PLATFORMS("TESTED" "TESTS" ALL_AVAILABLE_TESTED_PLATFORMS)
365+ GET_AVAILABLE_PRODUCTS("TESTED" ALL_PRODUCT_FAMILY_LIST DEFAULT_TESTED_PRODUCT_FAMILY)
326366
327367message (STATUS "All supported platforms: ${ALL_AVAILABLE_SUPPORTED_PLATFORMS} " )
328368message (STATUS "All tested platforms: ${ALL_AVAILABLE_TESTED_PLATFORMS} " )
329369
330370message (STATUS "Default supported platform: ${DEFAULT_SUPPORTED_PLATFORM} " )
331371
372+ message (STATUS "All product families: ${ALL_PRODUCT_FAMILY_LIST} " )
373+ message (STATUS "Default tested product family: ${DEFAULT_TESTED_PRODUCT_FAMILY} " )
374+
332375list (FIND SUPPORTED_PLATFORM_LIST ${DEFAULT_SUPPORTED_PLATFORM} VALID_DEFAULT_SUPPORTED_PLATFORM)
333376if (VALID_DEFAULT_SUPPORTED_PLATFORM LESS 0)
334377 message (FATAL_ERROR "Not a valid supported platform: ${DEFAULT_SUPPORTED_PLATFORM} " )
0 commit comments