mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-29 21:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Speed symbol state merging back up (#15731)

Browse source 
This is a follow-up to #15702 that hopefully claws back the 1%
performance regression. Assuming it works, the trick is to iterate over
the constraints vectors via mut reference (aka a single pointer), so
that we're not copying `BitSet`s into and out of the zip tuples as we
iterate. We use `std::mem::take` as a poor-man's move constructor only
at the very end, when we're ready to emplace it into the result. (C++
idioms intended! 😄)

With local testing via hyperfine, I'm seeing this be 1-3% faster than
`main` most of the time — though a small number of runs (1 in 10,
maybe?) are a wash or have `main` faster. Codspeed reports a 2%
gain.
This commit is contained in:
Douglas Creager 2025-01-24 16:07:31 -05:00 • committed by GitHub
parent 9353482a5a
commit 5a9d71a5f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/red_knot_python_semantic/src/semantic_index/use_def/symbol_state.rs
View file

@ -287,18 +287,27 @@ impl SymbolBindings {
} }
} }
fn merge(&mut self, b: Self, visibility_constraints: &mut VisibilityConstraints) { fn merge(&mut self, mut b: Self, visibility_constraints: &mut VisibilityConstraints) {
let a = std::mem::take(self); let mut a = std::mem::take(self);
self.live_bindings = a.live_bindings.clone(); self.live_bindings = a.live_bindings.clone();
self.live_bindings.union(&b.live_bindings); self.live_bindings.union(&b.live_bindings);
// Invariant: These zips are well-formed since we maintain an invariant that all of our // Invariant: These zips are well-formed since we maintain an invariant that all of our
// fields are sets/vecs with the same length. // fields are sets/vecs with the same length.
//
// Performance: We iterate over the `constraints` smallvecs via mut reference, because the
// individual elements are `BitSet`s (currently 24 bytes in size), and we don't want to
// move them by value multiple times during iteration. By iterating by reference, we only
// have to copy single pointers around. In the loop below, the `std::mem::take` calls
// specify precisely where we want to move them into the merged `constraints` smallvec.
//
// We don't need a similar optimization for `visibility_constraints`, since those elements
// are 32-bit IndexVec IDs, and so are already cheap to move/copy.
let a = (a.live_bindings.iter()) let a = (a.live_bindings.iter())
.zip(a.constraints) .zip(a.constraints.iter_mut())
.zip(a.visibility_constraints); .zip(a.visibility_constraints);
let b = (b.live_bindings.iter()) let b = (b.live_bindings.iter())
.zip(b.constraints) .zip(b.constraints.iter_mut())
.zip(b.visibility_constraints); .zip(b.visibility_constraints);
// Invariant: merge_join_by consumes the two iterators in sorted order, which ensures that // Invariant: merge_join_by consumes the two iterators in sorted order, which ensures that
@ -315,9 +324,9 @@ impl SymbolBindings {
// If the same definition is visible through both paths, any constraint // If the same definition is visible through both paths, any constraint
// that applies on only one path is irrelevant to the resulting type from // that applies on only one path is irrelevant to the resulting type from
// unioning the two paths, so we intersect the constraints. // unioning the two paths, so we intersect the constraints.
let mut constraints = a_constraints; let constraints = a_constraints;
constraints.intersect(&b_constraints); constraints.intersect(b_constraints);
self.constraints.push(constraints); self.constraints.push(std::mem::take(constraints));
// For visibility constraints, we merge them using a ternary OR operation: // For visibility constraints, we merge them using a ternary OR operation:
let vis_constraint = visibility_constraints let vis_constraint = visibility_constraints
@ -327,7 +336,7 @@ impl SymbolBindings {
EitherOrBoth::Left(((_, constraints), vis_constraint)) EitherOrBoth::Left(((_, constraints), vis_constraint))
| EitherOrBoth::Right(((_, constraints), vis_constraint)) => { | EitherOrBoth::Right(((_, constraints), vis_constraint)) => {
self.constraints.push(constraints); self.constraints.push(std::mem::take(constraints));
self.visibility_constraints.push(vis_constraint); self.visibility_constraints.push(vis_constraint);
} }
} }