Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor opt-dist to simplify local building #115795

Merged
merged 8 commits into from
Sep 18, 2023
Merged

Refactor opt-dist to simplify local building #115795

merged 8 commits into from
Sep 18, 2023

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Sep 12, 2023

This PR refactors the opt-dist tool to make it easier to invoke it locally, outside of CI, and thus simplify building PGO/BOLT optimized rustc builds e.g. for distro maintainers. It should also make it easier to run the PGO/BOLT workflow locally e.g. to profile performance or debug issues (looking at you, #115554).

@rustbot
Copy link
Collaborator

rustbot commented Sep 12, 2023

r? @Mark-Simulacrum

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

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Sep 12, 2023
@rustbot
Copy link
Collaborator

rustbot commented Sep 12, 2023

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@Kobzol
Copy link
Contributor Author

Kobzol commented Sep 12, 2023

@bors try

@bors
Copy link
Contributor

bors commented Sep 12, 2023

⌛ Trying commit 11f9283 with merge b33c555...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 12, 2023
@bors
Auto merge of rust-lang#115795 - Kobzol:opt-dist-custom, r=<try>
b33c555 
Refactor `opt-dist` to simplify local building

This PR refactors the `opt-dist` tool to make it easier to invoke it locally, outside of CI, and thus simplify building PGO/BOLT optimized `rustc` builds e.g. for distro maintainers. It should also make it easier to run the PGO/BOLT workflow locally e.g. to profile performance or debug issues (looking at you, rust-lang#115554).
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Sep 12, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 12, 2023
@rustbot
Copy link
Collaborator

rustbot commented Sep 13, 2023

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@Kobzol
Copy link
Contributor Author

Kobzol commented Sep 13, 2023

@bors try

@bors
Copy link
Contributor

bors commented Sep 13, 2023

⌛ Trying commit f13b545 with merge cee65ce...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 13, 2023
@bors
Auto merge of rust-lang#115795 - Kobzol:opt-dist-custom, r=<try>
cee65ce 
Refactor `opt-dist` to simplify local building

This PR refactors the `opt-dist` tool to make it easier to invoke it locally, outside of CI, and thus simplify building PGO/BOLT optimized `rustc` builds e.g. for distro maintainers. It should also make it easier to run the PGO/BOLT workflow locally e.g. to profile performance or debug issues (looking at you, rust-lang#115554).
@bors
Copy link
Contributor

bors commented Sep 13, 2023

☀️ Try build successful - checks-actions
Build commit: cee65ce (cee65ced60e6b28438e74bd0df75798449e85c85)

@Kobzol
Copy link
Contributor Author

Kobzol commented Sep 13, 2023

@rust-timer build cee65ce

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (cee65ce): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Warning ⚠: The following benchmark(s) failed to build:

  • syn-1.0.89

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 1.6% [1.6%, 1.6%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.5% [-1.5%, -1.5%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.0% [-1.5%, 1.6%] 2

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.1% [-3.1%, -3.1%] 1
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 632.169s -> 633.406s (0.20%)
Artifact size: 317.92 MiB -> 317.95 MiB (0.01%)

@Kobzol
Copy link
Contributor Author

Kobzol commented Sep 14, 2023

@bors try @rust-timer queue

@bors
Copy link
Contributor

bors commented Sep 17, 2023

📌 Commit f13b545 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors 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 Sep 17, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 18, 2023
@matthiaskrgr
Rollup merge of rust-lang#115795 - Kobzol:opt-dist-custom, r=Mark-Sim…
afdfce3 
…ulacrum

Refactor `opt-dist` to simplify local building

This PR refactors the `opt-dist` tool to make it easier to invoke it locally, outside of CI, and thus simplify building PGO/BOLT optimized `rustc` builds e.g. for distro maintainers. It should also make it easier to run the PGO/BOLT workflow locally e.g. to profile performance or debug issues (looking at you, rust-lang#115554).
@matthiaskrgr matthiaskrgr mentioned this pull request Sep 18, 2023
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 18, 2023
@bors
Auto merge of rust-lang#115928 - matthiaskrgr:rollup-b88wic9, r=matth…
5610d98 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#115558 (issue has since been fixed)
 - rust-lang#115724 (Add myself to the mailmap)
 - rust-lang#115795 (Refactor `opt-dist` to simplify local building)
 - rust-lang#115811 (Make AIX known by bootstrap)
 - rust-lang#115838 (inspect: closer to proof trees for coherence)
 - rust-lang#115902 (Fix up a few CI images)
 - rust-lang#115907 (nop_lift macros: ensure that we are using the right interner)
 - rust-lang#115916 (Add me as on vacation)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr
Copy link
Member

@bors r- rollup=never
#115928 (comment)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 18, 2023
@Kobzol
Copy link
Contributor Author

Kobzol commented Sep 18, 2023

Oops, there was an error on Windows. I'll do a Windows CI try build to make sure that it works there.

@bors try

@bors
Copy link
Contributor

bors commented Sep 18, 2023

⌛ Trying commit 791d98c with merge f146df3...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 18, 2023
@bors
Auto merge of rust-lang#115795 - Kobzol:opt-dist-custom, r=<try>
f146df3 
Refactor `opt-dist` to simplify local building

This PR refactors the `opt-dist` tool to make it easier to invoke it locally, outside of CI, and thus simplify building PGO/BOLT optimized `rustc` builds e.g. for distro maintainers. It should also make it easier to run the PGO/BOLT workflow locally e.g. to profile performance or debug issues (looking at you, rust-lang#115554).
@bors
Copy link
Contributor

bors commented Sep 18, 2023

☀️ Try build successful - checks-actions
Build commit: f146df3 (f146df3cf408bcac5aad8285b4a9567839790adf)

@Kobzol
Copy link
Contributor Author

Kobzol commented Sep 18, 2023

Ok, it seems to work now.

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Sep 18, 2023

📌 Commit ee451f8 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 18, 2023
@bors
Copy link
Contributor

bors commented Sep 18, 2023

⌛ Testing commit ee451f8 with merge cbcf9a5...

@bors bors mentioned this pull request Sep 18, 2023
Merged
@bors
Copy link
Contributor

bors commented Sep 18, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing cbcf9a5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 18, 2023
@bors bors merged commit cbcf9a5 into rust-lang:master Sep 18, 2023
12 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 18, 2023
@Kobzol Kobzol deleted the opt-dist-custom branch September 18, 2023 16:18
This was referenced Sep 18, 2023
Open
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (cbcf9a5): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.8% [-3.5%, -2.1%] 2
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 634.379s -> 633.632s (-0.12%)
Artifact size: 317.94 MiB -> 317.99 MiB (0.01%)

@Kobzol Kobzol mentioned this pull request Sep 18, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fbstj fbstj fbstj left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.74.0
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@Kobzol @rustbot @bors @rust-log-analyzer @rust-timer @Mark-Simulacrum @matthiaskrgr @fbstj