[CAS] swift dependency scanning using CAS for compiler caching #66366
Conversation
This file contains 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
cachemeifyoucan
requested review from
artemcm,
tshortli,
zoecarver,
hyp,
egorzhdan,
hborla,
slavapestov and
xedin
as code owners
artemcm
reviewed
Jun 6, 2023
artemcm
reviewed
Jun 6, 2023
| SwiftDependencyScanningService::SwiftDependencyScanningService() { | ||
| ClangScanningService.emplace( | ||
| clang::tooling::dependencies::ScanningMode::DependencyDirectivesScan, | ||
| clang::tooling::dependencies::ScanningOutputFormat::FullTree, |
There was a problem hiding this comment.
Is this to be set irrespective of whether CAS is used?
There was a problem hiding this comment.
Default initializer just creates a non-CAS scanning service. I still need to improve to create different ClangScanningService for different CASOptions.
cachemeifyoucan
force-pushed
the
eng/PR-cas-cache-depscan
branch
from
4ac9013
to
7e585d1
Compare
|
@swift-ci please smoke test |
cachemeifyoucan
force-pushed
the
eng/PR-cas-cache-depscan
branch
from
7e585d1
to
1b24105
Compare
|
@swift-ci please smoke test |
Using clang include tree for dependency scanning and building for all clang modules and PCHs.
cachemeifyoucan
force-pushed
the
eng/PR-cas-cache-depscan
branch
from
1b24105
to
ff9e5ba
Compare
|
@swift-ci please smoke test |
Remove a trailing common that makes the JSON output from `-scan-dependencies` to be invalide JSON format.
cachemeifyoucan
force-pushed
the
eng/PR-cas-cache-depscan
branch
from
ff9e5ba
to
56617ac
Compare
|
@swift-ci please smoke test |
|
@swift-ci please test windows platform |
artemcm
approved these changes
Jun 12, 2023
hjyamauchi
pushed a commit
to hjyamauchi/swift
that referenced
this pull request
Jun 28, 2023
…#66366) Teach swift dependency scanner to use CAS to capture the full dependencies for a build and construct build commands with immutable inputs from CAS. This allows swift compilation caching using CAS.
drodriguez
added a commit
to drodriguez/swift
that referenced
this pull request
Jul 12, 2023
The code of `ScanDependencies.cpp` was creating invalid JSON since apple#66031 because in the case of having `extraPcmArgs` and `swiftOverlayDependencies`, but not `bridgingHeader`, a comma will not be added at the end of `extraPcmArgs`, creating an invalid JSON file. Additionally that same PR added a trailing comma at the end of the `swiftOverlayDependencies`, which valid JSON does not allow, but that bug was removed in apple#66366. Both problems are, however, present in the 5.9 branch, because apple#66936 included apple#66031, but not apple#66366. Besides fixing the problem in `ScanDependencies.cpp` I modified every test that uses `--scan-dependencies` to pass the produced JSON through Python's `json.tool` in order to validate proper JSON is produced. In most cases I was able to pipe the output of the tool into `FileCheck`, but in some cases the validation is done by itself because the checks depend on the exact format generated by `--scan-dependencies`. In a couple of tests I added a call to `FileCheck` that seemed to be missing. Without these changes, two tests seems to be generating invalid JSON in my machine: - `ScanDependencies/local_cache_consistency.swift` (which outputs `Expecting ',' delimiter: line 525 column 11 (char 22799)`) - `ScanDependencies/placholder_overlay_deps.swift`
drodriguez
added a commit
that referenced
this pull request
Jul 12, 2023
…67246) The code of `ScanDependencies.cpp` was creating invalid JSON since #66031 because in the case of having `extraPcmArgs` and `swiftOverlayDependencies`, but not `bridgingHeader`, a comma will not be added at the end of `extraPcmArgs`, creating an invalid JSON file. Additionally that same PR added a trailing comma at the end of the `swiftOverlayDependencies`, which valid JSON does not allow, but that bug was removed in #66366. Both problems are, however, present in the 5.9 branch, because #66936 included #66031, but not #66366. Besides fixing the problem in `ScanDependencies.cpp` I modified every test that uses `--scan-dependencies` to pass the produced JSON through Python's `json.tool` in order to validate proper JSON is produced. In most cases I was able to pipe the output of the tool into `FileCheck`, but in some cases the validation is done by itself because the checks depend on the exact format generated by `--scan-dependencies`. In a couple of tests I added a call to `FileCheck` that seemed to be missing. Without these changes, two tests seems to be generating invalid JSON in my machine: - `ScanDependencies/local_cache_consistency.swift` (which outputs `Expecting ',' delimiter: line 525 column 11 (char 22799)`) - `ScanDependencies/placholder_overlay_deps.swift`
drodriguez
added a commit
that referenced
this pull request
Jul 14, 2023
…es. (#67265) The code of `ScanDependencies.cpp` was creating invalid JSON since #66031 because in the case of having `extraPcmArgs` and `swiftOverlayDependencies`, but not `bridgingHeader`, a comma will not be added at the end of `extraPcmArgs`, creating an invalid JSON file. Additionally that same PR added a trailing comma at the end of the `swiftOverlayDependencies`, which valid JSON does not allow, but that bug was removed in #66366. Both problems are, however, present in the 5.9 branch, because #66936 included #66031, but not #66366. Besides fixing the problem in `ScanDependencies.cpp` I modified every test that uses `--scan-dependencies` to pass the produced JSON through Python's `json.tool` in order to validate proper JSON is produced. In most cases I was able to pipe the output of the tool into `FileCheck`, but in some cases the validation is done by itself because the checks depend on the exact format generated by `--scan-dependencies`. In a couple of tests I added a call to `FileCheck` that seemed to be missing. Without these changes, two tests seems to be generating invalid JSON in my machine: - `ScanDependencies/local_cache_consistency.swift` (which outputs `Expecting ',' delimiter: line 525 column 11 (char 22799)`) - `ScanDependencies/placholder_overlay_deps.swift` Additional changes for the cherry-pick: - Removed some changes in some CAS tests that are not present in release/5.9. - Switch `trailingComma` from `true` to `false` for `swiftOverlayDependencies` similar to what #66366 did in `main`. - Remove the new `RUN` line in `optional_deps_of_testable_imports.swift` because it fails in 5.9 if the `CHECK` is performed. (cherry picked from commit 7de1089)
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.
Teach swift dependency scanner to scan dependency with a CAS for compiler caching.