Feature/pc latency diagnostics

ETLTrimmer/main.cpp

@@ -374,6 +374,8 @@ int main(int argc, const char** argv)
         traceConsumer.mTrackGPUVideo = true;  // ... GPU video work (separately from non-video GPU work).
         traceConsumer.mTrackInput = true;     // ... keyboard/mouse latency.
         traceConsumer.mTrackFrameType = true; // ... the frame type communicated through the Intel-PresentMon provider.
+        traceConsumer.mTrackAppTiming = true; // ... app timing data communicated through the Intel-PresentMon provider.
+        traceConsumer.mTrackPcLatency = true; // ... Nvidia PCL stats.
         EnableProvidersListing(0, nullptr, &traceConsumer, true, true, pFilter);
     }
 

IntelPresentMon/AppCef/CefNano.vcxproj

@@ -170,7 +170,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>Cef\Lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;Dwrite.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;Dwrite.lib;shcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Message>Executing Post Build</Message>
@@ -200,7 +200,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>Cef\Lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;Dwrite.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;Dwrite.lib;shcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Message>Executing Post Build</Message>

IntelPresentMon/AppCef/ipm-ui-vue/BlockLists/TargetBlockList.txt

@@ -25,6 +25,7 @@ bethesdanethelper.exe
 bethesdanetlauncher.exe
 blend.exe
 blender.exe
+bootstrapperui_v2.exe
 bsglauncher.exe
 calculator.exe
 calculatorapp.exe

IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj

@@ -216,20 +216,22 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>..\..\build\obj\$(ProjectName)-$(Platform)-$(Configuration)\</OutDir>
-    <IntDir>..\..\build\obj\$(ProjectName)-$(Platform)-$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)build\lib\$(ProjectName)-$(Platform)-$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\obj\$(ProjectName)-$(Platform)-$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>..\..\build\obj\$(ProjectName)-$(Platform)-$(Configuration)\</OutDir>
-    <IntDir>..\..\build\obj\$(ProjectName)-$(Platform)-$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)build\lib\$(ProjectName)-$(Platform)-$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\obj\$(ProjectName)-$(Platform)-$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
+    <OutDir>$(SolutionDir)build\lib\$(ProjectName)-$(Platform)-$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
+    <OutDir>$(SolutionDir)build\lib\$(ProjectName)-$(Platform)-$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -294,7 +296,8 @@
       </Outputs>
     </CustomBuildStep>
     <Lib>
-      <AdditionalDependencies>shcore.lib</AdditionalDependencies>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -327,7 +330,8 @@
       </Outputs>
     </CustomBuildStep>
     <Lib>
-      <AdditionalDependencies>shcore.lib</AdditionalDependencies>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
     </Lib>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj.filters

@@ -171,9 +171,6 @@
     <ClInclude Include="log\TimePoint.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Math.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="log\Subsystem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -234,6 +231,9 @@
     <ClInclude Include="ref\GeneratedReflectionHelpers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Math.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="win\MessageBox.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -395,6 +395,9 @@
     <ClCompile Include="win\ProcessMapBuilder.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Math.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="vcpkg.json" />

IntelPresentMon/CommonUtilities/Math.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <cmath>
 #include <limits>
+#include <algorithm>
 
 namespace pmon::util
 {
@@ -53,4 +54,9 @@ namespace pmon::util
 		const auto conversionFactor = srcFactor / dstFactor;
 		return To(fromExtended * conversionFactor);
 	}
+	template<typename T>
+	T CalculateEma(T prevEma, T newSample, T alpha)
+	{
+		return prevEma + alpha * (newSample - prevEma);
+	}
 }

IntelPresentMon/CommonUtilities/Meta.h

