Skip to content

[DNM] Add more detailed logging for corelibs foundation #82755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+35 −26
Draft

[DNM] Add more detailed logging for corelibs foundation #82755

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 35 additions & 26 deletions utils/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,9 @@ param
# Debug Information
[switch] $DebugInfo,
[ValidateSet("codeview", "dwarf")]
[string] $CDebugFormat = "dwarf",
[string] $CDebugFormat = "codeview",
[ValidateSet("codeview", "dwarf")]
[string] $SwiftDebugFormat = "dwarf",
[string] $SwiftDebugFormat = "codeview",

# Android SDK Options
[switch] $Android = $false,
Expand Down Expand Up @@ -244,10 +244,11 @@ if ($WindowsSDKArchitectures.Length -eq 1) { $WindowsSDKArchitectures = $Windows

if ($Test.Length -eq 1) { $Test = $Test[0].Split(",") }

if ($Test -contains "*") {
# Explicitly don't include llbuild yet since tests are known to fail on Windows
$Test = @("lld", "lldb", "swift", "dispatch", "foundation", "xctest", "swift-format", "sourcekit-lsp")
}
#if ($Test -contains "*") {
# # Explicitly don't include llbuild yet since tests are known to fail on Windows
# $Test = @("lld", "lldb", "swift", "dispatch", "foundation", "xctest", "swift-format", "sourcekit-lsp")
#}
$Test = @("foundation")

if ($UseHostToolchain -is [string]) {
$UseHostToolchain = [System.Convert]::ToBoolean($UseHostToolchain)
Expand Down Expand Up @@ -1369,6 +1370,7 @@ function Build-CMakeProject {
[switch] $AddAndroidCMakeEnv = $false,
[switch] $UseGNUDriver = $false,
[string] $SwiftSDK = $null,
[switch] $IncludeDebugInfo = $DebugInfo,
[hashtable] $Defines = @{}, # Values are either single strings or arrays of flags
[string[]] $BuildTargets = @()
)
Expand Down Expand Up @@ -1435,7 +1437,7 @@ function Build-CMakeProject {
Add-KeyValueIfNew $Defines CMAKE_ASM_FLAGS @("--target=$($Platform.Triple)")
Add-KeyValueIfNew $Defines CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL "/MD"

if ($DebugInfo) {
if ($IncludeDebugInfo) {
$ASMDebugFlags = if ($CDebugFormat -eq "dwarf") {
if ($UseGNUDriver) { @("-gdwarf") } else { @("-clang:-gdwarf") }
} else {
Expand Down Expand Up @@ -1485,7 +1487,7 @@ function Build-CMakeProject {
@("/GS-", "/Gw", "/Gy", "/Oy", "/Oi", "/Zc:inline")
}

if ($DebugInfo) {
if ($IncludeDebugInfo) {
if ($UsePinnedCompilers.Contains("C") -or $UseBuiltCompilers.Contains("C")) {
if ($CDebugFormat -eq "dwarf") {
$CFLAGS += if ($UseGNUDriver) {
Expand Down Expand Up @@ -1525,7 +1527,7 @@ function Build-CMakeProject {
@("/GS-", "/Gw", "/Gy", "/Oy", "/Oi", "/Zc:inline", "/Zc:__cplusplus")
}

if ($DebugInfo) {
if ($IncludeDebugInfo) {
if ($UsePinnedCompilers.Contains("CXX") -or $UseBuiltCompilers.Contains("CXX")) {
if ($CDebugFormat -eq "dwarf") {
$CXXFLAGS += if ($UseGNUDriver) {
Expand Down Expand Up @@ -1565,7 +1567,7 @@ function Build-CMakeProject {
@()
}

$SwiftFlags += if ($DebugInfo) {
$SwiftFlags += if ($IncludeDebugInfo) {
if ($SwiftDebugFormat -eq "dwarf") {
@("-g", "-debug-info-format=dwarf", "-use-ld=lld-link", "-Xlinker", "/DEBUG:DWARF")
} else {
Expand All @@ -1592,7 +1594,7 @@ function Build-CMakeProject {
@("/INCREMENTAL:NO", "/OPT:REF", "/OPT:ICF")
}

if ($DebugInfo) {
if ($IncludeDebugInfo) {
if ($UseASM -or $UseC -or $UseCXX) {
# Prefer `/Z7` over `/ZI`
# By setting the debug information format, the appropriate C/C++
Expand Down Expand Up @@ -1629,7 +1631,7 @@ function Build-CMakeProject {
Add-KeyValueIfNew $Defines CMAKE_C_COMPILER_TARGET $Platform.Triple

$CFLAGS = @("--sysroot=${AndroidSysroot}", "-ffunction-sections", "-fdata-sections")
if ($DebugInfo) {
if ($IncludeDebugInfo) {
$CFLAGS += @("-gdwarf")
}
Add-FlagsDefine $Defines CMAKE_C_FLAGS $CFLAGS
Expand All @@ -1639,7 +1641,7 @@ function Build-CMakeProject {
Add-KeyValueIfNew $Defines CMAKE_CXX_COMPILER_TARGET $Platform.Triple

$CXXFLAGS = @("--sysroot=${AndroidSysroot}", "-ffunction-sections", "-fdata-sections")
if ($DebugInfo) {
if ($IncludeDebugInfo) {
$CXXFLAGS += @("-gdwarf")
}
Add-FlagsDefine $Defines CMAKE_CXX_FLAGS $CXXFLAGS
Expand Down Expand Up @@ -1678,7 +1680,7 @@ function Build-CMakeProject {
"-Xclang-linker", "-resource-dir", "-Xclang-linker", "${AndroidPrebuiltRoot}\lib\clang\$($(Get-AndroidNDK).ClangVersion)"
)

$SwiftFlags += if ($DebugInfo) { @("-g") } else { @("-gnone") }
$SwiftFlags += if ($IncludeDebugInfo) { @("-g") } else { @("-gnone") }

Add-FlagsDefine $Defines CMAKE_Swift_FLAGS $SwiftFlags
# Workaround CMake 3.26+ enabling `-wmo` by default on release builds
Expand Down Expand Up @@ -1861,10 +1863,11 @@ function Build-SPMProject {
}
Test {
$ActionName = "test"
$Arguments += @("-v")
}
TestParallel {
$ActionName = "test"
$Arguments += @("--parallel")
$Arguments += @("--parallel", "-v")
}
}

Expand Down Expand Up @@ -2938,8 +2941,10 @@ function Test-Foundation {
-Src $SourceCache\swift-foundation `
-Bin "$ScratchPath" `
-Platform $BuildPlatform `
-Configuration $FoundationTestConfiguration `
--multiroot-data-file "$SourceCache\swift\utils\build_swift\resources\SwiftPM-Unified-Build.xcworkspace" `
--test-product swift-foundationPackageTests
--test-product swift-foundationPackageTests `
-j 2

Invoke-IsolatingEnvVars {
$env:DISPATCH_INCLUDE_PATH="$(Get-SwiftSDK $BuildPlatform.OS)/usr/include"
Expand All @@ -2953,8 +2958,10 @@ function Test-Foundation {
-Src $SourceCache\swift-corelibs-foundation `
-Bin "$ScratchPath" `
-Platform $BuildPlatform `
-Configuration $FoundationTestConfiguration `
--multiroot-data-file "$SourceCache\swift\utils\build_swift\resources\SwiftPM-Unified-Build.xcworkspace" `
--test-product swift-corelibs-foundationPackageTests
--test-product swift-corelibs-foundationPackageTests `
-j 2
}
}

Expand Down Expand Up @@ -3366,7 +3373,9 @@ function Build-Driver([Hashtable] $Platform) {
-Platform $Platform `
-UseBuiltCompilers C,CXX,Swift `
-SwiftSDK (Get-SwiftSDK $Platform.OS) `
-IncludeDebugInfo `
-Defines @{
CMAKE_BUILD_TYPE = "Debug";
BUILD_SHARED_LIBS = "YES";
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
TSC_DIR = (Get-ProjectCMakeModules $Platform ToolsSupportCore);
Expand Down Expand Up @@ -4008,12 +4017,12 @@ if (-not $SkipBuild) {
Invoke-BuildStep Build-Subprocess $HostPlatform
Invoke-BuildStep Build-Build $HostPlatform
Invoke-BuildStep Build-PackageManager $HostPlatform
Invoke-BuildStep Build-Markdown $HostPlatform
Invoke-BuildStep Build-Format $HostPlatform
Invoke-BuildStep Build-LMDB $HostPlatform
Invoke-BuildStep Build-IndexStoreDB $HostPlatform
Invoke-BuildStep Build-SourceKitLSP $HostPlatform
Invoke-BuildStep Build-Inspect $HostPlatform
# Invoke-BuildStep Build-Markdown $HostPlatform
# Invoke-BuildStep Build-Format $HostPlatform
# Invoke-BuildStep Build-LMDB $HostPlatform
# Invoke-BuildStep Build-IndexStoreDB $HostPlatform
# Invoke-BuildStep Build-SourceKitLSP $HostPlatform
# Invoke-BuildStep Build-Inspect $HostPlatform
}

Install-HostToolchain
Expand All @@ -4027,15 +4036,15 @@ if (-not $SkipBuild -and $IncludeNoAsserts) {
}

if (-not $SkipBuild -and -not $IsCrossCompiling) {
Invoke-BuildStep Build-DocC $HostPlatform
# Invoke-BuildStep Build-DocC $HostPlatform
}

if (-not $SkipPackaging) {
Invoke-BuildStep Build-Installer $HostPlatform
# Invoke-BuildStep Build-Installer $HostPlatform
}

if ($Stage) {
Copy-BuildArtifactsToStage $HostPlatform
# Copy-BuildArtifactsToStage $HostPlatform
}

if (-not $IsCrossCompiling) {
Expand Down