Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove not used method 

Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
This commit is contained in:
Bartosz Dunajski 2020-11-19 16:37:41 +00:00 committed by Compute-Runtime-Automation
parent 514b191bb6
commit 949137e068
40 changed files with 0 additions and 514 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opencl/source/gen12lp/linux/hw_info_config_adls.inl
View File

@ -18,12 +18,5 @@ int HwInfoConfigHw<IGFX_ALDERLAKE_S>::configureHardwareCustom(HardwareInfo *hwIn
return 0;
}
template <>
void HwInfoConfigHw<IGFX_ALDERLAKE_S>::adjustPlatformForProductFamily(HardwareInfo *hwInfo) {
PLATFORM *platform = &hwInfo->platform;
platform->eRenderCoreFamily = IGFX_GEN12LP_CORE;
platform->eDisplayCoreFamily = IGFX_GEN12LP_CORE;
}
template class HwInfoConfigHw<IGFX_ALDERLAKE_S>;
} // namespace NEO

28
opencl/source/gen12lp/windows/hw_info_config_gen12lp.cpp
View File

@ -23,13 +23,6 @@ int HwInfoConfigHw<IGFX_TIGERLAKE_LP>::configureHardwareCustom(HardwareInfo *hwI
return 0;
}
template <>
void HwInfoConfigHw<IGFX_TIGERLAKE_LP>::adjustPlatformForProductFamily(HardwareInfo *hwInfo) {
PLATFORM *platform = &hwInfo->platform;
platform->eRenderCoreFamily = IGFX_GEN12LP_CORE;
platform->eDisplayCoreFamily = IGFX_GEN12LP_CORE;
}
template class HwInfoConfigHw<IGFX_TIGERLAKE_LP>;
#endif
#ifdef SUPPORT_DG1
@ -41,13 +34,6 @@ int HwInfoConfigHw<IGFX_DG1>::configureHardwareCustom(HardwareInfo *hwInfo, OSIn
return 0;
}
template <>
void HwInfoConfigHw<IGFX_DG1>::adjustPlatformForProductFamily(HardwareInfo *hwInfo) {
PLATFORM *platform = &hwInfo->platform;
platform->eRenderCoreFamily = IGFX_GEN12LP_CORE;
platform->eDisplayCoreFamily = IGFX_GEN12LP_CORE;
}
template <>
bool HwInfoConfigHw<IGFX_DG1>::isEvenContextCountRequired() {
return true;
@ -68,13 +54,6 @@ int HwInfoConfigHw<IGFX_ROCKETLAKE>::configureHardwareCustom(HardwareInfo *hwInf
return 0;
}
template <>
void HwInfoConfigHw<IGFX_ROCKETLAKE>::adjustPlatformForProductFamily(HardwareInfo *hwInfo) {
PLATFORM *platform = &hwInfo->platform;
platform->eRenderCoreFamily = IGFX_GEN12LP_CORE;
platform->eDisplayCoreFamily = IGFX_GEN12LP_CORE;
}
template class HwInfoConfigHw<IGFX_ROCKETLAKE>;
#endif
#ifdef SUPPORT_ADLS
@ -86,13 +65,6 @@ int HwInfoConfigHw<IGFX_ALDERLAKE_S>::configureHardwareCustom(HardwareInfo *hwIn
return 0;
}
template <>
void HwInfoConfigHw<IGFX_ALDERLAKE_S>::adjustPlatformForProductFamily(HardwareInfo *hwInfo) {
PLATFORM *platform = &hwInfo->platform;
platform->eRenderCoreFamily = IGFX_GEN12LP_CORE;
platform->eDisplayCoreFamily = IGFX_GEN12LP_CORE;
}
template class HwInfoConfigHw<IGFX_ALDERLAKE_S>;
#endif
} // namespace NEO

13
opencl/test/unit_test/gen11/ehl/windows/CMakeLists.txt
View File

@ -1,13 +0,0 @@
#
# Copyright (C) 2019-2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(IGDRCL_SRCS_tests_gen11_ehl_windows
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_ehl.cpp
)
if(WIN32)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen11_ehl_windows})
endif()

