Rollup of 6 pull requests by workingjubilee · Pull Request #135101 · rust-lang/rust

workingjubilee · 2025-01-04T15:57:37Z

Successful merges:

turn rustc_box into an intrinsic #135046 (turn rustc_box into an intrinsic)
crashes: add latest batch of tests #135061 (crashes: add latest batch of tests)
std: sync to dep versions of backtrace #135070 (std: sync to dep versions of backtrace)
Force code generation in assembly generation smoke-tests #135088 (Force code generation in assembly generation smoke-tests)
Bump backtrace to 0.3.75 #135091 (Bump backtrace to 0.3.75)
bootstrap: If dir_is_empty fails, show the non-existent directory path #135094 (bootstrap: If dir_is_empty fails, show the non-existent directory path)

r? @ghost
@rustbot modify labels: rollup

In llvm/llvm-project@7b23f41 , `.text` started being suppressed from LLVM assembly in cases where it wasn't strictly necessary. Currently, the sample functions in these two tests are frequently decided to be IR-only functions, resulting in no code generation, so LLVM drops the `.text` directive. Adding `#[no_mangle]` forces these tests back to their original intent - assembly code is generated, and so a `.text` directive is generated as well.

I prefer when we can ship the same version of backtrace on crates.io, and this will be the next published version. Compare: rust-lang/backtrace-rs@4d7906b...0.3.75 Mostly internal-to-backtrace changes, plus a tiny code size win.

This should help when trying to debug issues.

…mpiler-errors turn rustc_box into an intrinsic I am not entirely sure why this was made a special magic attribute, but an intrinsic seems like a more natural way to add magic expressions to the language.

crashes: add latest batch of tests try-job: aarch64-apple try-job: x86_64-msvc try-job: x86_64-gnu try-job: dist-i586-gnu-i586-i686-musl

…bilee std: sync to dep versions of backtrace Minor versions from backtrace desynced with std (they still differs in patch numbers, but still better): https://github.com/rust-lang/backtrace-rs/blob/4d7906bb24ae91ee6587127020d360f5298f9e7e/Cargo.toml#L44-L48 There is hidden bug here, let's see if CI can find it. cc `@workingjubilee`

Force code generation in assembly generation smoke-tests In llvm/llvm-project@7b23f41 , `.text` started being suppressed from LLVM assembly in cases where it wasn't strictly necessary. Currently, the sample functions in these two tests are frequently decided to be IR-only functions, resulting in no code generation, so LLVM drops the `.text` directive. Adding `#[no_mangle]` forces these tests back to their original intent - assembly code is generated, and so a `.text` directive is generated as well. `@rustbot` label: +llvm-main r? `@workingjubilee` I'll attach a buildbot link once it finishes consuming this PR

…=workingjubilee Bump backtrace to 0.3.75 I prefer when we can ship the same version of backtrace on crates.io, and this will be the next published version. Compare: rust-lang/backtrace-rs@4d7906b...0.3.75 Mostly internal-to-backtrace changes, plus a tiny code size win. r? `@ghost`

…stent-dir, r=jieyouxu bootstrap: If dir_is_empty fails, show the non-existent directory path This should help when trying to debug issues.

workingjubilee · 2025-01-04T15:57:45Z

@bors r+ rollup=never p=5

bors · 2025-01-04T15:57:47Z

📌 Commit e2983d8 has been approved by workingjubilee

It is now in the queue for this repository.

bors · 2025-01-04T21:11:31Z

⌛ Testing commit e2983d8 with merge 1891c28...

bors · 2025-01-04T23:55:16Z

☀️ Test successful - checks-actions
Approved by: workingjubilee
Pushing 1891c28 to master...

rust-timer · 2025-01-04T23:57:03Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#135046	turn rustc_box into an intrinsic	`90b61b5dad710fc715ed8019b46aeb061f394c20` (link)
#135061	crashes: add latest batch of tests	`15cea17f2da74c89ea269c46cea64f8fa94fab9b` (link)
#135070	std: sync to dep versions of backtrace	`42abf531cba01861def318210dc6e38ca79493ae` (link)
#135088	Force code generation in assembly generation smoke-tests	`fc5100a0a025d25d9dd643de834a334df09a843a` (link)
#135091	Bump backtrace to 0.3.75	`1362fca927abcdce6ea060494d9c9faa664e319f` (link)
#135094	bootstrap: If dir_is_empty fails, show the non-existent dir…	`0fe74c827c2a7b70160030700817fe6204cd8886` (link)

previous master: ead4a8f536

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

rust-timer · 2025-01-05T01:11:41Z

Finished benchmarking commit (1891c28): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

If the regression was expected or you think it can be justified,
please write a comment with sufficient written justification, and add
@rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
If you think that you know of a way to resolve the regression, try to create
a new PR with a fix for the regression.
If you do not understand the regression or you think that it is just noise,
you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.7%	[0.7%, 0.8%]	4
Regressions ❌ (secondary)	0.7%	[0.3%, 2.2%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.3%	[-1.8%, -0.2%]	13
All ❌✅ (primary)	0.7%	[0.7%, 0.8%]	4

Max RSS (memory usage)

Results (primary 2.3%, secondary 4.8%)

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)	2.3%	[1.9%, 2.8%]	2
Regressions ❌ (secondary)	6.4%	[1.3%, 15.0%]	14
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.8%	[-5.9%, -0.8%]	3
All ❌✅ (primary)	2.3%	[1.9%, 2.8%]	2

