Rollup of 7 pull requests #113484

matthiaskrgr · 2023-07-08T13:49:48Z

Successful merges:

Enable zlib in LLVM on aarch64-apple-darwin #112931 (Enable zlib in LLVM on aarch64-apple-darwin)
tests: unset RUSTC_LOG_COLOR in a test #113158 (tests: unset RUSTC_LOG_COLOR in a test)
CI: include workflow name in concurrency group #113173 (CI: include workflow name in concurrency group)
Reveal opaques in new solver #113335 (Reveal opaques in new solver)
CGU formation tweaks #113390 (CGU formation tweaks)
Structurally normalize again for byte string lit pat checking #113399 (Structurally normalize again for byte string lit pat checking)
Add basic types to SMIR #113412 (Add basic types to SMIR)

r? @ghost
@rustbot modify labels: rollup

Setting `RUSTC_LOG_COLOR=always` is sometimes useful if tools that one pipes `RUSTC_LOG` into support coloured output, but it makes this test fail. Signed-off-by: David Wood <[email protected]>

Currently, this won't change anything, because we only have one relevant workflow (`CI`), but for future proofing we should probably include the workflow name in the concurrency group.

It's nicer this way.

It's needless verbosity.

Enable zlib in LLVM on aarch64-apple-darwin Works on macOS 13.4, Xcode version 14.3.1.0.1.1683849156 This was disabled in rust-lang#75500 on Apple Silicon Developer Transition Kit, but Apple appears to have fixed their zlib now

…-test, r=wesleywiser tests: unset `RUSTC_LOG_COLOR` in a test Setting `RUSTC_LOG_COLOR=always` is sometimes useful if tools that one pipes `RUSTC_LOG` into support coloured output, but it makes this test fail because it has a `.stderr` file with `WARN` log output.

…ow, r=pietroalbini CI: include workflow name in concurrency group Currently, this won't change anything, because we only have one relevant workflow (`CI`), but for future proofing we should probably include the workflow name in the concurrency group. Found by ``@klensy`` [here](rust-lang#113059 (comment)).

…new-solver, r=lcnr Reveal opaques in new solver We were testing against the wrong reveal mode 😨 Also a couple of misc commits that I don't want to really put in separate prs r? ``@lcnr``

CGU formation tweaks Minor improvements I found while trying out something bigger that didn't work out. r? ``@wesleywiser``

…at-again, r=oli-obk Structurally normalize again for byte string lit pat checking We need to structurally normalize the pointee of a match scrutinee when trying to match byte string patterns -- we used[^1] to call `structurally_resolve_type`, which errors for type vars[^2], but lcnr added `try_structurally_resolve_type`[^3] in the mean time, which is the right thing to use here since it's totally opportunistic. Fixes rust-lang/trait-system-refactor-initiative#38 [^1]: rust-lang#112428 [^2]: rust-lang#112993 [^3]: rust-lang#113086

Add basic types to SMIR Still incomplete but I think this can be merged and we can keep iterating over it. r? ``@oli-obk``

matthiaskrgr · 2023-07-08T13:50:11Z

@bors r+ rollup=never p=7

bors · 2023-07-08T13:50:13Z

📌 Commit 39f558f has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-07-08T18:37:02Z

⌛ Testing commit 39f558f with merge d1389b9...

bors · 2023-07-08T20:56:49Z

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

rust-timer · 2023-07-08T20:58:48Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#112931	Enable zlib in LLVM on aarch64-apple-darwin	`978f00ead6cb31ffabd41d70d78c57c2e55153b1` (link)
#113158	tests: unset `RUSTC_LOG_COLOR` in a test	`35c9279dfe2b9cfeac361c9c36b1c004ddc6d1e7` (link)
#113173	CI: include workflow name in concurrency group	`9d0aa27540d057257d32e8aa85ad375bee47d269` (link)
#113335	Reveal opaques in new solver	`d6042a99b4d4101b0c9e71c5fb88c7763c6bf8dc` (link)
#113390	CGU formation tweaks	`b558fcb7abf03d9a78ccf0b663e99c56f3749e21` (link)
#113399	Structurally normalize again for byte string lit pat checki…	`d80036062ce5cfb37905918f5758b19b6ea76aa5` (link)
#113412	Add basic types to SMIR	`dcc1ab93327d7dbc45a64d3cd6953b942031aec1` (link)

