Rollup of 5 pull requests #113508

matthiaskrgr · 2023-07-09T14:33:38Z

Successful merges:

Always name the return place. #111618 (Always name the return place.)
Add Tests for native wasm exceptions #113247 (Add Tests for native wasm exceptions)
Use String or Int to set the opt level #113273 (Use String or Int to set the opt level)
Remove default_free_fn feature #113469 (Remove default_free_fn feature)
additional io::copy specializations #113493 (additional io::copy specializations)

r? @ghost
@rustbot modify labels: rollup

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

- copying from `&[u8]` and `VecDeque<u8>` - copying to `Vec<u8>`

Signed-off-by: hi-rustin <rustin.liu@gmail.com>

Always name the return place. MIR opts more and more consider `_0` as just another local, so there is no point in keeping the special case in debug-info logic.

…std, r=Mark-Simulacrum Add Tests for native wasm exceptions ### Motivation In PR rust-lang#111322, I added support for native WASM exceptions. I was asked by ``@davidtwco`` to add some tests for it in a follow up PR, which seems like a very good idea. This PR adds three tests for this feature: * codegen: ensure the correct LLVM instructions are used * assembly: ensure the correct WASM instructions are used * run-make: ensure the exception handling works; the WASM code is run using a small nodejs script which demonstrates the exception handling ### Complications There are a few changes beside adding the tests, which were necessary * Tests for the wasm32-unknown-unknown target are (as far as I know) only run on `test-various`. Its docker image uses nodejs-15, which is very old. Experimental support for wasm-exceptions was added in nodejs16. In nodejs 18.12 (LTS), they are stable. - --> increase nodejs to 18.12 in `test-various` * codegen/assembly tests are not performed for the wasm32-unknown-unknown target yet - --> add those to `test-various` as well Due to the last point, some tests are run which have not run before (assembly+codegen tests for wasm32-unknown-unknown). I added `// ignore wasm32-bare` for those which failed ### Local testing I run all tests locally using both `test-various` and `wasm32`. As far as I know, none of the other systems run any test for wasm32 targets.

…r=Kobzol Use String or Int to set the opt level Address https://github.com/rust-lang/rust/pull/112756/files#r1249345725 Use String or Int to set the opt level. r? ``@jyn514``

…anieu Remove `default_free_fn` feature Closes rust-lang#73014 r? ``@Amanieu``

…Simulacrum additional io::copy specializations - copying from `&[u8]` and `VecDeque<u8>` - copying to `Vec<u8>` A user on reddit [mentioned they saw a performance drop](https://www.reddit.com/r/rust/comments/14shv9f/comment/jr0bg6j/?context=3) when copying from a slice.

matthiaskrgr · 2023-07-09T14:33:51Z

@bors r+ rollup=never p=5

bors · 2023-07-09T14:33:53Z

📌 Commit 205ae16 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-07-09T16:07:04Z

⌛ Testing commit 205ae16 with merge a9eba8d...

bors · 2023-07-09T18:41:26Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing a9eba8d to master...

rust-timer · 2023-07-09T18:42:51Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#111618	Always name the return place.	`1ff55153e28e5bd87e9b50048e2fa69832e8925d` (link)
#113247	Add Tests for native wasm exceptions	`4cdb66ce10eff5258888dcd568f12fabc704fc3b` (link)
#113273	Use String or Int to set the opt level	`96d5a56ef3450fe6a721de5d7806464998b18ecd` (link)
#113469	Remove `default_free_fn` feature	`0a687574b9fe99803f51e869c4d0e514024236e4` (link)
#113493	additional io::copy specializations	`303fb317e843fae51e54a4b72960c5baaba9644b` (link)

previous master: b12ff66f2c

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 · 2023-07-09T19:57:44Z

Finished benchmarking commit (a9eba8d): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was 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)	-4.4%	[-4.4%, -4.4%]	1
All ❌✅ (primary)	-	-	0

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)	2.4%	[2.3%, 2.4%]	2
Improvements ✅ (primary)	-2.1%	[-2.1%, -2.1%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.1%	[-2.1%, -2.1%]	1

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)	2.2%	[2.2%, 2.2%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.6%	[-3.7%, -2.0%]	3
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 657.878s -> 657.324s (-0.08%)

mirkootter and others added 14 commits July 1, 2023 20:24

add codegen-test: wasm-exceptions

db76154

add assembly-test: wasm-exceptions

65aeac6

test-various: update nodejs to 18.12 (LTS)

6144130

add run-make test for wasm-exceptions

211946c

test-various: run codegen and assembly tests

a0bd381

Remove default_free_fn feature

a088e79

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

Always name the return place.

d7983a2

additional io::copy specializations

6f8ba51

- copying from `&[u8]` and `VecDeque<u8>` - copying to `Vec<u8>`

Use String or Int to set the opt level

92b5d0c

Signed-off-by: hi-rustin <rustin.liu@gmail.com>

Rollup merge of rust-lang#111618 - cjgillot:name-return-place, r=tmiasko

4406a92

Always name the return place. MIR opts more and more consider `_0` as just another local, so there is no point in keeping the special case in debug-info logic.

Rollup merge of rust-lang#113273 - hi-rustin:rustin-patch-opt-level, …

a46589f

…r=Kobzol Use String or Int to set the opt level Address https://github.com/rust-lang/rust/pull/112756/files#r1249345725 Use String or Int to set the opt level. r? ``@jyn514``

Rollup merge of rust-lang#113469 - JohnTitor:rm-default-free-fn, r=Am…

ec479ba

…anieu Remove `default_free_fn` feature Closes rust-lang#73014 r? ``@Amanieu``

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 Jul 9, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 9, 2023

bors merged commit a9eba8d into rust-lang:master Jul 9, 2023

rustbot added this to the 1.73.0 milestone Jul 9, 2023

matthiaskrgr deleted the rollup-xzrp4nt branch March 16, 2024 18:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 5 pull requests #113508

Rollup of 5 pull requests #113508

Uh oh!

matthiaskrgr commented Jul 9, 2023

Uh oh!

matthiaskrgr commented Jul 9, 2023

Uh oh!

bors commented Jul 9, 2023

Uh oh!

bors commented Jul 9, 2023

Uh oh!

bors commented Jul 9, 2023

Uh oh!

rust-timer commented Jul 9, 2023

Uh oh!

rust-timer commented Jul 9, 2023

Uh oh!

Uh oh!

Rollup of 5 pull requests #113508

Rollup of 5 pull requests #113508

Uh oh!

Conversation

matthiaskrgr commented Jul 9, 2023

Uh oh!

matthiaskrgr commented Jul 9, 2023

Uh oh!

bors commented Jul 9, 2023

Uh oh!

bors commented Jul 9, 2023

Uh oh!

bors commented Jul 9, 2023

Uh oh!

rust-timer commented Jul 9, 2023

Uh oh!

rust-timer commented Jul 9, 2023

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!