intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-05 09:09:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: don't use global ProductHelper getter in shared files 1/n

Browse Source 
Related-To: NEO-6853
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk
2022-12-27 03:09:52 +00:00
committed by Compute-Runtime-Automation
parent 96743747a3
commit 929e03ad8a
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
shared/test/unit_test/device_binary_format/device_binary_format_ar_tests.cpp
View File

@@ -16,6 +16,7 @@
#include "shared/source/os_interface/hw_info_config.h"
#include "shared/test/common/device_binary_format/patchtokens_tests.h"
#include "shared/test/common/helpers/default_hw_info.h"
#include "shared/test/common/mocks/mock_execution_environment.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/common/test_macros/test_base.h"
@@ -58,7 +59,8 @@ TEST(UnpackSingleDeviceBinaryAr, WhenFailedToFindMatchingBinariesThenUnpackingFa
TEST(UnpackSingleDeviceBinaryAr, WhenBinaryWithProductConfigIsFoundThenChooseItAsABestMatch) {
PatchTokensTestData::ValidEmptyProgram programTokens;
const auto &productHelper = *NEO::ProductHelper::get(productFamily);
NEO::MockExecutionEnvironment mockExecutionEnvironment{};
const auto &productHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper<NEO::ProductHelper>();
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo;
NEO::HardwareIpVersion aotConfig = {0};
aotConfig.value = productHelper.getProductConfigFromHwInfo(hwInfo);
@@ -99,7 +101,8 @@ TEST(UnpackSingleDeviceBinaryAr, WhenBinaryWithProductConfigIsFoundThenChooseItA
TEST(UnpackSingleDeviceBinaryAr, WhenBinaryWithProductConfigIsFoundThenPackedTargetDeviceBinaryIsSet) {
PatchTokensTestData::ValidEmptyProgram programTokens;
const auto &productHelper = *NEO::ProductHelper::get(productFamily);
NEO::MockExecutionEnvironment mockExecutionEnvironment{};
const auto &productHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper<NEO::ProductHelper>();
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo;
NEO::HardwareIpVersion aotConfig = {0};
aotConfig.value = productHelper.getProductConfigFromHwInfo(hwInfo);
@@ -130,7 +133,8 @@ TEST(UnpackSingleDeviceBinaryAr, WhenBinaryWithProductConfigIsFoundThenPackedTar
TEST(UnpackSingleDeviceBinaryAr, WhenMultipleBinariesMatchedThenChooseBestMatch) {
PatchTokensTestData::ValidEmptyProgram programTokens;
const auto &productHelper = *NEO::ProductHelper::get(productFamily);
NEO::MockExecutionEnvironment mockExecutionEnvironment{};
const auto &productHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper<NEO::ProductHelper>();
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo;
NEO::HardwareIpVersion aotConfig = {0};
aotConfig.value = productHelper.getProductConfigFromHwInfo(hwInfo);
@@ -239,7 +243,8 @@ TEST(UnpackSingleDeviceBinaryAr, WhenFailedToUnpackMatchWithProductConfigThenTry
PatchTokensTestData::ValidEmptyProgram programTokens;
PatchTokensTestData::ValidEmptyProgram programTokensWrongTokenVersion;
const auto &productHelper = *NEO::ProductHelper::get(productFamily);
NEO::MockExecutionEnvironment mockExecutionEnvironment{};
const auto &productHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper<NEO::ProductHelper>();
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo;
NEO::HardwareIpVersion aotConfig = {0};
aotConfig.value = productHelper.getProductConfigFromHwInfo(hwInfo);
@@ -347,7 +352,8 @@ TEST(UnpackSingleDeviceBinaryAr, WhenDeviceBinaryNotMatchedButIrWithProductFamil
TEST(UnpackSingleDeviceBinaryAr, WhenDeviceBinaryNotMatchedButIrWithProductConfigAvailableThenUseIr) {
PatchTokensTestData::ValidEmptyProgram programTokens;
const auto &productHelper = *NEO::ProductHelper::get(productFamily);
NEO::MockExecutionEnvironment mockExecutionEnvironment{};
const auto &productHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper<NEO::ProductHelper>();
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo;
NEO::HardwareIpVersion aotConfig = {0};
aotConfig.value = productHelper.getProductConfigFromHwInfo(hwInfo);
@@ -571,7 +577,8 @@ TEST(UnpackSingleDeviceBinaryAr, WhenCouldNotFindBinaryWithRightPointerSizeThenU
PatchTokensTestData::ValidEmptyProgram programTokens;
NEO::Ar::ArEncoder encoder;
const auto &productHelper = *NEO::ProductHelper::get(productFamily);
NEO::MockExecutionEnvironment mockExecutionEnvironment{};
const auto &productHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper<NEO::ProductHelper>();
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo;
NEO::HardwareIpVersion aotConfig = {0};
aotConfig.value = productHelper.getProductConfigFromHwInfo(hwInfo);