utils: enable early swift driver on Windows

This wires up the build of the swift-driver via SPM from the pinned
toolchain to allow us the use of the early swift driver in the Swift
build.

Author: compnerd

utils/build.ps1

@@ -230,6 +230,8 @@ $ArchX64 = @{
   ToolchainInstallRoot = "$BinaryCache\x64\toolchains\$ProductVersion+Asserts";
 }
 
+$WindowsX64 = $ArchX64
+
 $ArchX86 = @{
   VSName = "x86";
   ShortName = "x86";
@@ -245,6 +247,8 @@ $ArchX86 = @{
   SwiftTestingInstallRoot = "$BinaryCache\x86\Windows.platform\Developer\Library\Testing-development";
 }
 
+$WindowsX86 = $ArchX86
+
 $ArchARM64 = @{
   VSName = "arm64";
   ShortName = "arm64";
@@ -261,6 +265,8 @@ $ArchARM64 = @{
   SwiftTestingInstallRoot = "$BinaryCache\arm64\Windows.platform\Developer\Library\Testing-development";
 }
 
+$WindowsARM64 = $ArchARM64
+
 $AndroidARM64 = @{
   AndroidArchABI = "arm64-v8a";
   BinaryDir = "bin64a";
@@ -429,7 +435,7 @@ function Get-TargetProjectBinaryCache($Arch, [TargetComponent]$Project) {
 }
 
 enum HostComponent {
-  Compilers = 5
+  Compilers = 9
   FoundationMacros = 10
   TestingMacros
   System
@@ -463,6 +469,7 @@ function Get-HostProjectCMakeModules([HostComponent]$Project) {
 
 enum BuildComponent {
   BuildTools
+  Driver
   Compilers
   FoundationMacros
   TestingMacros
@@ -903,7 +910,7 @@ function Build-CMakeProject {
     [string[]] $UseMSVCCompilers = @(), # C,CXX
     [string[]] $UseBuiltCompilers = @(), # ASM,C,CXX,Swift
     [string[]] $UsePinnedCompilers = @(), # ASM,C,CXX,Swift
-    [switch] $UseSwiftSwiftDriver = $false,
+    [bool] $UseEarlySwiftDriver = $true,
     [switch] $AddAndroidCMakeEnv = $false,
     [string] $SwiftSDK = "",
     [hashtable] $Defines = @{}, # Values are either single strings or arrays of flags
@@ -941,14 +948,6 @@ function Build-CMakeProject {
         $env:SCCACHE_DIR = $Cache
       }
     }
-    if ($UseSwiftSwiftDriver) {
-      $env:SWIFT_DRIVER_SWIFT_FRONTEND_EXEC = ([IO.Path]::Combine($CompilersBinaryCache, "bin", "swift-frontend.exe"))
-    }
-
-    # TODO(compnerd) workaround swiftc.exe symlink not existing.
-    if ($UseSwiftSwiftDriver) {
-      Copy-Item -Force ([IO.Path]::Combine($DriverBinaryCache, "bin", "swift-driver.exe")) ([IO.Path]::Combine($DriverBinaryCache, "bin", "swiftc.exe"))
-    }
 
     # Add additional defines (unless already present)
     $Defines = $Defines.Clone()
@@ -1080,9 +1079,7 @@ function Build-CMakeProject {
     if ($UsePinnedCompilers.Contains("Swift") -Or $UseBuiltCompilers.Contains("Swift")) {
       $SwiftArgs = @()
 
-      if ($UseSwiftSwiftDriver) {
-        TryAdd-KeyValue $Defines CMAKE_Swift_COMPILER ([IO.Path]::Combine($DriverBinaryCache, "bin", "swiftc.exe"))
-      } elseif ($UseBuiltCompilers.Contains("Swift")) {
+      if ($UseBuiltCompilers.Contains("Swift")) {
         TryAdd-KeyValue $Defines CMAKE_Swift_COMPILER ([IO.Path]::Combine($CompilersBinaryCache, "bin", "swiftc.exe"))
       } else {
         TryAdd-KeyValue $Defines CMAKE_Swift_COMPILER (Join-Path -Path (Get-PinnedToolchainTool) -ChildPath  "swiftc.exe")
@@ -1201,7 +1198,11 @@ function Build-CMakeProject {
     }
 
     if ($UseBuiltCompilers.Contains("Swift")) {
-      $env:Path = "$($BuildArch.SDKInstallRoot)\usr\bin;$(Get-CMarkBinaryCache $Arch)\src;$($BuildArch.ToolchainInstallRoot)\usr\bin;${env:Path}"
+      $env:Path = if ($UseEarlySwiftDriver) {
+       "$(Get-PinnedToolchainRuntime);$($BuildArch.SDKInstallRoot)\usr\bin;$(Get-CMarkBinaryCache $BuildArch)\src;$($BuildArch.ToolchainInstallRoot)\usr\bin;${env:Path}"
+      } else {
+       "$($BuildArch.SDKInstallRoot)\usr\bin;$(Get-CMarkBinaryCache $BuildArch)\src;$($BuildArch.ToolchainInstallRoot)\usr\bin;${env:Path};$(Get-PinnedToolchainRuntime)"
+      }
     } elseif ($UsePinnedCompilers.Contains("Swift")) {
       $env:Path = "$(Get-PinnedToolchainRuntime);${env:Path}"
     }
@@ -1459,6 +1460,7 @@ function Build-Compilers() {
         SWIFT_BUILD_DYNAMIC_STDLIB = "YES";
         SWIFT_BUILD_REMOTE_MIRROR = "YES";
         SWIFT_NATIVE_SWIFT_TOOLS_PATH = "";
+        SWIFT_EARLY_SWIFT_DRIVER_BUILD = "$(Get-HostProjectBinaryCache Driver)\bin";
       }
 
       if ($TestClang) { $Targets += @("check-clang") }
@@ -1473,6 +1475,7 @@ function Build-Compilers() {
         SWIFT_BUILD_DYNAMIC_STDLIB = "NO";
         SWIFT_BUILD_REMOTE_MIRROR = "NO";
         SWIFT_NATIVE_SWIFT_TOOLS_PATH = $BuildTools;
+        SWIFT_EARLY_SWIFT_DRIVER_BUILD = "$(Get-BuildProjectBinaryCache Driver)\$($BuildArch.LLVMTarget)\release";
       }
     }
 
@@ -1497,6 +1500,7 @@ function Build-Compilers() {
       -UsePinnedCompilers Swift `
       -BuildTargets $Targets `
       -CacheScript $SourceCache\swift\cmake\caches\Windows-$($Arch.LLVMName).cmake `
+      -UseEarlySwiftDriver (-not ($TestClang -or $TestLLD -or $TestLLDB -or $TestLLVM -or $TestSwift)) `
       -Defines ($TestingDefines + @{
         CLANG_TABLEGEN = (Join-Path -Path $BuildTools -ChildPath "clang-tblgen.exe");
         CLANG_TIDY_CONFUSABLE_CHARS_GEN = (Join-Path -Path $BuildTools -ChildPath "clang-tidy-confusable-chars-gen.exe");
@@ -1865,6 +1869,7 @@ function Build-Dispatch([Platform]$Platform, $Arch, [switch]$Test = $false) {
     -Arch $Arch `
     -Platform $Platform `
     -UseBuiltCompilers C,CXX,Swift `
+    -SwiftSDK $((Get-Variable "${Platform}$($Arch.ShortName)" -ValueOnly).SDKInstallRoot) `
     -Defines @{
       ENABLE_SWIFT = "YES";
     }
@@ -1907,28 +1912,17 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
     $ShortArch = $Arch.LLVMName
 
     Isolate-EnvVars {
-      $SDKRoot = if ($Platform -eq "Windows") {
-        ""
-      } else {
-        (Get-Variable "${Platform}$($Arch.ShortName)" -ValueOnly).SDKInstallRoot
-      }
-
-      $SDKRoot = if ($Platform -eq "Windows") {
-        ""
-      } else {
-        (Get-Variable "${Platform}$($Arch.ShortName)" -ValueOnly).SDKInstallRoot
-      }
-
       Build-CMakeProject `
         -Src $SourceCache\swift-corelibs-foundation `
         -Bin $FoundationBinaryCache `
         -InstallTo "$($Arch.SDKInstallRoot)\usr" `
         -Arch $Arch `
         -Platform $Platform `
         -UseBuiltCompilers ASM,C,CXX,Swift `
-        -SwiftSDK:$SDKRoot `
+        -SwiftSDK $((Get-Variable "${Platform}$($Arch.ShortName)" -ValueOnly).SDKInstallRoot) `
         -Defines (@{
           ENABLE_TESTING = "NO";
+          CMAKE_Swift_COMPILER_USE_OLD_DRIVER = "YES";
           FOUNDATION_BUILD_TOOLS = if ($Platform -eq "Windows") { "YES" } else { "NO" };
           CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
           CURL_DIR = "$LibraryRoot\curl-8.9.1\usr\lib\$Platform\$ShortArch\cmake\CURL";
@@ -1967,7 +1961,7 @@ function Build-FoundationMacros() {
     Get-HostProjectBinaryCache FoundationMacros
   }
 
-  $SwiftSDK = $null
+  $SwiftSDK = $((Get-Variable "${Platform}$($Arch.ShortName)" -ValueOnly).SDKInstallRoot)
   if ($Build) {
     $SwiftSDK = $BuildArch.SDKInstallRoot
   }
@@ -1992,7 +1986,7 @@ function Build-FoundationMacros() {
     -Arch $Arch `
     -Platform $Platform `
     -UseBuiltCompilers Swift `
-    -SwiftSDK:$SwiftSDK `
+    -SwiftSDK $SwiftSDK `
     -BuildTargets:$Targets `
     -Defines @{
       SwiftSyntax_DIR = $SwiftSyntaxCMakeModules;
@@ -2029,6 +2023,7 @@ function Build-XCTest([Platform]$Platform, $Arch, [switch]$Test = $false) {
       -Arch $Arch `
       -Platform $Platform `
       -UseBuiltCompilers Swift `
+      -SwiftSDK $((Get-Variable "${Platform}$($Arch.ShortName)" -ValueOnly).SDKInstallRoot) `
       -BuildTargets $Targets `
       -Defines (@{
         CMAKE_BUILD_WITH_INSTALL_RPATH = "YES";
@@ -2058,6 +2053,7 @@ function Build-Testing([Platform]$Platform, $Arch, [switch]$Test = $false) {
       -Arch $Arch `
       -Platform $Platform `
       -UseBuiltCompilers C,CXX,Swift `
+      -SwiftSDK $((Get-Variable "${Platform}$($Arch.ShortName)" -ValueOnly).SDKInstallRoot) `
       -Defines (@{
         BUILD_SHARED_LIBS = "YES";
         CMAKE_BUILD_WITH_INSTALL_RPATH = "YES";
@@ -2283,29 +2279,78 @@ function Build-ArgumentParser($Arch) {
     }
 }
 
-function Build-Driver($Arch) {
-  Build-CMakeProject `
-    -Src $SourceCache\swift-driver `
-    -Bin (Get-HostProjectBinaryCache Driver) `
-    -InstallTo "$($Arch.ToolchainInstallRoot)\usr" `
-    -Arch $Arch `
-    -Platform Windows `
-    -UseBuiltCompilers C,CXX,Swift `
-    -SwiftSDK (Get-HostSwiftSDK) `
-    -Defines @{
-      BUILD_SHARED_LIBS = "YES";
-      SwiftSystem_DIR = (Get-HostProjectCMakeModules System);
-      TSC_DIR = (Get-HostProjectCMakeModules ToolsSupportCore);
-      LLBuild_DIR = (Get-HostProjectCMakeModules LLBuild);
-      Yams_DIR = (Get-HostProjectCMakeModules Yams);
-      ArgumentParser_DIR = (Get-HostProjectCMakeModules ArgumentParser);
-      SQLite3_INCLUDE_DIR = "$LibraryRoot\sqlite-3.46.0\usr\include";
-      SQLite3_LIBRARY = "$LibraryRoot\sqlite-3.46.0\usr\lib\SQLite3.lib";
-      SWIFT_DRIVER_BUILD_TOOLS = "YES";
-      LLVM_DIR = "$(Get-HostProjectBinaryCache Compilers)\lib\cmake\llvm";
-      Clang_DIR = "$(Get-HostProjectBinaryCache Compilers)\lib\cmake\clang";
-      Swift_DIR = "$(Get-HostProjectBinaryCache Compilers)\tools\swift\lib\cmake\swift";
+function Build-Driver() {
+  [CmdletBinding(PositionalBinding = $false)]
+  param
+  (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [hashtable]$Arch,
+    [switch] $Build = $false
+  )
+
+  if ($Build) {
+    $Stopwatch = [Diagnostics.Stopwatch]::StartNew()
+
+    Isolate-EnvVars {
+      $env:SWIFTCI_USE_LOCAL_DEPS=1
+      $env:SDKROOT = (Get-PinnedToolchainSDK)
+      $env:Path = "$(Get-PinnedToolchainRuntime);$(Get-PinnedToolchainTool);${env:Path}"
+
+      $src = "$SourceCache\swift-driver"
+      $dst = (Get-BuildProjectBinaryCache Driver)
+
+      if ($ToBatch) {
+        Write-Output ""
+        Write-Output "echo Building '$src' to '$dst' for arch '$($Arch.LLVMName)'..."
+      } else {
+        Write-Host -ForegroundColor Cyan "[$([DateTime]::Now.ToString("yyyy-MM-dd HH:mm:ss"))] Building '$src' to '$dst' for arch '$($Arch.LLVMName)'..."
+      }
+
+      Invoke-Program `
+        "$(Get-PinnedToolchainTool)\swift.exe" build `
+          -c release `
+          --scratch-path $dst `
+          --package-path $src `
+          -Xlinker "$(Get-PinnedToolchainSDK)\usr\lib\swift\windows\$($BuildArch.LLVMName)\swiftCore.lib"
+
+      if (-not $ToBatch) {
+        Write-Host -ForegroundColor Cyan "[$([DateTime]::Now.ToString("yyyy-MM-dd HH:mm:ss"))] Finished building '$src' to '$dst' for arch '$($Arch.LLVMName)' in $($Stopwatch.Elapsed)"
+        Write-Host ""
+      }
+
+      if ($Summary) {
+        $TimingData.Add([PSCustomObject]@{
+          Arch = $BuildArch.LLVMName
+          Checkout = $src.Replace($SourceCache, '')
+          Platform = "Windows"
+          "Elapsed Time" = $Stopwatch.Elapsed.ToString()
+        })
+      }
     }
+  } else {
+    Build-CMakeProject `
+      -Src $SourceCache\swift-driver `
+      -Bin (Get-HostProjectBinaryCache Driver) `
+      -InstallTo "$($Arch.ToolchainInstallRoot)\usr" `
+      -Arch $Arch `
+      -Platform Windows `
+      -UseBuiltCompilers C,CXX,Swift `
+      -SwiftSDK (Get-HostSwiftSDK) `
+      -Defines @{
+        BUILD_SHARED_LIBS = "YES";
+        SwiftSystem_DIR = (Get-HostProjectCMakeModules System);
+        TSC_DIR = (Get-HostProjectCMakeModules ToolsSupportCore);
+        LLBuild_DIR = (Get-HostProjectCMakeModules LLBuild);
+        Yams_DIR = (Get-HostProjectCMakeModules Yams);
+        ArgumentParser_DIR = (Get-HostProjectCMakeModules ArgumentParser);
+        SQLite3_INCLUDE_DIR = "$LibraryRoot\sqlite-3.46.0\usr\include";
+        SQLite3_LIBRARY = "$LibraryRoot\sqlite-3.46.0\usr\lib\SQLite3.lib";
+        SWIFT_DRIVER_BUILD_TOOLS = "YES";
+        LLVM_DIR = "$(Get-HostProjectBinaryCache Compilers)\lib\cmake\llvm";
+        Clang_DIR = "$(Get-HostProjectBinaryCache Compilers)\lib\cmake\clang";
+        Swift_DIR = "$(Get-HostProjectBinaryCache Compilers)\tools\swift\lib\cmake\swift";
+      }
+  }
 }
 
 function Build-Crypto($Arch) {
@@ -2603,7 +2648,7 @@ function Build-TestingMacros() {
     Get-HostProjectBinaryCache TestingMacros
   }
 
-  $SwiftSDK = $null
+  $SwiftSDK = $((Get-Variable "${Platform}$($Arch.ShortName)" -ValueOnly).SDKInstallRoot)
   if ($Build) {
     $SwiftSDK = $BuildArch.SDKInstallRoot
   }
@@ -2634,7 +2679,7 @@ function Build-TestingMacros() {
     -Arch $Arch `
     -Platform $Platform `
     -UseBuiltCompilers Swift `
-    -SwiftSDK:$SwiftSDK `
+    -SwiftSDK $SwiftSDK `
     -BuildTargets:$Targets `
     -Defines @{
       SwiftSyntax_DIR = $SwiftSyntaxCMakeModules;
@@ -2670,7 +2715,6 @@ function Build-Inspect() {
     -InstallTo "$($HostArch.ToolchainInstallRoot)\usr" `
     -Arch $HostArch `
     -UseBuiltCompilers Swift `
-    -UseSwiftSwiftDriver `
     -SwiftSDK $SDKRoot `
     -Defines @{
       CMAKE_Swift_FLAGS = @("-Xcc", "-I$SDKRoot\usr\include\swift\SwiftRemoteMirror");
@@ -2774,6 +2818,7 @@ if (-not $SkipBuild) {
 
   Invoke-BuildStep Build-CMark $BuildArch
   Invoke-BuildStep Build-BuildTools $BuildArch
+  Invoke-BuildStep Build-Driver -Build $BuildArch
   if ($IsCrossCompiling) {
     Invoke-BuildStep Build-XML2 Windows $BuildArch
     Invoke-BuildStep Build-Compilers -Build $BuildArch