Merge branch 'rc2.3.1'

markgalvan-intel · markgalvan-intel · commit 9c2310b757ed · 2025-06-24T17:51:27.000-07:00
diff --git a/IntelPresentMon/AppCef/AppCef.rc b/IntelPresentMon/AppCef/AppCef.rc
@@ -61,8 +61,8 @@ IDI_ICON1               ICON                    "flask.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,3,0
- PRODUCTVERSION 2,3,0,0
+ FILEVERSION 1,0,4,0
+ PRODUCTVERSION 2,3,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Intel(R) Corporation"
             VALUE "FileDescription", "Intel(R) PresentMon application"
-            VALUE "FileVersion", "1.0.3.0"
+            VALUE "FileVersion", "1.0.4.0"
             VALUE "InternalName", "CefNano.exe"
-            VALUE "LegalCopyright", "Copyright (C) 2017-2024"
+            VALUE "LegalCopyright", "Copyright (C) 2017-2025"
             VALUE "OriginalFilename", "CefNano.exe"
             VALUE "ProductName", "Intel(R) PresentMon"
-            VALUE "ProductVersion", "2.3.0.0"
+            VALUE "ProductVersion", "2.3.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/IntelPresentMon/FlashInjector/FlashInjector.rc b/IntelPresentMon/FlashInjector/FlashInjector.rc
diff --git a/IntelPresentMon/FlashInjector/FlashInjector.vcxproj b/IntelPresentMon/FlashInjector/FlashInjector.vcxproj
@@ -170,6 +170,7 @@
     <ClInclude Include="CliOptions.h" />
     <ClInclude Include="LibraryInject.h" />
     <ClInclude Include="Logging.h" />
+    <ClInclude Include="resource1.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CommonUtilities\CommonUtilities.vcxproj">
@@ -179,6 +180,11 @@
       <Project>{2e571d96-1196-45d4-ae13-f05ceb1f23c8}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="FlashInjector.rc">
+      <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">ISX86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/IntelPresentMon/FlashInjector/FlashInjector.vcxproj.filters b/IntelPresentMon/FlashInjector/FlashInjector.vcxproj.filters
@@ -32,5 +32,13 @@
     <ClInclude Include="Logging.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="resource1.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="FlashInjector.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>
diff --git a/IntelPresentMon/FlashInjector/resource.h b/IntelPresentMon/FlashInjector/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by FlashInjector.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/IntelPresentMon/FlashInjector/resource1.h b/IntelPresentMon/FlashInjector/resource1.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by FlashInjector.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/IntelPresentMon/FlashInjectorLibrary/FlashInjectorLibrary.rc b/IntelPresentMon/FlashInjectorLibrary/FlashInjectorLibrary.rc
diff --git a/IntelPresentMon/FlashInjectorLibrary/FlashInjectorLibrary.vcxproj b/IntelPresentMon/FlashInjectorLibrary/FlashInjectorLibrary.vcxproj
@@ -38,6 +38,7 @@
     <ClInclude Include="Logging.h" />
     <ClInclude Include="MemoryPool.h" />
     <ClInclude Include="NonCopyable.h" />
+    <ClInclude Include="resource.h" />
     <ClInclude Include="WrapUtils.h" />
   </ItemGroup>
   <ItemGroup>
@@ -66,6 +67,11 @@
       <Project>{08a704d8-ca1c-45e9-8ede-542a1a43b53e}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="FlashInjectorLibrary.rc">
+      <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">ISX86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
diff --git a/IntelPresentMon/FlashInjectorLibrary/FlashInjectorLibrary.vcxproj.filters b/IntelPresentMon/FlashInjectorLibrary/FlashInjectorLibrary.vcxproj.filters
@@ -75,6 +75,9 @@
     <ClInclude Include="Logging.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Custom\API_D3D11.cpp">
@@ -135,4 +138,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="FlashInjectorLibrary.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
diff --git a/IntelPresentMon/FlashInjectorLibrary/resource.h b/IntelPresentMon/FlashInjectorLibrary/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by FlashInjectorLibrary.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/IntelPresentMon/Interprocess/source/IntrospectionCapsLookup.h b/IntelPresentMon/Interprocess/source/IntrospectionCapsLookup.h
@@ -24,6 +24,7 @@ namespace pmon::ipc::intro
 	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_VOLTAGE> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::vram_voltage; };
 	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_FREQUENCY> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::vram_frequency; };
 	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_EFFECTIVE_FREQUENCY> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::vram_effective_frequency; };
+	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_TEMPERATURE> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::vram_temperature; };
 	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_VOLTAGE_REGULATOR_TEMPERATURE> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_voltage_regulator_temperature; };
 	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_MEM_EFFECTIVE_BANDWIDTH> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_mem_effective_bandwidth; };
 	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_OVERVOLTAGE_PERCENT> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_overvoltage_percent; };
