Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix setting hardwareInfo

Browse Source 
- use correct hwInfoConfig values

Change-Id: Iea1604fb14f5da7dbacc5c360b853513ef202955
Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2020-03-03 17:59:45 +01:00
committed by sys_ocldev
parent 8c777a879d
commit b1df098c2d
3 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opencl/source/gen12lp/hw_info_tgllp.inl
View File

@ -192,12 +192,12 @@ void TGLLP_1x2x16::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTabl
}; };
const HardwareInfo TGLLP::hwInfo = TGLLP_1x6x16::hwInfo; const HardwareInfo TGLLP::hwInfo = TGLLP_1x6x16::hwInfo;
const uint64_t TGLLP::defaultHardwareInfoConfig = 0x100060016; const uint64_t TGLLP::defaultHardwareInfoConfig = 0x100060010;
void setupTGLLPHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) { void setupTGLLPHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
if (hwInfoConfig == 0x100060016) { if (hwInfoConfig == 0x100060010) {
TGLLP_1x6x16::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable); TGLLP_1x6x16::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == 0x100020016) { } else if (hwInfoConfig == 0x100020010) {
TGLLP_1x2x16::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable); TGLLP_1x2x16::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
} else if (hwInfoConfig == 0x0) { } else if (hwInfoConfig == 0x0) {
// Default config // Default config

32
opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp
View File

@ -13,10 +13,9 @@
using namespace NEO; using namespace NEO;
TEST(TgllpHwInfoConfig, givenHwInfoErrorneousConfigString) { using TgllpHwInfoConfig = ::testing::Test;
if (IGFX_TIGERLAKE_LP != productFamily) {
return; TGLLPTEST_F(TgllpHwInfoConfig, givenHwInfoErrorneousConfigString) {
}
HardwareInfo hwInfo; HardwareInfo hwInfo;
GT_SYSTEM_INFO &gtSystemInfo = hwInfo.gtSystemInfo; GT_SYSTEM_INFO &gtSystemInfo = hwInfo.gtSystemInfo;
@ -28,6 +27,25 @@ TEST(TgllpHwInfoConfig, givenHwInfoErrorneousConfigString) {
EXPECT_EQ(0u, gtSystemInfo.EUCount); EXPECT_EQ(0u, gtSystemInfo.EUCount);
} }
TGLLPTEST_F(TgllpHwInfoConfig, whenUsingCorrectConfigValueThenCorrectHwInfoIsReturned) {
HardwareInfo hwInfo;
GT_SYSTEM_INFO &gtSystemInfo = hwInfo.gtSystemInfo;
uint64_t config = 0x100060010;
gtSystemInfo = {0};
hardwareInfoSetup[productFamily](&hwInfo, false, config);
EXPECT_EQ(1u, gtSystemInfo.SliceCount);
EXPECT_EQ(6u, gtSystemInfo.DualSubSliceCount);
config = 0x100020010;
gtSystemInfo = {0};
hardwareInfoSetup[productFamily](&hwInfo, false, config);
EXPECT_EQ(1u, gtSystemInfo.SliceCount);
EXPECT_EQ(2u, gtSystemInfo.DualSubSliceCount);
}
using TgllpHwInfo = ::testing::Test; using TgllpHwInfo = ::testing::Test;
TGLLPTEST_F(TgllpHwInfo, givenBoolWhenCallTgllpHardwareInfoSetupThenFeatureTableAndWorkaroundTableAreSetCorrect) { TGLLPTEST_F(TgllpHwInfo, givenBoolWhenCallTgllpHardwareInfoSetupThenFeatureTableAndWorkaroundTableAreSetCorrect) {
@ -39,8 +57,8 @@ TGLLPTEST_F(TgllpHwInfo, givenBoolWhenCallTgllpHardwareInfoSetupThenFeatureTable
WorkaroundTable &workaroundTable = hwInfo.workaroundTable; WorkaroundTable &workaroundTable = hwInfo.workaroundTable;
uint64_t configs[] = { uint64_t configs[] = {
0x100060016, 0x100060010,
0x100020016}; 0x100020010};
for (auto &config : configs) { for (auto &config : configs) {
for (auto setParamBool : boolValue) { for (auto setParamBool : boolValue) {
@ -82,7 +100,7 @@ TGLLPTEST_F(TgllpHwInfo, givenBoolWhenCallTgllpHardwareInfoSetupThenFeatureTable
TGLLPTEST_F(TgllpHwInfo, givenHwInfoConfigStringThenAfterSetupResultingVmeIsDisabled) { TGLLPTEST_F(TgllpHwInfo, givenHwInfoConfigStringThenAfterSetupResultingVmeIsDisabled) {
HardwareInfo hwInfo; HardwareInfo hwInfo;
uint64_t config = 0x100060016; uint64_t config = 0x100060010;
hardwareInfoSetup[productFamily](&hwInfo, false, config); hardwareInfoSetup[productFamily](&hwInfo, false, config);
EXPECT_FALSE(hwInfo.capabilityTable.ftrSupportsVmeAvcTextureSampler); EXPECT_FALSE(hwInfo.capabilityTable.ftrSupportsVmeAvcTextureSampler);
EXPECT_FALSE(hwInfo.capabilityTable.ftrSupportsVmeAvcPreemption); EXPECT_FALSE(hwInfo.capabilityTable.ftrSupportsVmeAvcPreemption);

1
opencl/test/unit_test/os_interface/hw_info_config_tests.cpp
View File

@ -66,6 +66,7 @@ TEST_F(HwInfoConfigTest, givenHwInfoConfigSetHwInfoValuesFromConfigStringReturns
success = parseHwInfoConfigString("2x4x16", hwInfoConfig); success = parseHwInfoConfigString("2x4x16", hwInfoConfig);
EXPECT_TRUE(success); EXPECT_TRUE(success);
EXPECT_EQ(0x200040010u, hwInfoConfig);
setHwInfoValuesFromConfig(hwInfoConfig, outHwInfo); setHwInfoValuesFromConfig(hwInfoConfig, outHwInfo);
EXPECT_EQ(outHwInfo.gtSystemInfo.SliceCount, 2u); EXPECT_EQ(outHwInfo.gtSystemInfo.SliceCount, 2u);
EXPECT_EQ(outHwInfo.gtSystemInfo.SubSliceCount, 8u); EXPECT_EQ(outHwInfo.gtSystemInfo.SubSliceCount, 8u);