large_assignments: Lint on specific large args passed to functions #116520

Enselic · 2023-10-07T16:54:14Z

Requires lowering function call arg spans down to MIR, which is done in the second commit.

Part of #83518

Also see

r? @oli-obk (E-mentor)

rustbot · 2023-10-07T16:54:23Z

This PR changes MIR

cc @oli-obk, @RalfJung, @JakobDegen, @davidtwco, @celinval, @vakaras

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

oli-obk

I only reviewed the first commit. I don't understand why you needed to change HIR types to be !Copy. Is that a leftover from previous experimentation adding such a Vec to the HIR?

compiler/rustc_middle/src/thir.rs

compiler/rustc_middle/src/mir/syntax.rs

Enselic · 2023-10-14T04:22:45Z

Looks like I need to bless 309 mir-opt tests to make CI pass. To not make the diff too noisy, would you mind doing a code review of the first commit before I bless tests? Am I on the right track?

@rustbot ready

oli-obk

I did write a review last night but seem to have fallen asleep while doing so.

None of this is important or even nits you must address, pick what you like

I like how it works now

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

compiler/rustc_codegen_ssa/src/mir/block.rs

compiler/rustc_mir_build/src/build/custom/parse/instruction.rs

compiler/rustc_borrowck/src/lib.rs

oli-obk · 2023-10-14T06:46:45Z

Ah, I think we shouldn't bless the mir opt tests. Instead change the mir printing logic to skip the Spanned and directly print the Operand

Enselic · 2023-10-14T08:20:54Z

@RalfJung Do you think this (Spanned<Operand>>) looks good? If both you and @oli-obk likes it, wouldn't it be nice to later make a PR that changes TerminatorKind::Drop from

func: Operand<'tcx>,
fn_span: Span,
...

to

func: Spanned<Operand<'tcx>>,
...

? I would be happy to do that later if you want it done.

Enselic · 2023-10-14T08:21:34Z

Instead change the mir printing logic to skip the Spanned and directly print the Operand

Done!

RalfJung · 2023-10-14T08:29:17Z

The change in compiler/rustc_middle/src/mir/syntax.rs LGTM, assuming this doesn't cost too much perf. We should do a perf run before landing. Let me know when you're ready for that, I can tell the bots to do it.

wouldn't it be nice to later make a PR that changes TerminatorKind::Drop

No strong opinion, but sure, why not. :)
We can even almost make ConstOperand just a Spanned<Const>, but sadly there's this user_ty field getting in the way...

compiler/rustc_codegen_cranelift/src/abi/mod.rs

compiler/rustc_monomorphize/src/collector.rs

To enable improved accuracy of diagnostics in upcoming commits.

Enselic · 2024-01-16T05:16:37Z

👍 @bors r=@oli-obk

bors · 2024-01-16T05:16:39Z

📌 Commit 8f440f0 has been approved by oli-obk

It is now in the queue for this repository.

large_assignments: Lint on specific large args passed to functions Requires lowering function call arg spans down to MIR, which is done in the second commit. Part of rust-lang#83518 Also see * https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/arg.20Spans.20for.20TerminatorKind.3A.3ACall.3F * https://rust-lang.zulipchat.com/#narrow/stream/122651-general/topic/move_size_limit.20lint r? `@oli-obk` (E-mentor)

bors · 2024-01-16T07:17:39Z

⌛ Testing commit 8f440f0 with merge 7d98bab...

bors · 2024-01-16T11:32:39Z

💥 Test timed out

rust-log-analyzer · 2024-01-16T11:34:58Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

oli-obk · 2024-01-16T16:07:27Z

@bors retry apple timeout

bors · 2024-01-16T19:33:18Z

⌛ Testing commit 8f440f0 with merge 92f2e0a...

bors · 2024-01-16T21:34:49Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 92f2e0a to master...

rust-timer · 2024-01-16T23:50:23Z

Finished benchmarking commit (92f2e0a): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

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

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.4%	[0.2%, 0.8%]	45
Regressions ❌ (secondary)	0.6%	[0.2%, 2.1%]	8
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-6.0%	[-6.0%, -6.0%]	1
All ❌✅ (primary)	0.4%	[0.2%, 0.8%]	45

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)	1.6%	[1.1%, 2.1%]	3
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.4%	[-2.4%, -2.3%]	2
Improvements ✅ (secondary)	-3.0%	[-4.5%, -1.8%]	4
All ❌✅ (primary)	-0.0%	[-2.4%, 2.1%]	5

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

Binary size

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

Bootstrap: 663.55s -> 663.149s (-0.06%)
Artifact size: 308.22 MiB -> 308.26 MiB (0.01%)

oli-obk · 2024-01-17T09:02:19Z

This regression is expected.

We are tracking more spans in order to be able to produce correct diagnostics. We expect to be using this information more now that we have it. I do expect some improvements to be possible in borrowck errors and const prop lints

@rustbot label: +perf-regression-triaged

Fixes were done to address the following upstream changes: - rust-lang/rust#119606 - rust-lang/rust#119751 - rust-lang/rust#120025 - rust-lang/rust#116520 Resolves #2971 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

