Change identification of gen families from number to type

Change-Id: I780528aeb2572fc95d8cd9a20eba26687156726b

Author: zzdanowicz

manifests/manifest.yml

@@ -36,7 +36,7 @@ components:
   internal:
     branch: master
     dest_dir: internal
-    revision: 7b713c9b8b5c18feaa222e84ecfcc07ac988dafa
+    revision: 948b79f564d5685eca9c34c8b0d7f941bdf0d879
     type: git
   khronos:
     branch: master

offline_compiler/CMakeLists.txt

@@ -54,22 +54,23 @@ set(OPTIONAL_RUNTIME_GENX_FILES
   hw_info.cpp
 )
 
-foreach(GEN_NUM RANGE ${MAX_GEN})
-  GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_NUM} GENX_HAS_PLATFORMS)
+foreach(GEN_TYPE ${ALL_GEN_TYPES})
+  string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER)
+  GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_TYPE} GENX_HAS_PLATFORMS)
   if(${GENX_HAS_PLATFORMS})
     foreach(SRC_IT ${OPTIONAL_RUNTIME_GENX_FILES})
-      set(SRC_FILE ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/${SRC_IT})
+      set(SRC_FILE ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/${SRC_IT})
       if(EXISTS ${SRC_FILE})
         list(APPEND CLOC_SRCS_LIB ${SRC_FILE})
       endif()
     endforeach()
 
-    GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_NUM} SUPPORTED_GENX_PLATFORMS)
+    GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_TYPE} SUPPORTED_GENX_PLATFORMS)
     foreach(PLATFORM_IT ${SUPPORTED_GENX_PLATFORMS})
       string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER)
       list(APPEND CLOC_SRCS_LIB
-        ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/hw_info_${PLATFORM_IT_LOWER}.cpp
-        ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/enable_${PLATFORM_IT_LOWER}.cpp
+        ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/hw_info_${PLATFORM_IT_LOWER}.cpp
+        ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_${PLATFORM_IT_LOWER}.cpp
       )
     endforeach()
   endif()

platforms.cmake

@@ -20,31 +20,48 @@
 
 set(MAX_GEN 64)
 
+set(ALL_GEN_TYPES "")
+
+list(APPEND ALL_GEN_TYPES "GEN8")
+list(APPEND ALL_GEN_TYPES "GEN9")
+
+set(ALL_GEN_TYPES_REVERSED ${ALL_GEN_TYPES})
+list(REVERSE ALL_GEN_TYPES_REVERSED)
+
+macro(FIND_IDX_FOR_GEN_TYPE GEN_TYPE GEN_IDX)
+  list(FIND ALL_GEN_TYPES "${GEN_TYPE}" GEN_IDX)
+  if(${GEN_IDX} EQUAL -1)
+    message(FATAL_ERROR "No ${GEN_TYPE} allowed, exiting")
+  endif(${GEN_IDX} EQUAL -1)
+endmacro(FIND_IDX_FOR_GEN_TYPE)
+
 macro(INIT_LIST LIST_TYPE ELEMENT_TYPE)
   foreach(IT RANGE 0 ${MAX_GEN} 1)
     list(APPEND ALL_${ELEMENT_TYPE}_${LIST_TYPE} " ")
   endforeach(IT)
 endmacro(INIT_LIST)
 
-macro(GET_LIST_FOR_GEN LIST_TYPE ELEMENT_TYPE GEN_NUMBER OUT_LIST)
-  list(GET ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_NUMBER} GEN_X_${LIST_TYPE})
+macro(GET_LIST_FOR_GEN LIST_TYPE ELEMENT_TYPE GEN_IDX OUT_LIST)
+  list(GET ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_IDX} GEN_X_${LIST_TYPE})
   string(REPLACE "_" ";" ${OUT_LIST} ${GEN_X_${LIST_TYPE}})
 endmacro(GET_LIST_FOR_GEN)
 
