Split join_codegen_and_link() into two steps
#68601
Merged
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
|
r? @varkor (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @tmandry |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
bjorn3
approved these changes
Jan 28, 2020
src/librustc_interface/queries.rs
Outdated
| }) | ||
| let codegen_results = codegen_backend.join_codegen(ongoing_codegen, &sess, &dep_graph)?; | ||
| let prof = sess.prof.clone(); | ||
| prof.generic_activity("drop_dep_graph").run(move || drop(dep_graph)); |
There was a problem hiding this comment.
This drops dep_graph before linking now, so this should reduce memory consumption during linking.
|
You will need to update the |
tmandry
reviewed
Jan 28, 2020
src/librustc_interface/queries.rs
Outdated
| ongoing_codegen: ongoing_codegen.take(), | ||
| codegen_backend, | ||
| }) | ||
| let codegen_results = codegen_backend.join_codegen(ongoing_codegen, &sess, &dep_graph)?; |
There was a problem hiding this comment.
This is introducing a stall inside what looks kind of like an accessor, when there wasn't one before. I think there should be a comment on the function, at least. Also, double check that this doesn't seem like a problem at any call sites.
There was a problem hiding this comment.
Good point, and after a second thought, I think it makes more sense to keep join_codegen in where join_codegen_and_link was, so that behavior changes should be minimized.
I add a commit to the PR moving join_codegen into Linker::link to demonstrate the change, could you take a look?
There was a problem hiding this comment.
BTW, we can still drop dep_graph before calling backend to link, so we should reduce similar memory consumption during linking, as if we join codegen inside Queries::linker().
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
@bors r+ |
|
📌 Commit ff1a5a1f613a9ca42fa0ddcaf23da086f0cae390 has been approved by |
bors
added
S-waiting-on-bors
`join_codegen_and_link()` is split to `join_codegen()` and `link()`.
|
@bors r+ |
|
📌 Commit ae51d2b has been approved by |
bors
added a commit
that referenced
this pull request
Feb 4, 2020
Split `join_codegen_and_link()` into two steps `join_codegen_and_link()` is split to `join_codegen()` and `link()`.
|
☀️ Test successful - checks-azure |
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.
join_codegen_and_link()is split tojoin_codegen()andlink().