Revert "fix: if device hierarchy is flat then getSubDevicesCount return 1u"

This reverts commit cb0bb57.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>

Source: fca2159

Author: Compute-Runtime-Validation

level_zero/core/source/device/device_imp.cpp

@@ -1596,7 +1596,7 @@ void DeviceImp::setDebugSession(DebugSession *session) {
 }
 bool DeviceImp::toPhysicalSliceId(const NEO::TopologyMap &topologyMap, uint32_t &slice, uint32_t &subslice, uint32_t &deviceIndex) {
     auto hwInfo = neoDevice->getRootDeviceEnvironment().getHardwareInfo();
-    uint32_t subDeviceCount = NEO::GfxCoreHelper::getSubDevicesCount(neoDevice->getExecutionEnvironment()->isExposingSubDevicesAsDevices(), hwInfo);
+    uint32_t subDeviceCount = NEO::GfxCoreHelper::getSubDevicesCount(hwInfo);
     auto deviceBitfield = neoDevice->getDeviceBitfield();
 
     if (topologyMap.size() == subDeviceCount && !isSubdevice) {

level_zero/sysman/source/api/ras/linux/sysman_os_ras_imp_hbm.cpp

@@ -29,7 +29,7 @@ ze_result_t LinuxRasSourceHbm::osRasGetState(zes_ras_state_t &state, ze_bool_t c
         return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
     }
     uint32_t subDeviceCount = 0;
-    subDeviceCount = NEO::GfxCoreHelper::getSubDevicesCount(false, &pDevice->getHardwareInfo());
+    subDeviceCount = NEO::GfxCoreHelper::getSubDevicesCount(&pDevice->getHardwareInfo());
     if (clear == true) {
         uint64_t errorCount = 0;
         ze_result_t result = pFwInterface->fwGetMemoryErrorCount(osRasErrorType, subDeviceCount, subdeviceId, errorCount);

level_zero/sysman/source/linux/zes_os_sysman_imp.cpp

@@ -58,7 +58,7 @@ ze_result_t LinuxSysmanImp::init() {
     }
     DEBUG_BREAK_IF(nullptr == pSysfsAccess);
 
-    subDeviceCount = NEO::GfxCoreHelper::getSubDevicesCount(false, &pParentSysmanDeviceImp->getHardwareInfo());
+    subDeviceCount = NEO::GfxCoreHelper::getSubDevicesCount(&pParentSysmanDeviceImp->getHardwareInfo());
     if (subDeviceCount == 1) {
         subDeviceCount = 0;
     }

level_zero/sysman/source/windows/zes_os_sysman_imp.cpp

@@ -30,7 +30,7 @@ ze_result_t WddmSysmanImp::init() {
     pKmdSysManager = KmdSysManager::create(pWddm);
     UNRECOVERABLE_IF(nullptr == pKmdSysManager);
 
-    subDeviceCount = NEO::GfxCoreHelper::getSubDevicesCount(false, &pParentSysmanDeviceImp->getHardwareInfo());
+    subDeviceCount = NEO::GfxCoreHelper::getSubDevicesCount(&pParentSysmanDeviceImp->getHardwareInfo());
     if (subDeviceCount == 1) {
         subDeviceCount = 0;
     }

level_zero/tools/source/sysman/sysman_imp.cpp

@@ -8,7 +8,6 @@
 #include "level_zero/tools/source/sysman/sysman_imp.h"
 
 #include "shared/source/device/sub_device.h"
-#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/hw_info.h"
@@ -89,7 +88,7 @@ void SysmanDeviceImp::getSysmanDeviceInfo(zes_device_handle_t hDevice, uint32_t
     // Check for root device with 1 sub-device case
     if (!neoDevice->isSubDevice() && neoDevice->getDeviceBitfield().count() == 1) {
         subdeviceId = Math::log2(static_cast<uint32_t>(neoDevice->getDeviceBitfield().to_ulong()));
-        if ((NEO::GfxCoreHelper::getSubDevicesCount(neoDevice->getExecutionEnvironment()->isExposingSubDevicesAsDevices(), &neoDevice->getHardwareInfo()) > 1) && useMultiArchEnabled) {
+        if ((NEO::GfxCoreHelper::getSubDevicesCount(&neoDevice->getHardwareInfo()) > 1) && useMultiArchEnabled) {
             onSubdevice = true;
         }
     } else if (neoDevice->isSubDevice()) {

level_zero/tools/test/unit_tests/sources/sysman/mocks/mock_sysman_device_info.h

@@ -31,7 +31,6 @@ class SysmanMultiDeviceInfoFixture : public ::testing::Test {
         hwInfo.gtSystemInfo.MultiTileArchInfo.Tile0 = 1;
         hwInfo.gtSystemInfo.MultiTileArchInfo.Tile1 = 1;
         auto executionEnvironment = MockDevice::prepareExecutionEnvironment(&hwInfo, 0u);
-        executionEnvironment->setExposeSubDevicesAsDevices(false);
         neoDevice = NEO::MockDevice::createWithExecutionEnvironment<NEO::MockDevice>(&hwInfo, executionEnvironment, 0u);
 
         NEO::DeviceVector devices;

opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp

@@ -81,7 +81,7 @@ void MulticontextAubFixture::setUp(uint32_t numberOfTiles, EnabledCommandStreame
         strfilename << renderEngineName << "_CCS0_3"; // xehp_config_name_RCS_CCS0_3.aub
     }
 
-    auto filename = AUBCommandStreamReceiver::createFullFilePath(localHwInfo, strfilename.str(), rootDeviceIndex, platform()->peekExecutionEnvironment()->isExposingSubDevicesAsDevices());
+    auto filename = AUBCommandStreamReceiver::createFullFilePath(localHwInfo, strfilename.str(), rootDeviceIndex);
 
     DebugManager.flags.AUBDumpCaptureFileName.set(filename);
 

opencl/test/unit_test/device/device_tests.cpp

@@ -735,7 +735,7 @@ TEST(ClDeviceHelperTest, givenNonZeroNumberOfTilesWhenPrepareDeviceEnvironmentsC
     HardwareInfo hwInfo{&platform, &skuTable, &waTable, &sysInfo, capTable};
     DebugManager.flags.CreateMultipleSubDevices.set(0);
 
-    uint32_t devicesCount = GfxCoreHelper::getSubDevicesCount(false, &hwInfo);
+    uint32_t devicesCount = GfxCoreHelper::getSubDevicesCount(&hwInfo);
     EXPECT_EQ(devicesCount, 3u);
 }
 
@@ -751,7 +751,7 @@ TEST(ClDeviceHelperTest, givenZeroNumberOfTilesWhenPrepareDeviceEnvironmentsCoun
     HardwareInfo hwInfo{&platform, &skuTable, &waTable, &sysInfo, capTable};
     DebugManager.flags.CreateMultipleSubDevices.set(0);
 
-    uint32_t devicesCount = GfxCoreHelper::getSubDevicesCount(false, &hwInfo);
+    uint32_t devicesCount = GfxCoreHelper::getSubDevicesCount(&hwInfo);
     EXPECT_EQ(devicesCount, 1u);
 }
 

opencl/test/unit_test/linux/main_linux_dll.cpp

@@ -715,7 +715,7 @@ TEST_F(DrmTests, whenDrmIsCreatedWithMultipleSubDevicesThenCreateMultipleVirtual
         GTEST_SKIP();
     }
 
-    auto numSubDevices = GfxCoreHelper::getSubDevicesCount(false, rootDeviceEnvironment->getHardwareInfo());
+    auto numSubDevices = GfxCoreHelper::getSubDevicesCount(rootDeviceEnvironment->getHardwareInfo());
     for (auto id = 0u; id < numSubDevices; id++) {
         EXPECT_EQ(id + 1, drm->getVirtualMemoryAddressSpace(id));
     }
@@ -733,7 +733,7 @@ TEST_F(DrmTests, givenDebuggingEnabledWhenDrmIsCreatedThenPerContextVMIsTrueGetV
     if (drm->isVmBindAvailable()) {
         EXPECT_TRUE(drm->isPerContextVMRequired());
 
-        auto numSubDevices = GfxCoreHelper::getSubDevicesCount(false, rootDeviceEnvironment->getHardwareInfo());
+        auto numSubDevices = GfxCoreHelper::getSubDevicesCount(rootDeviceEnvironment->getHardwareInfo());
         for (auto id = 0u; id < numSubDevices; id++) {
             EXPECT_EQ(0u, drm->getVirtualMemoryAddressSpace(id));
         }
@@ -762,7 +762,7 @@ TEST_F(DrmTests, givenEnabledDebuggingAndVmBindNotAvailableWhenDrmIsCreatedThenP
         GTEST_SKIP();
     }
 
-    auto numSubDevices = GfxCoreHelper::getSubDevicesCount(false, rootDeviceEnvironment->getHardwareInfo());
+    auto numSubDevices = GfxCoreHelper::getSubDevicesCount(rootDeviceEnvironment->getHardwareInfo());
     for (auto id = 0u; id < numSubDevices; id++) {
         EXPECT_NE(0u, drm->getVirtualMemoryAddressSpace(id));
     }

shared/source/aub/aub_center.cpp

@@ -9,7 +9,6 @@
 
 #include "shared/source/aub/aub_helper.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
-#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/hw_info.h"
@@ -25,9 +24,8 @@ extern aub_stream::AubManager *createAubManager(const aub_stream::AubManagerOpti
 AubCenter::AubCenter(const RootDeviceEnvironment &rootDeviceEnvironment, bool localMemoryEnabled, const std::string &aubFileName, CommandStreamReceiverType csrType) {
     if (DebugManager.flags.UseAubStream.get()) {
         auto hwInfo = rootDeviceEnvironment.getHardwareInfo();
-        bool subDevicesAsDevices = rootDeviceEnvironment.executionEnvironment.isExposingSubDevicesAsDevices();
-        auto devicesCount = GfxCoreHelper::getSubDevicesCount(subDevicesAsDevices, hwInfo);
-        auto memoryBankSize = AubHelper::getPerTileLocalMemorySize(subDevicesAsDevices, hwInfo);
+        auto devicesCount = GfxCoreHelper::getSubDevicesCount(hwInfo);
+        auto memoryBankSize = AubHelper::getPerTileLocalMemorySize(hwInfo);
         CommandStreamReceiverType type = csrType;
         if (DebugManager.flags.SetCommandStreamReceiver.get() >= CommandStreamReceiverType::CSR_HW) {
             type = static_cast<CommandStreamReceiverType>(DebugManager.flags.SetCommandStreamReceiver.get());