-macro(ADD_ITEM_FOR_GEN LIST_TYPE ELEMENT_TYPE GEN_NUMBER ITEM)
-  list(GET ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_NUMBER} GEN_X_LIST)
+macro(ADD_ITEM_FOR_GEN LIST_TYPE ELEMENT_TYPE GEN_TYPE ITEM)
+  FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX)
+  list(GET ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_IDX} GEN_X_LIST)
   string(REPLACE " " "" GEN_X_LIST ${GEN_X_LIST})
   if("${GEN_X_LIST}" STREQUAL "")
     set(GEN_X_LIST "${ITEM}")
   else("${GEN_X_LIST}" STREQUAL "")
     set(GEN_X_LIST "${GEN_X_LIST}_${ITEM}")
   endif("${GEN_X_LIST}" STREQUAL "")
-  list(REMOVE_AT ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_NUMBER})
-  list(INSERT ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_NUMBER} ${GEN_X_LIST})
+  list(REMOVE_AT ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_IDX})
+  list(INSERT ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_IDX} ${GEN_X_LIST})
 endmacro(ADD_ITEM_FOR_GEN)
 
-macro(GEN_CONTAINS_PLATFORMS TYPE GEN_NUMBER OUT_FLAG)
-  GET_LIST_FOR_GEN("PLATFORMS" ${TYPE} ${GEN_NUMBER} GEN_X_PLATFORMS)
+macro(GEN_CONTAINS_PLATFORMS TYPE GEN_TYPE OUT_FLAG)
+  FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX)
+  GET_LIST_FOR_GEN("PLATFORMS" ${TYPE} ${GEN_IDX} GEN_X_PLATFORMS)
   string(REPLACE " " "" GEN_X_PLATFORMS ${GEN_X_PLATFORMS})
   if("${GEN_X_PLATFORMS}" STREQUAL "")
     set(${OUT_FLAG} FALSE)
@@ -56,17 +73,18 @@ endmacro(GEN_CONTAINS_PLATFORMS)
 macro(GET_AVAILABLE_PLATFORMS TYPE FLAG_NAME OUT_STR)
   set(${TYPE}_PLATFORM_LIST)
   set(${TYPE}_GEN_FLAGS_DEFINITONS)
-  foreach(GEN_NUM RANGE ${MAX_GEN} 0 -1)
-    GEN_CONTAINS_PLATFORMS(${TYPE} ${GEN_NUM} GENX_HAS_PLATFORMS)
+  foreach(GEN_TYPE ${ALL_GEN_TYPES_REVERSED})
+    GEN_CONTAINS_PLATFORMS(${TYPE} ${GEN_TYPE} GENX_HAS_PLATFORMS)
     if(${GENX_HAS_PLATFORMS})
-      list(APPEND ${TYPE}_GEN_FLAGS_DEFINITONS ${FLAG_NAME}_GEN${GEN_NUM})
-      GET_LIST_FOR_GEN("PLATFORMS" ${TYPE} ${GEN_NUM} ${TYPE}_GENX_PLATFORMS)
+      FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX)
+      list(APPEND ${TYPE}_GEN_FLAGS_DEFINITONS ${FLAG_NAME}_${GEN_TYPE})
+      GET_LIST_FOR_GEN("PLATFORMS" ${TYPE} ${GEN_IDX} ${TYPE}_GENX_PLATFORMS)
       list(APPEND ${TYPE}_PLATFORM_LIST ${${TYPE}_GENX_PLATFORMS})
       if(NOT DEFAULT_${TYPE}_PLATFORM)
         list(GET ${TYPE}_PLATFORM_LIST 0 DEFAULT_${TYPE}_PLATFORM ${PLATFORM_IT})
       endif()
-      if(NOT DEFAULT_${TYPE}_GEN${GEN_NUM}_PLATFORM)
-        list(GET ${TYPE}_GENX_PLATFORMS 0 DEFAULT_${TYPE}_GEN${GEN_NUM}_PLATFORM)
+      if(NOT DEFAULT_${TYPE}_${GEN_TYPE}_PLATFORM)
+        list(GET ${TYPE}_GENX_PLATFORMS 0 DEFAULT_${TYPE}_${GEN_TYPE}_PLATFORM)
       endif()
     endif()
   endforeach()
@@ -76,14 +94,16 @@ macro(GET_AVAILABLE_PLATFORMS TYPE FLAG_NAME OUT_STR)
   endforeach()
 endmacro(GET_AVAILABLE_PLATFORMS)
 
