Add subdevice support for standby

Change-Id: I4209d11a8305ba524e56cddbee5ad3432b32554f
Signed-off-by: mraghuwa <[email protected]>

Author: mraghuwa

level_zero/tools/source/sysman/standby/linux/os_standby_imp.cpp

@@ -11,6 +11,14 @@ namespace L0 {
 
 const std::string LinuxStandbyImp::standbyModeFile("power/rc6_enable");
 
+ze_result_t LinuxStandbyImp::osStandbyGetProperties(zes_standby_properties_t &properties) {
+    properties.pNext = nullptr;
+    properties.type = ZES_STANDBY_TYPE_GLOBAL;
+    properties.onSubdevice = isSubdevice;
+    properties.subdeviceId = subdeviceId;
+    return ZE_RESULT_SUCCESS;
+}
+
 bool LinuxStandbyImp::isStandbySupported(void) {
     if (ZE_RESULT_SUCCESS == pSysfsAccess->canRead(standbyModeFile)) {
         return true;
@@ -47,14 +55,14 @@ ze_result_t LinuxStandbyImp::setMode(zes_standby_promo_mode_t mode) {
     return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 }
 
-LinuxStandbyImp::LinuxStandbyImp(OsSysman *pOsSysman) {
+LinuxStandbyImp::LinuxStandbyImp(OsSysman *pOsSysman, ze_bool_t onSubdevice, uint32_t subdeviceId) : isSubdevice(onSubdevice), subdeviceId(subdeviceId) {
     LinuxSysmanImp *pLinuxSysmanImp = static_cast<LinuxSysmanImp *>(pOsSysman);
 
     pSysfsAccess = &pLinuxSysmanImp->getSysfsAccess();
 }
 
-OsStandby *OsStandby::create(OsSysman *pOsSysman) {
-    LinuxStandbyImp *pLinuxStandbyImp = new LinuxStandbyImp(pOsSysman);
+OsStandby *OsStandby::create(OsSysman *pOsSysman, ze_bool_t onSubdevice, uint32_t subdeviceId) {
+    LinuxStandbyImp *pLinuxStandbyImp = new LinuxStandbyImp(pOsSysman, onSubdevice, subdeviceId);
     return static_cast<OsStandby *>(pLinuxStandbyImp);
 }
 

level_zero/tools/source/sysman/standby/linux/os_standby_imp.h

@@ -18,11 +18,12 @@ class LinuxStandbyImp : public OsStandby, NEO::NonCopyableOrMovableClass {
   public:
     ze_result_t getMode(zes_standby_promo_mode_t &mode) override;
     ze_result_t setMode(zes_standby_promo_mode_t mode) override;
+    ze_result_t osStandbyGetProperties(zes_standby_properties_t &properties) override;
 
     bool isStandbySupported(void) override;
 
     LinuxStandbyImp() = default;
-    LinuxStandbyImp(OsSysman *pOsSysman);
+    LinuxStandbyImp(OsSysman *pOsSysman, ze_bool_t onSubdevice, uint32_t subdeviceId);
     ~LinuxStandbyImp() override = default;
 
   protected:
@@ -32,6 +33,8 @@ class LinuxStandbyImp : public OsStandby, NEO::NonCopyableOrMovableClass {
     static const std::string standbyModeFile;
     static const int standbyModeDefault = 1;
     static const int standbyModeNever = 0;
+    bool isSubdevice = false;
+    uint32_t subdeviceId = 0;
 };
 
 } // namespace L0

level_zero/tools/source/sysman/standby/os_standby.h

@@ -16,10 +16,11 @@ class OsStandby {
   public:
     virtual ze_result_t getMode(zes_standby_promo_mode_t &mode) = 0;
     virtual ze_result_t setMode(zes_standby_promo_mode_t mode) = 0;
+    virtual ze_result_t osStandbyGetProperties(zes_standby_properties_t &properties) = 0;
 
     virtual bool isStandbySupported(void) = 0;
 
-    static OsStandby *create(OsSysman *pOsSysman);
+    static OsStandby *create(OsSysman *pOsSysman, ze_bool_t onSubdevice, uint32_t subdeviceId);
     virtual ~OsStandby() {}
 };
 

level_zero/tools/source/sysman/standby/standby.cpp

@@ -19,15 +19,22 @@ StandbyHandleContext::~StandbyHandleContext() {
     }
 }
 
-void StandbyHandleContext::init() {
-    Standby *pStandby = new StandbyImp(pOsSysman);
+void StandbyHandleContext::createHandle(ze_device_handle_t deviceHandle) {
+    Standby *pStandby = new StandbyImp(pOsSysman, deviceHandle);
     if (pStandby->isStandbyEnabled == true) {
         handleList.push_back(pStandby);
     } else {
         delete pStandby;
     }
 }
 
+ze_result_t StandbyHandleContext::init(std::vector<ze_device_handle_t> &deviceHandles) {
+    for (const auto &deviceHandle : deviceHandles) {
+        createHandle(deviceHandle);
+    }
+    return ZE_RESULT_SUCCESS;
+}
+
 ze_result_t StandbyHandleContext::standbyGet(uint32_t *pCount, zes_standby_handle_t *phStandby) {
     uint32_t handleListSize = static_cast<uint32_t>(handleList.size());
     uint32_t numToCopy = std::min(*pCount, handleListSize);

level_zero/tools/source/sysman/standby/standby.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include "level_zero/core/source/device/device.h"
 #include <level_zero/zes_api.h>
 
 #include <vector>
@@ -37,12 +38,15 @@ struct StandbyHandleContext {
     StandbyHandleContext(OsSysman *pOsSysman) : pOsSysman(pOsSysman){};
     ~StandbyHandleContext();
 
-    void init();
+    ze_result_t init(std::vector<ze_device_handle_t> &deviceHandles);
 
     ze_result_t standbyGet(uint32_t *pCount, zes_standby_handle_t *phStandby);
 
     OsSysman *pOsSysman;
     std::vector<Standby *> handleList = {};
+
+  private:
+    void createHandle(ze_device_handle_t deviceHandle);
 };
 
 } // namespace L0

level_zero/tools/source/sysman/standby/standby_imp.cpp

@@ -27,14 +27,14 @@ ze_result_t StandbyImp::standbySetMode(const zes_standby_promo_mode_t mode) {
 }
 
 void StandbyImp::init() {
-    standbyProperties.type = ZES_STANDBY_TYPE_GLOBAL; // Currently the only defined type
-    standbyProperties.onSubdevice = false;
-    standbyProperties.subdeviceId = 0;
+    pOsStandby->osStandbyGetProperties(standbyProperties);
     this->isStandbyEnabled = pOsStandby->isStandbySupported();
 }
 
-StandbyImp::StandbyImp(OsSysman *pOsSysman) {
-    pOsStandby = OsStandby::create(pOsSysman);
+StandbyImp::StandbyImp(OsSysman *pOsSysman, ze_device_handle_t handle) : deviceHandle(handle) {
+    ze_device_properties_t deviceProperties = {};
+    Device::fromHandle(deviceHandle)->getProperties(&deviceProperties);
+    pOsStandby = OsStandby::create(pOsSysman, deviceProperties.flags & ZE_DEVICE_PROPERTY_FLAG_SUBDEVICE, deviceProperties.subdeviceId);
     UNRECOVERABLE_IF(nullptr == pOsStandby);
     init();
 }

level_zero/tools/source/sysman/standby/standby_imp.h

@@ -22,14 +22,15 @@ class StandbyImp : public Standby, NEO::NonCopyableOrMovableClass {
     ze_result_t standbySetMode(const zes_standby_promo_mode_t mode) override;
 
     StandbyImp() = default;
-    StandbyImp(OsSysman *pOsSysman);
+    StandbyImp(OsSysman *pOsSysman, ze_device_handle_t handle);
     ~StandbyImp() override;
     OsStandby *pOsStandby = nullptr;
 
     void init();
 
   private:
     zes_standby_properties_t standbyProperties = {};
+    ze_device_handle_t deviceHandle = nullptr;
 };
 
 } // namespace L0

level_zero/tools/source/sysman/standby/windows/os_standby_imp.cpp

@@ -13,6 +13,7 @@ class WddmStandbyImp : public OsStandby {
   public:
     ze_result_t getMode(zes_standby_promo_mode_t &mode) override;
     ze_result_t setMode(zes_standby_promo_mode_t mode) override;
+    ze_result_t osStandbyGetProperties(zes_standby_properties_t &properties) override;
     bool isStandbySupported(void) override;
 };
 
@@ -24,11 +25,15 @@ ze_result_t WddmStandbyImp::getMode(zes_standby_promo_mode_t &mode) {
     return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 }
 
+ze_result_t WddmStandbyImp::osStandbyGetProperties(zes_standby_properties_t &properties) {
+    return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+}
+
 bool WddmStandbyImp::isStandbySupported(void) {
     return false;
 }
 
-OsStandby *OsStandby::create(OsSysman *pOsSysman) {
+OsStandby *OsStandby::create(OsSysman *pOsSysman, ze_bool_t onSubdevice, uint32_t subdeviceId) {
     WddmStandbyImp *pWddmStandbyImp = new WddmStandbyImp();
     return static_cast<OsStandby *>(pWddmStandbyImp);
 }

level_zero/tools/source/sysman/sysman_imp.cpp

@@ -82,7 +82,7 @@ void SysmanDeviceImp::init() {
         pPci->init();
     }
     if (pStandbyHandleContext) {
-        pStandbyHandleContext->init();
+        pStandbyHandleContext->init(deviceHandles);
     }
     if (pEngineHandleContext) {
         pEngineHandleContext->init();

level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h

@@ -79,6 +79,7 @@ class SysmanMultiDeviceFixture : public MultiDeviceFixture, public ::testing::Te
         pSysmanDeviceImp = static_cast<SysmanDeviceImp *>(pSysmanDevice);
         pOsSysman = pSysmanDeviceImp->pOsSysman;
         pLinuxSysmanImp = static_cast<PublicLinuxSysmanImp *>(pOsSysman);
+        subDeviceCount = numSubDevices;
     }
     void TearDown() override {
         unsetenv("ZES_ENABLE_SYSMAN");
@@ -91,7 +92,8 @@ class SysmanMultiDeviceFixture : public MultiDeviceFixture, public ::testing::Te
     PublicLinuxSysmanImp *pLinuxSysmanImp = nullptr;
     NEO::Device *neoDevice = nullptr;
     L0::Device *device = nullptr;
+    uint32_t subDeviceCount = 0u;
 };
 
 } // namespace ult
-} // namespace L0
+} // namespace L0