Save All Histograms from Perf (#3152)

.azure/azure-pipelines.perf.yml

@@ -353,15 +353,14 @@ stages:
           extraArgs: -PGO
           failOnRegression: 0
 
-- ${{ if eq(variables['Build.Reason'], 'IndividualCI') }}:
-  - stage: perf_post_process
-    displayName: Perf Post Processing
-    condition: succeededOrFailed()
-    dependsOn:
-    - perf_winkernel
-    - perf_winuser_schannel
-    - perf_winuser_xdp
-    - perf_winuser_openssl
-    - perf_linux_openssl
-    jobs:
-    - template: ./templates/post-process-performance.yml
+- stage: perf_post_process
+  displayName: Perf Post Processing
+  condition: succeededOrFailed()
+  dependsOn:
+  - perf_winkernel
+  - perf_winuser_schannel
+  - perf_winuser_xdp
+  - perf_winuser_openssl
+  - perf_linux_openssl
+  jobs:
+  - template: ./templates/post-process-performance.yml

scripts/performance-helper.psm1

@@ -522,14 +522,18 @@ function Log($msg) {
 
 function Invoke-LocalExe {
     [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingInvokeExpression', '')]
-    param ($Exe, $RunArgs, $Timeout, $OutputDir)
+    param ($Exe, $RunArgs, $Timeout, $OutputDir, $HistogramFileName)
     $BasePath = Split-Path $Exe -Parent
     if (!$IsWindows) {
         $env:LD_LIBRARY_PATH = $BasePath
         chmod +x $Exe | Out-Null
     }
-    $LocalExtraFile = Join-Path $BasePath "ExtraRunFile.txt"
-    $RunArgs = """--extraOutputFile:$LocalExtraFile"" $RunArgs"
+    $HistogramDir = Join-Path $OutputDir "histogram"
+    if (!(Test-Path $HistogramDir)) {
+        mkdir $HistogramDir | Out-Null
+    }
+    $HistogramFilePath = Join-Path $HistogramDir $HistogramFileName
+    $RunArgs = """--extraOutputFile:$HistogramFilePath"" $RunArgs"
     $TimeoutMs = ($Timeout - 5) * 1000;
     $RunArgs = "-watchdog:$TimeoutMs $RunArgs"
 
@@ -951,15 +955,6 @@ function Publish-RPSTestResults {
 
     $Request = [RPSRequest]::new($Test)
 
-    $BasePath = Split-Path $ExePath -Parent
-    $LocalExtraFile = Join-Path $BasePath "ExtraRunFile.txt"
-    if (Test-Path $LocalExtraFile -PathType Leaf) {
-        $ResultFile = Join-Path $OutputDir "histogram_$Test.txt"
-        Copy-Item -Path $LocalExtraFile -Destination $ResultFile
-    } else {
-        Write-Host "Extra file $LocalExtraFile not found when expected"
-    }
-
     $AllRunsResults = Get-TestResultAtIndex -FullResults $AllRunsFullResults -Index 1
     $MedianCurrentResult = Get-MedianTestResults -FullResults $AllRunsResults
     $FullLastResult = Get-LatestRPSRemoteTestResults -CpuData $PreviousResults -Request $Request

scripts/performance.ps1

@@ -478,7 +478,7 @@ function Invoke-Test {
     try {
         1..$NumIterations | ForEach-Object {
             Write-LogAndDebug "Running Local: $LocalExe Args: $LocalArguments"
-            $LocalResults = Invoke-LocalExe -Exe $LocalExe -RunArgs $LocalArguments -Timeout $Timeout -OutputDir $OutputDir
+            $LocalResults = Invoke-LocalExe -Exe $LocalExe -RunArgs $LocalArguments -Timeout $Timeout -OutputDir $OutputDir -HistogramFileName "$($Test)_run$($_).txt"
             Write-LogAndDebug $LocalResults
             $AllLocalParsedResults = Get-TestResult -Results $LocalResults -Matcher $Test.ResultsMatcher -FailureDefault $Test.FailureDefault
             $AllRunsResults += $AllLocalParsedResults