Redesign the multi-vector kernels to decouple layout, micro-kernel and reduction - #1333
Conversation
There was a problem hiding this comment.
Pull request overview
Refactors the diskann-quantization multi-vector MaxSim implementation to separate concerns (tiling/walks, micro-kernel leaves, accumulator scratch layout, and reduction/drain) behind a trait-based “driver + contracts” design, while keeping the same public API and test intent.
Changes:
- Replaces the previous monolithic
tiled_reduce+ layout/conversion machinery with a genericdriveloop and small, composable traits (TileWalk/Paneled/Scratch/Accumulate/Drain). - Introduces new tiling/walk primitives (
tiles.rs), accumulator storage (strip.rs), and ISA-specific leaves (leaves/*) and wires them into the f32 pipeline (float.rs). - Reworks the f16 path to widen per-tile into reusable buffers via lending walks, reusing the f32 pipeline without f16-specific leaves.
Reviewed changes
Copilot reviewed 15 out of 15 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| diskann-quantization/src/multi_vector/distance/kernels/mod.rs | Defines the new kernel “contract” traits, plan, and drive loop; exports new f32/f16 entries. |
| diskann-quantization/src/multi_vector/distance/kernels/tiles.rs | Adds tile/panel abstractions and lending walks for block-transposed queries and row-major docs. |
| diskann-quantization/src/multi_vector/distance/kernels/strip.rs | Adds column-major accumulator strip partitioned into fixed-size slots for leaf writes. |
| diskann-quantization/src/multi_vector/distance/kernels/leaves/mod.rs | Introduces per-ISA leaf module structure and reduction-chain configuration. |
| diskann-quantization/src/multi_vector/distance/kernels/leaves/v3.rs | New AVX2+FMA f32 leaf micro-kernel and column-fold reduction. |
| diskann-quantization/src/multi_vector/distance/kernels/leaves/scalar.rs | New scalar/emulated f32 leaf micro-kernel and column-fold reduction. |
| diskann-quantization/src/multi_vector/distance/kernels/float.rs | New f32 MaxSim pipeline: plans, allocates strip, drives, and drains to per-row maxima + tests. |
| diskann-quantization/src/multi_vector/distance/kernels/f16.rs | Replaces f16 adapter with per-tile widening walks that feed the f32 pipeline. |
| diskann-quantization/src/multi_vector/distance/factory.rs | Switches factory dispatch from old F32Kernel/F16Entry to new MaxIp/MaxIpF16 entries. |
| diskann-quantization/src/multi_vector/distance/kernels/tiled_reduce.rs | Removed: old 5-level tiling loop implementation and its tests. |
| diskann-quantization/src/multi_vector/distance/kernels/layouts.rs | Removed: old layout marker + tile-level conversion traits. |
| diskann-quantization/src/multi_vector/distance/kernels/reduce.rs | Removed: old compile-time reduction helper trait. |
| diskann-quantization/src/multi_vector/distance/kernels/f32/mod.rs | Removed: old f32 kernel family entry and dispatch wrapper. |
| diskann-quantization/src/multi_vector/distance/kernels/f32/scalar.rs | Removed: old scalar micro-kernel implementation. |
| diskann-quantization/src/multi_vector/distance/kernels/f32/v3.rs | Removed: old v3 micro-kernel implementation. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #1333 +/- ##
==========================================
- Coverage 91.55% 91.51% -0.05%
==========================================
Files 522 521 -1
Lines 99541 99614 +73
==========================================
+ Hits 91139 91158 +19
- Misses 8402 8456 +54
Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
Rebuilds
diskann-quantization/src/multi_vector/distance/kernels/around a contract insteadof a monolith. Same results, same public API, same tests. Only the internals change.
Big thanks to Mark Hildebrand (@hildebrandmw) for the valuable design insights and constant support in shaping and refining this design.
Why
The reduction was baked into the kernel.
tiled_reduce.rswas 806 lines in which the cachetiling, the inner FMA loop and the max-reduction were one function body, written out once per
element type per instruction set. To feed it quantized vectors, or compute anything other than
MaxSim, there was no seam to cut along. You copied the file.
So the redesign cuts it into four pieces, each with an obvious owner:
drivefunction owns the loop over blocks, written once for everybodyA new element type is now just a new walk, a new reduction just a new drain, and neither
touches a leaf or the loop. f16 already shows this: it has no kernel code left at all, just a
walk that widens to f32 on the way in. It used to be a separate path.
The other reason is safety. Raw pointers ran through 5 of the 8 old files, and
unsafethrough 6 of them, because the layout helpers, the tiling loop and the leaves each did their
own address arithmetic. Now
unsafeappears in two files only, the two leaves, as five blockseach, every one wrapping a single load, read or store.
What
Gone:
tiled_reduce.rs,layouts.rs,reduce.rs,f32/{mod,scalar,v3}.rs. In their place,roughly in dependency order:
mod.rs, the four traits above plus the cache planner anddrivetiles.rs, turning a matrix into blocks and panelsstrip.rs, the accumulator that leaves write into and drains read out ofleaves/v3.rsandleaves/scalar.rs, the two micro-kernelsfloat.rs, the f32 instantiation and its testsf16.rs, the widening walksWorth knowing going in:
driveonly hands out ordinals, like "A-panel 3, B-panels 8..12",never a stride or an address. That's what lets a drain whose panels are a different width
reuse the same loop.
One behaviour change to flag. Budgets and panel geometry are unchanged, but the B-panel count
now charges the accumulator strip against L1, which the old planner never counted. More
accurate, though it shrinks the B tile at small dims: 31 panels to 24 at dim 64, 13 to 12 at
dim 128, no change from 256 up.
Performance
Against
mainon a shared machine, 16 runs per side, comparing the minimum of each. Median +0.59%, p90 +2.65%.Eight of the nine shapes land between +0.02% and +1.52%, which is inside the noise floor.
The ninth, the smallest, does not. At 8 queries x 32 docs x dim 128:
That is the shape with the least work to amortise a fixed cost, and there is a new fixed
cost. The old kernel fused the multiply and the reduction, so the accumulator lived in
vector registers and folded into the caller's scratch on the way out; it was never
materialised. Splitting accumulate from drain means it has to exist somewhere the drain can
read it, which is one
vec![0.0f32; plan.strip_len()]per call. That is the price of theseam, paid once per call however much work follows.
Fixable, but not here: the strip is a fixed-size buffer with a known bound, so it can be
hoisted to the caller or held on the stack. Left as a follow-up to keep this PR a
restructure.
Running it
The benchmark is behind a feature flag. Run each side, then compare.
Switch revision, rebuild, run again into
after.json, then:Reading it
One run per side is not enough. A shared machine drifts between faster and slower states and
holds each for longer than a measurement takes, so a single pair of runs will breach the
tolerance in places with no code change at all. The drift is one-sided, it can only make
things slower, so repeat both sides and take the minimum, and do enough runs that the numbers
stop moving. A bigger
num_measurementsor a looser tolerance is not a substitute.The input carries
referencerows, the same code on both sides. Their spread is your errorbar; anything smaller is unmeasured.
Review order
kernels/mod.rsfirst. It's the contract; everything else implements it.kernels/tiles.rskernels/strip.rs. Short, but mind the axes: a doc is a row of the input and a column here.kernels/leaves/. All the unsafe in the PR, ~120 lines each. Worth reading the SAFETYcomments properly.
kernels/float.rs, where it comes together, plus the test suite.kernels/f16.rs, the proof it composes: a second element type, no new leaf.factory.rs, the wiring and the only caller-facing diff.