incr.comp.: Move task result fingerprinting into DepGraph. #44696
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
michaelwoerister
force-pushed
the
fingerprints-in-dep-graph-3
branch
from
58ed8f0 to
5196547
Compare
arielb1
added
the
S-waiting-on-review
nikomatsakis
approved these changes
Sep 19, 2017
| @@ -66,7 +66,7 @@ impl<'q> Predecessors<'q> { | |||
| // Reduce the graph to the most important nodes. | |||
| let compress::Reduction { graph, input_nodes } = | |||
| compress::reduce_graph(&query.graph, | |||
| |n| HashContext::is_hashable(tcx, n), | |||
| |n| n.kind.is_input(), | |||
src/librustc/dep_graph/graph.rs
Outdated
| @@ -26,7 +26,8 @@ use super::edges::{DepGraphEdges, DepNodeIndex}; | |||
|
|
|||
| #[derive(Clone)] | |||
| pub struct DepGraph { | |||
| data: Option<Rc<DepGraphData>> | |||
| data: Option<Rc<DepGraphData>>, | |||
| fingerprints: Rc<RefCell<FxHashMap<DepNode, Fingerprint>>> | |||
There was a problem hiding this comment.
can we use a DepNodeIndex and make this a vector?
There was a problem hiding this comment.
I guess not, because it is still used when incremental is disabled -- can you add some comments to that effect?
There was a problem hiding this comment.
Maybe we can at some point, but I didn't want to complicate things. Note that not all DepNode have an associated Fingerprint (e.g. anonymous nodes). Last time I checked, there where 15% anonymous nodes, which would result in an OK fill rate for a vector.
Anyway, I want to revisit this once we see how the rest of the system shakes out.
There was a problem hiding this comment.
Plus I'll add a comment for the meantime :)
|
☔ The latest upstream changes (presumably #44505) made this pull request unmergeable. Please resolve the merge conflicts. |
michaelwoerister
force-pushed
the
fingerprints-in-dep-graph-3
branch
from
5196547 to
9798a88
Compare
|
@bors r=nikomatsakis Comment added. |
|
📌 Commit 9798a88 has been approved by |
bors
added a commit
that referenced
this pull request
Sep 22, 2017
…r=nikomatsakis incr.comp.: Move task result fingerprinting into DepGraph. This PR - makes the DepGraph store all `Fingerprints` of task results, - allows `DepNode` to be marked as input nodes, - makes HIR node hashing use the regular fingerprinting infrastructure, - removes the now unused `IncrementalHashesMap`, and - makes sure that `traits_in_scope_map` fingerprints are stable. r? @nikomatsakis cc @alexcrichton
|
☀️ Test successful - status-appveyor, status-travis |
3 tasks
bors
added a commit
that referenced
this pull request
Sep 24, 2017
incr.comp.: Add new DepGraph implementation. This commits does a few things: 1. It adds the new dep-graph implementation -- *in addition* to the old one. This way we can start testing the new implementation without switching all tests at once. 2. It persists the new dep-graph (which includes query result fingerprints) to the incr. comp. caching directory and also loads this data. 3. It removes support for loading fingerprints of metadata imported from other crates (except for when running autotests). This is not needed anymore with red/green. It could provide a performance advantage but that's yet to be determined. For now, as red/green is not fully implemented yet, the cross-crate incremental tests are disabled. Note, this PR is based on top of soon-to-be-merged #44696 and only the last 4 commits are new: ``` - incr.comp.: Initial implemenation of append-only dep-graph. (c90147c) - incr.comp.: Do some various cleanup. (8ce20c5) - incr.comp.: Serialize and deserialize new DepGraph. (0e13c1a) - incr.comp.: Remove support for loading metadata fingerprints. (270a134) EDIT 2: - incr.comp.: Make #[rustc_dirty/clean] test for fingerprint equality ... (d8f7ff9) ``` (EDIT: GH displays the commits in the wrong order for some reason) Also note that this PR is expected to certainly result in performance regressions in the incr. comp. test cases, since we are adding quite a few things (a whole additional dep-graph, for example) without removing anything. End-to-end performance measurements will only make sense again after red/green is enabled and all the legacy tracking has been turned off. EDIT 2: Pushed another commit that makes the `#[rustc_dirty]`/`#[rustc_clean]` based autotests compared query result fingerprints instead of testing `DepNode` existence.
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 PR
Fingerprintsof task results,DepNodeto be marked as input nodes,IncrementalHashesMap, andtraits_in_scope_mapfingerprints are stable.r? @nikomatsakis
cc @alexcrichton