-macro(GET_PLATFORMS_FOR_GEN TYPE GEN_NUMBER OUT_LIST)
-  GET_LIST_FOR_GEN("PLATFORMS" ${TYPE} ${GEN_NUMBER} ${OUT_LIST})
+macro(GET_PLATFORMS_FOR_GEN TYPE GEN_TYPE OUT_LIST)
+  FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX)
+  GET_LIST_FOR_GEN("PLATFORMS" ${TYPE} ${GEN_IDX} ${OUT_LIST})
 endmacro(GET_PLATFORMS_FOR_GEN)
 
-macro(GET_TEST_CONFIGURATIONS_FOR_PLATFORM TYPE GEN_NUMBER PLATFORM OUT_LIST)
+macro(GET_TEST_CONFIGURATIONS_FOR_PLATFORM TYPE GEN_TYPE PLATFORM OUT_LIST)
+  FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX)
   set(${OUT_LIST})
   string(TOLOWER ${PLATFORM} PLATFORM_LOWER)
-  GET_LIST_FOR_GEN("CONFIGURATIONS" ${TYPE} ${GEN_NUMBER} ALL_CONFIGURATIONS_FOR_GEN)
+  GET_LIST_FOR_GEN("CONFIGURATIONS" ${TYPE} ${GEN_IDX} ALL_CONFIGURATIONS_FOR_GEN)
   foreach(CONFIGURATION ${ALL_CONFIGURATIONS_FOR_GEN})
     string(REPLACE "/" ";" CONFIGURATION_PARAMS ${CONFIGURATION})
     list(GET CONFIGURATION_PARAMS 0 CONFIGURATION_PLATFORM)
@@ -93,26 +113,26 @@ macro(GET_TEST_CONFIGURATIONS_FOR_PLATFORM TYPE GEN_NUMBER PLATFORM OUT_LIST)
   endforeach(CONFIGURATION)
 endmacro(GET_TEST_CONFIGURATIONS_FOR_PLATFORM)
 
-macro(PLATFORM_HAS_2_0 GEN_NUMBER PLATFORM_NAME OUT_FLAG)
-  GET_LIST_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" ${GEN_NUMBER} GEN_X_PLATFORMS)
+macro(PLATFORM_HAS_2_0 GEN_TYPE PLATFORM_NAME OUT_FLAG)
+  FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX)
+  GET_LIST_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" ${GEN_IDX} GEN_X_PLATFORMS)
   list(FIND GEN_X_PLATFORMS ${PLATFORM_NAME} PLATFORM_EXISTS)
   if("${PLATFORM_EXISTS}" LESS 0)
     set(${OUT_FLAG} FALSE)
   else("${PLATFORM_EXISTS}" LESS 0)
     set(${OUT_FLAG} TRUE)
   endif("${PLATFORM_EXISTS}" LESS 0)
-
 endmacro(PLATFORM_HAS_2_0 PLATFORM_NAME OUT_FLAG)
 
-macro(PLATFORM_TESTED_WITH_APPVERIFIER GEN_NUMBER PLATFORM_NAME OUT_FLAG)
-  GET_LIST_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER" ${GEN_NUMBER} GEN_X_PLATFORMS)
+macro(PLATFORM_TESTED_WITH_APPVERIFIER GEN_TYPE PLATFORM_NAME OUT_FLAG)
+  FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX)
+  GET_LIST_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER" ${GEN_IDX} GEN_X_PLATFORMS)
   list(FIND GEN_X_PLATFORMS ${PLATFORM_NAME} PLATFORM_EXISTS)
   if("${PLATFORM_EXISTS}" LESS 0)
     set(${OUT_FLAG} FALSE)
   else("${PLATFORM_EXISTS}" LESS 0)
     set(${OUT_FLAG} TRUE)
   endif("${PLATFORM_EXISTS}" LESS 0)
-
 endmacro(PLATFORM_TESTED_WITH_APPVERIFIER PLATFORM_NAME OUT_FLAG)
 
 # default flag for GenX devices support
@@ -121,26 +141,26 @@ set(SUPPORT_GEN_DEFAULT TRUE CACHE BOOL "default value for SUPPORT_GENx")
 set(SUPPORT_PLATFORM_DEFAULT TRUE CACHE BOOL "default value for support platform")
 
 # Define the hardware configurations we support and test
