From 769e09e88106d854013d2ea1abc8e47891730a76 Mon Sep 17 00:00:00 2001 From: "Stefanowski, Adam" Date: Tue, 5 Jun 2018 14:09:30 +0200 Subject: [PATCH] Group gen specific small cpp files together part 5 Change-Id: I3d1c0a3a416fb491a0a30c15f147c75fd0b548dd --- runtime/enable_gens.cmake | 6 ++-- ...config_bdw.cpp => hw_info_config_gen8.cpp} | 3 ++ runtime/gen9/windows/hw_info_config_bxt.cpp | 35 ------------------- ...config_cfl.cpp => hw_info_config_gen9.cpp} | 35 +++++++++++++++++++ runtime/gen9/windows/hw_info_config_glk.cpp | 35 ------------------- runtime/gen9/windows/hw_info_config_kbl.cpp | 35 ------------------- runtime/gen9/windows/hw_info_config_skl.cpp | 35 ------------------- 7 files changed, 41 insertions(+), 143 deletions(-) rename runtime/gen8/windows/{hw_info_config_bdw.cpp => hw_info_config_gen8.cpp} (98%) delete mode 100644 runtime/gen9/windows/hw_info_config_bxt.cpp rename runtime/gen9/windows/{hw_info_config_cfl.cpp => hw_info_config_gen9.cpp} (63%) delete mode 100644 runtime/gen9/windows/hw_info_config_glk.cpp delete mode 100644 runtime/gen9/windows/hw_info_config_kbl.cpp delete mode 100644 runtime/gen9/windows/hw_info_config_skl.cpp diff --git a/runtime/enable_gens.cmake b/runtime/enable_gens.cmake index 2cbd8c6ef6863..bc2139834178c 100644 --- 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 b/runtime/gen8/windows/hw_info_config_gen8.cpp similarity index 98% rename from runtime/gen8/windows/hw_info_config_bdw.cpp rename to runtime/gen8/windows/hw_info_config_gen8.cpp index 53b7a94c8be1c..9ac40df8af482 100644 --- a/runtime/gen8/windows/hw_info_config_bdw.cpp +++ b/runtime/gen8/windows/hw_info_config_gen8.cpp @@ -26,10 +26,13 @@ namespace OCLRT { +#ifdef SUPPORT_BDW template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { return 0; } template class HwInfoConfigHw; +#endif + } // namespace OCLRT diff --git a/runtime/gen9/windows/hw_info_config_bxt.cpp b/runtime/gen9/windows/hw_info_config_bxt.cpp deleted file mode 100644 index c59b940f77c43..0000000000000 --- a/runtime/gen9/windows/hw_info_config_bxt.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2018, Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "runtime/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" -#include "runtime/os_interface/hw_info_config.inl" - -namespace OCLRT { - -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - return 0; -} - -template class HwInfoConfigHw; -} // namespace OCLRT diff --git a/runtime/gen9/windows/hw_info_config_cfl.cpp b/runtime/gen9/windows/hw_info_config_gen9.cpp similarity index 63% rename from runtime/gen9/windows/hw_info_config_cfl.cpp rename to runtime/gen9/windows/hw_info_config_gen9.cpp index 6924a550319b5..45b4faa675fee 100644 --- a/runtime/gen9/windows/hw_info_config_cfl.cpp +++ b/runtime/gen9/windows/hw_info_config_gen9.cpp @@ -26,10 +26,45 @@ namespace OCLRT { +#ifdef SUPPORT_BXT +template <> +int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { + return 0; +} + +template class HwInfoConfigHw; +#endif +#ifdef SUPPORT_CFL template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { return 0; } template class HwInfoConfigHw; +#endif +#ifdef SUPPORT_GLK +template <> +int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { + return 0; +} + +template class HwInfoConfigHw; +#endif +#ifdef SUPPORT_KBL +template <> +int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { + return 0; +} + +template class HwInfoConfigHw; +#endif +#ifdef SUPPORT_SKL +template <> +int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { + return 0; +} + +template class HwInfoConfigHw; +#endif + } // namespace OCLRT diff --git a/runtime/gen9/windows/hw_info_config_glk.cpp b/runtime/gen9/windows/hw_info_config_glk.cpp deleted file mode 100644 index d14c48d2b55bb..0000000000000 --- a/runtime/gen9/windows/hw_info_config_glk.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2018, Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "runtime/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" -#include "runtime/os_interface/hw_info_config.inl" - -namespace OCLRT { - -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - return 0; -} - -template class HwInfoConfigHw; -} // namespace OCLRT diff --git a/runtime/gen9/windows/hw_info_config_kbl.cpp b/runtime/gen9/windows/hw_info_config_kbl.cpp deleted file mode 100644 index d49b4287897da..0000000000000 --- a/runtime/gen9/windows/hw_info_config_kbl.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2018, Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "runtime/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" -#include "runtime/os_interface/hw_info_config.inl" - -namespace OCLRT { - -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - return 0; -} - -template class HwInfoConfigHw; -} // namespace OCLRT diff --git a/runtime/gen9/windows/hw_info_config_skl.cpp b/runtime/gen9/windows/hw_info_config_skl.cpp deleted file mode 100644 index 9b184b309cabd..0000000000000 --- a/runtime/gen9/windows/hw_info_config_skl.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2017 - 2018, Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "runtime/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" -#include "runtime/os_interface/hw_info_config.inl" - -namespace OCLRT { - -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - return 0; -} - -template class HwInfoConfigHw; -} // namespace OCLRT