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

Rollup of 3 pull requests #135430

Merged
merged 12 commits into from
Jan 13, 2025
Merged

Rollup of 3 pull requests #135430

merged 12 commits into from
Jan 13, 2025

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented Jan 13, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ranger-ross and others added 12 commits January 11, 2025 20:43
@ranger-ross
ci: added ci format to test_render
dc11857
@lolbinarycat
clean up code related to the rustdoc-js test suite
0962afa
@lolbinarycat
don't use a string constant
a55bc72
@lolbinarycat
rename 'js-doc-test' to 'rustdoc-js' in compiletest
16286ce
@lolbinarycat
rename run_js_doc_test to run_rustdoc_js_test
d5f592a
@jieyouxu
bootstrap: add optional tracing cargo feature and optional `tracing…
97d59c5 
…*` deps
@jieyouxu
bootstrap: add tracing and tracing-tree based tracing setup
1307c95
@jieyouxu
bootstrap.py: build bootstrap binary with --features=tracing if `BO…
a4b9aa3 
…OTSTRAP_TRACING` env var is set
@jieyouxu
rustc-dev-guide: document BOOTSTRAP_TRACING and bootstrap tracing…
3ae724e 
… setup
@jhpratt
Rollup merge of rust-lang#135355 - ranger-ross:improved-ci-logs, r=on…
cc19b9b 
…ur-ozkan

ci: added test log format for ci

This PR adds a new test render format specifically for ci.
The goal as stated in rust-lang#134910 is to make reviewing test failures in CI easier.

See the new test output format in the CI for this PR ([here](https://github.com/rust-lang/rust/actions/runs/12723914643/job/35469515397?pr=135355))

closes rust-lang#134910 cc: `@jyn514`
@jhpratt
Rollup merge of rust-lang#135386 - lolbinarycat:bootstrap-test-cleanu…
abdd40d 
…p, r=jieyouxu

clean up code related to the rustdoc-js test suite

r? `@jieyouxu`
@jhpratt
Rollup merge of rust-lang#135391 - jieyouxu:conditional-tracing, r=on…
cc00936 
…ur-ozkan

bootstrap: Implement conditional `tracing` infra

Add a conditional `tracing` setup that is gated behind `BOOTSTRAP_TRACING` env var. This `tracing` infra is implemented by:

- Introducing an optional `tracing` cargo feature in bootstrap.
- Added optional `tracing*` dependencies which are gated behind the `tracing` cargo feature.
- When `BOOTSTRAP_TRACING` is set, `bootstrap.py` will build bootstrap with `--features=tracing`.

There is a small trick here to share `BOOTSTRAP_TRACING` env var without having to add a separate env var:

- `BOOTSTRAP_TRACING=1` is not a registered `tracing` filter target, so that can be used to enable the `tracing` cargo feature yet not actually enable any tracing logs (useful for editor r-a setups without actually outputting any tracing logs).
- `BOOTSTRAP_TRACING=TRACE` and such are actually valid `tracing` filters, but that sets `BOOTSTRAP_TRACING` anyway.

Example usage: rust-lang#135299 (that experimental PR is not conditionally gated)
This PR is intentionally kept minimal to focus on the infra itself. To get actual mileage, instrumentations will need to be added to individual `Step`s and such.

r? `@onur-ozkan` (or reroll)
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-rustc-dev-guide Area: rustc-dev-guide 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) rollup A PR which is a rollup labels Jan 13, 2025
@jhpratt
Copy link
Member Author

jhpratt commented Jan 13, 2025

@bors r+ rollup=never p=3

@bors
Copy link
Contributor

bors commented Jan 13, 2025

📌 Commit cc00936 has been approved by jhpratt

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 Jan 13, 2025
@bors
Copy link
Contributor

bors commented Jan 13, 2025

⌛ Testing commit cc00936 with merge b4045a4...

@bors
Copy link
Contributor

bors commented Jan 13, 2025

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing b4045a4 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 13, 2025
@bors bors merged commit b4045a4 into rust-lang:master Jan 13, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 13, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#135355 ci: added test log format for ci 1ac658bc09989d8411237c31e014b2417480a076 (link)
#135386 clean up code related to the rustdoc-js test suite c007994c9271eda6454f33b7100c8eab3335681b (link)
#135391 bootstrap: Implement conditional tracing infra 78543afa08a0a2367b2878ea6b1f920c202ac866 (link)

previous master: a2016aaba6

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@bors bors mentioned this pull request Jan 13, 2025
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b4045a4): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

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

Max RSS (memory usage)

Results (primary -3.0%, secondary 3.9%)

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)		 3.9% [3.9%, 3.9%] 1
Improvements ✅
(primary)		 -3.0% [-3.0%, -3.0%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -3.0% [-3.0%, -3.0%] 1

Cycles

Results (primary 3.5%, secondary 2.9%)

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)		 3.5% [3.5%, 3.5%] 1
Regressions ❌
(secondary)		 2.9% [2.6%, 3.3%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 3.5% [3.5%, 3.5%] 1

Binary size

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

Bootstrap: 764.824s -> 765.149s (0.04%)
Artifact size: 326.07 MiB -> 326.08 MiB (0.00%)

@jhpratt jhpratt deleted the rollup-39cecwd branch January 14, 2025 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-compiletest Area: The compiletest test runner A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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)
Projects
None yet
Milestone
1.86.0
Development

Successfully merging this pull request may close these issues.
7 participants
@jhpratt @bors @rust-timer @rustbot @ranger-ross @lolbinarycat @jieyouxu