add track_caller for arith ops #114841

bvanjoi · 2023-08-15T07:23:50Z

Fixes #114814

#[track_caller] is works, r? @scottmcm

library/core/src/internal_macros.rs

scottmcm · 2023-08-15T07:40:33Z

@bors try @rust-timer queue

bors · 2023-08-15T07:40:41Z

⌛ Trying commit d766ba4dac43f02a637e5780b0f975298f90ee04 with merge cf94c6c525288cbe7b7291e6d0ecd8ddb9f28f0f...

bors · 2023-08-15T08:53:36Z

☀️ Try build successful - checks-actions
Build commit: cf94c6c525288cbe7b7291e6d0ecd8ddb9f28f0f (cf94c6c525288cbe7b7291e6d0ecd8ddb9f28f0f)

rust-timer · 2023-08-15T11:05:39Z

Finished benchmarking commit (cf94c6c525288cbe7b7291e6d0ecd8ddb9f28f0f): comparison URL.

Overall result: ❌ regressions - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -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.6%	[0.4%, 0.7%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.1%]	1
All ❌✅ (primary)	-	-	0

Cycles

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

Binary size

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

Bootstrap: 631.44s -> 633.211s (0.28%)
Artifact size: 346.64 MiB -> 346.61 MiB (-0.01%)

apiraino · 2023-10-05T10:46:23Z

think I can remove T-compiler from the review of this PR

@rustbot label -T-compiler

workingjubilee · 2023-10-06T04:44:21Z

Looks like this is no longer just div and mod? Can we have the PR description/title updated?

scottmcm · 2023-10-06T06:25:12Z

library/core/src/ops/arith.rs

