Cleanup codegen_llvm/back by ljedrz · Pull Request #54864 · rust-lang/rust

ljedrz · 2018-10-06T09:56:16Z

improve allocations
use Cow<'static, str> where applicable
use to_owned instead of to_string with string literals
remove a redundant continue
possible minor speedup in logic
use mem::replace instead of swap where more concise
remove 'static from consts
improve common patterns
remove explicit returns
whitespace & formatting fixes

rust-highfive · 2018-10-06T09:56:26Z

(rust_highfive has picked a reviewer for you, use r? to override)

pnkfelix

Is this commit the result of running rustfmt ? Just curious...

ljedrz · 2018-10-09T01:43:16Z

@pnkfelix: you mean the whitespace one? No; those lines were hand-picked after having done all the other changes. I adjusted those spots along the way.

ljedrz · 2018-10-16T06:12:34Z

It seems @pnkfelix is busy with NLL; r? @Mark-Simulacrum

Mark-Simulacrum

I'm okay with landing this but some of these seem like they might not actually be improvements

ljedrz · 2018-10-16T18:00:00Z

@Mark-Simulacrum thanks for the thorough review! I think I addressed all the issues.

ljedrz · 2018-10-19T07:33:50Z

@Mark-Simulacrum r? I won't be able to rebase for the next few days.

ljedrz · 2018-10-19T13:31:21Z

The deletion was an accident. Travis should still be happy.

ljedrz · 2018-10-29T09:22:45Z

Included the suggestion by @sinkuu.

bors · 2018-11-04T15:07:43Z

