fix: Returns Correct No. of VF Engine Stats as requested.

- When the requested engine count is less than the actual engine stats
available, then only requested no. of engine stats are retrieved.

Related-To: NEO-13525

Signed-off-by: Pratik Bari <[email protected]>

Author: pratikbariintel

level_zero/sysman/source/api/vf_management/linux/sysman_os_vf_imp.cpp

@@ -191,19 +191,17 @@ ze_result_t LinuxVfImp::vfOsGetEngineUtilization(uint32_t *pCount, zes_vf_util_e
 
     if (pEngineUtil != nullptr) {
         const auto pPmuInterface = pLinuxSysmanImp->getPmuInterface();
-        uint32_t index = 0;
-        for (const auto &pEngineUtilsData : pEngineUtils) {
+        for (uint32_t i = 0; i < *pCount; i++) {
             uint64_t pmuData[4] = {};
-            auto ret = pPmuInterface->pmuRead(static_cast<int>(pEngineUtilsData.busyTicksFd), pmuData, sizeof(pmuData));
+            auto ret = pPmuInterface->pmuRead(static_cast<int>(pEngineUtils[i].busyTicksFd), pmuData, sizeof(pmuData));
             if (ret < 0) {
                 NEO::printDebugString(NEO::debugManager.flags.PrintDebugMessages.get(), stderr, "Error@ %s():pmuRead is returning value:%d and error:0x%x \n", __FUNCTION__, ret, ZE_RESULT_ERROR_UNKNOWN);
+                *pCount = 0;
                 return ZE_RESULT_ERROR_UNKNOWN;
             }
-
-            pEngineUtil[index].vfEngineType = pEngineUtilsData.engineType;
-            pEngineUtil[index].activeCounterValue = pmuData[2];
-            pEngineUtil[index].samplingCounterValue = pmuData[3];
-            index++;
+            pEngineUtil[i].vfEngineType = pEngineUtils[i].engineType;
+            pEngineUtil[i].activeCounterValue = pmuData[2];
+            pEngineUtil[i].samplingCounterValue = pmuData[3];
         }
     }
 

level_zero/sysman/test/unit_tests/sources/vf_management/linux/test_zes_sysman_vf_management_prelim.cpp

@@ -123,6 +123,26 @@ TEST_F(ZesVfFixturePrelim, GivenValidVfHandleWhenCallingZesVFManagementGetVFEngi
     }
 }
 
+TEST_F(ZesVfFixturePrelim, GivenValidVfHandleWhenCallingZesVFManagementGetVFEngineUtilizationExp2WithEngineStatsCountLessThanActualThenCorrectEngineStatsCountIsReturned) {
+
+    auto handles = getEnabledVfHandles(mockHandleCount);
+    for (auto handleVf : handles) {
+        ASSERT_NE(nullptr, handleVf);
+        uint32_t count = 0;
+        auto result = zesVFManagementGetVFEngineUtilizationExp2(handleVf, &count, nullptr);
+        EXPECT_EQ(result, ZE_RESULT_SUCCESS);
+        EXPECT_EQ(count, numberMockedEngines);
+        count = count - 1;
+        std::vector<zes_vf_util_engine_exp2_t> engineUtils(count);
+        result = zesVFManagementGetVFEngineUtilizationExp2(handleVf, &count, engineUtils.data());
+        EXPECT_EQ(result, ZE_RESULT_SUCCESS);
+        EXPECT_EQ(count, engineUtils.size());
+        EXPECT_EQ(engineUtils[0].vfEngineType, ZES_ENGINE_GROUP_COMPUTE_SINGLE);
+        EXPECT_EQ(engineUtils[0].activeCounterValue, mockActiveTime);
+        EXPECT_EQ(engineUtils[0].samplingCounterValue, mockTimestamp);
+    }
+}
+
 TEST_F(ZesVfFixturePrelim, GivenValidVfHandleWhenQueryingEngineUtilizationMultipleTimesThenCorrectEngineStatsAreReturned) {
 
     auto handles = getEnabledVfHandles(mockHandleCount);

level_zero/tools/source/sysman/vf_management/linux/os_vf_imp_prelim.cpp

@@ -110,19 +110,17 @@ ze_result_t LinuxVfImp::getEngineUtilization(uint32_t *pCount, zes_vf_util_engin
 
     if (pEngineUtil != nullptr) {
         PmuInterface *pPmuInterface = pLinuxSysmanImp->getPmuInterface();
-        uint32_t index = 0;
-        for (auto pEngineUtilsData : pEngineUtils) {
+        for (uint32_t i = 0; i < *pCount; i++) {
             uint64_t pmuData[4] = {};
-            auto ret = pPmuInterface->pmuRead(static_cast<int>(pEngineUtilsData.busyTicksFd), pmuData, sizeof(pmuData));
+            auto ret = pPmuInterface->pmuRead(static_cast<int>(pEngineUtils[i].busyTicksFd), pmuData, sizeof(pmuData));
             if (ret < 0) {
                 NEO::printDebugString(NEO::debugManager.flags.PrintDebugMessages.get(), stderr, "Error@ %s():pmuRead is returning value:%d and error:0x%x \n", __FUNCTION__, ret, ZE_RESULT_ERROR_UNKNOWN);
                 *pCount = 0;
                 return ZE_RESULT_ERROR_UNKNOWN;
             }
-            pEngineUtil[index].vfEngineType = pEngineUtilsData.engineType;
-            pEngineUtil[index].activeCounterValue = pmuData[2];
-            pEngineUtil[index].samplingCounterValue = pmuData[3];
-            index++;
+            pEngineUtil[i].vfEngineType = pEngineUtils[i].engineType;
+            pEngineUtil[i].activeCounterValue = pmuData[2];
+            pEngineUtil[i].samplingCounterValue = pmuData[3];
         }
     }
 

level_zero/tools/test/unit_tests/sources/sysman/vf_management/linux/test_zes_sysman_vf_management_prelim.cpp

@@ -99,6 +99,26 @@ TEST_F(ZesVfFixturePrelim, GivenValidVfHandleWhenCallingZesVFManagementGetVFEngi
     }
 }
 
+TEST_F(ZesVfFixturePrelim, GivenValidVfHandleWhenCallingZesVFManagementGetVFEngineUtilizationExp2WithEngineStatsCountLessThanActualThenCorrectEngineStatsCountIsReturned) {
+
+    auto handles = getEnabledVfHandles(mockHandleCount);
+    for (auto handleVf : handles) {
+        ASSERT_NE(nullptr, handleVf);
+        uint32_t count = 0;
+        auto result = zesVFManagementGetVFEngineUtilizationExp2(handleVf, &count, nullptr);
+        EXPECT_EQ(result, ZE_RESULT_SUCCESS);
+        EXPECT_EQ(count, numberMockedEngines);
+        count = count - 1;
+        std::vector<zes_vf_util_engine_exp2_t> engineUtils(count);
+        result = zesVFManagementGetVFEngineUtilizationExp2(handleVf, &count, engineUtils.data());
+        EXPECT_EQ(result, ZE_RESULT_SUCCESS);
+        EXPECT_EQ(count, engineUtils.size());
+        EXPECT_EQ(engineUtils[0].vfEngineType, ZES_ENGINE_GROUP_COMPUTE_SINGLE);
+        EXPECT_EQ(engineUtils[0].activeCounterValue, mockActiveTime);
+        EXPECT_EQ(engineUtils[0].samplingCounterValue, mockTimestamp);
+    }
+}
+
 TEST_F(ZesVfFixturePrelim, GivenValidVfHandleWhenQueryingEngineUtilizationMultipleTimesThenCorrectEngineStatsAreReturned) {
 
     auto handles = getEnabledVfHandles(mockHandleCount);