Benjaming/fix pmc columns

.gitignore

@@ -37,6 +37,7 @@ x64/
 x86/
 [Aa][Rr][Mm]/
 [Aa][Rr][Mm]64/
+!installer/*/
 bld/
 [Bb]in/
 [Oo]bj/

installer/arm64/prepare-installer.cmd

@@ -1,3 +1,3 @@
-set %_VERSION="1.2.0"
+set %_VERSION="1.2.1"
 
 iscc.exe installer.iss /DAPP_VERSION=%_VERSION% /O%cd%

installer/x64/prepare-installer.cmd

@@ -1,3 +1,3 @@
-set %_VERSION="1.2.0"
+set %_VERSION="1.2.1"
 
 iscc.exe installer.iss /DAPP_VERSION=%_VERSION% /O%cd%

src/ProfileExplorerCore/Profile/ETW/ETWProfileDataProvider.cs

@@ -298,6 +298,24 @@ await LoadBinaryAndDebugFiles(rawProfile, mainProcess, imageName,
           Trace.WriteLine(
             $"LoadTraceAsync: Done processing trace in {processingSw.Elapsed}, {processingSw.ElapsedMilliseconds} ms");
 
+          // If the trace has registered PMU counters (from PerfInfoCollectionEnd events)
+          // but no PerfInfoPMCSample events, the PMU counters were used as sampling sources
+          // rather than as separate counting events. Create synthetic counter events from
+          // the regular samples, similar to how samples without stacks get a synthetic
+          // single-frame stack (see ProcessSamplesChunk).
+          if (!rawProfile.HasPerformanceCountersEvents && rawProfile.PerformanceCounters.Count > 0) {
+            Trace.WriteLine($"LoadTraceAsync: Generating synthetic PMC events from {rawProfile.Samples.Count} samples " +
+                           $"for {rawProfile.PerformanceCounters.Count} PMU sampling source counter(s)");
+
+            foreach (var sample in rawProfile.Samples) {
+              foreach (var counter in rawProfile.PerformanceCounters) {
+                var counterEvent = new PerformanceCounterEvent(
+                  sample.IP, sample.Time, sample.ContextId, (short)counter.Id);
+                rawProfile.AddPerformanceCounterEvent(counterEvent);
+              }
+            }
+          }
+
           // Process performance counters.
           if (rawProfile.HasPerformanceCountersEvents) {
             Trace.WriteLine($"LoadTraceAsync: Processing {rawProfile.PerformanceCountersEvents.Count} performance counter events");
@@ -1340,8 +1358,7 @@ private void ProcessPerformanceCounters(RawProfileData rawProfile, List<int> pro
           continue;
         }
 
-        if (!profileModuleBuilder.Initialized || !profileModuleBuilder.HasDebugInfo) {
-          //Trace.WriteLine($"Uninitialized module {image.FileName}");
+        if (!profileModuleBuilder.HasDebugInfo) {
           continue;
         }
 

src/ProfileExplorerUI/Document/IRDocumentHost.xaml.cs

@@ -1190,9 +1190,9 @@ private async Task<bool> UpdateProfilingColumns() {
 
     // Add the columns to the View menu.
     ProfileColumns.BuildColumnsVisibilityMenu(columnData, ProfileViewMenu, () => {
-      // TODO: Force non-async run to ensure no events from SetViewMenuItemEvents
-      // are set yet, can cause an infinite update loop. Find a better way.
-      Utils.RunSync(UpdateProfilingColumns);
+      // UpdateProfilingColumns handles reentrancy by calling ResetViewMenuItemEvents()
+      // synchronously before any await, which unsubscribes the event handlers.
+      _ = UpdateProfilingColumns();
     });
 
     SetViewMenuItemEvents();

src/ProfileExplorerUI/ProfileExplorerUI.csproj

@@ -5,9 +5,9 @@
 		<TargetFramework>net8.0-windows</TargetFramework>
 		<UseWPF>true</UseWPF>
 		<ApplicationIcon>main.ico</ApplicationIcon>
-		<AssemblyVersion>1.2.0</AssemblyVersion>
-		<FileVersion>1.2.0</FileVersion>
-		<Version>1.2.0</Version>
+		<AssemblyVersion>1.2.1</AssemblyVersion>
+		<FileVersion>1.2.1</FileVersion>
+		<Version>1.2.1</Version>
 		<Authors></Authors>
 		<Company>Microsoft Corporation</Company>
 		<Product>Profile Explorer</Product>
@@ -325,4 +325,4 @@
 	</ItemGroup>
 
 
-</Project>
+</Project>