Cycles

Results (secondary -0.8%)

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

Binary size

Results (primary 0.3%, secondary 0.8%)

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.3%	[0.1%, 0.8%]	15
Regressions ❌ (secondary)	0.8%	[0.5%, 1.4%]	38
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	[0.1%, 0.8%]	15

Bootstrap: 762.69s -> 763.656s (0.13%)
Artifact size: 325.64 MiB -> 325.61 MiB (-0.01%)

klensy · 2025-01-05T10:24:43Z

Small binary size regression should be hopefully fixed by #135110?

Kobzol · 2025-01-05T10:30:54Z

That was not it (#135113 (comment)), probably it was just the backtrace bump.

workingjubilee · 2025-01-06T00:17:29Z

hm, might need to adjust how we're measuring sizes for backtrace...

Kobzol · 2025-01-06T07:22:23Z

It might have been also caused by #135070.

Kobzol · 2025-01-06T07:22:47Z

@rust-timer build 1362fca

rust-timer · 2025-01-06T08:38:04Z

Finished benchmarking commit (1362fca): comparison URL.

Overall result: no relevant changes - no action needed

Instruction count

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

Max RSS (memory usage)

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

Cycles

Results (secondary -0.7%)

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.8%	[2.8%, 2.8%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.5%	[-2.6%, -2.4%]	2
All ❌✅ (primary)	-	-	0

Binary size

Results (primary 0.2%, secondary 0.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.2%	[0.0%, 0.3%]	12
Regressions ❌ (secondary)	0.3%	[0.2%, 0.6%]	38
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.2%	[0.0%, 0.3%]	12

Bootstrap: 762.69s -> 761.839s (-0.11%)
Artifact size: 325.64 MiB -> 325.62 MiB (-0.01%)

Kobzol · 2025-01-06T08:45:22Z

Seems like it was indeed #135091.

Kobzol · 2025-01-07T09:59:40Z

The perf. effects on the deep-vector benchmark were most likely caused by #135046, and it seemed to have been expected.

@rustbot label: +perf-regression-triaged

RalfJung and others added 13 commits January 3, 2025 12:01

turn rustc_box into an intrinsic

ac9cb90

sync to actual dep verions of backtrace

31ffc66

tidy

4d3a028

Bump backtrace to 0.3.75

66bf53a

I prefer when we can ship the same version of backtrace on crates.io, and this will be the next published version. Compare: rust-lang/backtrace-rs@4d7906b...0.3.75 Mostly internal-to-backtrace changes, plus a tiny code size win.

bootstrap: If dir_is_empty fails, show the non-existent directory path

2cefd30

This should help when trying to debug issues.

crashes: add latest batch of tests

9444195

Rollup merge of rust-lang#135046 - RalfJung:rustc_box_intrinsic, r=co…

7cf3b96

…mpiler-errors turn rustc_box into an intrinsic I am not entirely sure why this was made a special magic attribute, but an intrinsic seems like a more natural way to add magic expressions to the language.

Rollup merge of rust-lang#135061 - matthiaskrgr:crashes_jan, r=lqd

0da5bb4

crashes: add latest batch of tests try-job: aarch64-apple try-job: x86_64-msvc try-job: x86_64-gnu try-job: dist-i586-gnu-i586-i686-musl

Rollup merge of rust-lang#135094 - joshtriplett:bootstrap-show-nonexi…

e2983d8

…stent-dir, r=jieyouxu bootstrap: If dir_is_empty fails, show the non-existent directory path This should help when trying to debug issues.

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 4, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 4, 2025

bors merged commit 1891c28 into rust-lang:master Jan 4, 2025
7 checks passed

rustbot added this to the 1.86.0 milestone Jan 4, 2025

rustbot added the perf-regression Performance regression. label Jan 5, 2025

workingjubilee deleted the rollup-owp3czl branch January 6, 2025 00:14

This comment has been minimized.

Sign in to view

rustbot added the perf-regression-triaged The performance regression has been triaged. label Jan 7, 2025

Uh oh!

Conversation

workingjubilee commented Jan 4, 2025

Uh oh!

workingjubilee commented Jan 4, 2025

Uh oh!

bors commented Jan 4, 2025

Uh oh!

bors commented Jan 4, 2025

Uh oh!

bors commented Jan 4, 2025

Uh oh!

Uh oh!

rust-timer commented Jan 4, 2025

Uh oh!

rust-timer commented Jan 5, 2025

Overall result: ❌✅ regressions and improvements - please read the text below

Uh oh!

klensy commented Jan 5, 2025

Uh oh!

Kobzol commented Jan 5, 2025

Uh oh!

workingjubilee commented Jan 6, 2025

Uh oh!

Kobzol commented Jan 6, 2025

Uh oh!

Kobzol commented Jan 6, 2025

Uh oh!

This comment has been minimized.

rust-timer commented Jan 6, 2025

Overall result: no relevant changes - no action needed

Uh oh!

Kobzol commented Jan 6, 2025

Uh oh!

Kobzol commented Jan 7, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants