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

Make -O mean OptLevel::Aggressive #135439

Merged
merged 1 commit into from
Feb 14, 2025
Merged

Make -O mean OptLevel::Aggressive #135439

merged 1 commit into from
Feb 14, 2025

Conversation

clubby789
Copy link
Contributor

@clubby789 clubby789 commented Jan 13, 2025 •
edited by saethlin
Loading

Implementation of this MCP: rust-lang/compiler-team#828, changing the meaning of -O from -Copt-level=2 to -Copt-level=3.

This also renames OptLevel::Default to OptLevel::More, as Default no longer makes sense.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 13, 2025
@clubby789 clubby789 added S-experimental Status: Ongoing experiment that does not require reviewing and won't be merged in its current state. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 13, 2025
@clubby789 clubby789 marked this pull request as draft January 13, 2025 15:53
@clubby789
Copy link
Contributor Author

@bors try

@bors
Copy link
Contributor

bors commented Jan 13, 2025

⌛ Trying commit 99d3f7a with merge 1d1ae32...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 13, 2025
@bors
Auto merge of rust-lang#135439 - clubby789:O3, r=<try>
1d1ae32 
[EXPERIMENTAL] Make `-O` mean `OptLevel::Aggressive`

Just out of curiosity to see if anything is relying on this

r? ghost
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jan 13, 2025

☀️ Try build successful - checks-actions
Build commit: 1d1ae32 (1d1ae328d71e07352118cafffcf33b01a88b6631)

@clubby789
Copy link
Contributor Author

Will keep this open in case rust-lang/compiler-team#828 merges

@rustbot rustbot added the A-run-make Area: port run-make Makefiles to rmake.rs label Jan 14, 2025
@clubby789 clubby789 added S-waiting-on-MCP Status: PR has a compiler MCP and is waiting for the compiler MCP to complete. and removed A-run-make Area: port run-make Makefiles to rmake.rs labels Jan 14, 2025
@clubby789 clubby789 changed the title [EXPERIMENTAL] Make -O mean OptLevel::Aggressive Make -O mean OptLevel::Aggressive Jan 14, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the A-run-make Area: port run-make Makefiles to rmake.rs label Jan 14, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@clubby789 clubby789 removed the S-experimental Status: Ongoing experiment that does not require reviewing and won't be merged in its current state. label Jan 16, 2025
@clubby789 clubby789 marked this pull request as ready for review January 16, 2025 13:53
@rustbot
Copy link
Collaborator

rustbot commented Jan 16, 2025

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

@clubby789 clubby789 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. B-MCP-approved Blocker: Approved by an accepted MCP but not yet implemented. and removed S-waiting-on-MCP Status: PR has a compiler MCP and is waiting for the compiler MCP to complete. A-run-make Area: port run-make Makefiles to rmake.rs labels Jan 27, 2025
@workingjubilee workingjubilee mentioned this pull request Feb 9, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 9, 2025
@bors
Auto merge of rust-lang#136758 - workingjubilee:specify-opt-level-for…
c912816 
…-tests, r=<try>

tests: Specify `-Copt-level=3` instead of `-O` in tests

An effective blocker for rust-lang#135439

r? `@ghost`

try-job: test-various
try-job: aarch64-gnu
try-job: aarch64-gnu-debug
try-job: i686-gnu-1
try-job: i686-gnu-2
try-job: i686-mingw
try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: x86_64-msvc-1
try-job: x86_64-msvc-2
@workingjubilee workingjubilee mentioned this pull request Feb 9, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 9, 2025
@bors
Auto merge of rust-lang#136761 - workingjubilee:specify-opt-level-for…
88aac11 
…-codegen-tests, r=<try>

tests: `-Copt-level=3` instead of `-O` in codegen tests

An effective blocker for rust-lang#135439

r? `@ghost`

try-job: test-various
try-job: aarch64-gnu
try-job: aarch64-gnu-debug
try-job: i686-gnu-1
try-job: i686-gnu-2
try-job: i686-mingw
try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: x86_64-msvc-1
try-job: x86_64-msvc-2
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 9, 2025
@bors
Auto merge of rust-lang#136761 - workingjubilee:specify-opt-level-for…
19ec3e2 
…-codegen-tests, r=<try>

tests: `-Copt-level=3` instead of `-O` in codegen tests

An effective blocker for rust-lang#135439

r? `@ghost`

try-job: test-various
try-job: aarch64-gnu
try-job: aarch64-gnu-debug
try-job: i686-gnu-1
try-job: i686-gnu-2
try-job: i686-mingw
try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: x86_64-msvc-1
try-job: x86_64-msvc-2
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 9, 2025
@bors
Auto merge of rust-lang#136758 - workingjubilee:specify-opt-level-for…
088e0cc 
…-tests, r=<try>

tests: `-Copt-level=3` instead of `-O` in assembly tests

An effective blocker for rust-lang#135439

r? `@ghost`

try-job: test-various
try-job: aarch64-gnu
try-job: aarch64-gnu-debug
try-job: i686-gnu-1
try-job: i686-gnu-2
try-job: i686-mingw
try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: x86_64-msvc-1
try-job: x86_64-msvc-2
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 9, 2025
@bors
Auto merge of rust-lang#136758 - workingjubilee:specify-opt-level-for…
d0a1bf8 
…-tests, r=<try>

tests: `-Copt-level=3` instead of `-O` in assembly tests

An effective blocker for rust-lang#135439

r? `@ghost`

