Rollup of 8 pull requests #128796

matthiaskrgr · 2024-08-07T18:28:21Z

Successful merges:

Add implied target features to target_feature attribute #128221 (Add implied target features to target_feature attribute)
impl Default for collection iterators that don't already have it #128261 (impl Default for collection iterators that don't already have it)
Change generate-copyright to generate HTML, with cargo dependencies included #128353 (Change generate-copyright to generate HTML, with cargo dependencies included)
codegen: better centralize function declaration attribute computation #128679 (codegen: better centralize function declaration attribute computation)
make import.vis is immutable #128732 (make import.vis is immutable)
Integrate crlf directly into related test file instead via of .gitattributes #128755 (Integrate crlf directly into related test file instead via of .gitattributes)
rustc_codegen_ssa: Set architecture for object crate for 32-bit SPARC #128772 (rustc_codegen_ssa: Set architecture for object crate for 32-bit SPARC)
unused_parens: do not lint against parens around &raw #128782 (unused_parens: do not lint against parens around &raw)

r? @ghost
@rustbot modify labels: rollup

This tool now scans for cargo dependencies and includes any important looking license files. We do this because cargo package metadata is not sufficient - the Apache-2.0 license says you have to include any NOTICE file, for example. And authors != copyright holders (cargo has the former, we must include the latter).

This format works better with large amounts of structured data. We also mark which deps are in the stdlib

I can't find a way to derive rinja::Template for Node - I think because it is a recursive type. So I rendered it manually using html_escape.

…ributes

…ling tests

Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>

The object crate was recently updated to recognize the 32-bit SPARC ELF targets EM_SPARC and EM_SPARC32PLUS, so the proper architecture for 32-bit SPARC can now be set in rustc_codegen_ssa.

Integrate crlf directly into related test file instead via of .gitattributes resolves rust-lang#128708 This PR seeks to resolve a contributor papercut when using jj to manage the git repo locally which does not support .gitattributes. It does so by integrating the crlf characters directly into the related test and disabling Git's end of line normalization logic across platforms for that specific file, instead of configuring git to always check out the files with alternative eol characters. related documentation: https://git-scm.com/docs/gitattributes#Documentation/gitattributes.txt-Unset-1

rustc_codegen_ssa: Set architecture for object crate for 32-bit SPARC The `object` crate was recently updated to recognize the 32-bit SPARC ELF targets `EM_SPARC` and `EM_SPARC32PLUS`, so the proper architecture for 32-bit SPARC can now be set in `rustc_codegen_ssa`. r? nagisa

…piler-errors unused_parens: do not lint against parens around &raw Requested by `@tmandry` in rust-lang#127679: with `&raw` one somewhat regularly has to write code like `(&raw const (*myptr).field).method()`, so parentheses around the expression are often required. To avoid churn between adding and removing parentheses as method calls appear and disappear, the proposal was made to silence the lint for unnecessary parentheses around `&raw` expressions. This PR implements that.

matthiaskrgr · 2024-08-07T18:28:40Z

@bors r+ rollup=never p=8

bors · 2024-08-07T18:28:43Z

📌 Commit aba506b has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-08-07T20:00:33Z

⌛ Testing commit aba506b with merge 8b38707...

bors · 2024-08-07T22:29:22Z

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

rust-timer · 2024-08-07T22:31:37Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#128221	Add implied target features to target_feature attribute	`de1e144cf6c9d2c4865e408a02417083da628d50` (link)
#128261	impl `Default` for collection iterators that don't already …	`2daf9a28d736c575cbcf85d079f3b7463e7bcfca` (link)
#128353	Change generate-copyright to generate HTML, with cargo depe…	`68ea2b2ddc1b8521f90bbb4b77874eef86776526` (link)
#128679	codegen: better centralize function declaration attribute c…	`f63e94bc21c971bd3dffe23472889a30baa33b6b` (link)
#128732	make `import.vis` is immutable	`f2b31805fbd92536329ebdc2894b5f16646aa0df` (link)
#128755	Integrate crlf directly into related test file instead via …	`2ba77daabe91d24ebf33f083434b58c000c5eaac` (link)
#128772	rustc_codegen_ssa: Set architecture for object crate for 32…	`929bc92fbf6d034cb882f3c190b7a78883c923b1` (link)
#128782	unused_parens: do not lint against parens around &raw	`87fe8aec0926d19ab7247ce68076a30956ff9fba` (link)

previous master: ce20e15f01

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 · 2024-08-08T02:34:22Z

Finished benchmarking commit (8b38707): comparison URL.

Overall result: ❌ regressions - 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)	4.3%	[4.3%, 4.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary -1.4%, secondary 2.4%)

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.1%	[1.7%, 3.8%]	5
Improvements ✅ (primary)	-1.4%	[-1.4%, -1.4%]	1
Improvements ✅ (secondary)	-1.2%	[-1.2%, -1.2%]	1
All ❌✅ (primary)	-1.4%	[-1.4%, -1.4%]	1

Cycles

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

Binary size

Results (primary 0.0%)

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.0%	[0.0%, 0.0%]	3
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.0%	[0.0%, 0.0%]	3