23
opencl/test/unit_test/gen11/ehl/windows/hw_info_config_tests_ehl.cpp
View File

@ -1,23 +0,0 @@
/*
* Copyright (C) 2019-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/os_interface/windows/os_interface.h"
#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
using namespace NEO;
using HwInfoConfigTestWindowsEhl = HwInfoConfigTestWindows;
EHLTEST_F(HwInfoConfigTestWindowsEhl, whenCallAdjustPlatformThenDoNothing) {
EXPECT_EQ(IGFX_ELKHARTLAKE, productFamily);
auto hwInfoConfig = HwInfoConfig::get(productFamily);
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}

13
opencl/test/unit_test/gen11/icllp/windows/CMakeLists.txt
View File

@ -1,13 +0,0 @@
#
# Copyright (C) 2018-2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(IGDRCL_SRCS_tests_gen11_icllp_windows
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_icllp.cpp
)
if(WIN32)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen11_icllp_windows})
endif()

24
opencl/test/unit_test/gen11/icllp/windows/hw_info_config_tests_icllp.cpp
View File

@ -1,24 +0,0 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/os_interface/windows/os_interface.h"
#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
using namespace NEO;
using HwInfoConfigTestWindowsIcllp = HwInfoConfigTestWindows;
ICLLPTEST_F(HwInfoConfigTestWindowsIcllp, whenCallAdjustPlatformThenDoNothing) {
EXPECT_EQ(IGFX_ICELAKE_LP, productFamily);
auto hwInfoConfig = HwInfoConfig::get(productFamily);
outHwInfo = pInHwInfo;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}

13
opencl/test/unit_test/gen11/lkf/windows/CMakeLists.txt
View File

@ -1,13 +0,0 @@
#
# Copyright (C) 2018-2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(IGDRCL_SRCS_tests_gen11_lkf_windows
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_lkf.cpp
)
if(WIN32)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen11_lkf_windows})
endif()

24
opencl/test/unit_test/gen11/lkf/windows/hw_info_config_tests_lkf.cpp
View File

@ -1,24 +0,0 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/os_interface/windows/os_interface.h"
#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
using namespace NEO;
using HwInfoConfigTestWindowsLkf = HwInfoConfigTestWindows;
LKFTEST_F(HwInfoConfigTestWindowsLkf, whenCallAdjustPlatformThenDoNothing) {
EXPECT_EQ(IGFX_LAKEFIELD, productFamily);
auto hwInfoConfig = HwInfoConfig::get(productFamily);
outHwInfo = pInHwInfo;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}

9
opencl/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp
View File

@ -47,15 +47,6 @@ ADLSTEST_F(HwInfoConfigTestLinuxAdls, configureHwInfoAdls) {
EXPECT_FALSE(outHwInfo.featureTable.ftrTileY);
}
ADLSTEST_F(HwInfoConfigTestLinuxAdls, whenCallAdjustPlatformThenDoNothing) {
auto hwInfoConfig = HwInfoConfig::get(productFamily);
outHwInfo = pInHwInfo;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}
ADLSTEST_F(HwInfoConfigTestLinuxAdls, negative) {
auto hwInfoConfig = HwInfoConfig::get(productFamily);

13
opencl/test/unit_test/gen12lp/adls/windows/CMakeLists.txt
View File

@ -1,13 +0,0 @@
#
# Copyright (C) 2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(IGDRCL_SRCS_tests_gen12_adls_windows
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_adls.cpp
)
if(WIN32)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen12_adls_windows})
endif()

27
opencl/test/unit_test/gen12lp/adls/windows/hw_info_config_tests_adls.cpp
View File

@ -1,27 +0,0 @@
/*
* Copyright (C) 2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/os_interface/windows/os_interface.h"
#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
using namespace NEO;
using HwInfoConfigTestWindowsAdls = HwInfoConfigTestWindows;
ADLSTEST_F(HwInfoConfigTestWindowsAdls, whenCallAdjustPlatformThenDoNothing) {
EXPECT_EQ(IGFX_ALDERLAKE_S, productFamily);
auto hwInfoConfig = HwInfoConfig::get(productFamily);
PLATFORM *testPlatform = &outHwInfo.platform;
testPlatform->eDisplayCoreFamily = IGFX_GEN11_CORE;
testPlatform->eRenderCoreFamily = IGFX_GEN11_CORE;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
EXPECT_EQ(IGFX_GEN12LP_CORE, testPlatform->eRenderCoreFamily);
EXPECT_EQ(IGFX_GEN12LP_CORE, testPlatform->eDisplayCoreFamily);
}

13
opencl/test/unit_test/gen12lp/dg1/windows/hw_info_config_tests_dg1.cpp
View File

@ -13,19 +13,6 @@ using namespace NEO;
using HwInfoConfigTestWindowsDg1 = HwInfoConfigTestWindows;
DG1TEST_F(HwInfoConfigTestWindowsDg1, whenCallAdjustPlatformThenDoNothing) {
EXPECT_EQ(IGFX_DG1, productFamily);
auto hwInfoConfig = HwInfoConfig::get(productFamily);
PLATFORM *testPlatform = &outHwInfo.platform;
testPlatform->eDisplayCoreFamily = IGFX_GEN11_CORE;
testPlatform->eRenderCoreFamily = IGFX_GEN11_CORE;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
EXPECT_EQ(IGFX_GEN12LP_CORE, testPlatform->eRenderCoreFamily);
EXPECT_EQ(IGFX_GEN12LP_CORE, testPlatform->eDisplayCoreFamily);
}
DG1TEST_F(HwInfoConfigTestWindowsDg1, whenCheckIfEvenContextCountIsRequiredThenReturnTrue) {
EXPECT_EQ(IGFX_DG1, productFamily);

9
opencl/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp
View File

@ -47,15 +47,6 @@ RKLTEST_F(HwInfoConfigTestLinuxRkl, configureHwInfoRkl) {
EXPECT_FALSE(outHwInfo.featureTable.ftrTileY);
}
RKLTEST_F(HwInfoConfigTestLinuxRkl, whenCallAdjustPlatformThenDoNothing) {
auto hwInfoConfig = HwInfoConfig::get(productFamily);
outHwInfo = pInHwInfo;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}
RKLTEST_F(HwInfoConfigTestLinuxRkl, negative) {
auto hwInfoConfig = HwInfoConfig::get(productFamily);

13
opencl/test/unit_test/gen12lp/rkl/windows/CMakeLists.txt
View File

@ -1,13 +0,0 @@
#
# Copyright (C) 2018-2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(IGDRCL_SRCS_tests_gen12_rkl_windows
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_rkl.cpp
)
if(WIN32)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen12_rkl_windows})
endif()

27
opencl/test/unit_test/gen12lp/rkl/windows/hw_info_config_tests_rkl.cpp
View File

@ -1,27 +0,0 @@
/*
* Copyright (C) 2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/os_interface/windows/os_interface.h"
#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
using namespace NEO;
using HwInfoConfigTestWindowsRkl = HwInfoConfigTestWindows;
RKLTEST_F(HwInfoConfigTestWindowsRkl, whenCallAdjustPlatformThenDoNothing) {
EXPECT_EQ(IGFX_ROCKETLAKE, productFamily);
auto hwInfoConfig = HwInfoConfig::get(productFamily);
PLATFORM *testPlatform = &outHwInfo.platform;
testPlatform->eDisplayCoreFamily = IGFX_GEN11_CORE;
testPlatform->eRenderCoreFamily = IGFX_GEN11_CORE;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
EXPECT_EQ(IGFX_GEN12LP_CORE, testPlatform->eRenderCoreFamily);
EXPECT_EQ(IGFX_GEN12LP_CORE, testPlatform->eDisplayCoreFamily);
}

13
opencl/test/unit_test/gen12lp/tgllp/windows/CMakeLists.txt
View File

@ -1,13 +0,0 @@
#
# Copyright (C) 2019-2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(IGDRCL_SRCS_tests_gen12_tgllp_windows
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_tgllp.cpp
)
if(WIN32)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen12_tgllp_windows})
endif()

27
opencl/test/unit_test/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp
View File

@ -1,27 +0,0 @@
/*
* Copyright (C) 2019-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/os_interface/windows/os_interface.h"
#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
using namespace NEO;
using HwInfoConfigTestWindowsTgllp = HwInfoConfigTestWindows;
TGLLPTEST_F(HwInfoConfigTestWindowsTgllp, whenCallAdjustPlatformThenSetGen12LpFamily) {
EXPECT_EQ(IGFX_TIGERLAKE_LP, productFamily);
auto hwInfoConfig = HwInfoConfig::get(productFamily);
PLATFORM *testPlatform = &outHwInfo.platform;
testPlatform->eDisplayCoreFamily = IGFX_GEN11_CORE;
testPlatform->eRenderCoreFamily = IGFX_GEN11_CORE;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
EXPECT_EQ(IGFX_GEN12LP_CORE, testPlatform->eRenderCoreFamily);
EXPECT_EQ(IGFX_GEN12LP_CORE, testPlatform->eDisplayCoreFamily);
}

9
opencl/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp
View File

@ -150,15 +150,6 @@ BDWTEST_F(HwInfoConfigTestLinuxBdw, configureHwInfoEdram) {
EXPECT_EQ(1u, outHwInfo.featureTable.ftrEDram);
}
BDWTEST_F(HwInfoConfigTestLinuxBdw, whenCallAdjustPlatformThenDoNothing) {
auto hwInfoConfig = HwInfoConfig::get(productFamily);
outHwInfo = pInHwInfo;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}
template <typename T>
class BdwHwInfoTests : public ::testing::Test {
};

1
opencl/test/unit_test/gen8/bdw/windows/CMakeLists.txt
View File

@ -7,7 +7,6 @@
set(IGDRCL_SRCS_tests_gen8_bdw_windows
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_bdw_windows.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_bdw.cpp
)
if(WIN32)

24
opencl/test/unit_test/gen8/bdw/windows/hw_info_config_tests_bdw.cpp
View File

@ -1,24 +0,0 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/os_interface/windows/os_interface.h"
#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
using namespace NEO;
using HwInfoConfigTestWindowsBdw = HwInfoConfigTestWindows;
BDWTEST_F(HwInfoConfigTestWindowsBdw, whenCallAdjustPlatformThenDoNothing) {
EXPECT_EQ(IGFX_BROADWELL, productFamily);
auto hwInfoConfig = HwInfoConfig::get(productFamily);
outHwInfo = pInHwInfo;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}

9
opencl/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp
View File

@ -209,15 +209,6 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, configureHwInfoWaFlags) {
EXPECT_EQ(0, ret);
}
BXTTEST_F(HwInfoConfigTestLinuxBxt, whenCallAdjustPlatformThenDoNothing) {
auto hwInfoConfig = HwInfoConfig::get(productFamily);
outHwInfo = pInHwInfo;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}
template <typename T>
class BxtHwInfoTests : public ::testing::Test {
};

1
opencl/test/unit_test/gen9/bxt/windows/CMakeLists.txt
View File

@ -7,7 +7,6 @@
set(IGDRCL_SRCS_tests_gen9_bxt_windows
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_bxt_windows.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_bxt.cpp
)
if(WIN32)

24
opencl/test/unit_test/gen9/bxt/windows/hw_info_config_tests_bxt.cpp
View File

@ -1,24 +0,0 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/os_interface/windows/os_interface.h"
#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
using namespace NEO;
using HwInfoConfigTestWindowsBxt = HwInfoConfigTestWindows;
BXTTEST_F(HwInfoConfigTestWindowsBxt, whenCallAdjustPlatformThenDoNothing) {
EXPECT_EQ(IGFX_BROXTON, productFamily);
auto hwInfoConfig = HwInfoConfig::get(productFamily);
outHwInfo = pInHwInfo;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}

9
opencl/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp
View File

@ -164,15 +164,6 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, configureHwInfoEdram) {
EXPECT_EQ(1u, outHwInfo.featureTable.ftrEDram);
}
CFLTEST_F(HwInfoConfigTestLinuxCfl, whenCallAdjustPlatformThenDoNothing) {
auto hwInfoConfig = HwInfoConfig::get(productFamily);
outHwInfo = pInHwInfo;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}
template <typename T>
class CflHwInfoTests : public ::testing::Test {
};

1
opencl/test/unit_test/gen9/cfl/windows/CMakeLists.txt
View File

@ -7,7 +7,6 @@
set(IGDRCL_SRCS_tests_gen9_cfl_windows
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_cfl_windows.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_cfl.cpp
)
if(WIN32)

24
opencl/test/unit_test/gen9/cfl/windows/hw_info_config_tests_cfl.cpp
View File

@ -1,24 +0,0 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/os_interface/windows/os_interface.h"
#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
using namespace NEO;
using HwInfoConfigTestWindowsCfl = HwInfoConfigTestWindows;
CFLTEST_F(HwInfoConfigTestWindowsCfl, whenCallAdjustPlatformThenDoNothing) {
EXPECT_EQ(IGFX_COFFEELAKE, productFamily);
auto hwInfoConfig = HwInfoConfig::get(productFamily);
outHwInfo = pInHwInfo;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}

9
opencl/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp
View File

@ -200,15 +200,6 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, configureHwInfoWaFlags) {
EXPECT_EQ(0, ret);
}
GLKTEST_F(HwInfoConfigTestLinuxGlk, whenCallAdjustPlatformThenDoNothing) {
auto hwInfoConfig = HwInfoConfig::get(productFamily);
outHwInfo = pInHwInfo;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}
template <typename T>
class GlkHwInfoTests : public ::testing::Test {
};

1
opencl/test/unit_test/gen9/glk/windows/CMakeLists.txt
View File

@ -7,7 +7,6 @@
set(IGDRCL_SRCS_tests_gen9_glk_windows
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_glk_windows.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_glk.cpp
)
if(WIN32)

24
opencl/test/unit_test/gen9/glk/windows/hw_info_config_tests_glk.cpp
View File

@ -1,24 +0,0 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/os_interface/windows/os_interface.h"
#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
using namespace NEO;
using HwInfoConfigTestWindowsGlk = HwInfoConfigTestWindows;
GLKTEST_F(HwInfoConfigTestWindowsGlk, whenCallAdjustPlatformThenDoNothing) {
EXPECT_EQ(IGFX_GEMINILAKE, productFamily);
auto hwInfoConfig = HwInfoConfig::get(productFamily);
outHwInfo = pInHwInfo;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}

9
opencl/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp
View File

@ -219,15 +219,6 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfoEdram) {
EXPECT_EQ(1u, outHwInfo.featureTable.ftrEDram);
}
KBLTEST_F(HwInfoConfigTestLinuxKbl, whenCallAdjustPlatformThenDoNothing) {
auto hwInfoConfig = HwInfoConfig::get(productFamily);
outHwInfo = pInHwInfo;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}
template <typename T>
class KblHwInfoTests : public ::testing::Test {
};

1
opencl/test/unit_test/gen9/kbl/windows/CMakeLists.txt
View File

@ -7,7 +7,6 @@
set(IGDRCL_SRCS_tests_gen9_kbl_windows
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_kbl_windows.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_kbl.cpp
)
if(WIN32)

23
opencl/test/unit_test/gen9/kbl/windows/hw_info_config_tests_kbl.cpp
View File

@ -1,23 +0,0 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/os_interface/windows/os_interface.h"
#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
using namespace NEO;
using HwInfoConfigTestWindowsKbl = HwInfoConfigTestWindows;
KBLTEST_F(HwInfoConfigTestWindowsKbl, whenCallAdjustPlatformThenDoNothing) {
EXPECT_EQ(IGFX_KABYLAKE, productFamily);
auto hwInfoConfig = HwInfoConfig::get(productFamily);
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}

9
opencl/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp
View File

@ -243,15 +243,6 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfoEdram) {
EXPECT_EQ(1u, outHwInfo.featureTable.ftrEDram);
}
SKLTEST_F(HwInfoConfigTestLinuxSkl, whenCallAdjustPlatformThenDoNothing) {
auto hwInfoConfig = HwInfoConfig::get(productFamily);
outHwInfo = pInHwInfo;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}
template <typename T>
class SklHwInfoTests : public ::testing::Test {
};

1
opencl/test/unit_test/gen9/skl/windows/CMakeLists.txt
View File

@ -7,7 +7,6 @@
set(IGDRCL_SRCS_tests_gen9_skl_windows
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_skl_windows.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_skl.cpp
)
if(WIN32)

24
opencl/test/unit_test/gen9/skl/windows/hw_info_config_tests_skl.cpp
View File

@ -1,24 +0,0 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/os_interface/windows/os_interface.h"
#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
using namespace NEO;
using HwInfoConfigTestWindowsSkl = HwInfoConfigTestWindows;
SKLTEST_F(HwInfoConfigTestWindowsSkl, whenCallAdjustPlatformThenDoNothing) {
EXPECT_EQ(IGFX_SKYLAKE, productFamily);
auto hwInfoConfig = HwInfoConfig::get(productFamily);
outHwInfo = pInHwInfo;
hwInfoConfig->adjustPlatformForProductFamily(&outHwInfo);
int ret = memcmp(&outHwInfo.platform, &pInHwInfo.platform, sizeof(PLATFORM));
EXPECT_EQ(0, ret);
}

4
opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp
View File

@ -45,10 +45,6 @@ int HwInfoConfigHw<IGFX_UNKNOWN>::configureHardwareCustom(HardwareInfo *hwInfo,
return (hwInfo->platform.usDeviceID == 10) ? -1 : 0;
}
template <>
void HwInfoConfigHw<IGFX_UNKNOWN>::adjustPlatformForProductFamily(HardwareInfo *hwInfo) {
}
template <>
cl_unified_shared_memory_capabilities_intel HwInfoConfigHw<IGFX_UNKNOWN>::getHostMemCapabilities(const HardwareInfo * /*hwInfo*/) {
return 0;

4
opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp
View File

@ -48,10 +48,6 @@ int HwInfoConfigHw<IGFX_UNKNOWN>::configureHardwareCustom(HardwareInfo *hwInfo,
return 0;
}
template <>
void HwInfoConfigHw<IGFX_UNKNOWN>::adjustPlatformForProductFamily(HardwareInfo *hwInfo) {
}
template <>
bool HwInfoConfigHw<IGFX_UNKNOWN>::isEvenContextCountRequired() {
return false;

2
shared/source/os_interface/hw_info_config.h
View File

@ -27,7 +27,6 @@ class HwInfoConfig {
}
int configureHwInfo(const HardwareInfo *inHwInfo, HardwareInfo *outHwInfo, OSInterface *osIface);
virtual int configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) = 0;
virtual void adjustPlatformForProductFamily(HardwareInfo *hwInfo) = 0;
virtual uint64_t getHostMemCapabilities(const HardwareInfo *hwInfo) = 0;
virtual uint64_t getDeviceMemCapabilities() = 0;
virtual uint64_t getSingleDeviceSharedMemCapabilities() = 0;
@ -45,7 +44,6 @@ class HwInfoConfigHw : public HwInfoConfig {
return &instance;
}
int configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) override;
void adjustPlatformForProductFamily(HardwareInfo *hwInfo) override;
uint64_t getHostMemCapabilities(const HardwareInfo *hwInfo) override;
uint64_t getDeviceMemCapabilities() override;
uint64_t getSingleDeviceSharedMemCapabilities() override;

4
shared/source/os_interface/hw_info_config.inl
View File

@ -9,10 +9,6 @@
namespace NEO {
template <PRODUCT_FAMILY gfxProduct>
void HwInfoConfigHw<gfxProduct>::adjustPlatformForProductFamily(HardwareInfo *hwInfo) {
}
template <PRODUCT_FAMILY gfxProduct>
bool HwInfoConfigHw<gfxProduct>::isEvenContextCountRequired() {
return false;

1
shared/source/os_interface/windows/wddm/wddm.cpp
View File

@ -94,7 +94,6 @@ bool Wddm::init() {
HwInfoConfig *hwConfig = HwInfoConfig::get(productFamily);
hwConfig->adjustPlatformForProductFamily(hardwareInfo.get());
if (hwConfig->configureHwInfo(hardwareInfo.get(), hardwareInfo.get(), nullptr)) {
return false;
}