-macro(SET_FLAGS_FOR GEN_NUM)
-  set(SUPPORT_GEN${GEN_NUM} ${SUPPORT_GEN_DEFAULT} CACHE BOOL "Support Gen${GEN_NUM} devices")
-  set(TESTS_GEN${GEN_NUM} ${SUPPORT_GEN${GEN_NUM}} CACHE BOOL "Build ULTs for Gen${GEN_NUM} devices")
-  if(NOT SUPPORT_GEN${GEN_NUM})
-    set(TESTS_GEN${GEN_NUM} FALSE)
+macro(SET_FLAGS_FOR GEN_TYPE)
+  set(SUPPORT_${GEN_TYPE} ${SUPPORT_GEN_DEFAULT} CACHE BOOL "Support ${GEN_TYPE} devices")
+  set(TESTS_${GEN_TYPE} ${SUPPORT_${GEN_TYPE}} CACHE BOOL "Build ULTs for ${GEN_TYPE} devices")
+  if(NOT SUPPORT_${GEN_TYPE})
+    set(TESTS_${GEN_TYPE} FALSE)
   else()
-    foreach(GEN${GEN_NUM}_PLATFORM ${ARGN})
-      set(SUPPORT_${GEN${GEN_NUM}_PLATFORM} ${SUPPORT_PLATFORM_DEFAULT} CACHE BOOL "Support ${GEN${GEN_NUM}_PLATFORM}")
-      if(TESTS_GEN${GEN_NUM})
-        set(TESTS_${GEN${GEN_NUM}_PLATFORM} ${SUPPORT_${GEN${GEN_NUM}_PLATFORM}} CACHE BOOL "Build ULTs for ${GEN${GEN_NUM}_PLATFORM}")
+    foreach(${GEN_TYPE}_PLATFORM ${ARGN})
+      set(SUPPORT_${${GEN_TYPE}_PLATFORM} ${SUPPORT_PLATFORM_DEFAULT} CACHE BOOL "Support ${${GEN_TYPE}_PLATFORM}")
+      if(TESTS_${GEN_TYPE})
+        set(TESTS_${${GEN_TYPE}_PLATFORM} ${SUPPORT_${${GEN_TYPE}_PLATFORM}} CACHE BOOL "Build ULTs for ${${GEN_TYPE}_PLATFORM}")
       endif()
-      if(NOT SUPPORT_${GEN${GEN_NUM}_PLATFORM} OR NOT TESTS_GEN${GEN_NUM})
-        set(TESTS_${GEN${GEN_NUM}_PLATFORM} FALSE)
+      if(NOT SUPPORT_${${GEN_TYPE}_PLATFORM} OR NOT TESTS_${GEN_TYPE})
+        set(TESTS_${${GEN_TYPE}_PLATFORM} FALSE)
       endif()
     endforeach()
   endif()
 endmacro()
 
-SET_FLAGS_FOR(8 "BDW")
-SET_FLAGS_FOR(9 "SKL" "KBL" "BXT" "GLK" "CFL")
+SET_FLAGS_FOR("GEN8" "BDW")
+SET_FLAGS_FOR("GEN9" "SKL" "KBL" "BXT" "GLK" "CFL")
 
 # Init lists
 INIT_LIST("FAMILY_NAME" "TESTED")
@@ -154,66 +174,66 @@ INIT_LIST("CONFIGURATIONS" "MT_TESTS")
 
 # Add supported and tested platforms
 if(SUPPORT_GEN8)
-  ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" 8 "BDW")
-  ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" 8 "BDW")
+  ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" "GEN8" "BDW")
+  ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" "GEN8" "BDW")
   if(TESTS_GEN8)
-    ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" 8 "BDWFamily")
-    ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" 8 "BDW")
-    ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER" 8 "BDW")
-    ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" 8 "bdw/1/3/8")
-    ADD_ITEM_FOR_GEN("CONFIGURATIONS" "MT_TESTS" 8 "bdw/1/3/8")
-    ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" 8 "bdw/1/3/8")
+    ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN8" "BDWFamily")
+    ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN8" "BDW")
+    ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER" "GEN8" "BDW")
+    ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" "GEN8" "bdw/1/3/8")
+    ADD_ITEM_FOR_GEN("CONFIGURATIONS" "MT_TESTS" "GEN8" "bdw/1/3/8")
+    ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN8" "bdw/1/3/8")
   endif()
 endif(SUPPORT_GEN8)
 
 if(SUPPORT_GEN9)
   if(TESTS_GEN9)
