Reorganize files in GEN8 family

Change-Id: Iafd0e34e8eaa9564a0811235bb513a8ec91b606d

Author: zzdanowicz

manifests/manifest.yml

@@ -17,7 +17,7 @@ components:
     branch: infra
     clean_on_sync: true
     dest_dir: infra
-    revision: 9912b9be69726cf6bbb2837318da8767b4263f60
+    revision: 07655b0a0ddec035e6f31cc42b21cf411b20cbc4
     type: git
   internal:
     branch: master

platforms.cmake

@@ -182,15 +182,19 @@ INIT_LIST("CONFIGURATIONS" "MT_TESTS")
 
 # Add supported and tested platforms
 if(SUPPORT_GEN8)
-  ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN8" "BDW" "CORE")
-  ADD_PLATFORM_FOR_GEN("SUPPORTED_2_0" "GEN8" "BDW" "CORE")
   if(TESTS_GEN8)
     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()
+  if(SUPPORT_BDW)
+    ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN8" "BDW" "CORE")
+    ADD_PLATFORM_FOR_GEN("SUPPORTED_2_0" "GEN8" "BDW" "CORE")
+    if(TESTS_BDW)
+      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()
 endif(SUPPORT_GEN8)
 

runtime/enable_gens.cmake

@@ -72,6 +72,12 @@ macro(macro_for_each_platform)
     list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${GENX_PREFIX}/${PLATFORM_FILE})
   endforeach()
 
+  foreach(PLATFORM_FILE "hw_info_${PLATFORM_IT_LOWER}.h")
+    if(EXISTS ${GENX_PREFIX}/${PLATFORM_FILE})
+      list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/${PLATFORM_FILE})
+    endif()
+  endforeach()
+  
   list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX ${GENX_PREFIX}/linux/hw_info_config_${PLATFORM_IT_LOWER}.inl)
 endmacro()
 
@@ -84,6 +90,12 @@ macro(macro_for_each_gen)
   if(EXISTS "${GENX_PREFIX}/hw_cmds_generated_patched.h")
     list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE "${GENX_PREFIX}/hw_cmds_generated_patched.h")
   endif()
+  if(EXISTS "${GENX_PREFIX}/hw_cmds_base.h")
+    list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE "${GENX_PREFIX}/hw_cmds_base.h")
+  endif()
+  if(EXISTS "${GENX_PREFIX}/hw_info_${GEN_TYPE_LOWER}.h")
+    list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE "${GENX_PREFIX}/hw_info_${GEN_TYPE_LOWER}.h")
+  endif()
 
   foreach(OS_IT "BASE" "WINDOWS" "LINUX")
     foreach(SRC_IT ${RUNTIME_SRCS_GENX_CPP_${OS_IT}})