Merge pull request #45 from intel-innersource/fix/removed-stale-input-latency

Removed stale input latency and updated MD file with latest generated…

Author: markgalvan-intel

IntelPresentMon/AppCef/source/util/async/Introspect.h

@@ -35,8 +35,7 @@ namespace p2c::client::util::async
             const auto filterPred = [](const pmapi::intro::MetricView& m) { const auto type = m.GetType();
                 return
                     (   m.GetId() != PM_METRIC_GPU_LATENCY &&
-                        m.GetId() != PM_METRIC_DISPLAY_LATENCY &&
-                        m.GetId() != PM_METRIC_INPUT_LATENCY)
+                        m.GetId() != PM_METRIC_DISPLAY_LATENCY)
                     &&
                     (   type == PM_METRIC_TYPE_DYNAMIC ||
                         type == PM_METRIC_TYPE_DYNAMIC_FRAME ||

IntelPresentMon/ControlLib/NvidiaPowerTelemetryAdapter.cpp

@@ -67,8 +67,8 @@ namespace pwr::nv
                 // loop through all sensors, read those of interest into output struct
                 for (const auto& sensor : thermals.sensor)
                 {
-                    if (sensor.target == NVAPI_THERMAL_TARGET_GPU &&
-                        sensor.controller == NVAPI_THERMAL_CONTROLLER_GPU_INTERNAL)
+                    // TODO: consider prioritizing sensor.controller == NVAPI_THERMAL_CONTROLLER_GPU_INTERNAL when multiple GPU thermals are present
+                    if (sensor.target == NVAPI_THERMAL_TARGET_GPU)
                     {
                         info.gpu_temperature_c = (double)sensor.currentTemp;
                         SetTelemetryCapBit(GpuTelemetryCapBits::gpu_temperature);
@@ -212,4 +212,4 @@ namespace pwr::nv
     {
         return name;
     }
-}
+}

IntelPresentMon/Interprocess/source/metadata/EnumMetric.h

@@ -36,7 +36,6 @@
 \
 		X_(METRIC, GPU_LATENCY, "GPU Latency", "", "How long it took until GPU work for this frame started") \
 		X_(METRIC, DISPLAY_LATENCY, "Display Latency", "", "Time between frame submission and scan out to display") \
-		X_(METRIC, INPUT_LATENCY, "Input To Frame Start Latency", "", "Time between input and display") \
 		X_(METRIC, CLICK_TO_PHOTON_LATENCY, "Click To Photon Latency", "", "Time between input and display") \
 		\
 		X_(METRIC, GPU_SUSTAINED_POWER_LIMIT, "GPU Sustained Power Limit", "", "Sustained power limit of the GPU") \

IntelPresentMon/Interprocess/source/metadata/MetricList.h

@@ -37,7 +37,6 @@
 		X_(PM_METRIC_GPU_LATENCY, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, FULL_STATS) \
 		X_(PM_METRIC_DISPLAY_LATENCY, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, FULL_STATS) \
 		X_(PM_METRIC_CLICK_TO_PHOTON_LATENCY, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, PM_STAT_NON_ZERO_AVG, PM_STAT_PERCENTILE_01, PM_STAT_PERCENTILE_05, PM_STAT_PERCENTILE_10, PM_STAT_MAX) \
-		X_(PM_METRIC_INPUT_LATENCY, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, FULL_STATS) \
 \
 		X_(PM_METRIC_GPU_SUSTAINED_POWER_LIMIT, PM_METRIC_TYPE_STATIC, PM_UNIT_WATTS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_GRAPHICS_ADAPTER, PM_STAT_NONE) \
 		X_(PM_METRIC_GPU_POWER, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_WATTS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_GRAPHICS_ADAPTER, FULL_STATS) \

IntelPresentMon/PresentMonAPI2/PresentMonAPI.h

@@ -65,7 +65,6 @@ extern "C" {
 
 		PM_METRIC_GPU_LATENCY,
 		PM_METRIC_DISPLAY_LATENCY,
-		PM_METRIC_INPUT_LATENCY,
 		PM_METRIC_CLICK_TO_PHOTON_LATENCY,
 
 		PM_METRIC_GPU_SUSTAINED_POWER_LIMIT,

IntelPresentMon/SampleClient/DynamicQuerySample.h

@@ -59,7 +59,7 @@ int AddGpuMetric(pmapi::Session& pSession, unsigned int processId, double window
         elements.push_back(PM_QUERY_ELEMENT{ .metric = PM_METRIC_GPU_BUSY, .stat = PM_STAT_AVG, .deviceId = 0, .arrayIndex = 0 });
         elements.push_back(PM_QUERY_ELEMENT{ .metric = PM_METRIC_DISPLAY_LATENCY, .stat = PM_STAT_AVG, .deviceId = 0, .arrayIndex = 0 });
         elements.push_back(PM_QUERY_ELEMENT{ .metric = PM_METRIC_DISPLAYED_TIME, .stat = PM_STAT_AVG, .deviceId = 0, .arrayIndex = 0 });
-        elements.push_back(PM_QUERY_ELEMENT{ .metric = PM_METRIC_INPUT_LATENCY, .stat = PM_STAT_AVG, .deviceId = 0, .arrayIndex = 0 });
+        elements.push_back(PM_QUERY_ELEMENT{ .metric = PM_METRIC_CLICK_TO_PHOTON_LATENCY, .stat = PM_STAT_NON_ZERO_AVG, .deviceId = 0, .arrayIndex = 0 });
 
         PM_METRIC gpuMetric;
         uint32_t gpuDeviceId;
@@ -157,7 +157,7 @@ int DynamicQuerySample(std::unique_ptr<pmapi::Session>&& pSession, double window
             FixedQueryElement gpuBusyTimeAvg{ this, PM_METRIC_GPU_BUSY, PM_STAT_AVG };
             FixedQueryElement gpuDisplayLatencyAvg{ this, PM_METRIC_DISPLAY_LATENCY, PM_STAT_AVG };
             FixedQueryElement gpuDisplayDurationAvg{ this, PM_METRIC_DISPLAYED_TIME, PM_STAT_AVG };
-            FixedQueryElement gpuPhotonLatencyAvg{ this, PM_METRIC_CLICK_TO_PHOTON_LATENCY, PM_STAT_AVG };
+            FixedQueryElement gpuPhotonLatencyAvg{ this, PM_METRIC_CLICK_TO_PHOTON_LATENCY, PM_STAT_NON_ZERO_AVG };
             FixedQueryElement gpuPower{ this, PM_METRIC_GPU_POWER, PM_STAT_AVG, 1 };
             FixedQueryElement presentMode{ this, PM_METRIC_PRESENT_MODE, PM_STAT_MID_POINT };
             FixedQueryElement gpuName{ this, PM_METRIC_GPU_NAME, PM_STAT_NONE, 1 };

IntelPresentMon/SampleClient/FrameQuerySample.h

@@ -119,7 +119,7 @@ int GenCsv(pmapi::Session& pSession, std::string processName, unsigned int proce
             { PM_METRIC_GPU_BUSY, PM_STAT_NONE, 0, 0},
             { PM_METRIC_DISPLAY_LATENCY, PM_STAT_NONE, 0, 0 },
             { PM_METRIC_DISPLAYED_TIME, PM_STAT_NONE, 0, 0 },
-            { PM_METRIC_INPUT_LATENCY, PM_STAT_NONE, 0, 0}
+            { PM_METRIC_CLICK_TO_PHOTON_LATENCY, PM_STAT_NONE, 0, 0}
         };
 
         auto frameQuery = pSession.RegisterFrameQuery(queryElements);

README-CaptureApplication.md

@@ -32,7 +32,7 @@ In Debug configuration, the application will halt with a modal error dialog when
 --p2c-no-net-fail
 ```
 
-## Metric Definitions
+## Metric and CSV Column Definitions
 
 | Metric | CSV Column | Description | Compatible Query Types |
 | - | - | - |:-:|
@@ -62,7 +62,6 @@ In Debug configuration, the application will halt with a modal error dialog when
 |Allows Tearing|AllowsTearing|Indicates if the frame allows tearing|DF|
 |GPU Latency|GPULatency|How long it took until GPU work for this frame started|DF|
 |Display Latency|DisplayLatency|Time between frame submission and scan out to display|DF|
-|Input To Frame Start Latency||Time between input and display|DF|
 |Click To Photon Latency|ClickToPhotonLatency|Time between input and display|DF|
 |GPU Sustained Power Limit||Sustained power limit of the GPU|DS|
 |GPU Power|GPUPower|Power consumed by the graphics adapter|DF|
@@ -110,10 +109,6 @@ The PresentMon capture application creates two CSV files per capture. The first
 The second CSV file generated is a stats summary file for the capture. It includes the duration of the capture, the total number of frames captured, plus the average, minimum, maximum, 99th, 95th and
 90th FPS percentiles. The stats file is named using the following pattern: "pmcap-[executablename]-YYMMDD-HHMMSS-stats.csv". All files are stored in the user's appdata local directory in the "Intel\PresentMon\Capture" folder.
 
-### CSV columns
-
-The PresentMon capture application outputs all of the telemetry provided by the PresentMon Service. Please see the following link for all metric definitions:
-
 ## Implementation
 
 ### Z-band