Upgrade toolset to VS 2019 16.8 Preview 1

CMakeLists.txt

@@ -5,13 +5,13 @@ if (NOT DEFINED CMAKE_TOOLCHAIN_FILE AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/vcpkg
     set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake")
 endif()
 
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.17)
 set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
 project(msvc_standard_libraries LANGUAGES CXX)
 
 find_package(Boost REQUIRED)
 
-set(VCLIBS_MIN_BOOST_VERSION 1.70.0)
+set(VCLIBS_MIN_BOOST_VERSION 1.73.0)
 if("${Boost_VERSION}" VERSION_LESS "${VCLIBS_MIN_BOOST_VERSION}")
     message(FATAL_ERROR "Detected Boost version is too old (older than ${VCLIBS_MIN_BOOST_VERSION}).")
 endif()

README.md

@@ -140,7 +140,7 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem
 The STL uses boost-math headers to provide P0226R1 Mathematical Special Functions. We recommend using [vcpkg][] to
 acquire this dependency.
 
-1. Install Visual Studio 2019 16.7 Preview 3 or later.
+1. Install Visual Studio 2019 16.8 Preview 1 or later.
 2. Invoke `git clone https://github.com/microsoft/vcpkg`
 3. Invoke `cd vcpkg`
 4. Invoke `.\bootstrap-vcpkg.bat`
@@ -159,7 +159,10 @@ acquire this dependency.
 These instructions assume you're targeting `x64-windows`; you can change this constant below to target other
 architectures.
 
-1. Install [CMake][] 3.16.5 or later, [Ninja][] 1.10.0 or later, and Visual Studio 2019 16.7 Preview 3 or later.
+1. Install Visual Studio 2019 16.8 Preview 1 or later.
+    * We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
+    This will ensure that you're using supported versions of CMake and Ninja.
+    * Otherwise, install [CMake][] 3.17 or later, and [Ninja][] 1.8.2 or later.
 2. Open an "x64 Native Tools Command Prompt for VS 2019".
 3. Change directories to a location where you'd like a clone of this STL repository.
 4. Invoke `git clone https://github.com/microsoft/STL`
@@ -222,8 +225,10 @@ C:\Users\bion\Desktop>dumpbin /IMPORTS .\example.exe | findstr msvcp
 1. Follow either [How To Build With A Native Tools Command Prompt][] or [How To Build With The Visual Studio IDE][].
 2. Invoke `git submodule update --init llvm-project` at the root of the STL source tree.
 3. Acquire [Python][] 3.8 or newer and have it on the `PATH` (or run it directly using its absolute or relative path).