-    ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" 9 "SKLFamily")
+    ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN9" "SKLFamily")
   endif()
   if(SUPPORT_SKL)
-    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" 9 "SKL")
-    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" 9 "SKL")
+    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" "GEN9" "SKL")
+    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" "GEN9" "SKL")
     if(TESTS_SKL)
-      ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED"  9 "SKL")
-      ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER"  9 "SKL")
-      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" 9 "skl/1/3/8")
-      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "MT_TESTS" 9 "skl/1/3/8")
-      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" 9 "skl/1/3/8")
+      ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "SKL")
+      ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER" "GEN9" "SKL")
+      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" "GEN9" "skl/1/3/8")
+      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "MT_TESTS" "GEN9" "skl/1/3/8")
+      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "skl/1/3/8")
     endif()
   endif()
 
   if(SUPPORT_KBL)
-    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" 9 "KBL")
-    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" 9 "KBL")
+    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" "GEN9" "KBL")
+    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" "GEN9" "KBL")
     if(TESTS_KBL)
-      ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED"  9 "KBL")
-      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" 9 "kbl/1/3/6")
+      ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "KBL")
+      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "kbl/1/3/6")
     endif()
   endif()
 
   if(SUPPORT_GLK)
-    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" 9 "GLK")
+    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" "GEN9" "GLK")
     if(TESTS_GLK)
-      ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED"  9 "GLK")
-      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" 9 "glk/1/3/6")
+      ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "GLK")
+      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "glk/1/3/6")
     endif()
   endif()
 
   if(SUPPORT_CFL)
-    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" 9 "CFL")
-    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" 9 "CFL")
+    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" "GEN9" "CFL")
+    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" "GEN9" "CFL")
     if(TESTS_CFL)
-      ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED"  9 "CFL")
-      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" 9 "cfl/1/3/6")
+      ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "CFL")
+      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "cfl/1/3/6")
     endif()
   endif()
 
   if(SUPPORT_BXT)
-    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" 9 "BXT")
+    ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" "GEN9" "BXT")
     if(TESTS_BXT)
-      ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED"  9 "BXT")
-      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" 9 "bxt/1/3/6")
-      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" 9 "bxt/1/3/6")
+      ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "BXT")
+      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" "GEN9" "bxt/1/3/6")
+      ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "bxt/1/3/6")
     endif()
   endif()
 endif(SUPPORT_GEN9)
@@ -242,8 +262,9 @@ if(DEFAULT_TESTED_PLATFORM)
 endif()
 
 if(NOT DEFAULT_TESTED_FAMILY_NAME)
-  foreach(GEN_NUM RANGE ${MAX_GEN} 0 -1)
-    list(GET ALL_TESTED_FAMILY_NAME ${GEN_NUM} GEN_FAMILY_NAME)
+  foreach(GEN_TYPE ${ALL_GEN_TYPES_REVERSED})
+    FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX)
+    list(GET ALL_TESTED_FAMILY_NAME ${GEN_IDX} GEN_FAMILY_NAME)
     if(NOT GEN_FAMILY_NAME STREQUAL " ")
       set(DEFAULT_TESTED_FAMILY_NAME ${GEN_FAMILY_NAME})
       break()

runtime/CMakeLists.txt

@@ -128,10 +128,11 @@ set_target_properties(${NEO_STATIC_LIB_NAME} PROPERTIES FOLDER "opencl runtime")
 
 if(${GENERATE_EXECUTABLE})
   if(GTPIN_HEADERS_DIR)
-    foreach(GEN_NUM RANGE ${MAX_GEN})
-      GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_NUM} GENX_HAS_PLATFORMS)
+    foreach(GEN_TYPE ${ALL_GEN_TYPES})
+      string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER)
+      GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_TYPE} GENX_HAS_PLATFORMS)
       if(${GENX_HAS_PLATFORMS})