Bootstrap: 760.891s -> 761.836s (0.12%)
Artifact size: 336.96 MiB -> 336.98 MiB (0.00%)

Enabling a tied feature should not enable the other feature automatically. This was fixed by something in rust-lang#128796, probably rust-lang#128221 or rust-lang#128679.

…n, r=wesleywiser codegen_ssa: consolidate tied target checks Fixes rust-lang#105110. Fixes rust-lang#105111. `rustc_codegen_llvm` and `rustc_codegen_gcc` duplicated logic for checking if tied target features were partially enabled. This PR consolidates these checks into `rustc_codegen_ssa` in the `codegen_fn_attrs` query, which also is run pre-monomorphisation for each function, which ensures that this check is run for unused functions, as would be expected. Also adds a test confirming that enabling one tied feature doesn't imply another - the appropriate error for this was already being emitted. I did a bisect and narrowed it down to two patches it was likely to be - something in rust-lang#128796, probably rust-lang#128221 or rust-lang#128679.

Rollup merge of rust-lang#130308 - davidtwco:tied-target-consolidation, r=wesleywiser codegen_ssa: consolidate tied target checks Fixes rust-lang#105110. Fixes rust-lang#105111. `rustc_codegen_llvm` and `rustc_codegen_gcc` duplicated logic for checking if tied target features were partially enabled. This PR consolidates these checks into `rustc_codegen_ssa` in the `codegen_fn_attrs` query, which also is run pre-monomorphisation for each function, which ensures that this check is run for unused functions, as would be expected. Also adds a test confirming that enabling one tied feature doesn't imply another - the appropriate error for this was already being emitted. I did a bisect and narrowed it down to two patches it was likely to be - something in rust-lang#128796, probably rust-lang#128221 or rust-lang#128679.

clarfonthey and others added 30 commits July 27, 2024 02:04

impl Default for collection iterators that don't already have it

50835bf

Okay, I guess I have to give these a different feature name

0b99720

generate-copyright: Produce HTML, not Markdown

204e3ea

This format works better with large amounts of structured data. We also mark which deps are in the stdlib

generate-copyright: Fix typo

56f8479

generate-copyright: use cargo-metadata

dbab595

generate-copyright: use rinja to format the output

f7e6bf6

I can't find a way to derive rinja::Template for Node - I think because it is a recursive type. So I rendered it manually using html_escape.

REUSE.toml: Copyright text isn't parsed as Markdown.

37ab090

generate-copyright: Render Node with rinja too.

30ac7c9

generate-copyright: gather files inside interesting folders

5277b67

Update to rinja 0.3

4e24e9b

Apparently library/std is now part of a workspace at library/

99579f3

Integrate crlf directly into related test file instead via of .gitatt…

b174cf8

…ributes

Add implied target features to target_feature attribute

74653b6

Add test to ensure implied target features work with asm, and fix fai…

22c5952

…ling tests

Fix codegen tests

520a5a5

Add missing features

c866e1f

Add +sse4.2 due to rust-lang#128426

34f29a2

Bless tests

3c48f65

Refactor and fill out target feature lists

fbd618d

Don't use LLVM's target features

484aca8

Don't use LLVM to compute -Ctarget-feature

a25da07

Remove redundant implied features

5006711

Add implied features to non-target-feature functions

6b96a60

Hide implicit target features from diagnostics when possible

83276f5

Fix typo

0b98a0c

Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>

Disallow enabling features without their implied features

8818c95

rustc_codegen_ssa: Set architecture for object crate for 32-bit SPARC

d1d21ed

The object crate was recently updated to recognize the 32-bit SPARC ELF targets EM_SPARC and EM_SPARC32PLUS, so the proper architecture for 32-bit SPARC can now be set in rustc_codegen_ssa.

unused_parens: do not lint against parens around &raw

c189796

make import.vis is not mutable

8c06dc4

matthiaskrgr added 3 commits August 7, 2024 20:28

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 Aug 7, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 7, 2024

bors merged commit 8b38707 into rust-lang:master Aug 7, 2024
7 checks passed

rustbot added this to the 1.82.0 milestone Aug 7, 2024

matthiaskrgr deleted the rollup-r7l68ph branch September 1, 2024 17:36

davidtwco mentioned this pull request Sep 13, 2024

codegen_ssa: consolidate tied target checks #130308

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #128796

Rollup of 8 pull requests #128796

matthiaskrgr commented Aug 7, 2024

matthiaskrgr commented Aug 7, 2024

bors commented Aug 7, 2024

bors commented Aug 7, 2024

bors commented Aug 7, 2024

rust-timer commented Aug 7, 2024

rust-timer commented Aug 8, 2024

Rollup of 8 pull requests #128796

Rollup of 8 pull requests #128796

Conversation

matthiaskrgr commented Aug 7, 2024

matthiaskrgr commented Aug 7, 2024

bors commented Aug 7, 2024

bors commented Aug 7, 2024

bors commented Aug 7, 2024

rust-timer commented Aug 7, 2024

rust-timer commented Aug 8, 2024

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size