try-job: test-various
try-job: aarch64-gnu
try-job: aarch64-gnu-debug
try-job: i686-gnu-1
try-job: i686-gnu-2
try-job: i686-mingw
try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: x86_64-msvc-1
try-job: x86_64-msvc-2
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 9, 2025
@bors
Auto merge of rust-lang#136761 - workingjubilee:specify-opt-level-for…
8c43bfa 
…-codegen-tests, r=<try>

tests: `-Copt-level=3` instead of `-O` in codegen tests

An effective blocker for rust-lang#135439

r? `@ghost`

try-job: test-various
try-job: aarch64-gnu
try-job: aarch64-gnu-debug
try-job: i686-gnu-1
try-job: i686-gnu-2
try-job: i686-mingw
try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: x86_64-msvc-1
try-job: x86_64-msvc-2
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 9, 2025
@bors
Auto merge of rust-lang#136761 - workingjubilee:specify-opt-level-for…
f1e2ad8 
…-codegen-tests, r=<try>

tests: `-Copt-level=3` instead of `-O` in codegen tests

An effective blocker for rust-lang#135439

r? `@ghost`

try-job: test-various
try-job: aarch64-gnu
try-job: aarch64-gnu-debug
try-job: i686-gnu-1
try-job: i686-gnu-2
try-job: i686-mingw
try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: x86_64-msvc-1
try-job: x86_64-msvc-2
@workingjubilee
Copy link
Member

This can move forward if these PRs get merged:

@workingjubilee workingjubilee added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 10, 2025
@bors
Copy link
Contributor

bors commented Feb 13, 2025

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

@DianQK DianQK added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Feb 13, 2025
@workingjubilee
Copy link
Member

The other PRs got merged, so this probably "just" needs a rebase.

@clubby789
Copy link
Contributor Author

@bors r=Noratrieb

@bors
Copy link
Contributor

bors commented Feb 14, 2025

📌 Commit 2966256 has been approved by Noratrieb

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 Feb 14, 2025
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Feb 14, 2025
@workingjubilee
Rollup merge of rust-lang#135439 - clubby789:O3, r=Noratrieb
c3e21a2 
Make `-O` mean `OptLevel::Aggressive`

Implementation of this MCP: rust-lang/compiler-team#828, changing the meaning of `-O` from `-Copt-level=2` to `-Copt-level=3`.

This also renames `OptLevel::Default` to `OptLevel::More`, as `Default` no longer makes sense.
@workingjubilee workingjubilee mentioned this pull request Feb 14, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 14, 2025
@bors
Auto merge of rust-lang#136998 - workingjubilee:rollup-b2v8qrc, r=wor…
5f4e6f2 
…kingjubilee

Rollup of 13 pull requests

Successful merges:

 - rust-lang#135439 (Make `-O` mean `OptLevel::Aggressive`)
 - rust-lang#136460 (Simplify `rustc_span` `analyze_source_file`)
 - rust-lang#136642 (Put the alloc unit tests in a separate alloctests package)
 - rust-lang#136904 (add `IntoBounds` trait)
 - rust-lang#136908 ([AIX] expect `EINVAL` for `pthread_mutex_destroy`)
 - rust-lang#136924 (Add profiling of bootstrap commands using Chrome events)
 - rust-lang#136951 (Use the right binder for rebinding `PolyTraitRef`)
 - rust-lang#136956 (add vendor directory to .gitignore)
 - rust-lang#136967 (Use `slice::fill` in `io::Repeat` implementation)
 - rust-lang#136976 (alloc boxed: docs: use MaybeUninit::write instead of as_mut_ptr)
 - rust-lang#136981 (ci: switch loongarch jobs to free runners)
 - rust-lang#136992 (Update backtrace)
 - rust-lang#136993 ([cg_llvm] Remove dead error message)

r? `@ghost`
`@rustbot` modify labels: rollup
@workingjubilee workingjubilee mentioned this pull request Feb 14, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 14, 2025
@bors
Auto merge of rust-lang#137010 - workingjubilee:rollup-g00c07v, r=wor…
905b1bf 
…kingjubilee

Rollup of 9 pull requests

Successful merges:

 - rust-lang#135439 (Make `-O` mean `OptLevel::Aggressive`)
 - rust-lang#136460 (Simplify `rustc_span` `analyze_source_file`)
 - rust-lang#136904 (add `IntoBounds` trait)
 - rust-lang#136908 ([AIX] expect `EINVAL` for `pthread_mutex_destroy`)
 - rust-lang#136924 (Add profiling of bootstrap commands using Chrome events)
 - rust-lang#136951 (Use the right binder for rebinding `PolyTraitRef`)
 - rust-lang#136981 (ci: switch loongarch jobs to free runners)
 - rust-lang#136992 (Update backtrace)
 - rust-lang#136993 ([cg_llvm] Remove dead error message)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e7d9cb3 into rust-lang:master Feb 14, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Feb 14, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 14, 2025
@rust-timer
Unrolled build for rust-lang#135439
8d07739 
Rollup merge of rust-lang#135439 - clubby789:O3, r=Noratrieb

Make `-O` mean `OptLevel::Aggressive`

Implementation of this MCP: rust-lang/compiler-team#828, changing the meaning of `-O` from `-Copt-level=2` to `-Copt-level=3`.

This also renames `OptLevel::Default` to `OptLevel::More`, as `Default` no longer makes sense.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Noratrieb Noratrieb Noratrieb approved these changes

Assignees

@Noratrieb Noratrieb

Labels
A-run-make Area: port run-make Makefiles to rmake.rs B-MCP-approved Blocker: Approved by an accepted MCP but not yet implemented. relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.86.0
Development

Successfully merging this pull request may close these issues.
8 participants
@clubby789 @bors @rust-log-analyzer @rustbot @Noratrieb @matthiaskrgr @workingjubilee @DianQK