Skip to content

Commit 00d8030

Browse files
compnerdcompnerd
authored
Merge pull request #84464 from speednoisemovement/experimental_substeps
build.ps1: add more timing instrumentation for ExperimentalSDK
2 parents fb30e07 + de29a16 commit 00d8030

File tree

1 file changed

+82
-74
lines changed

1 file changed

+82
-74
lines changed

‎utils/build.ps1‎

Lines changed: 82 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -3247,98 +3247,106 @@ function Build-ExperimentalSDK([Hashtable] $Platform) {
32473247
Invoke-IsolatingEnvVars {
32483248
$env:Path = "$(Get-CMarkBinaryCache $Platform)\src;$(Get-PinnedToolchainRuntime);${env:Path}"
32493249

3250+
Record-OperationTime $Platform "Build-ExperimentalDynamicDispatch" {
3251+
Build-CMakeProject `
3252+
-Src $SourceCache\swift-corelibs-libdispatch `
3253+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalDynamicDispatch) `
3254+
-InstallTo "${SDKROOT}\usr" `
3255+
-Platform $Platform `
3256+
-UseBuiltCompilers C,CXX,Swift `
3257+
-SwiftSDK "${SDKROOT}" `
3258+
-Defines @{
3259+
BUILD_SHARED_LIBS = "YES";
3260+
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
3261+
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
3262+
3263+
ENABLE_SWIFT = "YES";
3264+
}
3265+
}
3266+
3267+
Record-OperationTime $Platform "Build-ExperimentalStaticDispatch" {
3268+
Build-CMakeProject `
3269+
-Src $SourceCache\swift-corelibs-libdispatch `
3270+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticDispatch) `
3271+
-InstallTo "${SDKROOT}\usr" `
3272+
-Platform $Platform `
3273+
-UseBuiltCompilers C,CXX,Swift `
3274+
-SwiftSDK "${SDKROOT}" `
3275+
-Defines @{
3276+
BUILD_SHARED_LIBS = "NO";
3277+
CMAKE_Swift_FLAGS = @("-static-stdlib", "-Xfrontend", "-use-static-resource-dir");
3278+
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
3279+
3280+
ENABLE_SWIFT = "YES";
3281+
}
3282+
}
3283+
}
3284+
3285+
Record-OperationTime $Platform "Build-ExperimentalDynamicFoundation" {
32503286
Build-CMakeProject `
3251-
-Src $SourceCache\swift-corelibs-libdispatch `
3252-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalDynamicDispatch) `
3287+
-Src $SourceCache\swift-corelibs-foundation `
3288+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalDynamicFoundation) `
32533289
-InstallTo "${SDKROOT}\usr" `
32543290
-Platform $Platform `
3255-
-UseBuiltCompilers C,CXX,Swift `
3291+
-UseBuiltCompilers ASM,C,CXX,Swift `
32563292
-SwiftSDK "${SDKROOT}" `
32573293
-Defines @{
32583294
BUILD_SHARED_LIBS = "YES";
32593295
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
3296+
CMAKE_NINJA_FORCE_RESPONSE_FILE = "YES";
32603297
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
3261-
3262-
ENABLE_SWIFT = "YES";
3298+
ENABLE_TESTING = "NO";
3299+
3300+
FOUNDATION_BUILD_TOOLS = "NO";
3301+
CURL_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\CURL";
3302+
LibXml2_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\libxml2-2.11.5";
3303+
ZLIB_INCLUDE_DIR = "$BinaryCache\$($Platform.Triple)\usr\include";
3304+
ZLIB_LIBRARY = if ($Platform.OS -eq [OS]::Windows) {
3305+
"$BinaryCache\$($Platform.Triple)\usr\lib\zlibstatic.lib"
3306+
} else {
3307+
"$BinaryCache\$($Platform.Triple)\usr\lib\libz.a"
3308+
};
3309+
dispatch_DIR = $(Get-ProjectCMakeModules $Platform ExperimentalDynamicDispatch);
3310+
SwiftSyntax_DIR = (Get-ProjectBinaryCache $HostPlatform Compilers);
3311+
_SwiftFoundation_SourceDIR = "$SourceCache\swift-foundation";
3312+
_SwiftFoundationICU_SourceDIR = "$SourceCache\swift-foundation-icu";
3313+
_SwiftCollections_SourceDIR = "$SourceCache\swift-collections";
3314+
SwiftFoundation_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform BootstrapFoundationMacros)\bin"
32633315
}
3316+
}
32643317

