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

Revert "fix: correct number of slices based on GuC info"

Browse Source 
This reverts commit b6a56bcdde.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2024-07-23 16:01:56 +02:00
committed by Compute-Runtime-Automation
parent 1c1e437d4b
commit 2116808b8d
3 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shared/test/common/os_interface/linux/drm_mock_device_blob.h
View File

@@ -12,7 +12,7 @@
static constexpr uint32_t dummyDeviceBlobData[] = {
NEO::DeviceBlobConstants::maxSlicesSupported,
1,
0x02,
0x01,
NEO::DeviceBlobConstants::maxDualSubSlicesSupported,
1,
0x04,

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

@@ -160,7 +160,7 @@ TEST(DrmSystemInfoTest, givenSystemInfoCreatedFromDeviceBlobWhenQueryingSpecific
EXPECT_EQ(0x0Au, systemInfo.getMaxMemoryChannels());
EXPECT_EQ(0x0Bu, systemInfo.getMemoryType());
EXPECT_EQ(0x03u, systemInfo.getMaxEuPerDualSubSlice());
EXPECT_EQ(0x02u, systemInfo.getMaxSlicesSupported());
EXPECT_EQ(0x01u, systemInfo.getMaxSlicesSupported());
EXPECT_EQ(0x04u, systemInfo.getMaxDualSubSlicesSupported());
EXPECT_EQ(0x17u, systemInfo.getMaxRCS());
EXPECT_EQ(0x18u, systemInfo.getMaxCCS());
@@ -495,30 +495,3 @@ TEST(DrmSystemInfoTest, givenTopologyWithMoreEuPerDssThanInDeviceBlobWhenSetupHa
EXPECT_EQ(hwInfo.gtSystemInfo.SubSliceCount * drm.getSystemInfo()->getMaxEuPerDualSubSlice(), gtSystemInfo.EUCount);
EXPECT_EQ(hwInfo.gtSystemInfo.EUCount * drm.getSystemInfo()->getNumThreadsPerEu(), gtSystemInfo.ThreadCount);
}
TEST(DrmSystemInfoTest, givenFlatSubsliceInfoRepresentationWhenSetupHardwareInfoThenCorrectTopologyBasedOnMaxSubslicePerSliceCount) {
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
executionEnvironment->rootDeviceEnvironments[0]->initGmm();
HardwareInfo &hwInfo = *executionEnvironment->rootDeviceEnvironments[0]->getMutableHardwareInfo();
const auto &gtSystemInfo = hwInfo.gtSystemInfo;
DrmMockEngine drm(*executionEnvironment->rootDeviceEnvironments[0]);
drm.querySystemInfo();
auto systemInfo = drm.getSystemInfo();
EXPECT_NE(nullptr, systemInfo);
drm.storedSSVal = systemInfo->getMaxDualSubSlicesSupported() - 1;
drm.storedEUVal = drm.storedSSVal * systemInfo->getMaxEuPerDualSubSlice();
auto setupHardwareInfo = [](HardwareInfo *, bool, const ReleaseHelper *) {};
DeviceDescriptor device = {0, &hwInfo, setupHardwareInfo};
int ret = drm.setupHardwareInfo(&device, false);
EXPECT_EQ(ret, 0);
systemInfo = drm.getSystemInfo();
EXPECT_NE(nullptr, systemInfo);
EXPECT_EQ(gtSystemInfo.SliceCount, systemInfo->getMaxSlicesSupported());
EXPECT_EQ(gtSystemInfo.SubSliceCount, systemInfo->getMaxDualSubSlicesSupported() - 1);
EXPECT_EQ(gtSystemInfo.DualSubSliceCount, systemInfo->getMaxDualSubSlicesSupported() - 1);
}