Skip to content

Improve the forcing/promotion functions in DepKindVTable - #153122

Merged
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable
Mar 1, 2026
Merged

Improve the forcing/promotion functions in DepKindVTable#153122
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable

Conversation

@Zalathar

@ZalatharZalathar commented Feb 26, 2026

Copy link
Copy Markdown
Member

This is a bundle of changes to the two function pointers in DepKindVTable that are responsible for forcing dep nodes, or promoting disk-cached values from the previous session into memory.

The perf improvements to incr-unchanged and incr-patched are likely from skipping more of the “promotion” plumbing for queries that never cache to disk.

@rustbotrustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 26, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

This is not fully-baked yet, but I want to run PR CI and perf to check for unanticipated problems.

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Feb 26, 2026
Improve the forcing/promotion functions in `DepKindVTable`
@rustbotrustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
Comment threadcompiler/rustc_query_impl/src/dep_kind_vtables.rs Outdated
@rust-log-analyzer

This comment has been minimized.

@rust-bors

rust-borsBot commented Feb 26, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: dff6afa (dff6afa28aa02dfe76c0d36c5fc140333bf99233, parent: 1ed488274bec5bf5cfe6bf7a1cc089abcc4ebd68)

@rust-timer

This comment has been minimized.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (dff6afa): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-0.8%[-1.7%, -0.2%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.2%]102

Max RSS (memory usage)

