Merge pull request #66 from intel-innersource/feature/ft-fps-update

Updated fps calculations to operate on frame times.

Author: markgalvan-intel

IntelPresentMon/PresentMonMiddleware/ConcreteMiddleware.cpp

@@ -1130,32 +1130,24 @@ static void ReportMetrics(
             break;
         case PM_METRIC_PRESENTED_FPS:
         {
-            std::vector<double> presented_fps(swapChain.mCPUBusy.size());
+            std::vector<double> presented_fts(swapChain.mCPUBusy.size());
             for (size_t i = 0; i < swapChain.mCPUBusy.size(); ++i) {
-                presented_fps[i] = (swapChain.mCPUBusy[i] + swapChain.mCPUWait[i]) == 0. ? 0. : 
-                    1000.0 / (swapChain.mCPUBusy[i] + swapChain.mCPUWait[i]);
+                presented_fts[i] = swapChain.mCPUBusy[i] + swapChain.mCPUWait[i];
             }
-            output = CalculateStatistic(presented_fps, element.stat);
+            output = CalculateStatistic(presented_fts, element.stat, true);
+            output = output == 0 ? 0 : 1000.0 / output;
             break;
         }
         case PM_METRIC_APPLICATION_FPS:
         {
-            std::vector<double> application_fps(swapChain.mAppDisplayedTime.size());
-            for (size_t i = 0; i < swapChain.mAppDisplayedTime.size(); ++i) {
-                application_fps[i] = swapChain.mAppDisplayedTime[i] == 0. ? 0. : 
-                    1000.0 / swapChain.mAppDisplayedTime[i];
-            }
-            output = CalculateStatistic(application_fps, element.stat);
+            output = CalculateStatistic(swapChain.mAppDisplayedTime, element.stat, true);
+            output = output == 0 ? 0 : 1000.0 / output;
             break;
         }
         case PM_METRIC_DISPLAYED_FPS:
         {
-            std::vector<double> displayed_fps(swapChain.mDisplayedTime.size());
-            for (size_t i = 0; i < swapChain.mDisplayedTime.size(); ++i) {
-                displayed_fps[i] = swapChain.mDisplayedTime[i] == 0. ? 0. : 
-                    1000.0 / swapChain.mDisplayedTime[i];
-            }
-            output = CalculateStatistic(displayed_fps, element.stat);
+            output = CalculateStatistic(swapChain.mDisplayedTime, element.stat, true);
+            output = output == 0 ? 0 : 1000.0 / output;
             break;
         }
         case PM_METRIC_DROPPED_FRAMES:
@@ -1191,7 +1183,7 @@ static void ReportMetrics(
         return;
     }
 
-    double ConcreteMiddleware::CalculateStatistic(std::vector<double>& inData, PM_STAT stat) const
+    double ConcreteMiddleware::CalculateStatistic(std::vector<double>& inData, PM_STAT stat, bool invert) const
     {
         if (inData.size() == 1) {
             return inData[0];
@@ -1209,12 +1201,12 @@ static void ReportMetrics(
                 }
                 return sum / inData.size();
             }
-            case PM_STAT_PERCENTILE_99: return CalculatePercentile(inData, 0.99);
-            case PM_STAT_PERCENTILE_95: return CalculatePercentile(inData, 0.95);
-            case PM_STAT_PERCENTILE_90: return CalculatePercentile(inData, 0.90);
-            case PM_STAT_PERCENTILE_01: return CalculatePercentile(inData, 0.01);
-            case PM_STAT_PERCENTILE_05: return CalculatePercentile(inData, 0.05);
-            case PM_STAT_PERCENTILE_10: return CalculatePercentile(inData, 0.10);
+            case PM_STAT_PERCENTILE_99: return CalculatePercentile(inData, 0.99, invert);
+            case PM_STAT_PERCENTILE_95: return CalculatePercentile(inData, 0.95, invert);
+            case PM_STAT_PERCENTILE_90: return CalculatePercentile(inData, 0.90, invert);
+            case PM_STAT_PERCENTILE_01: return CalculatePercentile(inData, 0.01, invert);
+            case PM_STAT_PERCENTILE_05: return CalculatePercentile(inData, 0.05, invert);
+            case PM_STAT_PERCENTILE_10: return CalculatePercentile(inData, 0.10, invert);
             case PM_STAT_MAX:
             {
                 double max = inData[0];
@@ -1265,8 +1257,11 @@ static void ReportMetrics(
     }
 
     // Calculate percentile using linear interpolation between the closet ranks
-    double ConcreteMiddleware::CalculatePercentile(std::vector<double>& inData, double percentile) const
+    double ConcreteMiddleware::CalculatePercentile(std::vector<double>& inData, double percentile, bool invert) const
     {
+        if (invert) {
+            percentile = 1.0 - percentile;
+        }
         percentile = std::min(std::max(percentile, 0.), 1.);
 
         double integral_part_as_double;

IntelPresentMon/PresentMonMiddleware/ConcreteMiddleware.h

@@ -112,8 +112,8 @@ namespace pmon::mid
 
 		void CalculateFpsMetric(fpsSwapChainData& swapChain, const PM_QUERY_ELEMENT& element, uint8_t* pBlob, LARGE_INTEGER qpcFrequency);
 		void CalculateGpuCpuMetric(std::unordered_map<PM_METRIC, MetricInfo>& metricInfo, const PM_QUERY_ELEMENT& element, uint8_t* pBlob);
-		double CalculateStatistic(std::vector<double>& inData, PM_STAT stat) const;
-		double CalculatePercentile(std::vector<double>& inData, double percentile) const;
+		double CalculateStatistic(std::vector<double>& inData, PM_STAT stat, bool invert = false) const;
+		double CalculatePercentile(std::vector<double>& inData, double percentile, bool invert) const;
 		bool GetGpuMetricData(size_t telemetry_item_bit, PresentMonPowerTelemetryInfo& power_telemetry_info, std::unordered_map<PM_METRIC, MetricInfo>& metricInfo);
 		bool GetCpuMetricData(size_t telemetryBit, CpuTelemetryInfo& cpuTelemetry, std::unordered_map<PM_METRIC, MetricInfo>& metricInfo);
 		void GetStaticCpuMetrics();