-        target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/gen${GEN_NUM}/gtpin_setup_gen${GEN_NUM}.cpp)
+        target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/${GEN_TYPE_LOWER}/gtpin_setup_${GEN_TYPE_LOWER}.cpp)
       endif(${GENX_HAS_PLATFORMS})
     endforeach()
   endif()

runtime/built_ins/builtins_binary.cmake

@@ -42,22 +42,23 @@ if(COMPILE_BUILT_INS)
   add_subdirectory(kernels)
 endif()
 
-foreach(GEN_NUM RANGE ${MAX_GEN})
-  GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_NUM} GENX_HAS_PLATFORMS)
+foreach(GEN_TYPE ${ALL_GEN_TYPES})
+  string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER)
+  GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_TYPE} GENX_HAS_PLATFORMS)
   if(${GENX_HAS_PLATFORMS})
     # Get all supported platforms for this GEN
-    GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_NUM} SUPPORTED_GENX_PLATFORMS)
+    GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_TYPE} SUPPORTED_GENX_PLATFORMS)
 
     # Add platform-specific files
     foreach(PLATFORM_IT ${SUPPORTED_GENX_PLATFORMS})
       foreach(GENERATED_BUILTIN ${GENERATED_BUILTINS})
-        list(APPEND GENERATED_BUILTINS_CPPS ${BUILTINS_INCLUDE_DIR}/${RUNTIME_GENERATED_${GENERATED_BUILTIN}_GEN${GEN_NUM}_${PLATFORM_IT}})
+        list(APPEND GENERATED_BUILTINS_CPPS ${BUILTINS_INCLUDE_DIR}/${RUNTIME_GENERATED_${GENERATED_BUILTIN}_${GEN_TYPE_LOWER}_${PLATFORM_IT}})
       endforeach(GENERATED_BUILTIN)
     endforeach(PLATFORM_IT)
 
-    source_group("generated files\\gen${GEN_NUM}" FILES ${GENERATED_BUILTINS_CPPS})
+    source_group("generated files\\${GEN_TYPE_LOWER}" FILES ${GENERATED_BUILTINS_CPPS})
   endif(${GENX_HAS_PLATFORMS})
-endforeach(GEN_NUM)
+endforeach(GEN_TYPE)
 
 if(COMPILE_BUILT_INS)
   target_sources(${BUILTINS_BINARIES_LIB_NAME} PUBLIC ${GENERATED_BUILTINS_CPPS})

runtime/built_ins/kernels/CMakeLists.txt

@@ -78,9 +78,9 @@ function(compile_builtin gen_name builtin)
   endif()
 endfunction()
 
-macro(compile_builtins GEN_NUM PLATFORM_IT)
+macro(compile_builtins GEN_TYPE PLATFORM_IT)
   string(TOLOWER ${PLATFORM_IT} PLATFORM_LOWER)
-  string(CONCAT GEN "_GEN" ${GEN_NUM} "_" ${PLATFORM_IT})
+  string(CONCAT GEN "_" ${GEN_TYPE} "_" ${PLATFORM_IT})
 
   set (BUILTINS_COMMANDS)
   foreach(GENERATED_BUILTIN ${GENERATED_BUILTINS})
@@ -96,12 +96,13 @@ macro(compile_builtins GEN_NUM PLATFORM_IT)
 endmacro()
 
 # Compile built-in kernels for all GENs
-foreach(GEN_NUM RANGE ${MAX_GEN} 0 -1)
-  GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_NUM} GENX_HAS_PLATFORMS)
+foreach(GEN_TYPE ${ALL_GEN_TYPES})
+  string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER)
+  GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_TYPE} GENX_HAS_PLATFORMS)
   if(${GENX_HAS_PLATFORMS})
-    GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_NUM} SUPPORTED_GENX_PLATFORMS)
+    GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_TYPE} SUPPORTED_GENX_PLATFORMS)
     foreach(PLATFORM_IT ${SUPPORTED_GENX_PLATFORMS})
-      compile_builtins(${GEN_NUM} ${PLATFORM_IT})
+      compile_builtins(${GEN_TYPE_LOWER} ${PLATFORM_IT})
     endforeach()
   endif()
 endforeach()