diff --git a/IntelPresentMon/PMInstaller/PresentMon.wxs b/IntelPresentMon/PMInstaller/PresentMon.wxs
@@ -4,7 +4,7 @@
         Id="*"
         Name="Intel(R) PresentMon"
         Language="1033"
-        Version="2.3.0.0"
+        Version="2.3.1.0"
         Manufacturer="Intel(R) Corporation"
         UpgradeCode="CD0D489E-0FE7-452D-90D9-F94F3F5FF410">
 
@@ -16,7 +16,7 @@
 
         <MediaTemplate EmbedCab="yes" />
 
-        <?define console_app_ver = 2.3.0 ?>
+        <?define console_app_ver = 2.3.1 ?>
         <?define console_app_path = $(pm.GetConsoleAppPath($(var.SolutionDir), $(var.console_app_ver))) ?>
         <?define console_app_filename = $(pm.GetConsoleAppFileName($(var.console_app_ver))) ?>
         <?define has_console_app = $(pm.CheckFileExists($(var.console_app_path))) ?>
diff --git a/IntelPresentMon/PresentMonAPI2/PresentMonAPI.h b/IntelPresentMon/PresentMonAPI2/PresentMonAPI.h
@@ -9,10 +9,14 @@
 
 #include <cstdint>
 
