[Dependency Scanning][Refactor] Reduce the number of ClangImporter instances used by the scanner
#81361
+362
−312
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
|
@swift-ci test |
634bafc to
92632e6
Compare
|
@swift-ci test |
… scanning worker Move relevant logic directly into the worker
…r textual interface scanning sub-instance
92632e6 to
5b13c94
Compare
artemcm
commented
May 7, 2025
|
|
||
| // When caching is enabled, we rely on ClangImporter for | ||
| // 'addClangInvovcationDependencies' | ||
| if (Invocation.getCASOptions().EnableCaching) { |
There was a problem hiding this comment.
cc @cachemeifyoucan
This is due to:
swift/lib/Serialization/ScanningLoaders.cpp
Line 248 in df32362
I imagine we ought to be able to factor that out to something that happens once at worker creation, too.
There was a problem hiding this comment.
I have a feeling that I might be able to remove that function now. Let me check (Oh, there was a bad typo in function name)
There was a problem hiding this comment.
Here is a draft: #81389
I need to do more clean up before commit that PR, will comment in that PR about background
|
@swift-ci test |
|
@swift-ci test Linux platform |
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 refactoring PR that includes two changes meant to reduce the overall number of times that
ClangImporteris instantiated during a given dependency scanning action:Remove 'ClangImporter' instance from dependency scanning worker
This change moves
getModuleDependencyandgetHeaderDependencyfunctionality fromClangImporterdirectly into Swift'sModuleDependencyScanningWorkerusing theclangScanningToolit already has, removing the need to instantiate an instance ofClangImporterper-worker.Reduce number of module loaders instantiated for textual interface scanning sub-instance
When creating a compilation sub-instance for scanning a textual Swift module interface for dependencies, in
setupModuleLoadersonly configure the strictly-necessary module loaders, skippingClangImporterin particular.On a large benchmark scan (e.g. importing every Swift module in the macOS SDK yielding ~270 Swift modules and ~530 Clang modules) this change results in a ~5% speedup.