utils: Cleanup timing functions in build.ps1.

Author: jeffdav

utils/build.ps1

@@ -381,11 +381,40 @@ $KnownNDKs = @{
   }
 }
 
-
 $IsCrossCompiling = $HostArchName -ne $BuildArchName
 
 $TimingData = New-Object System.Collections.Generic.List[System.Object]
 
+function Add-TimingData {
+  param(
+    [Parameter(Mandatory)]
+    [string] $Arch,
+    [Parameter(Mandatory)]
+    [string] $Platform,
+    [Parameter(Mandatory)]
+    [string] $BuildStep,
+    [Parameter(Mandatory)]
+    [System.TimeSpan] $ElapsedTime
+  )
+
+  $TimingData.Add([PSCustomObject]@{
+    Arch = $Arch
+    Platform = $Platform
+    "Build Step" = $BuildStep
+    "Elapsed Time" = $ElapsedTime.ToString()
+  })
+}
+
+function Write-Summary {
+  Write-Host "Summary:" -ForegroundColor Cyan
+
+  # Sort timing data by elapsed time (descending)
+  $TimingData `
+    | Select-Object "Build Step",Platform,Arch,"Elapsed Time" `
+    | Sort-Object -Descending -Property "Elapsed Time" `
+    | Format-Table -AutoSize
+}
+
 function Get-AndroidNDK {
   $NDK = $KnownNDKs[$AndroidNDKVersion]
   if (-not $NDK) { throw "Unsupported Android NDK version" }
@@ -458,9 +487,20 @@ $WindowsSDKArchs = @($WindowsSDKs | ForEach-Object {
 })
 
 # Build functions
-function Invoke-BuildStep([string]$Name) {
+function Invoke-BuildStep([string] $Name) {
+  if ($Summary) {
+    $Stopwatch = [Diagnostics.Stopwatch]::StartNew()
+  }
+
   & $Name @Args
+
+  if ($Summary) {
+    Add-TimingData $BuildArch.LLVMName "Windows" ($Name -replace "Build-","") $Stopwatch.Elapsed
+  }
   if ($Name.Replace("Build-", "") -eq $BuildTo) {
+    if ($Summary) {
+      Write-Summary
+    }
     exit 0
   }
 }
@@ -732,6 +772,7 @@ function Invoke-VsDevShell($Arch) {
 }
 
 function Get-Dependencies {
+  Write-Host "[$([DateTime]::Now.ToString("yyyy-MM-dd HH:mm:ss"))] Fetch-Dependencies ..." -ForegroundColor Cyan
   $ProgressPreference = "SilentlyContinue"
 
   $WebClient = New-Object Net.WebClient
@@ -949,12 +990,7 @@ function Get-Dependencies {
     Write-Host ""
   }
   if ($Summary) {
-    $TimingData.Add([PSCustomObject]@{
-      Arch = $BuildArch.LLVMName
-      Platform = 'Windows'
-      Checkout = 'Get-Dependencies'
-      "Elapsed Time" = $Stopwatch.Elapsed.ToString()
-    })
+    Add-TimingData $BuildArch.LLVMName "Windows" "Get-Dependencies" $Stopwatch.Elapsed
   }
 }
 
@@ -1078,8 +1114,6 @@ function Build-CMakeProject {
     Write-Host -ForegroundColor Cyan "[$([DateTime]::Now.ToString("yyyy-MM-dd HH:mm:ss"))] Building '$Src' to '$Bin' ..."
   }
 
-  $Stopwatch = [Diagnostics.Stopwatch]::StartNew()
-
   # Enter the developer command shell early so we can resolve cmake.exe
   # for version checks.
   Invoke-IsolatingEnvVars {
@@ -1400,15 +1434,6 @@ function Build-CMakeProject {
     Write-Host -ForegroundColor Cyan "[$([DateTime]::Now.ToString("yyyy-MM-dd HH:mm:ss"))] Finished building '$Src' to '$Bin' in $($Stopwatch.Elapsed)"
     Write-Host ""
   }
-
-  if ($Summary) {
-    $TimingData.Add([PSCustomObject]@{
-      Arch = $Arch.LLVMName
-      Platform = $Platform
-      Checkout = $Src.Replace($SourceCache, '')
-      "Elapsed Time" = $Stopwatch.Elapsed.ToString()
-    })
-  }
 }
 
 enum SPMBuildAction {
@@ -1494,12 +1519,7 @@ function Build-SPMProject {
   }
 
   if ($Summary) {
-    $TimingData.Add([PSCustomObject]@{
-      Arch = $Arch.LLVMName
-      Checkout = $Src.Replace($SourceCache, '')
-      Platform = "Windows"
-      "Elapsed Time" = $Stopwatch.Elapsed.ToString()
-    })
+    Add-TimingData $BuildArch.LLVMName "Windows" $Src.Replace($SourceCache, '') $Stopwatch.Elapsed
   }
 }
 
@@ -3352,6 +3372,6 @@ if (-not $IsCrossCompiling) {
   exit 1
 } finally {
   if ($Summary) {
-    $TimingData | Select-Object Platform,Arch,Checkout,"Elapsed Time" | Sort-Object -Descending -Property "Elapsed Time" | Format-Table -AutoSize
+    Write-Summary
   }
 }