-4. Have LLVM's `bin` directory on the `PATH`. Simply using [LLVM's installer][] and choosing to add LLVM to your `PATH`
-during installation is the easiest way to get LLVM's `bin` directory on your `PATH`.
+4. Have LLVM's `bin` directory on the `PATH` (so `clang-cl.exe` is available).
+    * We recommend selecting "C++ Clang tools for Windows" in the VS Installer. This will automatically add LLVM to the
+    `PATH` of the x86 and x64 Native Tools Command Prompts, and will ensure that you're using a supported version.
+    * Otherwise, use [LLVM's installer][] and choose to add LLVM to your `PATH` during installation.
 5. Follow the instructions below.
 
 ## Running All The Tests

azure-devops/create-vmss.ps1

@@ -11,7 +11,7 @@ system. See https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/ov
 for more information.
 
 This script assumes you have installed Azure tools into PowerShell by following the instructions
-at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6.1
+at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps
 or are running from Azure Cloud Shell.
 #>
 
@@ -211,20 +211,20 @@ $denyEverythingElse = New-AzNetworkSecurityRuleConfig `
   -DestinationAddressPrefix * `
   -DestinationPortRange *
 
-$NetworkSecurityGroupName = $ResourceGroupName + 'NetworkSecurity'
+$NetworkSecurityGroupName = $ResourceGroupName + '-NetworkSecurity'
 $NetworkSecurityGroup = New-AzNetworkSecurityGroup `
   -Name $NetworkSecurityGroupName `
   -ResourceGroupName $ResourceGroupName `
   -Location $Location `
   -SecurityRules @($allowHttp, $allowDns, $denyEverythingElse)
 
-$SubnetName = $ResourceGroupName + 'Subnet'
+$SubnetName = $ResourceGroupName + '-Subnet'
 $Subnet = New-AzVirtualNetworkSubnetConfig `
   -Name $SubnetName `
   -AddressPrefix "10.0.0.0/16" `
   -NetworkSecurityGroup $NetworkSecurityGroup
 
-$VirtualNetworkName = $ResourceGroupName + 'Network'
+$VirtualNetworkName = $ResourceGroupName + '-Network'
 $VirtualNetwork = New-AzVirtualNetwork `
   -Name $VirtualNetworkName `
   -ResourceGroupName $ResourceGroupName `
@@ -237,7 +237,7 @@ Write-Progress `
   -Activity 'Creating prototype VM' `
   -PercentComplete (100 / $TotalProgress * $CurrentProgress++)
 
-$NicName = $ResourceGroupName + 'NIC'
+$NicName = $ResourceGroupName + '-NIC'
 $Nic = New-AzNetworkInterface `
   -Name $NicName `
   -ResourceGroupName $ResourceGroupName `
@@ -272,13 +272,15 @@ Write-Progress `
   -Status 'Running provisioning script provision-image.ps1 in VM' `
   -PercentComplete (100 / $TotalProgress * $CurrentProgress++)
 
-Invoke-AzVMRunCommand `
+$ProvisionImageResult = Invoke-AzVMRunCommand `
   -ResourceGroupName $ResourceGroupName `
   -VMName $ProtoVMName `
   -CommandId 'RunPowerShellScript' `
   -ScriptPath "$PSScriptRoot\provision-image.ps1" `
   -Parameter @{AdminUserPassword = $AdminPW }
 
+Write-Host "provision-image.ps1 output: $($ProvisionImageResult.value.Message)"
+
 ####################################################################################################
 Write-Progress `
   -Activity $ProgressActivity `
@@ -343,9 +345,9 @@ Write-Progress `
   -Status 'Creating scale set' `
   -PercentComplete (100 / $TotalProgress * $CurrentProgress++)
 
-$VmssIpConfigName = $ResourceGroupName + 'VmssIpConfig'
+$VmssIpConfigName = $ResourceGroupName + '-VmssIpConfig'
 $VmssIpConfig = New-AzVmssIpConfig -SubnetId $Nic.IpConfigurations[0].Subnet.Id -Primary -Name $VmssIpConfigName
-$VmssName = $ResourceGroupName + 'Vmss'
+$VmssName = $ResourceGroupName + '-Vmss'
 $Vmss = New-AzVmssConfig `
   -Location $Location `
   -SkuCapacity 0 `

azure-devops/enforce-clang-format.cmd

@@ -1,5 +1,7 @@
 :: Copyright (c) Microsoft Corporation.
 :: SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+call "%PROGRAMFILES(X86)%\Microsoft Visual Studio\2019\Preview\Common7\Tools\VsDevCmd.bat" ^
+-host_arch=amd64 -arch=amd64 -no_logo
 "%1" "clang-format.exe -style=file -i" ^
 stl/inc ^
 stl/src ^

azure-devops/provision-image.ps1

@@ -50,10 +50,14 @@ Function Get-TempFilePath {
   return Join-Path $tempPath $tempName
 }
 
-if (-not [string]::IsNullOrEmpty($AdminUserPassword)) {
-  Write-Host "AdminUser password supplied; switching to AdminUser"
+$TranscriptPath = 'C:\provision-image-transcript.txt'
+
+if ([string]::IsNullOrEmpty($AdminUserPassword)) {
+  Start-Transcript -Path $TranscriptPath
+} else {
+  Write-Host 'AdminUser password supplied; switching to AdminUser.'
   $PsExecPath = Get-TempFilePath -Extension 'exe'
-  Write-Host "Downloading psexec to $PsExecPath"
+  Write-Host "Downloading psexec to: $PsExecPath"
   & curl.exe -L -o $PsExecPath -s -S https://live.sysinternals.com/PsExec64.exe
   $PsExecArgs = @(
     '-u',
@@ -69,30 +73,31 @@ if (-not [string]::IsNullOrEmpty($AdminUserPassword)) {
     $PSCommandPath
   )
 
-  Write-Host "Executing $PsExecPath " + @PsExecArgs
+  Write-Host "Executing: $PsExecPath $PsExecArgs"
 
   $proc = Start-Process -FilePath $PsExecPath -ArgumentList $PsExecArgs -Wait -PassThru
+  Write-Host 'Reading transcript...'
+  Get-Content -Path $TranscriptPath
   Write-Host 'Cleaning up...'
   Remove-Item $PsExecPath
   exit $proc.ExitCode
 }
 
 $Workloads = @(
   'Microsoft.VisualStudio.Component.VC.CLI.Support',
+  'Microsoft.VisualStudio.Component.VC.CMake.Project',
   'Microsoft.VisualStudio.Component.VC.CoreIde',
-  'Microsoft.VisualStudio.Component.VC.Tools.x86.x64',
-  'Microsoft.VisualStudio.Component.VC.Tools.ARM64',
+  'Microsoft.VisualStudio.Component.VC.Llvm.Clang',
   'Microsoft.VisualStudio.Component.VC.Tools.ARM',
-  'Microsoft.VisualStudio.Component.Windows10SDK.18362'
+  'Microsoft.VisualStudio.Component.VC.Tools.ARM64',
+  'Microsoft.VisualStudio.Component.VC.Tools.x86.x64',
+  'Microsoft.VisualStudio.Component.Windows10SDK.19041'
 )
 
 $ReleaseInPath = 'Preview'
 $Sku = 'Enterprise'
 $VisualStudioBootstrapperUrl = 'https://aka.ms/vs/16/pre/vs_enterprise.exe'
-$CMakeUrl = 'https://github.com/Kitware/CMake/releases/download/v3.16.5/cmake-3.16.5-win64-x64.msi'
-$LlvmUrl = 'https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe'
-$NinjaUrl = 'https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip'
-$PythonUrl = 'https://www.python.org/ftp/python/3.8.2/python-3.8.2-amd64.exe'
+$PythonUrl = 'https://www.python.org/ftp/python/3.8.5/python-3.8.5-amd64.exe'
 
 $CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_426.00_win10.exe'
 $CudaFeatures = 'nvcc_10.1 cuobjdump_10.1 nvprune_10.1 cupti_10.1 gpu_library_advisor_10.1 memcheck_10.1 ' + `
@@ -162,7 +167,7 @@ Function InstallVisualStudio {
     Write-Host 'Downloading Visual Studio...'
     [string]$bootstrapperExe = Get-TempFilePath -Extension 'exe'
     curl.exe -L -o $bootstrapperExe -s -S $BootstrapperUrl
-    Write-Host "Installing Visual Studio..."
+    Write-Host 'Installing Visual Studio...'
     $args = @('/c', $bootstrapperExe, '--quiet', '--norestart', '--wait', '--nocache')
     foreach ($workload in $Workloads) {
       $args += '--add'
@@ -187,103 +192,6 @@ Function InstallVisualStudio {
   }
 }
 
-<#
-.SYNOPSIS
-Install an .msi file.
-
-.DESCRIPTION
-InstallMSI takes a URL where an .msi lives, and installs that .msi to the system.
-
-.PARAMETER Name
-The name of the thing to install.
-
-.PARAMETER Url
-The URL at which the .msi lives.
-#>
-Function InstallMSI {
-  Param(
-    [String]$Name,
-    [String]$Url
-  )
-
-  try {
-    Write-Host "Downloading $Name..."
-    [string]$msiPath = Get-TempFilePath -Extension 'msi'
-    curl.exe -L -o $msiPath -s -S $Url
-    Write-Host "Installing $Name..."
-    $args = @('/i', $msiPath, '/norestart', '/quiet', '/qn')
-    $proc = Start-Process -FilePath 'msiexec.exe' -ArgumentList $args -Wait -PassThru
-    PrintMsiExitCodeMessage $proc.ExitCode
-  }
-  catch {
-    Write-Error "Failed to install $Name! $($_.Exception.Message)"
-  }
-}
-
-<#
-.SYNOPSIS
-Unpacks a zip file to $Dir.
-
-.DESCRIPTION
-InstallZip takes a URL of a zip file, and unpacks the zip file to the directory
-$Dir.
-
-.PARAMETER Name
-The name of the tool being installed.
-
-.PARAMETER Url
-The URL of the zip file to unpack.
-
-.PARAMETER Dir
-The directory to unpack the zip file to.
-#>
-Function InstallZip {
-  Param(
-    [String]$Name,
-    [String]$Url,
-    [String]$Dir
-  )
-
-  try {
-    Write-Host "Downloading $Name..."
-    [string]$zipPath = Get-TempFilePath -Extension 'zip'
-    curl.exe -L -o $zipPath -s -S $Url
-    Write-Host "Installing $Name..."
-    Expand-Archive -Path $zipPath -DestinationPath $Dir -Force
-  }
-  catch {
-    Write-Error "Failed to install $Name! $($_.Exception.Message)"
-  }
-}
-
-<#
-.SYNOPSIS
-Installs LLVM.
-
-.DESCRIPTION
-InstallLLVM installs LLVM from the supplied URL.
-
-.PARAMETER Url
-The URL of the LLVM installer.
-#>
-Function InstallLLVM {
-  Param(
-    [String]$Url
-  )
-
-  try {
-    Write-Host 'Downloading LLVM...'
-    [string]$installerPath = Get-TempFilePath -Extension 'exe'
-    curl.exe -L -o $installerPath -s -S $Url
-    Write-Host 'Installing LLVM...'
-    $proc = Start-Process -FilePath $installerPath -ArgumentList @('/S') -NoNewWindow -Wait -PassThru
-    PrintMsiExitCodeMessage $proc.ExitCode
-  }
-  catch {
-    Write-Error "Failed to install LLVM! $($_.Exception.Message)"
-  }
-}
-
 <#
 .SYNOPSIS
 Installs Python.
@@ -369,16 +277,16 @@ Function PipInstall {
   )
 
   try {
-    Write-Host 'Installing or upgrading $Package...'
+    Write-Host "Installing or upgrading $Package..."
     python.exe -m pip install --upgrade $Package
-    Write-Host 'Done installing or upgrading $Package'
+    Write-Host "Done installing or upgrading $Package."
   }
   catch {
-    Write-Error "Failed to install or upgrade $Package"
+    Write-Error "Failed to install or upgrade $Package."
   }
 }
 
-Write-Host "AdminUser password not supplied; assuming already running as AdminUser"
+Write-Host 'AdminUser password not supplied; assuming already running as AdminUser.'
 
 Write-Host 'Configuring AntiVirus exclusions...'
 Add-MpPreference -ExclusionPath C:\agent
@@ -388,20 +296,28 @@ Add-MpPreference -ExclusionProcess clang-cl.exe
 Add-MpPreference -ExclusionProcess cl.exe
 Add-MpPreference -ExclusionProcess link.exe
 Add-MpPreference -ExclusionProcess python.exe
+Add-MpPreference -ExclusionProcess test.exe
 
-InstallMSI 'CMake' $CMakeUrl
-InstallZip 'Ninja' $NinjaUrl 'C:\Program Files\CMake\bin'
-InstallLLVM $LlvmUrl
 InstallPython $PythonUrl
 InstallVisualStudio -Workloads $Workloads -BootstrapperUrl $VisualStudioBootstrapperUrl
 InstallCuda -Url $CudaUrl -Features $CudaFeatures
 
 Write-Host 'Updating PATH...'
+
+# Step 1: Read the system path, which was just updated by installing Python.
 $environmentKey = Get-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment' -Name Path
-$Env:PATH="$($environmentKey.Path);C:\Program Files\CMake\bin;C:\Program Files\LLVM\bin"
+
+# Step 2: Update the local path (for this running script), so PipInstall can run python.exe.
+# Additional directories can be added here (e.g. if we extracted a zip file
+# or installed something that didn't update the system path).
+$Env:PATH="$($environmentKey.Path)"
+
+# Step 3: Update the system path, permanently recording any additional directories that were added in the previous step.
 Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment' `
   -Name Path `
   -Value "$Env:PATH"
 
+Write-Host 'Finished updating PATH!'
+
 PipInstall pip
 PipInstall psutil

azure-devops/sysprep.ps1

@@ -3,4 +3,4 @@
 
 $ErrorActionPreference = 'Stop'
 Write-Host 'Running sysprep'
-& C:\Windows\system32\sysprep\sysprep.exe /oobe /generalize /shutdown
+& C:\Windows\system32\sysprep\sysprep.exe /oobe /generalize /mode:vm /shutdown

azure-pipelines.yml

@@ -4,7 +4,7 @@
 # Build STL targeting x86, x64, arm, arm64
 
 variables:
-  agentPool: 'StlBuild-2020-07-08-2'
+  agentPool: 'StlBuild-2020-08-07'
   tmpDir: 'D:\Temp'
 
 stages:

stl/inc/bit

@@ -115,14 +115,7 @@ _NODISCARD constexpr int _Popcount_fallback(_Ty _Val) noexcept {
 
 #if defined(_M_IX86) || defined(_M_X64)
 
-// TRANSITION, VS 2019 16.8 Preview 1, intrin0.h will declare __lzcnt* and __popcnt*
 extern "C" {
-__MACHINEX86_X64(unsigned int __lzcnt(unsigned int))
-__MACHINEX86_X64(unsigned short __lzcnt16(unsigned short))
-__MACHINEX64(unsigned __int64 __lzcnt64(unsigned __int64))
-__MACHINEX86_X64(unsigned int __popcnt(unsigned int))
-__MACHINEX86_X64(unsigned short __popcnt16(unsigned short))
-__MACHINEX64(unsigned __int64 __popcnt64(unsigned __int64))
 extern int __isa_available;
 }
 

stl/inc/experimental/coroutine

@@ -32,10 +32,10 @@ support Clang. You can define _SILENCE_CLANG_COROUTINE_MESSAGE to silence this m
 unsupported.
 #endif // defined(__clang__) && !defined(_SILENCE_CLANG_COROUTINE_MESSAGE)
 
-#if defined(_MSC_VER) && defined(__cpp_impl_coroutine)
+#ifdef __cpp_impl_coroutine
 #error The <experimental/coroutine> and <experimental/resumable> headers are only supported \
 with /await and implement pre-C++20 coroutine support. Use <coroutine> for standard C++20 coroutines.
-#endif // defined(_MSC_VER) && defined(__cpp_impl_coroutine)
+#endif // __cpp_impl_coroutine
 
 // intrinsics used in implementation of coroutine_handle
 extern "C" size_t _coro_resume(void*);