+#define PM_API_VERSION_MAJOR 3
+#define PM_API_VERSION_MINOR 0
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+
 	enum PM_STATUS
 	{
 		PM_STATUS_SUCCESS,
diff --git a/IntelPresentMon/PresentMonAPI2/PresentMonAPI2.rc b/IntelPresentMon/PresentMonAPI2/PresentMonAPI2.rc
diff --git a/IntelPresentMon/PresentMonService/PresentMonService.rc b/IntelPresentMon/PresentMonService/PresentMonService.rc
diff --git a/IntelPresentMon/Versioning/PresentMonAPIVersion.cpp b/IntelPresentMon/Versioning/PresentMonAPIVersion.cpp
@@ -1,14 +1,15 @@
 #include "PresentMonAPIVersion.h"
 #include "BuildId.h"
 #include <cstring>
+#include "../PresentMonAPI2/PresentMonAPI.h"
 
 namespace pmon::bid
 {
 	PM_VERSION GetApiVersion() noexcept
 	{
 		PM_VERSION ver{
-			.major = 3,
-			.minor = 0,
+			.major = PM_API_VERSION_MAJOR,
+			.minor = PM_API_VERSION_MINOR,
 			.patch = 0,
 			.tag = "",
 		};
diff --git a/IntelPresentMon/metrics.csv b/IntelPresentMon/metrics.csv
@@ -13,7 +13,7 @@ PM_METRIC_FRAME_TYPE,,Frame Type,Whether the frame was rendered by the applicati
 ,,,
 PM_METRIC_CPU_START_TIME,,CPU Start Time,The time the CPU started working on this frame.
 PM_METRIC_CPU_START_QPC,1,CPU Start QPC,"The time the CPU started working on this frame, as a QueryPerformanceCounter() value."
-PM_METRIC_CPU_FRAME_TIME,,FrameTime-App,How long it took from the start of this frame until the CPU started working on the next frame.
+PM_METRIC_CPU_FRAME_TIME,1,FrameTime-App,How long it took from the start of this frame until the CPU started working on the next frame.
 PM_METRIC_CPU_BUSY,,Ms CPU Busy,How long the CPU spent working on this frame before presenting it.
 PM_METRIC_CPU_WAIT,,Ms CPU Wait,How long the CPU spent waiting before starting the next frame.
 ,,,
@@ -100,6 +100,6 @@ PM_METRIC_UNTIL_DISPLAYED,,Ms Until Displayed,"The time between the Present() ca
 PM_METRIC_RENDER_PRESENT_LATENCY,,Ms Render Present Latency,"The time between the Present() call and when GPU work for this frame completed, in milliseconds."
 PM_METRIC_BETWEEN_SIMULATION_START,,Ms Between Simulation Start,"The time between the start of simulation processing of the previous frame and this one, in milliseconds."
 PM_METRIC_PC_LATENCY,,Ms PC Latency,"Time between PC receiving input and frame being sent to the display, in milliseconds."
-PM_METRIC_DISPLAYED_FRAME_TIME,,FrameTime-Display,"The time between when the previous frame was displayed and this frame was, in milliseconds."
-PM_METRIC_PRESENTED_FRAME_TIME,,FrameTime-Presents,"The time between this Present call and the previous one, in milliseconds."
+PM_METRIC_DISPLAYED_FRAME_TIME,1,FrameTime-Display,"The time between when the previous frame was displayed and this frame was, in milliseconds."
+PM_METRIC_PRESENTED_FRAME_TIME,1,FrameTime-Presents,"The time between this Present call and the previous one, in milliseconds."
 PM_METRIC_BETWEEN_APP_START,,Ms Between App Start,"How long it took from the start of this frame until the CPU started working on the next frame, in milliseconds."
diff --git a/PresentMon.props b/PresentMon.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
     <!-- PresentMonVersion should be "dev" on main branch, and the version number (e.g., 2.1.0) on release branches. -->
-    <PresentMonVersion>2.3.0</PresentMonVersion>
+    <PresentMonVersion>2.3.1</PresentMonVersion>
     <PresentMonPlatform>$(Platform)</PresentMonPlatform>
   </PropertyGroup>
   <PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Win32'">
diff --git a/Provider/Version.rc b/Provider/Version.rc
diff --git a/README-CaptureApplication.md b/README-CaptureApplication.md
@@ -54,6 +54,8 @@ In Debug configuration, the application will halt with a modal error dialog when
 |GPU Wait|GPUWait|How long the GPU spent waiting while working on this frame|DF|
 |Dropped Frames||Indicates if the frame was not displayed|DF|
 |Displayed Time|DisplayedTime|How long this frame was displayed on screen|DF|
+|Animation Error|MsAnimationError|The difference between the previous frame's CPU delta and display delta|DF|
+|Animation Time|AnimationTime|The difference between the previous frame's CPU delta and display delta|F|
 |Sync Interval|SyncInterval|The application's requested interval between presents measured in vertical sync/vblank events|DF|
 |Present Flags|PresentFlags|Flags used to configure the present operation|DF|
 |Present Mode|PresentMode|Method used to present the frame|DF|
@@ -62,7 +64,7 @@ In Debug configuration, the application will halt with a modal error dialog when
 |Frame Type|FrameType|Whether the frame was rendered by the application or interpolated by a driver/SDK.|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|
-|Click To Photon Latency|ClickToPhotonLatency|Time between input and display|DF|
+|Click To Photon Latency|MsClickToPhotonLatency|Time between mouse click 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|
 |GPU Voltage|GPUVoltage|Voltage consumed by the graphics adapter|DF|
@@ -99,6 +101,29 @@ In Debug configuration, the application will halt with a modal error dialog when
 |CPU Temperature|CPUTemperature|Temperature of the CPU|DF|
 |CPU Frequency|CPUFrequency|Clock speed of the CPU|DF|
 |CPU Core Utility||Amount of CPU processing utility being used per core|D|
+|All Input To Photon Latency|MsAllInputToPhotonLatency|Time between any input and display|DF|
+|Instrumented Latency|InstrumentedLatency|How long it took from the instrumented start of this frame until the frame was displayed on the screen|DF|
+|GPU Effective Frequency||Effective clock speed of the GPU cores|DF|
+|GPU Voltage Regulator Temperature||Voltage regulator temperature|DF|
+|GPU Memory Effective Bandwidth||Data transfer rate that the memory modules can sustain based on current clock frequency|DF|
+|GPU Overvoltage Percent||GPU overvoltage increment as a ratio of the maximum increment|DF|
+|GPU Temperature Percent||GPU temperature as a ratio of the thermal margin|DF|
+|GPU Power Percent||GPU power draw as a ratio of default maximum power|DF|
+|GPU Fan Speed Percent||GPU fan speed as a ratio of the max speed for that fan|DF|
+|GPU Card Power||,Total power consumption of the graphics adapter board|DF|
+|Present Start Time|TimeInSeconds|The time the Present() call was made, in seconds|F|
+|Present Start QPC|Present Start QPC|The time the Present() call was made as a QueryPerformanceCounter() value|F|
+|Between Presents|MsBetweenPresents|The time between this Present() call and the previous one, in milliseconds|F|
+|In Present API|MsInPresentAPI|The time spent inside the Present() call, in milliseconds.|F|
+|Between Display Change|MsBetweenDisplayChange|How long the previous frame was displayed before this Present() was displayed, in milliseconds|DF|
+|Until Displayed|MsUntilDisplayed|The time between the Present() call and when the frame was displayed, in milliseconds|DF|
+|Render Present Latency|MsRenderPresentLatency|The time between the Present() call and when GPU work for this frame completed, in milliseconds|F|
+|Between Simulation Start|MsBetweenSimulationStart|The time between the start of simulation processing of the previous frame and this one, in milliseconds.|F|
+|PC Latency|MsPCLatency|Time between PC receiving input and frame being sent to the display, in milliseconds|DF|
+|Displayed Frame Time||The time between when the previous frame was displayed and this frame was, in milliseconds|D|
+|Presented Frame Time||The time between this Present call and the previous one, in milliseconds|D|
+|Between App Start|MsBetweenAppStart|How long it took from the start of this frame until the CPU started working on the next frame, in milliseconds.|F|
+
 *Query Type Codes: **D** = Dynamic Query, **F** = Frame Event Query, **S** = Static Query
 
 ## Comma-separated value (CSV) file output
diff --git a/README-ConsoleApplication.md b/README-ConsoleApplication.md
diff --git a/Tools/generate/readme/CSVOutro.md b/Tools/generate/readme/CSVOutro.md
