Group gen specific small cpp files together part 5

Change-Id: I3d1c0a3a416fb491a0a30c15f147c75fd0b548dd
intel · Jun 11, 2018 · 769e09e · 769e09e
1 parent 98b8b4b
commit 769e09e
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 143 deletions.
diff --git a/runtime/enable_gens.cmake b/runtime/enable_gens.cmake
@@ -72,9 +72,8 @@ macro(macro_for_each_platform)
   foreach(PLATFORM_FILE "hw_info_${PLATFORM_IT_LOWER}.inl")
     list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${GENX_PREFIX}/${PLATFORM_FILE})
   endforeach()
-
+  
   list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX ${GENX_PREFIX}/linux/hw_info_config_${PLATFORM_IT_LOWER}.inl)
-  list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_WINDOWS ${GENX_PREFIX}/windows/hw_info_config_${PLATFORM_IT_LOWER}.cpp)
 
   # Enable platform
   list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/enable_${PLATFORM_IT_LOWER}.cpp)
@@ -97,7 +96,8 @@ macro(macro_for_each_gen)
   endforeach()
 
   apply_macro_for_each_platform()
-
+
+  list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_WINDOWS ${GENX_PREFIX}/windows/hw_info_config_${GEN_TYPE_LOWER}.cpp)
   list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX ${GENX_PREFIX}/linux/hw_info_config_${GEN_TYPE_LOWER}.cpp)
 
   list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/enable_family_full_${GEN_TYPE_LOWER}.cpp)

diff --git a/runtime/gen8/windows/hw_info_config_bdw.cpp → runtime/gen8/windows/hw_info_config_gen8.cpp b/runtime/gen8/windows/hw_info_config_bdw.cpp → runtime/gen8/windows/hw_info_config_gen8.cpp
@@ -26,10 +26,13 @@
 
 namespace OCLRT {
 
+#ifdef SUPPORT_BDW
 template <>
 int HwInfoConfigHw<IGFX_BROADWELL>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) {
     return 0;
 }
 
 template class HwInfoConfigHw<IGFX_BROADWELL>;
+#endif
+
 } // namespace OCLRT
diff --git a/runtime/gen9/windows/hw_info_config_bxt.cpp b/runtime/gen9/windows/hw_info_config_bxt.cpp
diff --git a/runtime/gen9/windows/hw_info_config_cfl.cpp → runtime/gen9/windows/hw_info_config_gen9.cpp b/runtime/gen9/windows/hw_info_config_cfl.cpp → runtime/gen9/windows/hw_info_config_gen9.cpp
@@ -26,10 +26,45 @@
 
 namespace OCLRT {
 
+#ifdef SUPPORT_BXT
+template <>
+int HwInfoConfigHw<IGFX_BROXTON>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) {
+    return 0;
+}
+
+template class HwInfoConfigHw<IGFX_BROXTON>;
+#endif
+#ifdef SUPPORT_CFL
 template <>
 int HwInfoConfigHw<IGFX_COFFEELAKE>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) {
     return 0;
 }
 
 template class HwInfoConfigHw<IGFX_COFFEELAKE>;
+#endif
+#ifdef SUPPORT_GLK
+template <>
+int HwInfoConfigHw<IGFX_GEMINILAKE>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) {
+    return 0;
+}
+
+template class HwInfoConfigHw<IGFX_GEMINILAKE>;
+#endif
+#ifdef SUPPORT_KBL
+template <>
+int HwInfoConfigHw<IGFX_KABYLAKE>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) {
+    return 0;
+}
+
+template class HwInfoConfigHw<IGFX_KABYLAKE>;
+#endif
+#ifdef SUPPORT_SKL
+template <>
+int HwInfoConfigHw<IGFX_SKYLAKE>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) {
+    return 0;
+}
+
+template class HwInfoConfigHw<IGFX_SKYLAKE>;
+#endif
+
 } // namespace OCLRT
diff --git a/runtime/gen9/windows/hw_info_config_glk.cpp b/runtime/gen9/windows/hw_info_config_glk.cpp
diff --git a/runtime/gen9/windows/hw_info_config_kbl.cpp b/runtime/gen9/windows/hw_info_config_kbl.cpp
diff --git a/runtime/gen9/windows/hw_info_config_skl.cpp b/runtime/gen9/windows/hw_info_config_skl.cpp