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

Rename directive needs-profiler-support to needs-profiler-runtime #131429

Merged
merged 3 commits into from
Oct 9, 2024
Merged

Rename directive needs-profiler-support to needs-profiler-runtime #131429

merged 3 commits into from
Oct 9, 2024

Conversation

Zalathar
Copy link
Contributor

@Zalathar Zalathar commented Oct 9, 2024

The rest of the compiler mostly refers to this as profiler_runtime, so having a directive named needs-profiler-support was causing a lot of confusion.

r? jieyouxu

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 9, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 9, 2024

Some changes occurred in src/tools/compiletest

cc @jieyouxu

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

@Zalathar
Copy link
Contributor Author

Zalathar commented Oct 9, 2024 •
edited
Loading

I should also think about renaming the profiler_builtins crate to profiler_runtime, but that can be left for a separate PR (and would be a pretty hairy change on its own).

jieyouxu
jieyouxu approved these changes Oct 9, 2024
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, you can r=me after PR CI is green. As usual, please also update rustc-dev-guide about this 😄

@Zalathar
Copy link
Contributor Author

Zalathar commented Oct 9, 2024

CI is green.

@bors r=jieyouxu

@bors
Copy link
Contributor

bors commented Oct 9, 2024

📌 Commit ad7815c has been approved by jieyouxu

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 Oct 9, 2024
@Zalathar Zalathar mentioned this pull request Oct 9, 2024
Merged
@Zalathar
Copy link
Contributor Author

Zalathar commented Oct 9, 2024

Dev-guide update: rust-lang/rustc-dev-guide#2095

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 9, 2024
@matthiaskrgr
Rollup merge of rust-lang#131429 - Zalathar:needs-profiler-runtime, r…
8c68a20 
…=jieyouxu

Rename directive `needs-profiler-support` to `needs-profiler-runtime`

The rest of the compiler mostly refers to this as `profiler_runtime`, so having a directive named `needs-profiler-support` was causing a lot of confusion.

r? jieyouxu
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 9, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 9, 2024
@bors
Auto merge of rust-lang#131438 - matthiaskrgr:rollup-q2fcogi, r=matth…
0f85c9c 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#129424 (Stabilize `Pin::as_deref_mut()`)
 - rust-lang#131417 (Fix methods alignment on mobile)
 - rust-lang#131424 (compiler: Stop reexporting enum-globs from `rustc_target::abi`)
 - rust-lang#131426 (Fix quotation marks around debug line in `src/ci/run.sh`)
 - rust-lang#131429 (Rename directive `needs-profiler-support` to `needs-profiler-runtime`)
 - rust-lang#131435 (Ignore broken-pipe-no-ice on apple (specifically macOS) for now)

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

might have failed in #131438 (comment) ? 🤔

@Zalathar
Copy link
Contributor Author

Zalathar commented Oct 9, 2024

I'm pretty sure that failure is the thing #131434 was trying to fix, but that PR landed before the rollup failed ...

@jieyouxu
Copy link
Member

jieyouxu commented Oct 9, 2024

Yeah, there was a bootstrap test that was broken

@Zalathar
Rename directive needs-profiler-support to needs-profiler-runtime
622d589
@Zalathar
Rename profiler_support to profiler_runtime throughout compiletest
8320a01
@Zalathar
No need to cache the profiler_runtime flag
7a0e8bd 
This cache struct entry was a relic from when profiler availability was
communicated via an environment variable rather than a command-line flag.
@Zalathar Zalathar force-pushed the needs-profiler-runtime branch from ad7815c to 7a0e8bd Compare October 9, 2024 10:02
@Zalathar
Copy link
Contributor Author

Zalathar commented Oct 9, 2024

Anyhow, while it probably won't make a difference, I've rebased this PR for good luck.

@bors r=jieyouxu

@bors
Copy link
Contributor

bors commented Oct 9, 2024

📌 Commit 7a0e8bd has been approved by jieyouxu

It is now in the queue for this repository.

jieyouxu added a commit to jieyouxu/rust that referenced this pull request Oct 9, 2024
@jieyouxu
Rollup merge of rust-lang#131429 - Zalathar:needs-profiler-runtime, r…
c77c1c1 
…=jieyouxu

Rename directive `needs-profiler-support` to `needs-profiler-runtime`

The rest of the compiler mostly refers to this as `profiler_runtime`, so having a directive named `needs-profiler-support` was causing a lot of confusion.

r? jieyouxu
@jieyouxu jieyouxu mentioned this pull request Oct 9, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 9, 2024
@bors
Auto merge of rust-lang#131440 - jieyouxu:rollup-9jk0hs0, r=jieyouxu
9cb70ff 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#131417 (Fix methods alignment on mobile)
 - rust-lang#131420 (Dont ICE when encountering post-mono layout cycle error)
 - rust-lang#131424 (compiler: Stop reexporting enum-globs from `rustc_target::abi`)
 - rust-lang#131426 (Fix quotation marks around debug line in `src/ci/run.sh`)
 - rust-lang#131429 (Rename directive `needs-profiler-support` to `needs-profiler-runtime`)
 - rust-lang#131435 (Ignore broken-pipe-no-ice on apple (specifically macOS) for now)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Oct 9, 2024

⌛ Testing commit 7a0e8bd with merge a1eceec...

@bors
Copy link
Contributor

bors commented Oct 9, 2024

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing a1eceec to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 9, 2024
@bors bors merged commit a1eceec into rust-lang:master Oct 9, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 9, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a1eceec): 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 (secondary 2.3%)

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)		 2.3% [2.3%, 2.3%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
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: 775.672s -> 776.8s (0.15%)
Artifact size: 329.67 MiB -> 329.51 MiB (-0.05%)

@Zalathar Zalathar deleted the needs-profiler-runtime branch October 9, 2024 22:22
@jieyouxu jieyouxu added the A-compiletest Area: The compiletest test runner label Oct 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
A-compiletest Area: The compiletest test runner A-run-make Area: port run-make Makefiles to rmake.rs 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
Oxidizing run-make tests
Status: Done
compiletest maintenance and improvements
Status: Done
Milestone
1.83.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Zalathar @rustbot @bors @matthiaskrgr @jieyouxu @rust-timer