☔ The latest upstream changes (presumably #55349) made this pull request unmergeable. Please resolve the merge conflicts.

ljedrz · 2018-11-05T12:57:49Z

Rebased.

Mark-Simulacrum · 2018-11-05T13:38:46Z

@bors r+

bors · 2018-11-05T13:38:47Z

📌 Commit b74c9d60bf23b7d975dc87f5efeadd5fe937f605 has been approved by Mark-Simulacrum

bors · 2018-11-05T15:49:06Z

⌛ Testing commit b74c9d60bf23b7d975dc87f5efeadd5fe937f605 with merge f0097bd6148de603f9f56d906f5a286d568be711...

…rals

ljedrz · 2018-11-10T18:27:15Z

I removed the memory-related commit; maybe I will come up with a solution in the future, but there's no point in holding back the rest of the changes.

nagisa · 2018-11-10T21:33:10Z

@bors r=Mark-Simulacrum

bors · 2018-11-10T21:33:11Z

📌 Commit 2f99d09 has been approved by Mark-Simulacrum

bors · 2018-11-10T23:16:32Z

⌛ Testing commit 2f99d09 with merge 6408162...

…acrum Cleanup codegen_llvm/back - improve allocations - use `Cow<'static, str>` where applicable - use `to_owned` instead of `to_string` with string literals - remove a redundant `continue` - possible minor speedup in logic - use `mem::replace` instead of `swap` where more concise - remove `'static` from consts - improve common patterns - remove explicit `return`s - whitespace & formatting fixes

bors · 2018-11-11T01:56:41Z

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 6408162 to master...

codegen_llvm_back: improve allocations This commit was split out from #54864. Last time it was causing an LLVM OOM, presumably due to aggressive preallocation strategy in `thin_lto`. This time preallocations are more cautious and there are a few additional memory-related improvements (last 3 points from the list below). - _gently_ preallocate vectors of known length - `extend` instead of `append` where the argument is consumable - turn 2 `push` loops into `extend`s - create a vector from a function producing one instead of using `extend_from_slice` on it - consume `modules` when no longer needed - return an `impl Iterator` from `generate_lto_work` - don't `collect` `globals`, as they are iterated over and consumed right afterwards While I'm hoping it won't cause an OOM anymore, I would still consider this a "high-risk" PR and not roll it up.

codegen_llvm_back: improve allocations This commit was split out from #54864. Last time it was causing an LLVM OOM, which was most probably caused by not collecting the globals. - preallocate vectors of known length - `extend` instead of `append` where the argument is consumable - turn 2 `push` loops into `extend`s - create a vector from a function producing one instead of using `extend_from_slice` on it - consume `modules` when no longer needed - ~~return an `impl Iterator` from `generate_lto_work`~~ - ~~don't `collect` `globals`, as they are iterated over and consumed right afterwards~~ While I'm hoping it won't cause an OOM anymore, I would still consider this a "high-risk" PR and not roll it up.

rust-highfive assigned pnkfelix Oct 6, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 6, 2018

pnkfelix reviewed Oct 8, 2018
View reviewed changes

rust-highfive assigned Mark-Simulacrum and unassigned pnkfelix Oct 16, 2018

Mark-Simulacrum reviewed Oct 16, 2018
View reviewed changes

ljedrz force-pushed the cleanup_codegen_llvm_back branch from a544455 to 60e123dCompare October 16, 2018 17:58

ljedrz force-pushed the cleanup_codegen_llvm_back branch from 60e123d to ec65cffCompare October 16, 2018 20:19

sinkuu reviewed Oct 19, 2018
View reviewed changes

Comment threadsrc/librustc_codegen_llvm/back/link.rs Outdated

ljedrz closed this Oct 19, 2018

ljedrz deleted the cleanup_codegen_llvm_back branch October 19, 2018 12:36

ljedrz restored the cleanup_codegen_llvm_back branch October 19, 2018 13:27

ljedrz reopened this Oct 19, 2018

ljedrz force-pushed the cleanup_codegen_llvm_back branch from ec65cff to d2f2446Compare October 29, 2018 09:20

ljedrz force-pushed the cleanup_codegen_llvm_back branch from d2f2446 to b74c9d6Compare November 5, 2018 12:57

Mark-Simulacrum approved these changes Nov 5, 2018
View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 5, 2018

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 10, 2018

ljedrz added 10 commits November 10, 2018 19:22

codegen_llvm_back: whitespace & formatting fixes
1d1dc48

codegen_llvm_back: use Cow<'static, str> where applicable
c4c39e9

codegen_llvm_back: remove explicit returns
4286c3c

codegen_llvm_back: improve common patterns
3dbb2cc

codegen_llvm_back: use to_owned instead of to_string with string lite…
0195d9b
…rals

codegen_llvm_back: remove 'static from consts
ed5802c

codegen_llvm_back: use mem::replace instead of swap where more concise
3968ada

codegen_llvm_back: possible minor speedup in logic
4d88914

codegen_llvm_back: remove a redundant continue
815a3b6

codegen_llvm_back: simplify a conversion to char
2f99d09

ljedrz force-pushed the cleanup_codegen_llvm_back branch from 50c7e80 to 2f99d09Compare November 10, 2018 18:25

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 10, 2018

bors merged commit 2f99d09 into rust-lang:masterNov 11, 2018

bors mentioned this pull request Nov 11, 2018
Upgrade LLVM to trunk, still version 8 #55835
Merged

ljedrz deleted the cleanup_codegen_llvm_back branch November 11, 2018 07:05

ljedrz mentioned this pull request Nov 11, 2018
codegen_llvm_back: improve allocations #55871
Merged

Uh oh!

Uh oh!

Conversation

ljedrz commented Oct 6, 2018

Uh oh!

rust-highfive commented Oct 6, 2018

Uh oh!

pnkfelix left a comment

Choose a reason for hiding this comment

Uh oh!

ljedrz commented Oct 9, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ljedrz commented Oct 16, 2018

Uh oh!

Mark-Simulacrum left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ljedrz commented Oct 16, 2018

Uh oh!

ljedrz commented Oct 19, 2018

Uh oh!

Uh oh!

ljedrz commented Oct 19, 2018

Uh oh!

ljedrz commented Oct 29, 2018

Uh oh!

bors commented Nov 4, 2018

Uh oh!

ljedrz commented Nov 5, 2018

Uh oh!

Mark-Simulacrum commented Nov 5, 2018

Uh oh!

bors commented Nov 5, 2018

Uh oh!

bors commented Nov 5, 2018

Uh oh!

ljedrz commented Nov 10, 2018

Uh oh!

nagisa commented Nov 10, 2018

Uh oh!

bors commented Nov 10, 2018

Uh oh!

bors commented Nov 10, 2018

Uh oh!

bors commented Nov 11, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

ljedrz commented Oct 9, 2018•
edited
Loading