Trivial tweaks to stop tracking source span directly #139466

compiler-errors · 2025-04-07T05:06:20Z

Firstly, remove some unnecessary work from sccs_info. This included debug printing which ends up giving all mir borrowck queries a dependency edge from the query to source_span (I think?).

Secondly, turn some calls from hir_span (which does some span adjustment, and thus incurs span tracking, which causes a dependency edge from the query to source_span) to def_span, which should cache better.

r? oli-obk

compiler-errors · 2025-04-07T05:06:26Z

@bors try @rust-timer queue

…g, r=<try> Trivial tweaks to stop tracking source span directly Firstly, remove some unnecessary work from `sccs_info`. This included debug printing which ends up giving all mir borrowck queries a dependency edge from the query to `source_span` (I think?). Secondly, turn some calls from `hir_span` (which does some span adjustment, and thus incurs span tracking, which causes a dependency edge from the query to `source_span`) to `def_span`, which should cache better. r? oli-obk

bors · 2025-04-07T05:07:37Z

⌛ Trying commit d111aa8 with merge 47db507...

bors · 2025-04-07T07:15:31Z

☀️ Try build successful - checks-actions
Build commit: 47db507 (47db5075883eb8eac7fb87ff8cc5efda6a7407e3)

rust-timer · 2025-04-07T09:45:56Z

Finished benchmarking commit (47db507): comparison URL.

Overall result: ✅ improvements - 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 the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.2%	[-0.2%, -0.2%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.2%	[-0.2%, -0.2%]	1

Max RSS (memory usage)

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

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: 779.04s -> 776.708s (-0.30%)
Artifact size: 365.93 MiB -> 365.92 MiB (-0.00%)

oli-obk · 2025-04-07T10:10:14Z

@bors r+ rollup

bors · 2025-04-07T10:10:17Z

📌 Commit d111aa8 has been approved by oli-obk

It is now in the queue for this repository.

…ing, r=oli-obk Trivial tweaks to stop tracking source span directly Firstly, remove some unnecessary work from `sccs_info`. This included debug printing which ends up giving all mir borrowck queries a dependency edge from the query to `source_span` (I think?). Secondly, turn some calls from `hir_span` (which does some span adjustment, and thus incurs span tracking, which causes a dependency edge from the query to `source_span`) to `def_span`, which should cache better. r? oli-obk

Rollup of 8 pull requests Successful merges: - rust-lang#138603 (Report line number of test when should_panic test failed) - rust-lang#139035 (Add new `PatKind::Missing` variants) - rust-lang#139112 (Implement `super let`) - rust-lang#139365 (Default auto traits: fix perf) - rust-lang#139397 (coverage: Build the CGU's global file table as late as possible) - rust-lang#139455 ( Remove support for `extern "rust-intrinsic"` blocks) - rust-lang#139461 (Stop calling `source_span` query in significant drop order code) - rust-lang#139466 (Trivial tweaks to stop tracking source span directly) r? `@ghost` `@rustbot` modify labels: rollup

lqd · 2025-04-07T11:33:04Z

compiler/rustc_borrowck/src/region_infer/mod.rs

@@ -327,11 +327,13 @@ fn sccs_info<'tcx>(infcx: &BorrowckInferCtxt<'tcx>, sccs: &ConstraintSccs) {
    let mut var_to_origin_sorted = var_to_origin.clone().into_iter().collect::<Vec<_>>();


btw, the sorted vec is also only used for the debug! call.

Note that sccs_info is not called in prod, it's under a cfg!(debug_assertions). I guess you could switch that to check the log level instead (or inline it there) to make it clearer.

ugh, so i was only hitting this bc of my own debug assertions being enabled; i should've looked lol

Rollup of 9 pull requests Successful merges: - rust-lang#139035 (Add new `PatKind::Missing` variants) - rust-lang#139108 (Simplify `thir::PatKind::ExpandedConstant`) - rust-lang#139112 (Implement `super let`) - rust-lang#139365 (Default auto traits: fix perf) - rust-lang#139397 (coverage: Build the CGU's global file table as late as possible) - rust-lang#139455 ( Remove support for `extern "rust-intrinsic"` blocks) - rust-lang#139461 (Stop calling `source_span` query in significant drop order code) - rust-lang#139465 (add sret handling for scalar autodiff) - rust-lang#139466 (Trivial tweaks to stop tracking source span directly) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#139466 - compiler-errors:trivial-incr-tainting, r=oli-obk Trivial tweaks to stop tracking source span directly Firstly, remove some unnecessary work from `sccs_info`. This included debug printing which ends up giving all mir borrowck queries a dependency edge from the query to `source_span` (I think?). Secondly, turn some calls from `hir_span` (which does some span adjustment, and thus incurs span tracking, which causes a dependency edge from the query to `source_span`) to `def_span`, which should cache better. r? oli-obk

Trivial tweaks to stop tracking source span directly

d111aa8

rustbot assigned oli-obk Apr 7, 2025

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 Apr 7, 2025

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 Apr 7, 2025

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 Apr 7, 2025

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 Apr 7, 2025

Zalathar mentioned this pull request Apr 7, 2025

Rollup of 8 pull requests #139478

Closed

lqd reviewed Apr 7, 2025

View reviewed changes

Zalathar mentioned this pull request Apr 7, 2025

Rollup of 9 pull requests #139482

Merged

bors merged commit 6e0b674 into rust-lang:master Apr 7, 2025
7 checks passed

rustbot added this to the 1.88.0 milestone Apr 7, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Trivial tweaks to stop tracking source span directly #139466

Trivial tweaks to stop tracking source span directly #139466

compiler-errors commented Apr 7, 2025

compiler-errors commented Apr 7, 2025

This comment has been minimized.

bors commented Apr 7, 2025

bors commented Apr 7, 2025

This comment has been minimized.

rust-timer commented Apr 7, 2025

oli-obk commented Apr 7, 2025

bors commented Apr 7, 2025

lqd Apr 7, 2025 •

edited

Loading

compiler-errors Apr 7, 2025

		@@ -327,11 +327,13 @@ fn sccs_info<'tcx>(infcx: &BorrowckInferCtxt<'tcx>, sccs: &ConstraintSccs) {
		let mut var_to_origin_sorted = var_to_origin.clone().into_iter().collect::<Vec<_>>();

Trivial tweaks to stop tracking source span directly #139466

Trivial tweaks to stop tracking source span directly #139466

Conversation

compiler-errors commented Apr 7, 2025

compiler-errors commented Apr 7, 2025

This comment has been minimized.

bors commented Apr 7, 2025

bors commented Apr 7, 2025

This comment has been minimized.

rust-timer commented Apr 7, 2025

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

oli-obk commented Apr 7, 2025

bors commented Apr 7, 2025

lqd Apr 7, 2025 • edited Loading

Choose a reason for hiding this comment

compiler-errors Apr 7, 2025

Choose a reason for hiding this comment

lqd Apr 7, 2025 •

edited

Loading