From 95032bb2154c15174e65a258dcc901f24598f9c2 Mon Sep 17 00:00:00 2001 From: Rafal Maziejuk Date: Fri, 15 Oct 2021 16:34:11 +0000 Subject: [PATCH] Move isBlitterForImagesSupported ULTs to correct files Signed-off-by: Rafal Maziejuk --- opencl/test/unit_test/helpers/hw_helper_tests.cpp | 5 ----- .../test/unit_test/os_interface/hw_info_config_tests.cpp | 5 +++++ .../unit_test/xe_hp_core/hw_helper_tests_xe_hp_core.cpp | 7 ------- .../common/xe_hp_core/test_hw_info_config_xe_hp_core.cpp | 7 +++++++ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/opencl/test/unit_test/helpers/hw_helper_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_tests.cpp index acd1ce8bc2..ed6d1d94c2 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests.cpp @@ -1207,11 +1207,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, HwHelperTest, givenHwHelperWhenGettingPlanarYuvHeigh EXPECT_EQ(helper.getPlanarYuvMaxHeight(), 16352u); } -HWTEST_F(HwHelperTest, givenHwHelperWhenIsBlitterForImagesSupportedIsCalledThenFalseIsReturned) { - const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); - EXPECT_FALSE(hwInfoConfig.isBlitterForImagesSupported()); -} - TEST_F(HwHelperTest, WhenGettingIsCpuImageTransferPreferredThenFalseIsReturned) { REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); auto &hwHelper = HwHelper::get(renderCoreFamily); diff --git a/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp b/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp index 6afb9839ea..cbf4d57a54 100644 --- a/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp +++ b/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp @@ -336,3 +336,8 @@ HWTEST_F(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfStorageInfoAdjustmentIsRe const auto &hwInfoConfig = *HwInfoConfig::get(pInHwInfo.platform.eProductFamily); EXPECT_FALSE(hwInfoConfig.isStorageInfoAdjustmentRequired()); } + +HWTEST_F(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfBlitterForImagesIsSupportedThenFalseIsReturned) { + const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); + EXPECT_FALSE(hwInfoConfig.isBlitterForImagesSupported()); +} diff --git a/opencl/test/unit_test/xe_hp_core/hw_helper_tests_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/hw_helper_tests_xe_hp_core.cpp index ffb9eb44ee..4e4db67a51 100644 --- a/opencl/test/unit_test/xe_hp_core/hw_helper_tests_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/hw_helper_tests_xe_hp_core.cpp @@ -308,10 +308,3 @@ XE_HP_CORE_TEST_F(HwHelperTestXE_HP_CORE, givenXeHpCoreHelperWhenCheckDirectSubm XE_HP_CORE_TEST_F(HwHelperTestXE_HP_CORE, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion) { EXPECT_EQ(ClHwHelperMock::makeDeviceIpVersion(12, 5, 1), ClHwHelper::get(renderCoreFamily).getDeviceIpVersion(*defaultHwInfo)); } - -XE_HP_CORE_TEST_F(HwHelperTestXE_HP_CORE, givenXeHpCoreWhenIsBlitterForImagesSupportedIsCalledThenFalseIsReturned) { - HardwareInfo hwInfo = *defaultHwInfo; - const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); - - EXPECT_FALSE(hwInfoConfig.isBlitterForImagesSupported()); -} \ No newline at end of file diff --git a/shared/test/common/xe_hp_core/test_hw_info_config_xe_hp_core.cpp b/shared/test/common/xe_hp_core/test_hw_info_config_xe_hp_core.cpp index aaa2c14f30..c2cbb46e34 100644 --- a/shared/test/common/xe_hp_core/test_hw_info_config_xe_hp_core.cpp +++ b/shared/test/common/xe_hp_core/test_hw_info_config_xe_hp_core.cpp @@ -110,3 +110,10 @@ XEHPTEST_F(TestXeHPHwInfoConfig, givenXEHPWhenHeapInLocalMemIsCalledThenCorrectV EXPECT_TRUE(hwInfoConfig.heapInLocalMem(hwInfo)); } } + +XEHPTEST_F(TestXeHPHwInfoConfig, givenXeHpCoreWhenIsBlitterForImagesSupportedIsCalledThenFalseIsReturned) { + HardwareInfo hwInfo = *defaultHwInfo; + const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); + + EXPECT_FALSE(hwInfoConfig.isBlitterForImagesSupported()); +}