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

fix: Move setupHardwareInfo to avoid overwrriten values from blob

Browse Source 
device setupHardwareInfo should be called before setupSystemInfo to not
override queried systemInfo values

Signed-off-by: Cencelewska, Katarzyna <katarzyna.cencelewska@intel.com>
This commit is contained in:
Cencelewska, Katarzyna
2023-01-04 17:15:35 +00:00
committed by Compute-Runtime-Automation
parent 43b790957d
commit 19763db9a2
2 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
shared/test/unit_test/os_interface/linux/drm_system_info_tests.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2022 Intel Corporation
* Copyright (C) 2020-2023 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -175,6 +175,43 @@ TEST(DrmSystemInfoTest, givenSetupHardwareInfoWhenQuerySystemInfoSucceedsThenSys
EXPECT_GT(gtSystemInfo.MemoryType, 0u);
}
TEST(DrmSystemInfoTest, givenSetupHardwareInfoWhenQuerySystemInfoSucceedsThenSystemInfoIsCreatedAndHardwareInfoSetProperlyBasedOnBlobData) {
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
executionEnvironment->rootDeviceEnvironments[0]->initGmm();
DrmMockEngine drm(*executionEnvironment->rootDeviceEnvironments[0]);
HardwareInfo hwInfo = *defaultHwInfo;
hwInfo.gtSystemInfo.MaxSlicesSupported = 0u;
hwInfo.gtSystemInfo.MaxSubSlicesSupported = 0u;
hwInfo.gtSystemInfo.MaxEuPerSubSlice = 0u;
drm.storedSVal = 0u;
drm.storedSSVal = 1u;
drm.storedEUVal = 1u;
auto expectedMaxSlicesSupported = dummyDeviceBlobData[2];
auto expectedMaxSubslicesSupported = dummyDeviceBlobData[5];
auto expectedMaxEusPerSubsliceSupported = dummyDeviceBlobData[8];
auto setupHardwareInfo = [](HardwareInfo *, bool) {};
DeviceDescriptor device = {0, &hwInfo, setupHardwareInfo};
int ret = drm.setupHardwareInfo(&device, false);
EXPECT_EQ(ret, 0);
EXPECT_NE(nullptr, drm.getSystemInfo());
const auto &gtSystemInfo = executionEnvironment->rootDeviceEnvironments[0]->getHardwareInfo()->gtSystemInfo;
EXPECT_EQ(expectedMaxSlicesSupported, gtSystemInfo.MaxSlicesSupported);
EXPECT_NE(0u, gtSystemInfo.MaxSlicesSupported);
EXPECT_EQ(expectedMaxSubslicesSupported, gtSystemInfo.MaxSubSlicesSupported);
EXPECT_NE(0u, gtSystemInfo.MaxSubSlicesSupported);
EXPECT_EQ(expectedMaxEusPerSubsliceSupported, gtSystemInfo.MaxEuPerSubSlice);
EXPECT_NE(0u, gtSystemInfo.MaxEuPerSubSlice);
}
TEST(DrmSystemInfoTest, givenZeroBankCountWhenCreatingSystemInfoThenUseDualSubslicesToCalculateL3Size) {
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
executionEnvironment->rootDeviceEnvironments[0]->initGmm();