Results (primary -3.7%, secondary 4.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
8.2%[8.1%, 8.2%]2
Improvements ✅
(primary)
-3.7%[-3.7%, -3.7%]1
Improvements ✅
(secondary)
-3.4%[-3.4%, -3.4%]1
All ❌✅ (primary)-3.7%[-3.7%, -3.7%]1

Cycles

Results (primary -3.1%, secondary -8.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.1%[-3.2%, -3.1%]2
Improvements ✅
(secondary)
-8.1%[-18.7%, -2.7%]7
All ❌✅ (primary)-3.1%[-3.2%, -3.1%]2

Binary size

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

Bootstrap: 492.161s -> 478.802s (-2.71%)
Artifact size: 395.78 MiB -> 397.55 MiB (0.45%)

@rustbotrustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
@Zalathar
Zalatharforce-pushed the dep-kind-vtable branch 3 times, most recently from 2aba5f0 to 3b6451eCompareFebruary 26, 2026 22:56
@Zalathar

Copy link
Copy Markdown
MemberAuthor

r? nnethercote (or compiler)

@Zalathar
Zalathar marked this pull request as ready for review February 27, 2026 01:17
@rustbotrustbot 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 Feb 27, 2026
@nnethercote

Copy link
Copy Markdown
Contributor

Fantastic perf results!

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

@bors r+

@rust-bors

rust-borsBot commented Feb 27, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 3b6451e has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Feb 27, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

Right now, GetQueryVTable is what allows DepKindVTable to not know about query key/value/cache types at all, because that knowledge is baked into the different generic instantiations of its function pointers instead.

So I currently don't see a way to usefully put a query-vtable pointer into DepKindVTable.

/// True if a key can _potentially_ be recovered from a key fingerprint
/// with this style.
///
/// For some key types, recovery is possible but not guaranteed.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems a bit misleading. Do we have any types where recovery will fail?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's possible for DefId to fail recovery, for example.

I verified this by adding a panic to the failure path of one of the try_recover_key calls, and then running x test incremental.

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 1, 2026
- `force_from_dep_node` → `force_from_dep_node_fn`
- `try_load_from_disk_cache` → `promote_from_disk_fn`
This commit also inlines the wrapper function around `promote_from_disk_fn`.
@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@Zalathar

Copy link
Copy Markdown
MemberAuthor

Rebased to fix trivial conflict.

@bors r=nnethercote

@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 08df254 has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: nnethercote
Duration: 3h 15m 52s
Pushing 28b5c1c to main...

@rust-bors
rust-borsBot merged commit 28b5c1c into rust-lang:mainMar 1, 2026
12 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 1, 2026
@github-actions

Copy link
Copy Markdown
Contributor
What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 024757f (parent) -> 28b5c1c (this PR)

Test differences

Show 4 test diffs

4 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 28b5c1cc084d3d21168f034b39c23193a9a7f127 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-rust-for-linux: 42m 15s -> 53m 34s (+26.8%)
  2. dist-i586-gnu-i586-i686-musl: 1h 22m -> 1h 35m (+16.2%)
  3. pr-check-1: 29m 8s -> 33m 43s (+15.8%)
  4. aarch64-gnu-llvm-20-1: 53m 42s -> 1h 2m (+15.4%)
  5. dist-aarch64-llvm-mingw: 1h 28m -> 1h 41m (+15.2%)
  6. i686-gnu-1: 2h 1m -> 2h 16m (+13.0%)
  7. dist-aarch64-apple: 2h 1m -> 1h 46m (-12.3%)
  8. test-various: 1h 51m -> 2h 5m (+12.2%)
  9. x86_64-gnu-llvm-21-3: 1h 44m -> 1h 56m (+12.1%)
  10. i686-gnu-2: 1h 29m -> 1h 40m (+12.0%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

This was referenced Mar 1, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (28b5c1c): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
1.9%[1.9%, 1.9%]1
Improvements ✅
(primary)
-0.8%[-1.7%, -0.3%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.3%]102

Max RSS (memory usage)

Results (secondary -2.7%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-2.7%[-2.7%, -2.7%]1
All ❌✅ (primary)--0

Cycles

Results (primary -3.0%, secondary -6.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.0%[-3.0%, -2.9%]2
Improvements ✅
(secondary)
-6.3%[-15.9%, -2.9%]11
All ❌✅ (primary)-3.0%[-3.0%, -2.9%]2

Binary size

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

Bootstrap: 477.708s -> 479.821s (0.44%)
Artifact size: 397.23 MiB -> 397.02 MiB (-0.05%)

@Zalathar
Zalathar deleted the dep-kind-vtable branch March 1, 2026 22:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)merged-by-borsThis PR was explicitly merged by bors.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@Zalathar@rust-timer@rust-log-analyzer@nnethercote@rustbot@Zoxc
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Improve the forcing/promotion functions in `DepKindVTable` by Zalathar · Pull Request #153122 · rust-lang/rust · GitHub
Skip to content

Improve the forcing/promotion functions in DepKindVTable - #153122

Merged
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable
Mar 1, 2026
Merged

Improve the forcing/promotion functions in DepKindVTable#153122
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable

Conversation

@Zalathar

@ZalatharZalathar commented Feb 26, 2026

Copy link
Copy Markdown
Member

This is a bundle of changes to the two function pointers in DepKindVTable that are responsible for forcing dep nodes, or promoting disk-cached values from the previous session into memory.

The perf improvements to incr-unchanged and incr-patched are likely from skipping more of the “promotion” plumbing for queries that never cache to disk.

@rustbotrustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 26, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

This is not fully-baked yet, but I want to run PR CI and perf to check for unanticipated problems.

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Feb 26, 2026
Improve the forcing/promotion functions in `DepKindVTable`
@rustbotrustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
Comment threadcompiler/rustc_query_impl/src/dep_kind_vtables.rs Outdated
@rust-log-analyzer

This comment has been minimized.

@rust-bors

rust-borsBot commented Feb 26, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: dff6afa (dff6afa28aa02dfe76c0d36c5fc140333bf99233, parent: 1ed488274bec5bf5cfe6bf7a1cc089abcc4ebd68)

@rust-timer

This comment has been minimized.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (dff6afa): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-0.8%[-1.7%, -0.2%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.2%]102

Max RSS (memory usage)

Results (primary -3.7%, secondary 4.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
8.2%[8.1%, 8.2%]2
Improvements ✅
(primary)
-3.7%[-3.7%, -3.7%]1
Improvements ✅
(secondary)
-3.4%[-3.4%, -3.4%]1
All ❌✅ (primary)-3.7%[-3.7%, -3.7%]1

Cycles

Results (primary -3.1%, secondary -8.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.1%[-3.2%, -3.1%]2
Improvements ✅
(secondary)
-8.1%[-18.7%, -2.7%]7
All ❌✅ (primary)-3.1%[-3.2%, -3.1%]2

Binary size

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

Bootstrap: 492.161s -> 478.802s (-2.71%)
Artifact size: 395.78 MiB -> 397.55 MiB (0.45%)

@rustbotrustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
@Zalathar
Zalatharforce-pushed the dep-kind-vtable branch 3 times, most recently from 2aba5f0 to 3b6451eCompareFebruary 26, 2026 22:56
@Zalathar

Copy link
Copy Markdown
MemberAuthor

r? nnethercote (or compiler)

@Zalathar
Zalathar marked this pull request as ready for review February 27, 2026 01:17
@rustbotrustbot 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 Feb 27, 2026
@nnethercote

Copy link
Copy Markdown
Contributor

Fantastic perf results!

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

@bors r+

@rust-bors

rust-borsBot commented Feb 27, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 3b6451e has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Feb 27, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

Right now, GetQueryVTable is what allows DepKindVTable to not know about query key/value/cache types at all, because that knowledge is baked into the different generic instantiations of its function pointers instead.

So I currently don't see a way to usefully put a query-vtable pointer into DepKindVTable.

/// True if a key can _potentially_ be recovered from a key fingerprint
/// with this style.
///
/// For some key types, recovery is possible but not guaranteed.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems a bit misleading. Do we have any types where recovery will fail?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's possible for DefId to fail recovery, for example.

I verified this by adding a panic to the failure path of one of the try_recover_key calls, and then running x test incremental.

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 1, 2026
- `force_from_dep_node` → `force_from_dep_node_fn`
- `try_load_from_disk_cache` → `promote_from_disk_fn`
This commit also inlines the wrapper function around `promote_from_disk_fn`.
@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@Zalathar

Copy link
Copy Markdown
MemberAuthor

Rebased to fix trivial conflict.

@bors r=nnethercote

@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 08df254 has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: nnethercote
Duration: 3h 15m 52s
Pushing 28b5c1c to main...

@rust-bors
rust-borsBot merged commit 28b5c1c into rust-lang:mainMar 1, 2026
12 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 1, 2026
@github-actions

Copy link
Copy Markdown
Contributor
What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 024757f (parent) -> 28b5c1c (this PR)

Test differences

Show 4 test diffs

4 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 28b5c1cc084d3d21168f034b39c23193a9a7f127 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-rust-for-linux: 42m 15s -> 53m 34s (+26.8%)
  2. dist-i586-gnu-i586-i686-musl: 1h 22m -> 1h 35m (+16.2%)
  3. pr-check-1: 29m 8s -> 33m 43s (+15.8%)
  4. aarch64-gnu-llvm-20-1: 53m 42s -> 1h 2m (+15.4%)
  5. dist-aarch64-llvm-mingw: 1h 28m -> 1h 41m (+15.2%)
  6. i686-gnu-1: 2h 1m -> 2h 16m (+13.0%)
  7. dist-aarch64-apple: 2h 1m -> 1h 46m (-12.3%)
  8. test-various: 1h 51m -> 2h 5m (+12.2%)
  9. x86_64-gnu-llvm-21-3: 1h 44m -> 1h 56m (+12.1%)
  10. i686-gnu-2: 1h 29m -> 1h 40m (+12.0%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

This was referenced Mar 1, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (28b5c1c): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
1.9%[1.9%, 1.9%]1
Improvements ✅
(primary)
-0.8%[-1.7%, -0.3%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.3%]102

Max RSS (memory usage)

Results (secondary -2.7%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-2.7%[-2.7%, -2.7%]1
All ❌✅ (primary)--0

Cycles

Results (primary -3.0%, secondary -6.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.0%[-3.0%, -2.9%]2
Improvements ✅
(secondary)
-6.3%[-15.9%, -2.9%]11
All ❌✅ (primary)-3.0%[-3.0%, -2.9%]2

Binary size

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

Bootstrap: 477.708s -> 479.821s (0.44%)
Artifact size: 397.23 MiB -> 397.02 MiB (-0.05%)

@Zalathar
Zalathar deleted the dep-kind-vtable branch March 1, 2026 22:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)merged-by-borsThis PR was explicitly merged by bors.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@Zalathar@rust-timer@rust-log-analyzer@nnethercote@rustbot@Zoxc
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Improve the forcing/promotion functions in `DepKindVTable` by Zalathar · Pull Request #153122 · rust-lang/rust · GitHub
Skip to content

Improve the forcing/promotion functions in DepKindVTable - #153122

Merged
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable
Mar 1, 2026
Merged

Improve the forcing/promotion functions in DepKindVTable#153122
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable

Conversation

@Zalathar

@ZalatharZalathar commented Feb 26, 2026

Copy link
Copy Markdown
Member

This is a bundle of changes to the two function pointers in DepKindVTable that are responsible for forcing dep nodes, or promoting disk-cached values from the previous session into memory.

The perf improvements to incr-unchanged and incr-patched are likely from skipping more of the “promotion” plumbing for queries that never cache to disk.

@rustbotrustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 26, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

This is not fully-baked yet, but I want to run PR CI and perf to check for unanticipated problems.

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Feb 26, 2026
Improve the forcing/promotion functions in `DepKindVTable`
@rustbotrustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
Comment threadcompiler/rustc_query_impl/src/dep_kind_vtables.rs Outdated
@rust-log-analyzer

This comment has been minimized.

@rust-bors

rust-borsBot commented Feb 26, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: dff6afa (dff6afa28aa02dfe76c0d36c5fc140333bf99233, parent: 1ed488274bec5bf5cfe6bf7a1cc089abcc4ebd68)

@rust-timer

This comment has been minimized.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (dff6afa): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-0.8%[-1.7%, -0.2%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.2%]102

Max RSS (memory usage)

Results (primary -3.7%, secondary 4.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
8.2%[8.1%, 8.2%]2
Improvements ✅
(primary)
-3.7%[-3.7%, -3.7%]1
Improvements ✅
(secondary)
-3.4%[-3.4%, -3.4%]1
All ❌✅ (primary)-3.7%[-3.7%, -3.7%]1

Cycles

Results (primary -3.1%, secondary -8.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.1%[-3.2%, -3.1%]2
Improvements ✅
(secondary)
-8.1%[-18.7%, -2.7%]7
All ❌✅ (primary)-3.1%[-3.2%, -3.1%]2

Binary size

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

Bootstrap: 492.161s -> 478.802s (-2.71%)
Artifact size: 395.78 MiB -> 397.55 MiB (0.45%)

@rustbotrustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
@Zalathar
Zalatharforce-pushed the dep-kind-vtable branch 3 times, most recently from 2aba5f0 to 3b6451eCompareFebruary 26, 2026 22:56
@Zalathar

Copy link
Copy Markdown
MemberAuthor

r? nnethercote (or compiler)

@Zalathar
Zalathar marked this pull request as ready for review February 27, 2026 01:17
@rustbotrustbot 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 Feb 27, 2026
@nnethercote

Copy link
Copy Markdown
Contributor

Fantastic perf results!

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

@bors r+

@rust-bors

rust-borsBot commented Feb 27, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 3b6451e has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Feb 27, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

Right now, GetQueryVTable is what allows DepKindVTable to not know about query key/value/cache types at all, because that knowledge is baked into the different generic instantiations of its function pointers instead.

So I currently don't see a way to usefully put a query-vtable pointer into DepKindVTable.

/// True if a key can _potentially_ be recovered from a key fingerprint
/// with this style.
///
/// For some key types, recovery is possible but not guaranteed.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems a bit misleading. Do we have any types where recovery will fail?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's possible for DefId to fail recovery, for example.

I verified this by adding a panic to the failure path of one of the try_recover_key calls, and then running x test incremental.

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 1, 2026
- `force_from_dep_node` → `force_from_dep_node_fn`
- `try_load_from_disk_cache` → `promote_from_disk_fn`
This commit also inlines the wrapper function around `promote_from_disk_fn`.
@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@Zalathar

Copy link
Copy Markdown
MemberAuthor

Rebased to fix trivial conflict.

@bors r=nnethercote

@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 08df254 has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: nnethercote
Duration: 3h 15m 52s
Pushing 28b5c1c to main...

@rust-bors
rust-borsBot merged commit 28b5c1c into rust-lang:mainMar 1, 2026
12 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 1, 2026
@github-actions

Copy link
Copy Markdown
Contributor
What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 024757f (parent) -> 28b5c1c (this PR)

Test differences

Show 4 test diffs

4 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 28b5c1cc084d3d21168f034b39c23193a9a7f127 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-rust-for-linux: 42m 15s -> 53m 34s (+26.8%)
  2. dist-i586-gnu-i586-i686-musl: 1h 22m -> 1h 35m (+16.2%)
  3. pr-check-1: 29m 8s -> 33m 43s (+15.8%)
  4. aarch64-gnu-llvm-20-1: 53m 42s -> 1h 2m (+15.4%)
  5. dist-aarch64-llvm-mingw: 1h 28m -> 1h 41m (+15.2%)
  6. i686-gnu-1: 2h 1m -> 2h 16m (+13.0%)
  7. dist-aarch64-apple: 2h 1m -> 1h 46m (-12.3%)
  8. test-various: 1h 51m -> 2h 5m (+12.2%)
  9. x86_64-gnu-llvm-21-3: 1h 44m -> 1h 56m (+12.1%)
  10. i686-gnu-2: 1h 29m -> 1h 40m (+12.0%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

This was referenced Mar 1, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (28b5c1c): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
1.9%[1.9%, 1.9%]1
Improvements ✅
(primary)
-0.8%[-1.7%, -0.3%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.3%]102

Max RSS (memory usage)

Results (secondary -2.7%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-2.7%[-2.7%, -2.7%]1
All ❌✅ (primary)--0

Cycles

Results (primary -3.0%, secondary -6.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.0%[-3.0%, -2.9%]2
Improvements ✅
(secondary)
-6.3%[-15.9%, -2.9%]11
All ❌✅ (primary)-3.0%[-3.0%, -2.9%]2

Binary size

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

Bootstrap: 477.708s -> 479.821s (0.44%)
Artifact size: 397.23 MiB -> 397.02 MiB (-0.05%)

@Zalathar
Zalathar deleted the dep-kind-vtable branch March 1, 2026 22:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)merged-by-borsThis PR was explicitly merged by bors.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@Zalathar@rust-timer@rust-log-analyzer@nnethercote@rustbot@Zoxc
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Improve the forcing/promotion functions in `DepKindVTable` by Zalathar · Pull Request #153122 · rust-lang/rust · GitHub
Skip to content

Improve the forcing/promotion functions in DepKindVTable - #153122

Merged
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable
Mar 1, 2026
Merged

Improve the forcing/promotion functions in DepKindVTable#153122
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable

Conversation

@Zalathar

@ZalatharZalathar commented Feb 26, 2026

Copy link
Copy Markdown
Member

This is a bundle of changes to the two function pointers in DepKindVTable that are responsible for forcing dep nodes, or promoting disk-cached values from the previous session into memory.

The perf improvements to incr-unchanged and incr-patched are likely from skipping more of the “promotion” plumbing for queries that never cache to disk.

@rustbotrustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 26, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

This is not fully-baked yet, but I want to run PR CI and perf to check for unanticipated problems.

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Feb 26, 2026
Improve the forcing/promotion functions in `DepKindVTable`
@rustbotrustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
Comment threadcompiler/rustc_query_impl/src/dep_kind_vtables.rs Outdated
@rust-log-analyzer

This comment has been minimized.

@rust-bors

rust-borsBot commented Feb 26, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: dff6afa (dff6afa28aa02dfe76c0d36c5fc140333bf99233, parent: 1ed488274bec5bf5cfe6bf7a1cc089abcc4ebd68)

@rust-timer

This comment has been minimized.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (dff6afa): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-0.8%[-1.7%, -0.2%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.2%]102

Max RSS (memory usage)

Results (primary -3.7%, secondary 4.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
8.2%[8.1%, 8.2%]2
Improvements ✅
(primary)
-3.7%[-3.7%, -3.7%]1
Improvements ✅
(secondary)
-3.4%[-3.4%, -3.4%]1
All ❌✅ (primary)-3.7%[-3.7%, -3.7%]1

Cycles

Results (primary -3.1%, secondary -8.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.1%[-3.2%, -3.1%]2
Improvements ✅
(secondary)
-8.1%[-18.7%, -2.7%]7
All ❌✅ (primary)-3.1%[-3.2%, -3.1%]2

Binary size

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

Bootstrap: 492.161s -> 478.802s (-2.71%)
Artifact size: 395.78 MiB -> 397.55 MiB (0.45%)

@rustbotrustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
@Zalathar
Zalatharforce-pushed the dep-kind-vtable branch 3 times, most recently from 2aba5f0 to 3b6451eCompareFebruary 26, 2026 22:56
@Zalathar

Copy link
Copy Markdown
MemberAuthor

r? nnethercote (or compiler)

@Zalathar
Zalathar marked this pull request as ready for review February 27, 2026 01:17
@rustbotrustbot 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 Feb 27, 2026
@nnethercote

Copy link
Copy Markdown
Contributor

Fantastic perf results!

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

@bors r+

@rust-bors

rust-borsBot commented Feb 27, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 3b6451e has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Feb 27, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

Right now, GetQueryVTable is what allows DepKindVTable to not know about query key/value/cache types at all, because that knowledge is baked into the different generic instantiations of its function pointers instead.

So I currently don't see a way to usefully put a query-vtable pointer into DepKindVTable.

/// True if a key can _potentially_ be recovered from a key fingerprint
/// with this style.
///
/// For some key types, recovery is possible but not guaranteed.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems a bit misleading. Do we have any types where recovery will fail?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's possible for DefId to fail recovery, for example.

I verified this by adding a panic to the failure path of one of the try_recover_key calls, and then running x test incremental.

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 1, 2026
- `force_from_dep_node` → `force_from_dep_node_fn`
- `try_load_from_disk_cache` → `promote_from_disk_fn`
This commit also inlines the wrapper function around `promote_from_disk_fn`.
@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@Zalathar

Copy link
Copy Markdown
MemberAuthor

Rebased to fix trivial conflict.

@bors r=nnethercote

@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 08df254 has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: nnethercote
Duration: 3h 15m 52s
Pushing 28b5c1c to main...

@rust-bors
rust-borsBot merged commit 28b5c1c into rust-lang:mainMar 1, 2026
12 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 1, 2026
@github-actions

Copy link
Copy Markdown
Contributor
What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 024757f (parent) -> 28b5c1c (this PR)

Test differences

Show 4 test diffs

4 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 28b5c1cc084d3d21168f034b39c23193a9a7f127 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-rust-for-linux: 42m 15s -> 53m 34s (+26.8%)
  2. dist-i586-gnu-i586-i686-musl: 1h 22m -> 1h 35m (+16.2%)
  3. pr-check-1: 29m 8s -> 33m 43s (+15.8%)
  4. aarch64-gnu-llvm-20-1: 53m 42s -> 1h 2m (+15.4%)
  5. dist-aarch64-llvm-mingw: 1h 28m -> 1h 41m (+15.2%)
  6. i686-gnu-1: 2h 1m -> 2h 16m (+13.0%)
  7. dist-aarch64-apple: 2h 1m -> 1h 46m (-12.3%)
  8. test-various: 1h 51m -> 2h 5m (+12.2%)
  9. x86_64-gnu-llvm-21-3: 1h 44m -> 1h 56m (+12.1%)
  10. i686-gnu-2: 1h 29m -> 1h 40m (+12.0%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

This was referenced Mar 1, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (28b5c1c): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
1.9%[1.9%, 1.9%]1
Improvements ✅
(primary)
-0.8%[-1.7%, -0.3%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.3%]102

Max RSS (memory usage)

Results (secondary -2.7%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-2.7%[-2.7%, -2.7%]1
All ❌✅ (primary)--0

Cycles

Results (primary -3.0%, secondary -6.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.0%[-3.0%, -2.9%]2
Improvements ✅
(secondary)
-6.3%[-15.9%, -2.9%]11
All ❌✅ (primary)-3.0%[-3.0%, -2.9%]2

Binary size

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

Bootstrap: 477.708s -> 479.821s (0.44%)
Artifact size: 397.23 MiB -> 397.02 MiB (-0.05%)

@Zalathar
Zalathar deleted the dep-kind-vtable branch March 1, 2026 22:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)merged-by-borsThis PR was explicitly merged by bors.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@Zalathar@rust-timer@rust-log-analyzer@nnethercote@rustbot@Zoxc
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Improve the forcing/promotion functions in `DepKindVTable` by Zalathar · Pull Request #153122 · rust-lang/rust · GitHub
Skip to content

Improve the forcing/promotion functions in DepKindVTable - #153122

Merged
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable
Mar 1, 2026
Merged

Improve the forcing/promotion functions in DepKindVTable#153122
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable

Conversation

@Zalathar

@ZalatharZalathar commented Feb 26, 2026

Copy link
Copy Markdown
Member

This is a bundle of changes to the two function pointers in DepKindVTable that are responsible for forcing dep nodes, or promoting disk-cached values from the previous session into memory.

The perf improvements to incr-unchanged and incr-patched are likely from skipping more of the “promotion” plumbing for queries that never cache to disk.

@rustbotrustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 26, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

This is not fully-baked yet, but I want to run PR CI and perf to check for unanticipated problems.

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Feb 26, 2026
Improve the forcing/promotion functions in `DepKindVTable`
@rustbotrustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
Comment threadcompiler/rustc_query_impl/src/dep_kind_vtables.rs Outdated
@rust-log-analyzer

This comment has been minimized.

@rust-bors

rust-borsBot commented Feb 26, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: dff6afa (dff6afa28aa02dfe76c0d36c5fc140333bf99233, parent: 1ed488274bec5bf5cfe6bf7a1cc089abcc4ebd68)

@rust-timer

This comment has been minimized.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (dff6afa): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-0.8%[-1.7%, -0.2%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.2%]102

Max RSS (memory usage)

Results (primary -3.7%, secondary 4.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
8.2%[8.1%, 8.2%]2
Improvements ✅
(primary)
-3.7%[-3.7%, -3.7%]1
Improvements ✅
(secondary)
-3.4%[-3.4%, -3.4%]1
All ❌✅ (primary)-3.7%[-3.7%, -3.7%]1

Cycles

Results (primary -3.1%, secondary -8.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.1%[-3.2%, -3.1%]2
Improvements ✅
(secondary)
-8.1%[-18.7%, -2.7%]7
All ❌✅ (primary)-3.1%[-3.2%, -3.1%]2

Binary size

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

Bootstrap: 492.161s -> 478.802s (-2.71%)
Artifact size: 395.78 MiB -> 397.55 MiB (0.45%)

@rustbotrustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
@Zalathar
Zalatharforce-pushed the dep-kind-vtable branch 3 times, most recently from 2aba5f0 to 3b6451eCompareFebruary 26, 2026 22:56
@Zalathar

Copy link
Copy Markdown
MemberAuthor

r? nnethercote (or compiler)

@Zalathar
Zalathar marked this pull request as ready for review February 27, 2026 01:17
@rustbotrustbot 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 Feb 27, 2026
@nnethercote

Copy link
Copy Markdown
Contributor

Fantastic perf results!

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

@bors r+

@rust-bors

rust-borsBot commented Feb 27, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 3b6451e has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Feb 27, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

Right now, GetQueryVTable is what allows DepKindVTable to not know about query key/value/cache types at all, because that knowledge is baked into the different generic instantiations of its function pointers instead.

So I currently don't see a way to usefully put a query-vtable pointer into DepKindVTable.

/// True if a key can _potentially_ be recovered from a key fingerprint
/// with this style.
///
/// For some key types, recovery is possible but not guaranteed.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems a bit misleading. Do we have any types where recovery will fail?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's possible for DefId to fail recovery, for example.

I verified this by adding a panic to the failure path of one of the try_recover_key calls, and then running x test incremental.

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 1, 2026
- `force_from_dep_node` → `force_from_dep_node_fn`
- `try_load_from_disk_cache` → `promote_from_disk_fn`
This commit also inlines the wrapper function around `promote_from_disk_fn`.
@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@Zalathar

Copy link
Copy Markdown
MemberAuthor

Rebased to fix trivial conflict.

@bors r=nnethercote

@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 08df254 has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: nnethercote
Duration: 3h 15m 52s
Pushing 28b5c1c to main...

@rust-bors
rust-borsBot merged commit 28b5c1c into rust-lang:mainMar 1, 2026
12 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 1, 2026
@github-actions

Copy link
Copy Markdown
Contributor
What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 024757f (parent) -> 28b5c1c (this PR)

Test differences

Show 4 test diffs

4 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 28b5c1cc084d3d21168f034b39c23193a9a7f127 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-rust-for-linux: 42m 15s -> 53m 34s (+26.8%)
  2. dist-i586-gnu-i586-i686-musl: 1h 22m -> 1h 35m (+16.2%)
  3. pr-check-1: 29m 8s -> 33m 43s (+15.8%)
  4. aarch64-gnu-llvm-20-1: 53m 42s -> 1h 2m (+15.4%)
  5. dist-aarch64-llvm-mingw: 1h 28m -> 1h 41m (+15.2%)
  6. i686-gnu-1: 2h 1m -> 2h 16m (+13.0%)
  7. dist-aarch64-apple: 2h 1m -> 1h 46m (-12.3%)
  8. test-various: 1h 51m -> 2h 5m (+12.2%)
  9. x86_64-gnu-llvm-21-3: 1h 44m -> 1h 56m (+12.1%)
  10. i686-gnu-2: 1h 29m -> 1h 40m (+12.0%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

This was referenced Mar 1, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (28b5c1c): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
1.9%[1.9%, 1.9%]1
Improvements ✅
(primary)
-0.8%[-1.7%, -0.3%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.3%]102

Max RSS (memory usage)

Results (secondary -2.7%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-2.7%[-2.7%, -2.7%]1
All ❌✅ (primary)--0

Cycles

Results (primary -3.0%, secondary -6.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.0%[-3.0%, -2.9%]2
Improvements ✅
(secondary)
-6.3%[-15.9%, -2.9%]11
All ❌✅ (primary)-3.0%[-3.0%, -2.9%]2

Binary size

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

Bootstrap: 477.708s -> 479.821s (0.44%)
Artifact size: 397.23 MiB -> 397.02 MiB (-0.05%)

@Zalathar
Zalathar deleted the dep-kind-vtable branch March 1, 2026 22:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)merged-by-borsThis PR was explicitly merged by bors.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@Zalathar@rust-timer@rust-log-analyzer@nnethercote@rustbot@Zoxc
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Improve the forcing/promotion functions in `DepKindVTable` by Zalathar · Pull Request #153122 · rust-lang/rust · GitHub
Skip to content

Improve the forcing/promotion functions in DepKindVTable - #153122

Merged
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable
Mar 1, 2026
Merged

Improve the forcing/promotion functions in DepKindVTable#153122
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable

Conversation

@Zalathar

@ZalatharZalathar commented Feb 26, 2026

Copy link
Copy Markdown
Member

This is a bundle of changes to the two function pointers in DepKindVTable that are responsible for forcing dep nodes, or promoting disk-cached values from the previous session into memory.

The perf improvements to incr-unchanged and incr-patched are likely from skipping more of the “promotion” plumbing for queries that never cache to disk.

@rustbotrustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 26, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

This is not fully-baked yet, but I want to run PR CI and perf to check for unanticipated problems.

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Feb 26, 2026
Improve the forcing/promotion functions in `DepKindVTable`
@rustbotrustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
Comment threadcompiler/rustc_query_impl/src/dep_kind_vtables.rs Outdated
@rust-log-analyzer

This comment has been minimized.

@rust-bors

rust-borsBot commented Feb 26, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: dff6afa (dff6afa28aa02dfe76c0d36c5fc140333bf99233, parent: 1ed488274bec5bf5cfe6bf7a1cc089abcc4ebd68)

@rust-timer

This comment has been minimized.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (dff6afa): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-0.8%[-1.7%, -0.2%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.2%]102

Max RSS (memory usage)

Results (primary -3.7%, secondary 4.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
8.2%[8.1%, 8.2%]2
Improvements ✅
(primary)
-3.7%[-3.7%, -3.7%]1
Improvements ✅
(secondary)
-3.4%[-3.4%, -3.4%]1
All ❌✅ (primary)-3.7%[-3.7%, -3.7%]1

Cycles

Results (primary -3.1%, secondary -8.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.1%[-3.2%, -3.1%]2
Improvements ✅
(secondary)
-8.1%[-18.7%, -2.7%]7
All ❌✅ (primary)-3.1%[-3.2%, -3.1%]2

Binary size

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

Bootstrap: 492.161s -> 478.802s (-2.71%)
Artifact size: 395.78 MiB -> 397.55 MiB (0.45%)

@rustbotrustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
@Zalathar
Zalatharforce-pushed the dep-kind-vtable branch 3 times, most recently from 2aba5f0 to 3b6451eCompareFebruary 26, 2026 22:56
@Zalathar

Copy link
Copy Markdown
MemberAuthor

r? nnethercote (or compiler)

@Zalathar
Zalathar marked this pull request as ready for review February 27, 2026 01:17
@rustbotrustbot 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 Feb 27, 2026
@nnethercote

Copy link
Copy Markdown
Contributor

Fantastic perf results!

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

@bors r+

@rust-bors

rust-borsBot commented Feb 27, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 3b6451e has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Feb 27, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

Right now, GetQueryVTable is what allows DepKindVTable to not know about query key/value/cache types at all, because that knowledge is baked into the different generic instantiations of its function pointers instead.

So I currently don't see a way to usefully put a query-vtable pointer into DepKindVTable.

/// True if a key can _potentially_ be recovered from a key fingerprint
/// with this style.
///
/// For some key types, recovery is possible but not guaranteed.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems a bit misleading. Do we have any types where recovery will fail?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's possible for DefId to fail recovery, for example.

I verified this by adding a panic to the failure path of one of the try_recover_key calls, and then running x test incremental.

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 1, 2026
- `force_from_dep_node` → `force_from_dep_node_fn`
- `try_load_from_disk_cache` → `promote_from_disk_fn`
This commit also inlines the wrapper function around `promote_from_disk_fn`.
@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@Zalathar

Copy link
Copy Markdown
MemberAuthor

Rebased to fix trivial conflict.

@bors r=nnethercote

@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 08df254 has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: nnethercote
Duration: 3h 15m 52s
Pushing 28b5c1c to main...

@rust-bors
rust-borsBot merged commit 28b5c1c into rust-lang:mainMar 1, 2026
12 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 1, 2026
@github-actions

Copy link
Copy Markdown
Contributor
What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 024757f (parent) -> 28b5c1c (this PR)

Test differences

Show 4 test diffs

4 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 28b5c1cc084d3d21168f034b39c23193a9a7f127 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-rust-for-linux: 42m 15s -> 53m 34s (+26.8%)
  2. dist-i586-gnu-i586-i686-musl: 1h 22m -> 1h 35m (+16.2%)
  3. pr-check-1: 29m 8s -> 33m 43s (+15.8%)
  4. aarch64-gnu-llvm-20-1: 53m 42s -> 1h 2m (+15.4%)
  5. dist-aarch64-llvm-mingw: 1h 28m -> 1h 41m (+15.2%)
  6. i686-gnu-1: 2h 1m -> 2h 16m (+13.0%)
  7. dist-aarch64-apple: 2h 1m -> 1h 46m (-12.3%)
  8. test-various: 1h 51m -> 2h 5m (+12.2%)
  9. x86_64-gnu-llvm-21-3: 1h 44m -> 1h 56m (+12.1%)
  10. i686-gnu-2: 1h 29m -> 1h 40m (+12.0%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

This was referenced Mar 1, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (28b5c1c): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
1.9%[1.9%, 1.9%]1
Improvements ✅
(primary)
-0.8%[-1.7%, -0.3%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.3%]102

Max RSS (memory usage)

Results (secondary -2.7%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-2.7%[-2.7%, -2.7%]1
All ❌✅ (primary)--0

Cycles

Results (primary -3.0%, secondary -6.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.0%[-3.0%, -2.9%]2
Improvements ✅
(secondary)
-6.3%[-15.9%, -2.9%]11
All ❌✅ (primary)-3.0%[-3.0%, -2.9%]2

Binary size

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

Bootstrap: 477.708s -> 479.821s (0.44%)
Artifact size: 397.23 MiB -> 397.02 MiB (-0.05%)

@Zalathar
Zalathar deleted the dep-kind-vtable branch March 1, 2026 22:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)merged-by-borsThis PR was explicitly merged by bors.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@Zalathar@rust-timer@rust-log-analyzer@nnethercote@rustbot@Zoxc
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Improve the forcing/promotion functions in `DepKindVTable` by Zalathar · Pull Request #153122 · rust-lang/rust · GitHub
Skip to content

Improve the forcing/promotion functions in DepKindVTable - #153122

Merged
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable
Mar 1, 2026
Merged

Improve the forcing/promotion functions in DepKindVTable#153122
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable

Conversation

@Zalathar

@ZalatharZalathar commented Feb 26, 2026

Copy link
Copy Markdown
Member

This is a bundle of changes to the two function pointers in DepKindVTable that are responsible for forcing dep nodes, or promoting disk-cached values from the previous session into memory.

The perf improvements to incr-unchanged and incr-patched are likely from skipping more of the “promotion” plumbing for queries that never cache to disk.

@rustbotrustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 26, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

This is not fully-baked yet, but I want to run PR CI and perf to check for unanticipated problems.

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Feb 26, 2026
Improve the forcing/promotion functions in `DepKindVTable`
@rustbotrustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
Comment threadcompiler/rustc_query_impl/src/dep_kind_vtables.rs Outdated
@rust-log-analyzer

This comment has been minimized.

@rust-bors

rust-borsBot commented Feb 26, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: dff6afa (dff6afa28aa02dfe76c0d36c5fc140333bf99233, parent: 1ed488274bec5bf5cfe6bf7a1cc089abcc4ebd68)

@rust-timer

This comment has been minimized.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (dff6afa): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-0.8%[-1.7%, -0.2%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.2%]102

Max RSS (memory usage)

Results (primary -3.7%, secondary 4.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
8.2%[8.1%, 8.2%]2
Improvements ✅
(primary)
-3.7%[-3.7%, -3.7%]1
Improvements ✅
(secondary)
-3.4%[-3.4%, -3.4%]1
All ❌✅ (primary)-3.7%[-3.7%, -3.7%]1

Cycles

Results (primary -3.1%, secondary -8.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.1%[-3.2%, -3.1%]2
Improvements ✅
(secondary)
-8.1%[-18.7%, -2.7%]7
All ❌✅ (primary)-3.1%[-3.2%, -3.1%]2

Binary size

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

Bootstrap: 492.161s -> 478.802s (-2.71%)
Artifact size: 395.78 MiB -> 397.55 MiB (0.45%)

@rustbotrustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
@Zalathar
Zalatharforce-pushed the dep-kind-vtable branch 3 times, most recently from 2aba5f0 to 3b6451eCompareFebruary 26, 2026 22:56
@Zalathar

Copy link
Copy Markdown
MemberAuthor

r? nnethercote (or compiler)

@Zalathar
Zalathar marked this pull request as ready for review February 27, 2026 01:17
@rustbotrustbot 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 Feb 27, 2026
@nnethercote

Copy link
Copy Markdown
Contributor

Fantastic perf results!

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

@bors r+

@rust-bors

rust-borsBot commented Feb 27, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 3b6451e has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Feb 27, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

Right now, GetQueryVTable is what allows DepKindVTable to not know about query key/value/cache types at all, because that knowledge is baked into the different generic instantiations of its function pointers instead.

So I currently don't see a way to usefully put a query-vtable pointer into DepKindVTable.

/// True if a key can _potentially_ be recovered from a key fingerprint
/// with this style.
///
/// For some key types, recovery is possible but not guaranteed.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems a bit misleading. Do we have any types where recovery will fail?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's possible for DefId to fail recovery, for example.

I verified this by adding a panic to the failure path of one of the try_recover_key calls, and then running x test incremental.

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 1, 2026
- `force_from_dep_node` → `force_from_dep_node_fn`
- `try_load_from_disk_cache` → `promote_from_disk_fn`
This commit also inlines the wrapper function around `promote_from_disk_fn`.
@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@Zalathar

Copy link
Copy Markdown
MemberAuthor

Rebased to fix trivial conflict.

@bors r=nnethercote

@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 08df254 has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: nnethercote
Duration: 3h 15m 52s
Pushing 28b5c1c to main...

@rust-bors
rust-borsBot merged commit 28b5c1c into rust-lang:mainMar 1, 2026
12 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 1, 2026
@github-actions

Copy link
Copy Markdown
Contributor
What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 024757f (parent) -> 28b5c1c (this PR)

Test differences

Show 4 test diffs

4 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 28b5c1cc084d3d21168f034b39c23193a9a7f127 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-rust-for-linux: 42m 15s -> 53m 34s (+26.8%)
  2. dist-i586-gnu-i586-i686-musl: 1h 22m -> 1h 35m (+16.2%)
  3. pr-check-1: 29m 8s -> 33m 43s (+15.8%)
  4. aarch64-gnu-llvm-20-1: 53m 42s -> 1h 2m (+15.4%)
  5. dist-aarch64-llvm-mingw: 1h 28m -> 1h 41m (+15.2%)
  6. i686-gnu-1: 2h 1m -> 2h 16m (+13.0%)
  7. dist-aarch64-apple: 2h 1m -> 1h 46m (-12.3%)
  8. test-various: 1h 51m -> 2h 5m (+12.2%)
  9. x86_64-gnu-llvm-21-3: 1h 44m -> 1h 56m (+12.1%)
  10. i686-gnu-2: 1h 29m -> 1h 40m (+12.0%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

This was referenced Mar 1, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (28b5c1c): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
1.9%[1.9%, 1.9%]1
Improvements ✅
(primary)
-0.8%[-1.7%, -0.3%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.3%]102

Max RSS (memory usage)

Results (secondary -2.7%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-2.7%[-2.7%, -2.7%]1
All ❌✅ (primary)--0

Cycles

Results (primary -3.0%, secondary -6.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.0%[-3.0%, -2.9%]2
Improvements ✅
(secondary)
-6.3%[-15.9%, -2.9%]11
All ❌✅ (primary)-3.0%[-3.0%, -2.9%]2

Binary size

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

Bootstrap: 477.708s -> 479.821s (0.44%)
Artifact size: 397.23 MiB -> 397.02 MiB (-0.05%)

@Zalathar
Zalathar deleted the dep-kind-vtable branch March 1, 2026 22:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)merged-by-borsThis PR was explicitly merged by bors.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@Zalathar@rust-timer@rust-log-analyzer@nnethercote@rustbot@Zoxc
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Improve the forcing/promotion functions in `DepKindVTable` by Zalathar · Pull Request #153122 · rust-lang/rust · GitHub
Skip to content

Improve the forcing/promotion functions in DepKindVTable - #153122

Merged
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable
Mar 1, 2026
Merged

Improve the forcing/promotion functions in DepKindVTable#153122
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
Zalathar:dep-kind-vtable

Conversation

@Zalathar

@ZalatharZalathar commented Feb 26, 2026

Copy link
Copy Markdown
Member

This is a bundle of changes to the two function pointers in DepKindVTable that are responsible for forcing dep nodes, or promoting disk-cached values from the previous session into memory.

The perf improvements to incr-unchanged and incr-patched are likely from skipping more of the “promotion” plumbing for queries that never cache to disk.

@rustbotrustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 26, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

This is not fully-baked yet, but I want to run PR CI and perf to check for unanticipated problems.

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rust-bors

This comment has been minimized.

rust-borsBot pushed a commit that referenced this pull request Feb 26, 2026
Improve the forcing/promotion functions in `DepKindVTable`
@rustbotrustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
Comment threadcompiler/rustc_query_impl/src/dep_kind_vtables.rs Outdated
@rust-log-analyzer

This comment has been minimized.

@rust-bors

rust-borsBot commented Feb 26, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: dff6afa (dff6afa28aa02dfe76c0d36c5fc140333bf99233, parent: 1ed488274bec5bf5cfe6bf7a1cc089abcc4ebd68)

@rust-timer

This comment has been minimized.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (dff6afa): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-0.8%[-1.7%, -0.2%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.2%]102

Max RSS (memory usage)

Results (primary -3.7%, secondary 4.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
8.2%[8.1%, 8.2%]2
Improvements ✅
(primary)
-3.7%[-3.7%, -3.7%]1
Improvements ✅
(secondary)
-3.4%[-3.4%, -3.4%]1
All ❌✅ (primary)-3.7%[-3.7%, -3.7%]1

Cycles

Results (primary -3.1%, secondary -8.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.1%[-3.2%, -3.1%]2
Improvements ✅
(secondary)
-8.1%[-18.7%, -2.7%]7
All ❌✅ (primary)-3.1%[-3.2%, -3.1%]2

Binary size

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

Bootstrap: 492.161s -> 478.802s (-2.71%)
Artifact size: 395.78 MiB -> 397.55 MiB (0.45%)

@rustbotrustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 26, 2026
@Zalathar
Zalatharforce-pushed the dep-kind-vtable branch 3 times, most recently from 2aba5f0 to 3b6451eCompareFebruary 26, 2026 22:56
@Zalathar

Copy link
Copy Markdown
MemberAuthor

r? nnethercote (or compiler)

@Zalathar
Zalathar marked this pull request as ready for review February 27, 2026 01:17
@rustbotrustbot 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 Feb 27, 2026
@nnethercote

Copy link
Copy Markdown
Contributor

Fantastic perf results!

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

@bors r+

@rust-bors

rust-borsBot commented Feb 27, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 3b6451e has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Feb 27, 2026
@Zalathar

Copy link
Copy Markdown
MemberAuthor

I would like to eliminate GetQueryVTable if possible. I think it might be possible if each normal query's DepKindVTable had a pointer to its QueryVTable. But not in this PR.

Right now, GetQueryVTable is what allows DepKindVTable to not know about query key/value/cache types at all, because that knowledge is baked into the different generic instantiations of its function pointers instead.

So I currently don't see a way to usefully put a query-vtable pointer into DepKindVTable.

/// True if a key can _potentially_ be recovered from a key fingerprint
/// with this style.
///
/// For some key types, recovery is possible but not guaranteed.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems a bit misleading. Do we have any types where recovery will fail?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's possible for DefId to fail recovery, for example.

I verified this by adding a panic to the failure path of one of the try_recover_key calls, and then running x test incremental.

@rust-borsrust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 1, 2026
- `force_from_dep_node` → `force_from_dep_node_fn`
- `try_load_from_disk_cache` → `promote_from_disk_fn`
This commit also inlines the wrapper function around `promote_from_disk_fn`.
@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@Zalathar

Copy link
Copy Markdown
MemberAuthor

Rebased to fix trivial conflict.

@bors r=nnethercote

@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 08df254 has been approved by nnethercote

It is now in the queue for this repository.

@rust-borsrust-borsBot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 1, 2026
@rust-bors

This comment has been minimized.

@rust-borsrust-borsBot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: nnethercote
Duration: 3h 15m 52s
Pushing 28b5c1c to main...

@rust-bors
rust-borsBot merged commit 28b5c1c into rust-lang:mainMar 1, 2026
12 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 1, 2026
@github-actions

Copy link
Copy Markdown
Contributor
What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 024757f (parent) -> 28b5c1c (this PR)

Test differences

Show 4 test diffs

4 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 28b5c1cc084d3d21168f034b39c23193a9a7f127 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-rust-for-linux: 42m 15s -> 53m 34s (+26.8%)
  2. dist-i586-gnu-i586-i686-musl: 1h 22m -> 1h 35m (+16.2%)
  3. pr-check-1: 29m 8s -> 33m 43s (+15.8%)
  4. aarch64-gnu-llvm-20-1: 53m 42s -> 1h 2m (+15.4%)
  5. dist-aarch64-llvm-mingw: 1h 28m -> 1h 41m (+15.2%)
  6. i686-gnu-1: 2h 1m -> 2h 16m (+13.0%)
  7. dist-aarch64-apple: 2h 1m -> 1h 46m (-12.3%)
  8. test-various: 1h 51m -> 2h 5m (+12.2%)
  9. x86_64-gnu-llvm-21-3: 1h 44m -> 1h 56m (+12.1%)
  10. i686-gnu-2: 1h 29m -> 1h 40m (+12.0%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

This was referenced Mar 1, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (28b5c1c): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
1.9%[1.9%, 1.9%]1
Improvements ✅
(primary)
-0.8%[-1.7%, -0.3%]102
Improvements ✅
(secondary)
-1.2%[-6.5%, -0.2%]68
All ❌✅ (primary)-0.8%[-1.7%, -0.3%]102

Max RSS (memory usage)

Results (secondary -2.7%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-2.7%[-2.7%, -2.7%]1
All ❌✅ (primary)--0

Cycles

Results (primary -3.0%, secondary -6.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-3.0%[-3.0%, -2.9%]2
Improvements ✅
(secondary)
-6.3%[-15.9%, -2.9%]11
All ❌✅ (primary)-3.0%[-3.0%, -2.9%]2

Binary size

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

Bootstrap: 477.708s -> 479.821s (0.44%)
Artifact size: 397.23 MiB -> 397.02 MiB (-0.05%)

@Zalathar
Zalathar deleted the dep-kind-vtable branch March 1, 2026 22:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)merged-by-borsThis PR was explicitly merged by bors.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@Zalathar@rust-timer@rust-log-analyzer@nnethercote@rustbot@Zoxc