3318+
Record-OperationTime $Platform "Build-ExperimentalStaticFoundation" {
32653319
Build-CMakeProject `
3266-
-Src $SourceCache\swift-corelibs-libdispatch `
3267-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticDispatch) `
3320+
-Src $SourceCache\swift-corelibs-foundation `
3321+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticFoundation) `
32683322
-InstallTo "${SDKROOT}\usr" `
32693323
-Platform $Platform `
3270-
-UseBuiltCompilers C,CXX,Swift `
3271-
-SwiftSDK "${SDKROOT}" `
3324+
-UseBuiltCompilers ASM,C,CXX,Swift `
3325+
-SwiftSDK ${SDKROOT} `
32723326
-Defines @{
32733327
BUILD_SHARED_LIBS = "NO";
3328+
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
3329+
CMAKE_NINJA_FORCE_RESPONSE_FILE = "YES";
32743330
CMAKE_Swift_FLAGS = @("-static-stdlib", "-Xfrontend", "-use-static-resource-dir");
32753331
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
3276-
3277-
ENABLE_SWIFT = "YES";
3332+
ENABLE_TESTING = "NO";
3333+
3334+
FOUNDATION_BUILD_TOOLS = if ($Platform.OS -eq [OS]::Windows) { "YES" } else { "NO" };
3335+
CURL_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\CURL";
3336+
LibXml2_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\libxml2-2.11.5";
3337+
ZLIB_INCLUDE_DIR = "$BinaryCache\$($Platform.Triple)\usr\include";
3338+
ZLIB_LIBRARY = if ($Platform.OS -eq [OS]::Windows) {
3339+
"$BinaryCache\$($Platform.Triple)\usr\lib\zlibstatic.lib"
3340+
} else {
3341+
"$BinaryCache\$($Platform.Triple)\usr\lib\libz.a"
3342+
};
3343+
dispatch_DIR = $(Get-ProjectCMakeModules $Platform ExperimentalStaticDispatch);
3344+
SwiftSyntax_DIR = (Get-ProjectBinaryCache $HostPlatform Compilers);
3345+
_SwiftFoundation_SourceDIR = "$SourceCache\swift-foundation";
3346+
_SwiftFoundationICU_SourceDIR = "$SourceCache\swift-foundation-icu";
3347+
_SwiftCollections_SourceDIR = "$SourceCache\swift-collections";
3348+
SwiftFoundation_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform BootstrapFoundationMacros)\bin"
32783349
}
3279-
}
3280-
3281-
Build-CMakeProject `
3282-
-Src $SourceCache\swift-corelibs-foundation `
3283-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalDynamicFoundation) `
3284-
-InstallTo "${SDKROOT}\usr" `
3285-
-Platform $Platform `
3286-
-UseBuiltCompilers ASM,C,CXX,Swift `
3287-
-SwiftSDK "${SDKROOT}" `
3288-
-Defines @{
3289-
BUILD_SHARED_LIBS = "YES";
3290-
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
3291-
CMAKE_NINJA_FORCE_RESPONSE_FILE = "YES";
3292-
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
3293-
ENABLE_TESTING = "NO";
3294-
3295-
FOUNDATION_BUILD_TOOLS = "NO";
3296-
CURL_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\CURL";
3297-
LibXml2_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\libxml2-2.11.5";
3298-
ZLIB_INCLUDE_DIR = "$BinaryCache\$($Platform.Triple)\usr\include";
3299-
ZLIB_LIBRARY = if ($Platform.OS -eq [OS]::Windows) {
3300-
"$BinaryCache\$($Platform.Triple)\usr\lib\zlibstatic.lib"
3301-
} else {
3302-
"$BinaryCache\$($Platform.Triple)\usr\lib\libz.a"
3303-
};
3304-
dispatch_DIR = $(Get-ProjectCMakeModules $Platform ExperimentalDynamicDispatch);
3305-
SwiftSyntax_DIR = (Get-ProjectBinaryCache $HostPlatform Compilers);
3306-
_SwiftFoundation_SourceDIR = "$SourceCache\swift-foundation";
3307-
_SwiftFoundationICU_SourceDIR = "$SourceCache\swift-foundation-icu";
3308-
_SwiftCollections_SourceDIR = "$SourceCache\swift-collections";
3309-
SwiftFoundation_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform BootstrapFoundationMacros)\bin"
3310-
}
3311-
3312-
Build-CMakeProject `
3313-
-Src $SourceCache\swift-corelibs-foundation `
3314-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticFoundation) `
3315-
-InstallTo "${SDKROOT}\usr" `
3316-
-Platform $Platform `
3317-
-UseBuiltCompilers ASM,C,CXX,Swift `
3318-
-SwiftSDK ${SDKROOT} `
3319-
-Defines @{
3320-
BUILD_SHARED_LIBS = "NO";
3321-
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
3322-
CMAKE_NINJA_FORCE_RESPONSE_FILE = "YES";
3323-
CMAKE_Swift_FLAGS = @("-static-stdlib", "-Xfrontend", "-use-static-resource-dir");
3324-
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
3325-
ENABLE_TESTING = "NO";
3326-
3327-
FOUNDATION_BUILD_TOOLS = if ($Platform.OS -eq [OS]::Windows) { "YES" } else { "NO" };
3328-
CURL_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\CURL";
3329-
LibXml2_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\libxml2-2.11.5";
3330-
ZLIB_INCLUDE_DIR = "$BinaryCache\$($Platform.Triple)\usr\include";
3331-
ZLIB_LIBRARY = if ($Platform.OS -eq [OS]::Windows) {
3332-
"$BinaryCache\$($Platform.Triple)\usr\lib\zlibstatic.lib"
3333-
} else {
3334-
"$BinaryCache\$($Platform.Triple)\usr\lib\libz.a"
3335-
};
3336-
dispatch_DIR = $(Get-ProjectCMakeModules $Platform ExperimentalStaticDispatch);
3337-
SwiftSyntax_DIR = (Get-ProjectBinaryCache $HostPlatform Compilers);
3338-
_SwiftFoundation_SourceDIR = "$SourceCache\swift-foundation";
3339-
_SwiftFoundationICU_SourceDIR = "$SourceCache\swift-foundation-icu";
3340-
_SwiftCollections_SourceDIR = "$SourceCache\swift-collections";
3341-
SwiftFoundation_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform BootstrapFoundationMacros)\bin"
33423350
}
33433351
}
33443352

0 commit comments

Comments
 (0)