@@ -4,6 +4,10 @@
 
 namespace pmon::util
 {
+    // Helper: dependent_false for static_assert in templates.
+    template<typename T>
+    struct dependent_false : std::false_type {};
+
     // deconstruct member pointer into the object type the pointer works with and the member type
     template <typename T> struct MemberPointerInfo;
     template <typename S, typename M>

IntelPresentMon/Core/source/pmon/RawFrameDataMetricList.h

@@ -47,10 +47,12 @@ namespace p2c::pmon
             Element{.metricId = PM_METRIC_GPU_BUSY, .deviceId = 0 },
             Element{.metricId = PM_METRIC_GPU_WAIT, .deviceId = 0 },
             Element{.metricId = PM_METRIC_ANIMATION_ERROR, .deviceId = 0 },
+            Element{.metricId = PM_METRIC_FLIP_DELAY, .deviceId = 0 },
             Element{.metricId = PM_METRIC_ANIMATION_TIME, .deviceId = 0 },
             Element{.metricId = PM_METRIC_ALL_INPUT_TO_PHOTON_LATENCY, .deviceId = 0 },
             Element{.metricId = PM_METRIC_CLICK_TO_PHOTON_LATENCY, .deviceId = 0 },
             Element{.metricId = PM_METRIC_INSTRUMENTED_LATENCY, .deviceId = 0 },
+            Element{.metricId = PM_METRIC_PC_LATENCY, .deviceId = 0 },
 
             Element{.metricId = PM_METRIC_GPU_POWER, .deviceId = activeDeviceId },
             Element{.metricId = PM_METRIC_GPU_VOLTAGE, .deviceId = activeDeviceId },

IntelPresentMon/Core/source/win/HotkeyListener.cpp

@@ -5,6 +5,8 @@
 #include <CommonUtilities/Exception.h>
 #include <CommonUtilities/ref/WrapReflect.h>
 #include <ranges>
+// disable faulty warnings on lock
+#pragma warning(disable: 26117 26110)
 
 namespace rn = std::ranges;
 namespace vi = rn::views;

IntelPresentMon/Interprocess/source/metadata/MetricList.h

@@ -93,3 +93,4 @@
 		X_(PM_METRIC_DISPLAYED_FRAME_TIME, PM_METRIC_TYPE_DYNAMIC, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, FULL_STATS) \
 		X_(PM_METRIC_PRESENTED_FRAME_TIME, PM_METRIC_TYPE_DYNAMIC, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, FULL_STATS) \
 		X_(PM_METRIC_BETWEEN_APP_START, PM_METRIC_TYPE_FRAME_EVENT, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, FULL_STATS) \
+		X_(PM_METRIC_FLIP_DELAY, PM_METRIC_TYPE_FRAME_EVENT, PM_UNIT_MILLISECONDS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_INDEPENDENT, FULL_STATS) \

IntelPresentMon/PresentMonAPI2/PresentMonAPI.h

@@ -132,6 +132,7 @@ extern "C" {
 		PM_METRIC_DISPLAYED_FRAME_TIME,
 		PM_METRIC_BETWEEN_APP_START,
 		PM_METRIC_PRESENTED_FRAME_TIME,
+		PM_METRIC_FLIP_DELAY,
 	};
 
 	enum PM_METRIC_TYPE

IntelPresentMon/PresentMonAPI2Tests/CsvHelper.h

@@ -306,18 +306,22 @@ void CharConvert<T>::Convert(const std::string data, T& convertedData, Header co
 }
 
 size_t countDecimalPlaces(double value) {
-    // Convert double to string
     std::string str = std::to_string(value);
+    auto dotPos = str.find('.');
+    if (dotPos == std::string::npos) return 0;
 
-    char const* a = str.c_str();
+    // Get the decimal part
+    std::string decimals = str.substr(dotPos + 1);
 
-    double testNumber = 0.0;
-    double goldNumber = 0.0;
-    int testSucceededCount = sscanf_s(a, "%lf", &testNumber);
+    // Remove trailing zeros
+    decimals.erase(decimals.find_last_not_of('0') + 1);
 
-    const char* testDecimalAddr = strchr(a, '.');
-    size_t testDecimalNumbersCount = testDecimalAddr == nullptr ? 0 : ((a + strlen(a)) - testDecimalAddr - 1);
-    return testDecimalNumbersCount;
+    // Count non-zero decimal digits
+    size_t count = 0;
+    for (char c : decimals) {
+        if (c != '0') ++count;
+    }
+    return count;
 }
 
 template<typename T>
@@ -357,7 +361,7 @@ std::optional<std::ofstream> CreateCsvFile(std::string& output_dir, std::string&
             ",MsBetweenDisplayChange,MsInPresent,MsRenderPresentLatency"
             ",MsUntilDisplayed,MsPCLatency,CPUStartQPC,MsBetweenAppStart"
             ",MsCPUBusy,MsCPUWait,MsGPULatency,MsGPUTime,MsGPUBusy,MsGPUWait"
-            ",MsVideoBusy,MsAnimationError,AnimationTime,MsAllInputToPhotonLatency"
+            ",MsVideoBusy,MsAnimationError,AnimationTime,MsFlipDelay,MsAllInputToPhotonLatency"
             ",MsClickToPhotonLatency,MsInstrumentedLatency";
         csvFile << std::endl;
         return csvFile;
@@ -416,7 +420,7 @@ std::string TranslateFrameType(PM_FRAME_TYPE frameType) {
 }
 
 void WriteToCSV(std::optional<std::ofstream>& debugCsvFile, const std::string& processName, const unsigned int& processId,
-    PM_QUERY_ELEMENT(&queryElements)[28], pmapi::BlobContainer& blobs)
+    PM_QUERY_ELEMENT(&queryElements)[29], pmapi::BlobContainer& blobs)
 {
 
     if (!debugCsvFile.has_value()) {
@@ -449,9 +453,10 @@ void WriteToCSV(std::optional<std::ofstream>& debugCsvFile, const std::string& p
             const auto msGpuWait = *reinterpret_cast<const double*>(&pBlob[queryElements[22].dataOffset]);
             const auto msAnimationError = *reinterpret_cast<const double*>(&pBlob[queryElements[23].dataOffset]);
             const auto animationTime = *reinterpret_cast<const double*>(&pBlob[queryElements[24].dataOffset]);
-            const auto msAllInputToPhotonLatency = *reinterpret_cast<const double*>(&pBlob[queryElements[25].dataOffset]);
-            const auto msClickToPhotonLatency = *reinterpret_cast<const double*>(&pBlob[queryElements[26].dataOffset]);
-            const auto msInstrumentedLatency = *reinterpret_cast<const double*>(&pBlob[queryElements[27].dataOffset]);
+            const auto msFlipDelay = *reinterpret_cast<const double*>(&pBlob[queryElements[25].dataOffset]);
+            const auto msAllInputToPhotonLatency = *reinterpret_cast<const double*>(&pBlob[queryElements[26].dataOffset]);
+            const auto msClickToPhotonLatency = *reinterpret_cast<const double*>(&pBlob[queryElements[27].dataOffset]);
+            const auto msInstrumentedLatency = *reinterpret_cast<const double*>(&pBlob[queryElements[28].dataOffset]);
             *debugCsvFile << processName << ",";
             *debugCsvFile << processId << ",";
             *debugCsvFile << std::hex << "0x" << std::dec << swapChain << ",";
@@ -480,6 +485,7 @@ void WriteToCSV(std::optional<std::ofstream>& debugCsvFile, const std::string& p
             *debugCsvFile << 0 << ",";
             *debugCsvFile << msAnimationError << ",";
             *debugCsvFile << animationTime << ",";
+            *debugCsvFile << msFlipDelay << ",";
             *debugCsvFile << msAllInputToPhotonLatency << ",";
             *debugCsvFile << msClickToPhotonLatency << ",";
             *debugCsvFile << msInstrumentedLatency << std::endl;
@@ -497,7 +503,7 @@ class CsvParser {
     bool Open(std::wstring const& path, uint32_t processId);
     void Close();
     bool VerifyBlobAgainstCsv(const std::string& processName, const unsigned int& processId,
-        PM_QUERY_ELEMENT(&queryElements)[28], pmapi::BlobContainer& blobs, std::optional<std::ofstream>& debugCsvFile);
+        PM_QUERY_ELEMENT(&queryElements)[29], pmapi::BlobContainer& blobs, std::optional<std::ofstream>& debugCsvFile);
     bool ResetCsv();
 
 private:
@@ -526,7 +532,7 @@ CsvParser::CsvParser()
 {}
 
 bool CsvParser::VerifyBlobAgainstCsv(const std::string& processName, const unsigned int& processId,
-    PM_QUERY_ELEMENT(&queryElements)[28], pmapi::BlobContainer& blobs, std::optional<std::ofstream>& debugCsvFile)
+    PM_QUERY_ELEMENT(&queryElements)[29], pmapi::BlobContainer& blobs, std::optional<std::ofstream>& debugCsvFile)
 {
     if (debugCsvFile.has_value()) {
         WriteToCSV(debugCsvFile, processName, processId, queryElements, blobs);
@@ -559,11 +565,10 @@ bool CsvParser::VerifyBlobAgainstCsv(const std::string& processName, const unsig
         const auto msGpuWait = *reinterpret_cast<const double*>(&pBlob[queryElements[22].dataOffset]);
         const auto msAnimationError = *reinterpret_cast<const double*>(&pBlob[queryElements[23].dataOffset]);
         const auto animationTime = *reinterpret_cast<const double*>(&pBlob[queryElements[24].dataOffset]);
-        const auto msAllInputToPhotonLatency = *reinterpret_cast<const double*>(&pBlob[queryElements[25].dataOffset]);
-        const auto msClickToPhotonLatency = *reinterpret_cast<const double*>(&pBlob[queryElements[26].dataOffset]);
-        const auto msInstrumentedLatency = *reinterpret_cast<const double*>(&pBlob[queryElements[27].dataOffset]);
-
-
+        const auto msFrameDelay = *reinterpret_cast<const double*>(&pBlob[queryElements[25].dataOffset]);
+        const auto msAllInputToPhotonLatency = *reinterpret_cast<const double*>(&pBlob[queryElements[26].dataOffset]);
+        const auto msClickToPhotonLatency = *reinterpret_cast<const double*>(&pBlob[queryElements[27].dataOffset]);
+        const auto msInstrumentedLatency = *reinterpret_cast<const double*>(&pBlob[queryElements[28].dataOffset]);
 
         // Read rows until we find one with the process we are interested in
         // or we are out of data.
@@ -689,6 +694,9 @@ bool CsvParser::VerifyBlobAgainstCsv(const std::string& processName, const unsig
             case Header_MsPCLatency:
                 if (v2MetricRow_.msPcLatency.has_value()) {
                     columnsMatch = Validate(v2MetricRow_.msPcLatency.value(), msPcLatency);
+                    if (!columnsMatch) {
+                        OutputDebugStringA("What!?\n");
+                    }
                 }
                 else
                 {
@@ -780,6 +788,11 @@ bool CsvParser::VerifyBlobAgainstCsv(const std::string& processName, const unsig
                 columnsMatch = true;
                 break;
             }
+            if (columnsMatch == false) {
+                // If the columns do not match, create an error string
+                // and assert failure.
+                Assert::Fail(CreateErrorString(pair.second, line_).c_str());
+            }
             Assert::IsTrue(columnsMatch, CreateErrorString(pair.second, line_).c_str());
         }
     }
@@ -1185,7 +1198,6 @@ void CsvParser::ConvertToMetricDataType(const char* data, Header columnId)
         }
     }
     break;
-
     default:
         Assert::Fail(CreateErrorString(UnknownHeader, line_).c_str());
     }