diff --git a/opencl/source/gen11/windows/hw_info_config_gen11.cpp b/opencl/source/gen11/windows/hw_info_config_gen11.cpp index 078b89fc02..7d85d9aea5 100644 --- a/opencl/source/gen11/windows/hw_info_config_gen11.cpp +++ b/opencl/source/gen11/windows/hw_info_config_gen11.cpp @@ -5,7 +5,6 @@ * */ -#include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_bdw_plus.inl" @@ -13,28 +12,14 @@ namespace NEO { #ifdef SUPPORT_ICLLP -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - return 0; -} - template class HwInfoConfigHw; #endif -#ifdef SUPPORT_LKF -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - return 0; -} +#ifdef SUPPORT_LKF template class HwInfoConfigHw; #endif #ifdef SUPPORT_EHL -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - return 0; -} - template class HwInfoConfigHw; #endif } // namespace NEO diff --git a/opencl/source/gen12lp/linux/hw_info_config_adls.inl b/opencl/source/gen12lp/linux/hw_info_config_adls.inl index d713fd0594..31c63efa9b 100644 --- a/opencl/source/gen12lp/linux/hw_info_config_adls.inl +++ b/opencl/source/gen12lp/linux/hw_info_config_adls.inl @@ -9,14 +9,5 @@ #include "shared/source/os_interface/hw_info_config.h" namespace NEO { - -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - hwInfo->capabilityTable.ftrRenderCompressedImages = hwInfo->featureTable.ftrE2ECompression; - hwInfo->capabilityTable.ftrRenderCompressedBuffers = hwInfo->featureTable.ftrE2ECompression; - - return 0; -} - template class HwInfoConfigHw; } // namespace NEO diff --git a/opencl/source/gen12lp/linux/hw_info_config_dg1.inl b/opencl/source/gen12lp/linux/hw_info_config_dg1.inl index c9db086c08..2ad24223a5 100644 --- a/opencl/source/gen12lp/linux/hw_info_config_dg1.inl +++ b/opencl/source/gen12lp/linux/hw_info_config_dg1.inl @@ -6,27 +6,18 @@ */ #include "shared/source/helpers/hw_info.h" -#include "shared/source/helpers/hw_info_config_common_helper.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - if (nullptr == osIface) { - return 0; - } - GT_SYSTEM_INFO *gtSystemInfo = &hwInfo->gtSystemInfo; gtSystemInfo->SliceCount = 1; - HwInfoConfigCommonHelper::enableBlitterOperationsSupport(*hwInfo); - hwInfo->featureTable.ftrGpGpuMidThreadLevelPreempt = false; - return 0; -} + enableBlitterOperationsSupport(hwInfo); -template <> -uint64_t HwInfoConfigHw::getSharedSystemMemCapabilities() { + hwInfo->featureTable.ftrGpGpuMidThreadLevelPreempt = false; return 0; } diff --git a/opencl/source/gen12lp/linux/hw_info_config_rkl.inl b/opencl/source/gen12lp/linux/hw_info_config_rkl.inl index e15ea68ded..4a5de750fd 100644 --- a/opencl/source/gen12lp/linux/hw_info_config_rkl.inl +++ b/opencl/source/gen12lp/linux/hw_info_config_rkl.inl @@ -12,13 +12,12 @@ namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - if (nullptr == osIface) { - return 0; - } - GT_SYSTEM_INFO *gtSystemInfo = &hwInfo->gtSystemInfo; gtSystemInfo->SliceCount = 1; hwInfo->featureTable.ftrGpGpuMidThreadLevelPreempt = false; + + enableBlitterOperationsSupport(hwInfo); + return 0; } diff --git a/opencl/source/gen12lp/linux/hw_info_config_tgllp.inl b/opencl/source/gen12lp/linux/hw_info_config_tgllp.inl index 823a4329b0..c03296467a 100644 --- a/opencl/source/gen12lp/linux/hw_info_config_tgllp.inl +++ b/opencl/source/gen12lp/linux/hw_info_config_tgllp.inl @@ -12,14 +12,11 @@ namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - - if (nullptr == osIface) { - return 0; - } - GT_SYSTEM_INFO *gtSystemInfo = &hwInfo->gtSystemInfo; gtSystemInfo->SliceCount = 1; hwInfo->featureTable.ftrGpGpuMidThreadLevelPreempt = false; + enableBlitterOperationsSupport(hwInfo); + return 0; } diff --git a/opencl/source/gen12lp/windows/hw_info_config_gen12lp.cpp b/opencl/source/gen12lp/windows/hw_info_config_gen12lp.cpp index e17de92b60..c9a0e7468e 100644 --- a/opencl/source/gen12lp/windows/hw_info_config_gen12lp.cpp +++ b/opencl/source/gen12lp/windows/hw_info_config_gen12lp.cpp @@ -5,47 +5,34 @@ * */ -#include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/hw_info.h" -#include "shared/source/helpers/hw_info_config_common_helper.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_bdw_plus.inl" namespace NEO { +namespace Gen12LPCommonFunctions { +inline void adjustPlatformForProductFamily(PLATFORM &platform, GFXCORE_FAMILY newCoreFamily) { + platform.eRenderCoreFamily = IGFX_GEN12LP_CORE; + platform.eDisplayCoreFamily = IGFX_GEN12LP_CORE; +} + +} // namespace Gen12LPCommonFunctions #ifdef SUPPORT_TGLLP -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - hwInfo->capabilityTable.ftrRenderCompressedImages = hwInfo->featureTable.ftrE2ECompression; - hwInfo->capabilityTable.ftrRenderCompressedBuffers = hwInfo->featureTable.ftrE2ECompression; - - return 0; -} template <> void HwInfoConfigHw::adjustPlatformForProductFamily(HardwareInfo *hwInfo) { - PLATFORM *platform = &hwInfo->platform; - platform->eRenderCoreFamily = IGFX_GEN12LP_CORE; - platform->eDisplayCoreFamily = IGFX_GEN12LP_CORE; + Gen12LPCommonFunctions::adjustPlatformForProductFamily(hwInfo->platform, GFXCORE_FAMILY::IGFX_GEN12LP_CORE); } template class HwInfoConfigHw; #endif #ifdef SUPPORT_DG1 -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - hwInfo->capabilityTable.ftrRenderCompressedImages = hwInfo->featureTable.ftrE2ECompression; - hwInfo->capabilityTable.ftrRenderCompressedBuffers = hwInfo->featureTable.ftrE2ECompression; - HwInfoConfigCommonHelper::enableBlitterOperationsSupport(*hwInfo); - return 0; -} template <> void HwInfoConfigHw::adjustPlatformForProductFamily(HardwareInfo *hwInfo) { - PLATFORM *platform = &hwInfo->platform; - platform->eRenderCoreFamily = IGFX_GEN12LP_CORE; - platform->eDisplayCoreFamily = IGFX_GEN12LP_CORE; + Gen12LPCommonFunctions::adjustPlatformForProductFamily(hwInfo->platform, GFXCORE_FAMILY::IGFX_GEN12LP_CORE); } template <> @@ -53,44 +40,22 @@ bool HwInfoConfigHw::isEvenContextCountRequired() { return true; } -template <> -uint64_t HwInfoConfigHw::getSharedSystemMemCapabilities() { - return 0; -} - template class HwInfoConfigHw; #endif #ifdef SUPPORT_RKL -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - hwInfo->capabilityTable.ftrRenderCompressedImages = hwInfo->featureTable.ftrE2ECompression; - hwInfo->capabilityTable.ftrRenderCompressedBuffers = hwInfo->featureTable.ftrE2ECompression; - return 0; -} template <> void HwInfoConfigHw::adjustPlatformForProductFamily(HardwareInfo *hwInfo) { - PLATFORM *platform = &hwInfo->platform; - platform->eRenderCoreFamily = IGFX_GEN12LP_CORE; - platform->eDisplayCoreFamily = IGFX_GEN12LP_CORE; + Gen12LPCommonFunctions::adjustPlatformForProductFamily(hwInfo->platform, GFXCORE_FAMILY::IGFX_GEN12LP_CORE); } template class HwInfoConfigHw; #endif #ifdef SUPPORT_ADLS -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - hwInfo->capabilityTable.ftrRenderCompressedImages = hwInfo->featureTable.ftrE2ECompression; - hwInfo->capabilityTable.ftrRenderCompressedBuffers = hwInfo->featureTable.ftrE2ECompression; - - return 0; -} template <> void HwInfoConfigHw::adjustPlatformForProductFamily(HardwareInfo *hwInfo) { - PLATFORM *platform = &hwInfo->platform; - platform->eRenderCoreFamily = IGFX_GEN12LP_CORE; - platform->eDisplayCoreFamily = IGFX_GEN12LP_CORE; + Gen12LPCommonFunctions::adjustPlatformForProductFamily(hwInfo->platform, GFXCORE_FAMILY::IGFX_GEN12LP_CORE); } template class HwInfoConfigHw; diff --git a/opencl/source/gen8/windows/hw_info_config_gen8.cpp b/opencl/source/gen8/windows/hw_info_config_gen8.cpp index 4571ec0a7a..71167db771 100644 --- a/opencl/source/gen8/windows/hw_info_config_gen8.cpp +++ b/opencl/source/gen8/windows/hw_info_config_gen8.cpp @@ -5,7 +5,6 @@ * */ -#include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_bdw_plus.inl" @@ -13,11 +12,6 @@ namespace NEO { #ifdef SUPPORT_BDW -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - return 0; -} - template class HwInfoConfigHw; #endif diff --git a/opencl/source/gen9/windows/hw_info_config_gen9.cpp b/opencl/source/gen9/windows/hw_info_config_gen9.cpp index 63d2165b60..ffb2db170b 100644 --- a/opencl/source/gen9/windows/hw_info_config_gen9.cpp +++ b/opencl/source/gen9/windows/hw_info_config_gen9.cpp @@ -5,7 +5,6 @@ * */ -#include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_bdw_plus.inl" @@ -13,43 +12,22 @@ namespace NEO { #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; -} +#ifdef SUPPORT_CFL template class HwInfoConfigHw; #endif -#ifdef SUPPORT_GLK -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - return 0; -} +#ifdef SUPPORT_GLK template class HwInfoConfigHw; #endif -#ifdef SUPPORT_KBL -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - return 0; -} +#ifdef SUPPORT_KBL template class HwInfoConfigHw; #endif -#ifdef SUPPORT_SKL -template <> -int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { - return 0; -} +#ifdef SUPPORT_SKL template class HwInfoConfigHw; #endif diff --git a/opencl/test/unit_test/helpers/hw_helper_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_tests.cpp index 9961d57ac6..7a851a9562 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests.cpp @@ -11,7 +11,6 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/gmm_helper/resource_info.h" #include "shared/source/helpers/aligned_memory.h" -#include "shared/source/helpers/hw_info_config_common_helper.h" #include "shared/source/helpers/string.h" #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/os_interface/hw_info_config.h" @@ -1016,10 +1015,15 @@ HWTEST_F(PipeControlHelperTests, WhenProgrammingCacheFlushThenExpectBasicFieldsS EXPECT_TRUE(pipeControl->getStateCacheInvalidationEnable()); } -TEST(HwInfoConfigCommonHelperTest, givenBlitterPreferenceWhenEnablingBlitterOperationsSupportThenHonorThePreference) { +using HwInfoConfigCommonTest = ::testing::Test; + +HWTEST2_F(HwInfoConfigCommonTest, givenBlitterPreferenceWhenEnablingBlitterOperationsSupportThenHonorThePreference, IsAtLeastGen12lp) { HardwareInfo hardwareInfo = *defaultHwInfo; - HwInfoConfigCommonHelper::enableBlitterOperationsSupport(hardwareInfo); + auto hwInfoConfig = HwInfoConfig::get(hardwareInfo.platform.eProductFamily); + + hwInfoConfig->configureHardwareCustom(&hardwareInfo, nullptr); + const auto expectedBlitterSupport = HwHelper::get(hardwareInfo.platform.eRenderCoreFamily).obtainBlitterPreference(hardwareInfo); EXPECT_EQ(expectedBlitterSupport, hardwareInfo.capabilityTable.blitterOperationsSupported); } @@ -1047,16 +1051,18 @@ HWTEST_F(HwHelperTest, givenHwHelperWhenAskingForIsaSystemMemoryPlacementThenRet EXPECT_NE(localMemoryEnabled, hwHelper.useSystemMemoryPlacementForISA(hardwareInfo)); } -TEST(HwInfoConfigCommonHelperTest, givenDebugFlagSetWhenEnablingBlitterOperationsSupportThenHonorTheFlag) { +HWTEST2_F(HwInfoConfigCommonTest, givenDebugFlagSetWhenEnablingBlitterOperationsSupportThenHonorTheFlag, IsAtLeastGen12lp) { DebugManagerStateRestore restore{}; HardwareInfo hardwareInfo = *defaultHwInfo; + auto hwInfoConfig = HwInfoConfig::get(hardwareInfo.platform.eProductFamily); + DebugManager.flags.EnableBlitterOperationsSupport.set(1); - HwInfoConfigCommonHelper::enableBlitterOperationsSupport(hardwareInfo); + hwInfoConfig->configureHardwareCustom(&hardwareInfo, nullptr); EXPECT_TRUE(hardwareInfo.capabilityTable.blitterOperationsSupported); DebugManager.flags.EnableBlitterOperationsSupport.set(0); - HwInfoConfigCommonHelper::enableBlitterOperationsSupport(hardwareInfo); + hwInfoConfig->configureHardwareCustom(&hardwareInfo, nullptr); EXPECT_FALSE(hardwareInfo.capabilityTable.blitterOperationsSupported); } diff --git a/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp index 14ef57b497..512ee5f392 100644 --- a/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp @@ -151,6 +151,19 @@ TEST_F(HwInfoConfigTestLinuxDummy, dummyConfig) { GTTYPE GtTypes[] = { GTTYPE_GT1, GTTYPE_GT2, GTTYPE_GT1_5, GTTYPE_GT2_5, GTTYPE_GT3, GTTYPE_GT4, GTTYPE_GTA, GTTYPE_GTC, GTTYPE_GTX}; +using HwInfoConfigCommonLinuxTest = ::testing::Test; + +HWTEST2_F(HwInfoConfigCommonLinuxTest, givenDebugFlagSetWhenEnablingBlitterOperationsSupportThenIgnore, IsAtMostGen11) { + DebugManagerStateRestore restore{}; + HardwareInfo hardwareInfo = *defaultHwInfo; + + auto hwInfoConfig = HwInfoConfig::get(hardwareInfo.platform.eProductFamily); + + DebugManager.flags.EnableBlitterOperationsSupport.set(1); + hwInfoConfig->configureHardwareCustom(&hardwareInfo, nullptr); + EXPECT_FALSE(hardwareInfo.capabilityTable.blitterOperationsSupported); +} + TEST_F(HwInfoConfigTestLinuxDummy, dummyConfigGtTypes) { int ret = hwConfig.configureHwInfo(&pInHwInfo, &outHwInfo, osInterface); EXPECT_EQ(0, ret); diff --git a/shared/source/helpers/CMakeLists.txt b/shared/source/helpers/CMakeLists.txt index bef9fde1e7..e935dc9aaf 100644 --- a/shared/source/helpers/CMakeLists.txt +++ b/shared/source/helpers/CMakeLists.txt @@ -60,8 +60,6 @@ set(NEO_CORE_HELPERS ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tgllp_plus.inl ${CMAKE_CURRENT_SOURCE_DIR}/hw_info.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_info.h - ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_common_helper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_common_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/interlocked_max.h ${CMAKE_CURRENT_SOURCE_DIR}/kernel_helpers.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kernel_helpers.h diff --git a/shared/source/helpers/hw_info_config_common_helper.cpp b/shared/source/helpers/hw_info_config_common_helper.cpp deleted file mode 100644 index 2402fd3bdc..0000000000 --- a/shared/source/helpers/hw_info_config_common_helper.cpp +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "shared/source/helpers/hw_info_config_common_helper.h" - -#include "shared/source/debug_settings/debug_settings_manager.h" -#include "shared/source/helpers/hw_helper.h" -#include "shared/source/helpers/hw_info.h" - -namespace NEO { -namespace HwInfoConfigCommonHelper { -void enableBlitterOperationsSupport(HardwareInfo &hardwareInfo) { - hardwareInfo.capabilityTable.blitterOperationsSupported = HwHelper::get(hardwareInfo.platform.eRenderCoreFamily).obtainBlitterPreference(hardwareInfo); - - if (DebugManager.flags.EnableBlitterOperationsSupport.get() != -1) { - hardwareInfo.capabilityTable.blitterOperationsSupported = !!DebugManager.flags.EnableBlitterOperationsSupport.get(); - } -} -} // namespace HwInfoConfigCommonHelper -} // namespace NEO diff --git a/shared/source/helpers/hw_info_config_common_helper.h b/shared/source/helpers/hw_info_config_common_helper.h deleted file mode 100644 index 8dfe354364..0000000000 --- a/shared/source/helpers/hw_info_config_common_helper.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#pragma once - -namespace NEO { -struct HardwareInfo; - -namespace HwInfoConfigCommonHelper { -void enableBlitterOperationsSupport(HardwareInfo &hardwareInfo); -} -} // namespace NEO diff --git a/shared/source/os_interface/hw_info_config.h b/shared/source/os_interface/hw_info_config.h index 60726a9376..356a1fd43b 100644 --- a/shared/source/os_interface/hw_info_config.h +++ b/shared/source/os_interface/hw_info_config.h @@ -54,7 +54,10 @@ class HwInfoConfigHw : public HwInfoConfig { bool isEvenContextCountRequired() override; protected: - HwInfoConfigHw() {} + HwInfoConfigHw() = default; + + void enableRenderCompression(HardwareInfo *hwInfo); + void enableBlitterOperationsSupport(HardwareInfo *hwInfo); }; template diff --git a/shared/source/os_interface/hw_info_config.inl b/shared/source/os_interface/hw_info_config.inl index c78d7baa9a..be2ae653fa 100644 --- a/shared/source/os_interface/hw_info_config.inl +++ b/shared/source/os_interface/hw_info_config.inl @@ -5,10 +5,25 @@ * */ +#include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/hw_info_config.h" namespace NEO { +template +int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { + enableRenderCompression(hwInfo); + enableBlitterOperationsSupport(hwInfo); + + return 0; +} + +template +uint64_t HwInfoConfigHw::getSharedSystemMemCapabilities() { + return 0; +} + template bool HwInfoConfigHw::isEvenContextCountRequired() { return false; @@ -17,4 +32,28 @@ bool HwInfoConfigHw::isEvenContextCountRequired() { template void HwInfoConfigHw::adjustPlatformForProductFamily(HardwareInfo *hwInfo) {} +template +void HwInfoConfigHw::enableRenderCompression(HardwareInfo *hwInfo) { + hwInfo->capabilityTable.ftrRenderCompressedImages = hwInfo->featureTable.ftrE2ECompression; + hwInfo->capabilityTable.ftrRenderCompressedBuffers = hwInfo->featureTable.ftrE2ECompression; +} + +template +void HwInfoConfigHw::enableBlitterOperationsSupport(HardwareInfo *hwInfo) { + hwInfo->capabilityTable.blitterOperationsSupported = HwHelper::get(hwInfo->platform.eRenderCoreFamily).obtainBlitterPreference(*hwInfo); + + if (DebugManager.flags.EnableBlitterOperationsSupport.get() != -1) { + hwInfo->capabilityTable.blitterOperationsSupported = !!DebugManager.flags.EnableBlitterOperationsSupport.get(); + } +} + +template +uint64_t HwInfoConfigHw::getDeviceMemCapabilities() { + return (UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS); +} + +template +uint64_t HwInfoConfigHw::getSingleDeviceSharedMemCapabilities() { + return (UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS); +} } // namespace NEO diff --git a/shared/source/os_interface/hw_info_config_bdw_plus.inl b/shared/source/os_interface/hw_info_config_bdw_plus.inl index 996e70db19..a0afdacbef 100644 --- a/shared/source/os_interface/hw_info_config_bdw_plus.inl +++ b/shared/source/os_interface/hw_info_config_bdw_plus.inl @@ -13,24 +13,9 @@ uint64_t HwInfoConfigHw::getHostMemCapabilities(const HardwareInfo * return (UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS); } -template -uint64_t HwInfoConfigHw::getDeviceMemCapabilities() { - return (UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS); -} - -template -uint64_t HwInfoConfigHw::getSingleDeviceSharedMemCapabilities() { - return (UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS); -} - template uint64_t HwInfoConfigHw::getCrossDeviceSharedMemCapabilities() { return 0; } -template -uint64_t HwInfoConfigHw::getSharedSystemMemCapabilities() { - return 0; -} - } // namespace NEO diff --git a/shared/test/unit_test/test_macros/header/test.h b/shared/test/unit_test/test_macros/header/test.h index 32b81a96ce..4ca3d50517 100644 --- a/shared/test/unit_test/test_macros/header/test.h +++ b/shared/test/unit_test/test_macros/header/test.h @@ -1086,6 +1086,8 @@ using IsGen12LP = IsGfxCore; using IsAtMostGen11 = IsAtMostGfxCore; +using IsAtLeastGen12lp = IsAtLeastGfxCore; + using IsBXT = IsProduct; using IsCFL = IsProduct; using IsEHL = IsProduct;