intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-26 07:00:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: use relative subslice mapping indices in Xe DRM

Browse Source 
This aligns behavior with i915 and L0 spec.

Signed-off-by: Radoslaw Jablonski <radoslaw.jablonski@intel.com>
This commit is contained in:
Radoslaw Jablonski
2025-08-05 21:42:01 +00:00
committed by Compute-Runtime-Automation
parent 9ec004ba59
commit e190e1b8ec
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp
View File

@@ -596,8 +596,9 @@ bool IoctlHelperXe::getTopologyDataAndMap(const HardwareInfo &hwInfo, DrmQueryTo
auto byte = subSliceId / 8;
auto bit = subSliceId & 0b111;
int sliceId = static_cast<int>(subSliceId / topologyData.maxSubSlicesPerSlice);
int subSliceIdRelative = static_cast<int>(subSliceId % topologyData.maxSubSlicesPerSlice);
if (subSliceInfo[byte].test(bit)) {
subSliceIndices.push_back(subSliceId);
subSliceIndices.push_back(subSliceIdRelative);
subSliceCountPerTile++;
if (sliceId != previouslyEnabledSlice) {
previouslyEnabledSlice = sliceId;

46
shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp
View File

@@ -1486,6 +1486,52 @@ TEST_F(IoctlHelperXeTest, givenMissingEuPerDssInTopologyWhenGetTopologyDataAndMa
EXPECT_EQ(8, topologyData.maxEusPerSubSlice);
}
TEST_F(IoctlHelperXeTest, givenSliceWithIdxGreaterThanZeroWhenGetTopologyDataAndMapThenSubSliceIndicesAreRelativeToTheSlice) {
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
auto drm = DrmMockXe::create(*executionEnvironment->rootDeviceEnvironments[0]);
auto xeIoctlHelper = static_cast<MockIoctlHelperXe *>(drm->getIoctlHelper());
auto &hwInfo = *executionEnvironment->rootDeviceEnvironments[0]->getMutableHardwareInfo();
xeIoctlHelper->initialize();
const auto &tileIdToGtId = xeIoctlHelper->tileIdToGtId;
auto numTiles = tileIdToGtId.size();
for (auto &dssConfigType : {DRM_XE_TOPO_DSS_GEOMETRY, DRM_XE_TOPO_DSS_COMPUTE}) {
drm->queryTopology.clear();
DrmQueryTopologyData topologyData{};
TopologyMap topologyMap{};
for (auto tileId = 0u; tileId < numTiles; tileId++) {
drm->addMockedQueryTopologyData(tileIdToGtId[tileId], dssConfigType, 8, {0, 0b1100'0011, 0, 0, 0, 0, 0, 0});
drm->addMockedQueryTopologyData(tileIdToGtId[tileId], DRM_XE_TOPO_EU_PER_DSS, 4, {0b1111'1111, 0, 0, 0});
}
hwInfo.gtSystemInfo.MaxSlicesSupported = 2;
hwInfo.gtSystemInfo.MaxSubSlicesSupported = 16;
hwInfo.gtSystemInfo.MaxEuPerSubSlice = 8;
auto result = xeIoctlHelper->getTopologyDataAndMap(hwInfo, topologyData, topologyMap);
EXPECT_TRUE(result);
EXPECT_EQ(1, topologyData.sliceCount);
EXPECT_EQ(2, topologyData.maxSlices);
EXPECT_EQ(4, topologyData.subSliceCount);
EXPECT_EQ(8, topologyData.maxSubSlicesPerSlice);
EXPECT_EQ(32, topologyData.euCount);
EXPECT_EQ(8, topologyData.maxEusPerSubSlice);
for (auto tileId = 0u; tileId < numTiles; tileId++) {
std::vector<int> expectedSubSliceIndices{0, 1, 6, 7};
ASSERT_EQ(topologyMap[tileId].subsliceIndices.size(), expectedSubSliceIndices.size());
for (auto i = 0u; i < topologyMap[tileId].subsliceIndices.size(); ++i) {
EXPECT_EQ(topologyMap[tileId].subsliceIndices[i], expectedSubSliceIndices[i]);
}
}
}
}
TEST_F(IoctlHelperXeTest, whenCreatingEngineInfoThenProperEnginesAreDiscovered) {
DebugManagerStateRestore restorer;
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();