fix hw config linux: set slice info based on slice count

Related-To: NEO-7622
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

Source: 5b2e1f6

Author: JablonskiMateusz

level_zero/tools/test/unit_tests/sources/debug/linux/debug_session_fixtures_linux.cpp

@@ -32,9 +32,14 @@ void DebugApiLinuxFixture::setUp(NEO::HardwareInfo *hwInfo) {
     }
     NEO::Drm::QueryTopologyData topologyData = {};
     mockDrm->queryTopology(neoDevice->getHardwareInfo(), topologyData);
+    auto &rootDeviceEnvironment = *neoDevice->executionEnvironment->rootDeviceEnvironments[0];
+    auto gtSystemInfo = &rootDeviceEnvironment.getMutableHardwareInfo()->gtSystemInfo;
+    for (uint32_t slice = 0; slice < GT_MAX_SLICE; slice++) {
+        gtSystemInfo->SliceInfo[slice].Enabled = slice < gtSystemInfo->SliceCount;
+    }
 
-    neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface.reset(new NEO::OSInterface);
-    neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface->setDriverModel(std::unique_ptr<DriverModel>(mockDrm));
+    rootDeviceEnvironment.osInterface.reset(new NEO::OSInterface);
+    rootDeviceEnvironment.osInterface->setDriverModel(std::unique_ptr<DriverModel>(mockDrm));
 }
 
 void DebugApiLinuxMultiDeviceFixture::setUp() {
@@ -58,9 +63,14 @@ void DebugApiLinuxMultiDeviceFixture::setUp() {
 
     NEO::Drm::QueryTopologyData topologyData = {};
     mockDrm->queryTopology(neoDevice->getHardwareInfo(), topologyData);
+    auto &rootDeviceEnvironment = *neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0];
+    auto gtSystemInfo = &rootDeviceEnvironment.getMutableHardwareInfo()->gtSystemInfo;
+    for (uint32_t slice = 0; slice < GT_MAX_SLICE; slice++) {
+        gtSystemInfo->SliceInfo[slice].Enabled = slice < gtSystemInfo->SliceCount;
+    }
 
-    neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.reset(new NEO::OSInterface);
-    neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface->setDriverModel(std::unique_ptr<DriverModel>(mockDrm));
+    rootDeviceEnvironment.osInterface.reset(new NEO::OSInterface);
+    rootDeviceEnvironment.osInterface->setDriverModel(std::unique_ptr<DriverModel>(mockDrm));
 }
 
 TileDebugSessionLinux *MockDebugSessionLinux::createTileSession(const zet_debug_config_t &config, L0::Device *device, L0::DebugSessionImp *rootDebugSession) {

shared/source/os_interface/linux/hw_info_config_drm.cpp

@@ -113,8 +113,8 @@ int ProductHelper::configureHwInfoDrm(const HardwareInfo *inHwInfo, HardwareInfo
     gtSystemInfo->MaxDualSubSlicesSupported = gtSystemInfo->MaxSubSlicesSupported;
 
     gtSystemInfo->IsDynamicallyPopulated = true;
-    for (uint32_t slice = 0; slice < gtSystemInfo->SliceCount; slice++) {
-        gtSystemInfo->SliceInfo[slice].Enabled = true;
+    for (uint32_t slice = 0; slice < GT_MAX_SLICE; slice++) {
+        gtSystemInfo->SliceInfo[slice].Enabled = slice < gtSystemInfo->SliceCount;
     }
 
     uint64_t gttSizeQuery = 0;

shared/source/xe_hpg_core/hw_info_dg2.cpp

@@ -165,18 +165,17 @@ void Dg2HwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTable
         gtSysInfo->MaxEuPerSubSlice = gtSysInfo->EUCount / gtSysInfo->SubSliceCount;
         gtSysInfo->MaxSlicesSupported = gtSysInfo->SliceCount;
         gtSysInfo->MaxSubSlicesSupported = gtSysInfo->SubSliceCount;
+        gtSysInfo->IsDynamicallyPopulated = true;
+    }
+    gtSysInfo->L3CacheSizeInKb = 1;
+    gtSysInfo->L3BankCount = 1;
 
-        gtSysInfo->L3CacheSizeInKb = 1;
-        gtSysInfo->L3BankCount = 1;
-
-        gtSysInfo->CCSInfo.IsValid = true;
-        gtSysInfo->CCSInfo.NumberOfCCSEnabled = 1;
+    gtSysInfo->CCSInfo.IsValid = true;
+    gtSysInfo->CCSInfo.NumberOfCCSEnabled = 1;
 
-        hwInfo->featureTable.ftrBcsInfo = 1;
-        gtSysInfo->IsDynamicallyPopulated = true;
-        for (uint32_t slice = 0; slice < gtSysInfo->SliceCount; slice++) {
-            gtSysInfo->SliceInfo[slice].Enabled = true;
-        }
+    hwInfo->featureTable.ftrBcsInfo = 1;
+    for (uint32_t slice = 0; slice < gtSysInfo->SliceCount; slice++) {
+        gtSysInfo->SliceInfo[slice].Enabled = true;
     }
 
     adjustHardwareInfo(hwInfo);

shared/test/common/tests_configuration.cpp

@@ -34,6 +34,7 @@ void adjustHwInfoForTests(HardwareInfo &hwInfoForTests, uint32_t euPerSubSlice,
 
     gtSystemInfo.SliceCount = sliceCount;
     gtSystemInfo.SubSliceCount = gtSystemInfo.SliceCount * subSlicePerSliceCount;
+    gtSystemInfo.DualSubSliceCount = gtSystemInfo.SubSliceCount;
     gtSystemInfo.EUCount = gtSystemInfo.SubSliceCount * euPerSubSlice - dieRecovery;
     gtSystemInfo.ThreadCount = gtSystemInfo.EUCount * threadsPerEu;
     gtSystemInfo.MaxEuPerSubSlice = std::max(gtSystemInfo.MaxEuPerSubSlice, euPerSubSlice);

shared/test/unit_test/xe_hpg_core/dg2/test_encode_dispatch_kernel_dg2.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_container/command_encoder.h"
+#include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/kernel/dispatch_kernel_encoder_interface.h"
 #include "shared/source/os_interface/hw_info_config.h"
@@ -93,6 +94,7 @@ DG2TEST_F(CommandEncodeStatesDg2Test, GivenVariousSlmTotalSizesAndSettingRevIDTo
         for (auto deviceId : {dg2G10DeviceIds[0], dg2G11DeviceIds[0], dg2G12DeviceIds[0]}) {
             hwInfo.platform.usRevId = productHelper.getHwRevIdFromStepping(revision, hwInfo);
             hwInfo.platform.usDeviceID = deviceId;
+            setHwInfoValuesFromConfig(0x200040005, hwInfo);
             if (DG2::isG10(hwInfo) && (revision < REVISION_B)) {
                 verifyPreferredSlmValues<FamilyType>(valuesToTestForDg2G10AStep, rootDeviceEnvironment);
             } else {