Make `TerminatorKind::Call::func` `Spanned` and remove `::fn_span` To get structural symmetry between `TerminatorKind::Call::func` and `TerminatorKind::Call::args`, make `func` `Spanned`, since `args` already is `Spanned`. This way we can remove the separate `fn_span` field. Doing this was briefly discussed [here](rust-lang#116520 (comment)). For easier review, this PR is split into two commits. The first commit is the actual change. The second commit just makes the code build again and is very repetitive. Can someone start a perf run of this change please?

rustbot assigned oli-obk Oct 7, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 7, 2023

oli-obk requested changes Oct 7, 2023

View reviewed changes

compiler/rustc_middle/src/thir.rs Outdated Show resolved Hide resolved

compiler/rustc_middle/src/mir/syntax.rs Outdated Show resolved Hide resolved

Enselic force-pushed the large-copy-into-fn branch 2 times, most recently from b4384b9 to 1f1bc69 Compare October 7, 2023 22:18

RalfJung reviewed Oct 7, 2023

View reviewed changes

compiler/rustc_middle/src/mir/syntax.rs Show resolved Hide resolved

Enselic added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 8, 2023

Enselic force-pushed the large-copy-into-fn branch 2 times, most recently from 748ed9c to f43309d Compare October 13, 2023 21:30

This comment has been minimized.

Sign in to view

Enselic force-pushed the large-copy-into-fn branch from f43309d to bbd139c Compare October 13, 2023 22:15

This comment has been minimized.

Sign in to view

Enselic force-pushed the large-copy-into-fn branch from bbd139c to 97f5bd1 Compare October 13, 2023 22:32

This comment has been minimized.

Sign in to view

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 14, 2023

Enselic force-pushed the large-copy-into-fn branch from 97f5bd1 to b642da8 Compare October 14, 2023 06:31

oli-obk reviewed Oct 14, 2023

View reviewed changes

This comment has been minimized.

Sign in to view

Enselic force-pushed the large-copy-into-fn branch from b642da8 to 058e557 Compare October 14, 2023 08:19

bjorn3 reviewed Oct 14, 2023

View reviewed changes

compiler/rustc_codegen_cranelift/src/abi/mod.rs Outdated Show resolved Hide resolved

bjorn3 reviewed Oct 14, 2023

View reviewed changes

compiler/rustc_monomorphize/src/collector.rs Show resolved Hide resolved

Enselic and others added 2 commits January 15, 2024 19:07

compiler: Lower fn call arg spans down to MIR

16ba56c

To enable improved accuracy of diagnostics in upcoming commits.

large_assignments: Lint on specific large args passed to functions

8f440f0

Enselic force-pushed the large-copy-into-fn branch from c15236b to 8f440f0 Compare January 15, 2024 18:23

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-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). labels Jan 16, 2024

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 16, 2024

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

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 16, 2024

bors merged commit 92f2e0a into rust-lang:master Jan 16, 2024
12 checks passed

rustbot added this to the 1.77.0 milestone Jan 16, 2024

This was referenced Jan 16, 2024

WIP: Remove ResumeTy from async lowering #107562

Draft

Only generate a single shim for clone of copy types. #119501

Draft

rustbot added the perf-regression-triaged The performance regression has been triaged. label Jan 17, 2024

celinval mentioned this pull request Jan 18, 2024

Upgrade toolchain to nightly-2024-01-17 model-checking/kani#2976

Merged

Enselic mentioned this pull request Jan 18, 2024

Make TerminatorKind::Call::func Spanned and remove ::fn_span #120114

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

large_assignments: Lint on specific large args passed to functions #116520

large_assignments: Lint on specific large args passed to functions #116520

Enselic commented Oct 7, 2023 •

edited

Loading

rustbot commented Oct 7, 2023

oli-obk left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Enselic commented Oct 14, 2023

oli-obk left a comment

This comment has been minimized.

oli-obk commented Oct 14, 2023

Enselic commented Oct 14, 2023

Enselic commented Oct 14, 2023

RalfJung commented Oct 14, 2023

Enselic commented Jan 16, 2024

bors commented Jan 16, 2024

bors commented Jan 16, 2024

bors commented Jan 16, 2024

rust-log-analyzer commented Jan 16, 2024

oli-obk commented Jan 16, 2024

bors commented Jan 16, 2024

bors commented Jan 16, 2024

rust-timer commented Jan 16, 2024

oli-obk commented Jan 17, 2024

large_assignments: Lint on specific large args passed to functions #116520

large_assignments: Lint on specific large args passed to functions #116520

Conversation

Enselic commented Oct 7, 2023 • edited Loading

rustbot commented Oct 7, 2023

oli-obk left a comment

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Enselic commented Oct 14, 2023

oli-obk left a comment

Choose a reason for hiding this comment

This comment has been minimized.

oli-obk commented Oct 14, 2023

Enselic commented Oct 14, 2023

Enselic commented Oct 14, 2023

RalfJung commented Oct 14, 2023

Enselic commented Jan 16, 2024

bors commented Jan 16, 2024

bors commented Jan 16, 2024

bors commented Jan 16, 2024

rust-log-analyzer commented Jan 16, 2024

oli-obk commented Jan 16, 2024

bors commented Jan 16, 2024

bors commented Jan 16, 2024

rust-timer commented Jan 16, 2024

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Binary size

oli-obk commented Jan 17, 2024

Enselic commented Oct 7, 2023 •

edited

Loading