[6.2][Caching] Swift Caching Dependency Scanning Improvements #81720
+293
−599
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Using IncludeTree::FileList to concat the include tree file systems that are passed on the command-line. This significantly reduce the command-line size, and also makes the cache key computation a lot faster. rdar://148752988 (cherry picked from commit 201e4fa)
Remove the CASFS based clang module implemenation as it is not longer used. (cherry picked from commit 3c81c1c)
After removing the CASFS implementation for clang modules, there is no need to capture clang extra file that sets up the VFS for the clang modules since all content imported by ClangImporter is dependency scanned and available via include-tree. This saves more ClangImporter instance when caching is enabled. Update the test to check that clang content found via `-Xcc` VFS options can currently work without capture the headermaps and vfs overlays. (cherry picked from commit 1506a0d)
Use `resetBenignCodeGenOptions()` from clang dependency scanner to clear the swift explicit module build cc1 arguments. This fixes the problem that CurrentWorkingDirectory is leaking through `-fcoverage-compilation-dir` that can cause extra module variants when caching is enabled. This also avoid the duplicating the logics for clearing CodeGen options inside Swift. rdar://151395300 (cherry picked from commit 531227d)
Use the underlying compiler invocation inside module scanning result to speed up the clang module dependency bridging. This avoids converting cc1 arguments to compiler invocation and back, just to modify the cc1 arguments needed for building PCM using swift-frontend. rdar://151705822 (cherry picked from commit 391446d)
|
@swift-ci please test |
akyrtzi
approved these changes
May 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a combined nomination for 4 different changes but they are highly dependent on each other and have merge conflicts that can be hard to resolve if picking up individually. They combined together should give about 4% overall speed up for swift caching build for both cold/hot cache for a single target swift projects. They also combined to fix module sharing problems that can have significant overhead for multi-target workspaces, and also fixes a corder case that can trigger dependency tracking issue in build system for incremental build. The changes have gone through a full qualification without finding regressions.
Individual changes:
1
2
3
4