@@ -194,6 +195,7 @@ pub trait Sub<Rhs = Self> {
    /// assert_eq!(12 - 1, 11);
    /// ```
    #[must_use = "this returns the result of the operation, without modifying the original"]
+    #[track_caller]


Hmm, @bvanjoi, can you remind me why this is best on the trait here, rather than on the implementation that has the #[rustc_inherit_overflow_checks]? (Like the one at line 212 below.)

It's not clear to me that we should force this on everyone's Sub::sub.

As I recall, placing it here was simply a means to reduce some of the code

Like the one at line 212 below.

Thank you for your reminder. I agree that it forms a better approach.

scottmcm · 2023-10-06T06:26:06Z

Since this was updated since the last run, let's double-check perf here:
@bors try @rust-timer queue

bors · 2023-10-06T06:27:19Z

⌛ Trying commit 28b88c9 with merge a18f635...

fix: add track_caller attr for div and mod Fixes rust-lang#114814 `#[track_caller]` is works, r? `@scottmcm`

bors · 2023-10-06T07:39:35Z

☀️ Try build successful - checks-actions
Build commit: a18f635 (a18f63521ab8c04741ecb96b8cd93398b1b96e55)

rust-timer · 2023-10-06T09:49:32Z

Finished benchmarking commit (a18f635): comparison URL.

Overall result: ❌ regressions - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -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.3%	[0.3%, 0.3%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
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)	1.1%	[1.1%, 1.1%]	1
Regressions ❌ (secondary)	1.4%	[1.4%, 1.4%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.1%	[1.1%, 1.1%]	1

Cycles

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

Binary size

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

Bootstrap: 624.133s -> 624.61s (0.08%)
Artifact size: 270.63 MiB -> 270.68 MiB (0.02%)

add track_caller for arith ops Fixes rust-lang#114814 `#[track_caller]` is works, r? ``@scottmcm``

scottmcm · 2023-11-18T05:18:39Z

Since it looks like there hasn't been a change since one of the new tests in this failed in #114841 (comment)

@bors r-

scottmcm · 2023-11-18T05:19:19Z

Re-rolling as I took myself off the libcore rotation,
r? libs

bvanjoi · 2023-11-23T17:32:53Z

I've added ignore-wasm32 test header in the latest patch. @rustbot ready

cuviper · 2023-11-28T23:20:34Z

@bors r+ rollup=never
(making sure we test its perf again after landing)

bors · 2023-11-28T23:20:37Z

📌 Commit fc87d6e has been approved by cuviper

It is now in the queue for this repository.

bors · 2023-11-29T00:47:29Z

⌛ Testing commit fc87d6e with merge b1e56de...

bors · 2023-11-29T02:44:30Z

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing b1e56de to master...

bors · 2023-11-29T02:44:30Z

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing b1e56de to master...

rust-timer · 2023-11-29T06:05:23Z

Finished benchmarking commit (b1e56de): 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.3%	[0.2%, 0.4%]	6
Regressions ❌ (secondary)	0.7%	[0.2%, 1.3%]	12
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.2%	[-0.3%, -0.2%]	3
All ❌✅ (primary)	0.3%	[0.2%, 0.4%]	6

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)	1.8%	[1.7%, 1.9%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

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

Binary size

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

Bootstrap: 672.968s -> 673.535s (0.08%)
Artifact size: 313.36 MiB -> 313.39 MiB (0.01%)

cuviper · 2023-11-29T16:32:50Z

IMO, the perf loss is unfortunate but pretty minor, especially weighed against the diagnostic gain.

lqd · 2023-11-29T16:35:30Z

Also it's mostly in rustdoc, and the one debug benchmark affected looks a bit noisy.

lqd · 2023-11-29T17:01:06Z

@rustbot label: +perf-regression-triaged

:3

rustbot assigned scottmcm Aug 15, 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Aug 15, 2023

scottmcm reviewed Aug 15, 2023

View reviewed changes

library/core/src/internal_macros.rs Show resolved Hide resolved

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Aug 15, 2023

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Aug 15, 2023

bvanjoi force-pushed the fix-114814 branch from d766ba4 to cf8b020 Compare August 15, 2023 12:51

This comment has been minimized.

Sign in to view

bvanjoi force-pushed the fix-114814 branch from cf8b020 to 28b88c9 Compare August 15, 2023 13:22

rustbot removed the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 5, 2023

scottmcm reviewed Oct 6, 2023

View reviewed changes

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 6, 2023

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 6, 2023

Auto merge of rust-lang#114841 - bvanjoi:fix-114814, r=<try>

a18f635

fix: add track_caller attr for div and mod Fixes rust-lang#114814 `#[track_caller]` is works, r? `@scottmcm`

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 6, 2023

Dylan-DPC removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 5, 2023

TaKO8Ki added a commit to TaKO8Ki/rust that referenced this pull request Nov 9, 2023

Rollup merge of rust-lang#114841 - bvanjoi:fix-114814, r=scottmcm

e923f69

add track_caller for arith ops Fixes rust-lang#114814 `#[track_caller]` is works, r? ``@scottmcm``

TaKO8Ki mentioned this pull request Nov 9, 2023

Rollup of 11 pull requests #117735

Closed

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 18, 2023

rustbot assigned cuviper and unassigned scottmcm Nov 18, 2023

add track_caller for arith ops

fc87d6e

bvanjoi force-pushed the fix-114814 branch from dcaee27 to fc87d6e Compare November 23, 2023 16:54

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 Nov 23, 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 Nov 28, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 29, 2023

bors merged commit b1e56de into rust-lang:master Nov 29, 2023
12 checks passed

rustbot added this to the 1.76.0 milestone Nov 29, 2023

rustbot added the perf-regression-triaged The performance regression has been triaged. label Nov 29, 2023

rust-lang deleted a comment from rustbot Nov 29, 2023

NCGThompson mentioned this pull request Jan 7, 2024

Many functions with rustc_inherit_overflow_checks should also have track_caller #119682

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add track_caller for arith ops #114841

add track_caller for arith ops #114841

bvanjoi commented Aug 15, 2023

scottmcm commented Aug 15, 2023

This comment has been minimized.

bors commented Aug 15, 2023

bors commented Aug 15, 2023

This comment has been minimized.

rust-timer commented Aug 15, 2023

This comment has been minimized.

apiraino commented Oct 5, 2023

workingjubilee commented Oct 6, 2023

scottmcm Oct 6, 2023

bvanjoi Oct 6, 2023

scottmcm commented Oct 6, 2023

This comment has been minimized.

bors commented Oct 6, 2023

bors commented Oct 6, 2023

This comment has been minimized.

rust-timer commented Oct 6, 2023

scottmcm commented Nov 18, 2023

scottmcm commented Nov 18, 2023

bvanjoi commented Nov 23, 2023

cuviper commented Nov 28, 2023

bors commented Nov 28, 2023

bors commented Nov 29, 2023

bors commented Nov 29, 2023

bors commented Nov 29, 2023

rust-timer commented Nov 29, 2023

cuviper commented Nov 29, 2023

lqd commented Nov 29, 2023

lqd commented Nov 29, 2023

add track_caller for arith ops #114841

add track_caller for arith ops #114841

Conversation

bvanjoi commented Aug 15, 2023

scottmcm commented Aug 15, 2023

This comment has been minimized.

bors commented Aug 15, 2023

bors commented Aug 15, 2023

This comment has been minimized.

rust-timer commented Aug 15, 2023

Overall result: ❌ regressions - no action needed

This comment has been minimized.

apiraino commented Oct 5, 2023

workingjubilee commented Oct 6, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

scottmcm commented Oct 6, 2023

This comment has been minimized.

bors commented Oct 6, 2023

bors commented Oct 6, 2023

This comment has been minimized.

rust-timer commented Oct 6, 2023

Overall result: ❌ regressions - no action needed

scottmcm commented Nov 18, 2023

scottmcm commented Nov 18, 2023

bvanjoi commented Nov 23, 2023

cuviper commented Nov 28, 2023

bors commented Nov 28, 2023

bors commented Nov 29, 2023

bors commented Nov 29, 2023

bors commented Nov 29, 2023

rust-timer commented Nov 29, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

cuviper commented Nov 29, 2023

lqd commented Nov 29, 2023

lqd commented Nov 29, 2023