previous master: 4353b1ecd6

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-08T22:14:37Z

Finished benchmarking commit (d1389b9): 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

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.8%	[3.8%, 3.8%]	1
Improvements ✅ (primary)	-0.7%	[-0.7%, -0.7%]	1
Improvements ✅ (secondary)	-3.3%	[-3.6%, -3.1%]	2
All ❌✅ (primary)	-0.7%	[-0.7%, -0.7%]	1

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: 657.486s -> 656.754s (-0.11%)

cbeuw and others added 25 commits June 22, 2023 18:48

Enable zlib in LLVM on aarch64-apple-darwin

c37afcd

Bump download-ci-llvm-stamp

d43131b

tests: unset RUSTC_LOG_COLOR

181d7b4

Setting `RUSTC_LOG_COLOR=always` is sometimes useful if tools that one pipes `RUSTC_LOG` into support coloured output, but it makes this test fail. Signed-off-by: David Wood <[email protected]>

CI: include workflow name in concurrency group

f880246

Currently, this won't change anything, because we only have one relevant workflow (`CI`), but for future proofing we should probably include the workflow name in the concurrency group.

Make UsageMap::get_user_items infallible.

142075a

It's nicer this way.

Use iter() instead of iter_mut() in one place.

22d4c79

Remove the field name from MonoItemPlacement::SingleCgu.

b51169c

It's needless verbosity.

Minor comment fix.

3078e4d

Structurally normalize again for byte string lit pat checking

906d2b1

Wrap SMIR bool and tuple into a Rigid variant

284df9f

Remove an AFIT test that isn't an AFIT test

010ee7b

Mark more hanging new-solver tests

713f9bb

Normalize opaques during codegen in new solver

f55b046

Add rustc_ty_to_ty basic tests

61adcaf

Add Char ty to SMIR

73e816e

Add Int ty to SMIR

458ead4

Add Uint ty to SMIR

42eccff

Add Float ty to SMIR

9ca51b9

Rollup merge of rust-lang#113335 - compiler-errors:reveal-opaques-in-…

f3f1b03

…new-solver, r=lcnr Reveal opaques in new solver We were testing against the wrong reveal mode 😨 Also a couple of misc commits that I don't want to really put in separate prs r? ``@lcnr``

Rollup merge of rust-lang#113390 - nnethercote:cgu-tweaks, r=wesleywiser

d5b1ef9

CGU formation tweaks Minor improvements I found while trying out something bigger that didn't work out. r? ``@wesleywiser``

Rollup merge of rust-lang#113412 - spastorino:smir-types-1, r=oli-obk

39f558f

Add basic types to SMIR Still incomplete but I think this can be merged and we can keep iterating over it. r? ``@oli-obk``

rustbot added WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Jul 8, 2023

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 8, 2023

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

bors merged commit d1389b9 into rust-lang:master Jul 8, 2023

rustbot added this to the 1.72.0 milestone Jul 8, 2023

bors mentioned this pull request Jul 8, 2023

Implement a few more rvalue translation to smir #112717

Merged

matthiaskrgr deleted the rollup-goq2u0d branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests #113484

Rollup of 7 pull requests #113484

Uh oh!

matthiaskrgr commented Jul 8, 2023

Uh oh!

matthiaskrgr commented Jul 8, 2023

Uh oh!

bors commented Jul 8, 2023

Uh oh!

bors commented Jul 8, 2023

Uh oh!

bors commented Jul 8, 2023

Uh oh!

rust-timer commented Jul 8, 2023

Uh oh!

rust-timer commented Jul 8, 2023

Uh oh!

Uh oh!

Rollup of 7 pull requests #113484

Rollup of 7 pull requests #113484

Uh oh!

Conversation

matthiaskrgr commented Jul 8, 2023

Uh oh!

matthiaskrgr commented Jul 8, 2023

Uh oh!

bors commented Jul 8, 2023

Uh oh!

bors commented Jul 8, 2023

Uh oh!

bors commented Jul 8, 2023

Uh oh!

rust-timer commented Jul 8, 2023

Uh oh!

rust-timer commented Jul 8, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!