sum_tree: Reduce Cursor size for contextless summary types (#38776)

This reduces the size of cursor by a usize when the summary does not require a context making Cursor usages and constructions slightly more efficient. This change is a bit annoying though, as Rust has no means of specializing, so this uses a `ContextlessSummary` trait with a blanket impl while turning the `Context` into a GAT `Context<'a>`. This means `Summary` implies are a bit more verbose now while contextless ones are slimmer. It does come with the downside that the lifetime in the GAT is always considered invariant, so some lifetime splitting occurred due to that. ``` push/4096 time: [352.65 µs 360.87 µs 367.80 µs] thrpt: [10.621 MiB/s 10.825 MiB/s 11.077 MiB/s] change: time: [-2.6633% -1.3640% -0.0561%] (p = 0.05 < 0.05) thrpt: [+0.0561% +1.3828% +2.7361%] Change within noise threshold. Found 16 outliers among 100 measurements (16.00%) 7 (7.00%) low severe 3 (3.00%) low mild 2 (2.00%) high mild 4 (4.00%) high severe push/65536 time: [1.2917 ms 1.2949 ms 1.2979 ms] thrpt: [48.156 MiB/s 48.267 MiB/s 48.387 MiB/s] change: time: [+1.4428% +1.9844% +2.5299%] (p = 0.00 < 0.05) thrpt: [-2.4675% -1.9458% -1.4223%] Performance has regressed. Found 3 outliers among 100 measurements (3.00%) 1 (1.00%) low severe 1 (1.00%) low mild 1 (1.00%) high severe append/4096 time: [677.87 ns 678.87 ns 679.83 ns] thrpt: [5.6112 GiB/s 5.6192 GiB/s 5.6274 GiB/s] change: time: [-0.8924% -0.5017% -0.1705%] (p = 0.00 < 0.05) thrpt: [+0.1708% +0.5043% +0.9004%] Change within noise threshold. Found 2 outliers among 100 measurements (2.00%) 1 (1.00%) low mild 1 (1.00%) high mild append/65536 time: [9.3275 µs 9.3406 µs 9.3536 µs] thrpt: [6.5253 GiB/s 6.5344 GiB/s 6.5435 GiB/s] change: time: [+0.5409% +0.7215% +0.9054%] (p = 0.00 < 0.05) thrpt: [-0.8973% -0.7163% -0.5380%] Change within noise threshold. slice/4096 time: [27.673 µs 27.791 µs 27.907 µs] thrpt: [139.97 MiB/s 140.56 MiB/s 141.16 MiB/s] change: time: [-1.1065% -0.6725% -0.2429%] (p = 0.00 < 0.05) thrpt: [+0.2435% +0.6770% +1.1189%] Change within noise threshold. Found 5 outliers among 100 measurements (5.00%) 4 (4.00%) low mild 1 (1.00%) high mild slice/65536 time: [507.55 µs 517.40 µs 535.60 µs] thrpt: [116.69 MiB/s 120.80 MiB/s 123.14 MiB/s] change: time: [-1.3489% +0.0599% +2.2591%] (p = 0.96 > 0.05) thrpt: [-2.2092% -0.0598% +1.3674%] No change in performance detected. Found 8 outliers among 100 measurements (8.00%) 5 (5.00%) low mild 2 (2.00%) high mild 1 (1.00%) high severe bytes_in_range/4096 time: [3.3917 µs 3.4108 µs 3.4313 µs] thrpt: [1.1117 GiB/s 1.1184 GiB/s 1.1247 GiB/s] change: time: [-5.3466% -4.7193% -4.1262%] (p = 0.00 < 0.05) thrpt: [+4.3038% +4.9531% +5.6487%] Performance has improved. Found 6 outliers among 100 measurements (6.00%) 1 (1.00%) low mild 5 (5.00%) high mild bytes_in_range/65536 time: [88.175 µs 88.613 µs 89.111 µs] thrpt: [701.37 MiB/s 705.31 MiB/s 708.82 MiB/s] change: time: [-0.6935% +0.3769% +1.4655%] (p = 0.50 > 0.05) thrpt: [-1.4443% -0.3755% +0.6984%] No change in performance detected. Found 2 outliers among 100 measurements (2.00%) 2 (2.00%) high mild chars/4096 time: [678.70 ns 680.38 ns 682.08 ns] thrpt: [5.5927 GiB/s 5.6067 GiB/s 5.6206 GiB/s] change: time: [-0.6969% -0.2755% +0.1485%] (p = 0.20 > 0.05) thrpt: [-0.1483% +0.2763% +0.7018%] No change in performance detected. Found 9 outliers among 100 measurements (9.00%) 5 (5.00%) low mild 4 (4.00%) high mild chars/65536 time: [12.720 µs 12.775 µs 12.830 µs] thrpt: [4.7573 GiB/s 4.7778 GiB/s 4.7983 GiB/s] change: time: [-0.6172% -0.1110% +0.4179%] (p = 0.68 > 0.05) thrpt: [-0.4162% +0.1112% +0.6211%] No change in performance detected. Found 2 outliers among 100 measurements (2.00%) 1 (1.00%) low mild 1 (1.00%) high mild clip_point/4096 time: [33.240 µs 33.310 µs 33.394 µs] thrpt: [116.98 MiB/s 117.27 MiB/s 117.52 MiB/s] change: time: [-2.8892% -2.6305% -2.3438%] (p = 0.00 < 0.05) thrpt: [+2.4000% +2.7015% +2.9751%] Performance has improved. Found 12 outliers among 100 measurements (12.00%) 1 (1.00%) low mild 4 (4.00%) high mild 7 (7.00%) high severe clip_point/65536 time: [1.6531 ms 1.6586 ms 1.6640 ms] thrpt: [37.560 MiB/s 37.683 MiB/s 37.808 MiB/s] change: time: [-6.6381% -5.9395% -5.2680%] (p = 0.00 < 0.05) thrpt: [+5.5610% +6.3146% +7.1100%] Performance has improved. Found 7 outliers among 100 measurements (7.00%) 1 (1.00%) low mild 2 (2.00%) high mild 4 (4.00%) high severe point_to_offset/4096 time: [11.586 µs 11.603 µs 11.621 µs] thrpt: [336.15 MiB/s 336.67 MiB/s 337.16 MiB/s] change: time: [-14.289% -14.111% -13.939%] (p = 0.00 < 0.05) thrpt: [+16.197% +16.429% +16.672%] Performance has improved. Found 12 outliers among 100 measurements (12.00%) 3 (3.00%) low severe 5 (5.00%) low mild 4 (4.00%) high mild point_to_offset/65536 time: [527.74 µs 532.08 µs 536.51 µs] thrpt: [116.49 MiB/s 117.46 MiB/s 118.43 MiB/s] change: time: [-6.7825% -4.6235% -2.3533%] (p = 0.00 < 0.05) thrpt: [+2.4100% +4.8477% +7.2760%] Performance has improved. Found 8 outliers among 100 measurements (8.00%) 4 (4.00%) high mild 4 (4.00%) high severe cursor/4096 time: [16.154 µs 16.192 µs 16.232 µs] thrpt: [240.66 MiB/s 241.24 MiB/s 241.81 MiB/s] change: time: [-3.2536% -2.9145% -2.5526%] (p = 0.00 < 0.05) thrpt: [+2.6194% +3.0019% +3.3630%] Performance has improved. Found 5 outliers among 100 measurements (5.00%) 1 (1.00%) low mild 2 (2.00%) high mild 2 (2.00%) high severe cursor/65536 time: [509.60 µs 511.24 µs 512.93 µs] thrpt: [121.85 MiB/s 122.25 MiB/s 122.65 MiB/s] change: time: [-7.3677% -6.6017% -5.7840%] (p = 0.00 < 0.05) thrpt: [+6.1391% +7.0683% +7.9537%] Performance has improved. Found 6 outliers among 100 measurements (6.00%) 3 (3.00%) high mild 3 (3.00%) high severe ``` Release Notes: - N/A *or* Added/Fixed/Improved ...
2025-09-24 14:35:38 +02:00
parent c5219e8fd2
commit e1b57f00a0
26 changed files with 811 additions and 785 deletions
@@ -55,7 +55,7 @@ pub struct WrapChunks<'a> {
    input_chunk: Chunk<'a>,
    output_position: WrapPoint,
    max_output_row: u32,
-    transforms: Cursor<'a, Transform, Dimensions<WrapPoint, TabPoint>>,
+    transforms: Cursor<'a, 'static, Transform, Dimensions<WrapPoint, TabPoint>>,
    snapshot: &'a WrapSnapshot,
 }

@@ -66,7 +66,7 @@ pub struct WrapRows<'a> {
    output_row: u32,
    soft_wrapped: bool,
    max_output_row: u32,
-    transforms: Cursor<'a, Transform, Dimensions<WrapPoint, TabPoint>>,
+    transforms: Cursor<'a, 'static, Transform, Dimensions<WrapPoint, TabPoint>>,
 }

 impl WrapRows<'_> {
@@ -221,7 +221,7 @@ impl WrapMap {
            if !summary.lines.is_zero() {
                self.snapshot
                    .transforms
-                    .push(Transform::isomorphic(summary), &());
+                    .push(Transform::isomorphic(summary), ());
            }
            let new_rows = self.snapshot.transforms.summary().output.lines.row + 1;
            self.snapshot.interpolated = false;
@@ -318,7 +318,7 @@ impl WrapSnapshot {
        let mut transforms = SumTree::default();
        let extent = tab_snapshot.text_summary();
        if !extent.lines.is_zero() {
-            transforms.push(Transform::isomorphic(extent), &());
+            transforms.push(Transform::isomorphic(extent), ());
        }
        Self {
            transforms,
@@ -336,7 +336,7 @@ impl WrapSnapshot {
        if tab_edits.is_empty() {
            new_transforms = self.transforms.clone();
        } else {
-            let mut old_cursor = self.transforms.cursor::<TabPoint>(&());
+            let mut old_cursor = self.transforms.cursor::<TabPoint>(());

            let mut tab_edits_iter = tab_edits.iter().peekable();
            new_transforms =
@@ -368,7 +368,7 @@ impl WrapSnapshot {

                        old_cursor.next();
                        new_transforms
-                            .append(old_cursor.slice(&next_edit.old.start, Bias::Right), &());
+                            .append(old_cursor.slice(&next_edit.old.start, Bias::Right), ());
                    }
                } else {
                    if old_cursor.end() > edit.old.end {
@@ -378,7 +378,7 @@ impl WrapSnapshot {
                        new_transforms.push_or_extend(Transform::isomorphic(summary));
                    }
                    old_cursor.next();
-                    new_transforms.append(old_cursor.suffix(), &());
+                    new_transforms.append(old_cursor.suffix(), ());
                }
            }
        }
@@ -434,7 +434,7 @@ impl WrapSnapshot {
            new_transforms = self.transforms.clone();
        } else {
            let mut row_edits = row_edits.into_iter().peekable();
-            let mut old_cursor = self.transforms.cursor::<TabPoint>(&());
+            let mut old_cursor = self.transforms.cursor::<TabPoint>(());

            new_transforms = old_cursor.slice(
                &TabPoint::new(row_edits.peek().unwrap().old_rows.start, 0),
@@ -511,7 +511,7 @@ impl WrapSnapshot {
                if let Some(transform) = edit_transforms.next() {
                    new_transforms.push_or_extend(transform);
                }
-                new_transforms.extend(edit_transforms, &());
+                new_transforms.extend(edit_transforms, ());

                old_cursor.seek_forward(&TabPoint::new(edit.old_rows.end, 0), Bias::Right);
                if let Some(next_edit) = row_edits.peek() {
@@ -526,7 +526,7 @@ impl WrapSnapshot {
                        new_transforms.append(
                            old_cursor
                                .slice(&TabPoint::new(next_edit.old_rows.start, 0), Bias::Right),
-                            &(),
+                            (),
                        );
                    }
                } else {
@@ -537,7 +537,7 @@ impl WrapSnapshot {
                        new_transforms.push_or_extend(Transform::isomorphic(summary));
                    }
                    old_cursor.next();
-                    new_transforms.append(old_cursor.suffix(), &());
+                    new_transforms.append(old_cursor.suffix(), ());
                }
            }
        }
@@ -556,8 +556,8 @@ impl WrapSnapshot {

    fn compute_edits(&self, tab_edits: &[TabEdit], new_snapshot: &WrapSnapshot) -> Patch<u32> {
        let mut wrap_edits = Vec::with_capacity(tab_edits.len());
-        let mut old_cursor = self.transforms.cursor::<TransformSummary>(&());
-        let mut new_cursor = new_snapshot.transforms.cursor::<TransformSummary>(&());
+        let mut old_cursor = self.transforms.cursor::<TransformSummary>(());
+        let mut new_cursor = new_snapshot.transforms.cursor::<TransformSummary>(());
        for mut tab_edit in tab_edits.iter().cloned() {
            tab_edit.old.start.0.column = 0;
            tab_edit.old.end.0 += Point::new(1, 0);
@@ -600,7 +600,7 @@ impl WrapSnapshot {
        let output_end = WrapPoint::new(rows.end, 0);
        let mut transforms = self
            .transforms
-            .cursor::<Dimensions<WrapPoint, TabPoint>>(&());
+            .cursor::<Dimensions<WrapPoint, TabPoint>>(());
        transforms.seek(&output_start, Bias::Right);
        let mut input_start = TabPoint(transforms.start().1.0);
        if transforms.item().is_some_and(|t| t.is_isomorphic()) {
@@ -630,7 +630,7 @@ impl WrapSnapshot {
    pub fn line_len(&self, row: u32) -> u32 {
        let mut cursor = self
            .transforms
-            .cursor::<Dimensions<WrapPoint, TabPoint>>(&());
+            .cursor::<Dimensions<WrapPoint, TabPoint>>(());
        cursor.seek(&WrapPoint::new(row + 1, 0), Bias::Left);
        if cursor
            .item()
@@ -657,7 +657,7 @@ impl WrapSnapshot {

        let mut cursor = self
            .transforms
-            .cursor::<Dimensions<WrapPoint, TabPoint>>(&());
+            .cursor::<Dimensions<WrapPoint, TabPoint>>(());
        cursor.seek(&start, Bias::Right);
        if let Some(transform) = cursor.item() {
            let start_in_transform = start.0 - cursor.start().0.0;
@@ -711,7 +711,7 @@ impl WrapSnapshot {
    }

    pub fn soft_wrap_indent(&self, row: u32) -> Option<u32> {
-        let mut cursor = self.transforms.cursor::<WrapPoint>(&());
+        let mut cursor = self.transforms.cursor::<WrapPoint>(());
        cursor.seek(&WrapPoint::new(row + 1, 0), Bias::Right);
        cursor.item().and_then(|transform| {
            if transform.is_isomorphic() {
@@ -729,7 +729,7 @@ impl WrapSnapshot {
    pub fn row_infos(&self, start_row: u32) -> WrapRows<'_> {
        let mut transforms = self
            .transforms
-            .cursor::<Dimensions<WrapPoint, TabPoint>>(&());
+            .cursor::<Dimensions<WrapPoint, TabPoint>>(());
        transforms.seek(&WrapPoint::new(start_row, 0), Bias::Left);
        let mut input_row = transforms.start().1.row();
        if transforms.item().is_some_and(|t| t.is_isomorphic()) {
@@ -751,7 +751,7 @@ impl WrapSnapshot {
    pub fn to_tab_point(&self, point: WrapPoint) -> TabPoint {
        let mut cursor = self
            .transforms
-            .cursor::<Dimensions<WrapPoint, TabPoint>>(&());
+            .cursor::<Dimensions<WrapPoint, TabPoint>>(());
        cursor.seek(&point, Bias::Right);
        let mut tab_point = cursor.start().1.0;
        if cursor.item().is_some_and(|t| t.is_isomorphic()) {
@@ -771,14 +771,14 @@ impl WrapSnapshot {
    pub fn tab_point_to_wrap_point(&self, point: TabPoint) -> WrapPoint {
        let mut cursor = self
            .transforms
-            .cursor::<Dimensions<TabPoint, WrapPoint>>(&());
+            .cursor::<Dimensions<TabPoint, WrapPoint>>(());
        cursor.seek(&point, Bias::Right);
        WrapPoint(cursor.start().1.0 + (point.0 - cursor.start().0.0))
    }

    pub fn clip_point(&self, mut point: WrapPoint, bias: Bias) -> WrapPoint {
        if bias == Bias::Left {
-            let mut cursor = self.transforms.cursor::<WrapPoint>(&());
+            let mut cursor = self.transforms.cursor::<WrapPoint>(());
            cursor.seek(&point, Bias::Right);
            if cursor.item().is_some_and(|t| !t.is_isomorphic()) {
                point = *cursor.start();
@@ -798,7 +798,7 @@ impl WrapSnapshot {

        let mut cursor = self
            .transforms
-            .cursor::<Dimensions<WrapPoint, TabPoint>>(&());
+            .cursor::<Dimensions<WrapPoint, TabPoint>>(());
        cursor.seek(&point, Bias::Right);
        if cursor.item().is_none() {
            cursor.prev();
@@ -820,7 +820,7 @@ impl WrapSnapshot {

        let mut cursor = self
            .transforms
-            .cursor::<Dimensions<WrapPoint, TabPoint>>(&());
+            .cursor::<Dimensions<WrapPoint, TabPoint>>(());
        cursor.seek(&point, Bias::Right);
        while let Some(transform) = cursor.item() {
            if transform.is_isomorphic() && cursor.start().1.column() == 0 {
@@ -857,7 +857,7 @@ impl WrapSnapshot {
            );

            {
-                let mut transforms = self.transforms.cursor::<()>(&()).peekable();
+                let mut transforms = self.transforms.cursor::<()>(()).peekable();
                while let Some(transform) = transforms.next() {
                    if let Some(next_transform) = transforms.peek() {
                        assert!(transform.is_isomorphic() != next_transform.is_isomorphic());
@@ -1075,7 +1075,7 @@ impl Transform {
 impl sum_tree::Item for Transform {
    type Summary = TransformSummary;

-    fn summary(&self, _cx: &()) -> Self::Summary {
+    fn summary(&self, _cx: ()) -> Self::Summary {
        self.summary.clone()
    }
 }
@@ -1106,11 +1106,11 @@ impl SumTreeExt for SumTree<Transform> {
                    last_transform.summary.output += &transform.summary.output;
                }
            },
-            &(),
+            (),
        );

        if let Some(transform) = transform {
-            self.push(transform, &());
+            self.push(transform, ());
        }
    }
 }
@@ -1137,41 +1137,39 @@ impl WrapPoint {
    }
 }

-impl sum_tree::Summary for TransformSummary {
-    type Context = ();
-
-    fn zero(_cx: &()) -> Self {
+impl sum_tree::ContextLessSummary for TransformSummary {
+    fn zero() -> Self {
        Default::default()
    }

-    fn add_summary(&mut self, other: &Self, _: &()) {
+    fn add_summary(&mut self, other: &Self) {
        self.input += &other.input;
        self.output += &other.output;
    }
 }

 impl<'a> sum_tree::Dimension<'a, TransformSummary> for TabPoint {
-    fn zero(_cx: &()) -> Self {
+    fn zero(_cx: ()) -> Self {
        Default::default()
    }

-    fn add_summary(&mut self, summary: &'a TransformSummary, _: &()) {
+    fn add_summary(&mut self, summary: &'a TransformSummary, _: ()) {
        self.0 += summary.input.lines;
    }
 }

 impl sum_tree::SeekTarget<'_, TransformSummary, TransformSummary> for TabPoint {
-    fn cmp(&self, cursor_location: &TransformSummary, _: &()) -> std::cmp::Ordering {
+    fn cmp(&self, cursor_location: &TransformSummary, _: ()) -> std::cmp::Ordering {
        Ord::cmp(&self.0, &cursor_location.input.lines)
    }
 }

 impl<'a> sum_tree::Dimension<'a, TransformSummary> for WrapPoint {
-    fn zero(_cx: &()) -> Self {
+    fn zero(_cx: ()) -> Self {
        Default::default()
    }

-    fn add_summary(&mut self, summary: &'a TransformSummary, _: &()) {
+    fn add_summary(&mut self, summary: &'a TransformSummary, _: ()) {
        self.0 += summary.output.lines;
    }
 }
@@ -1385,7 +1383,7 @@ mod tests {
                let mut summary = TextSummary::default();
                for (ix, item) in wrapped_snapshot
                    .transforms
-                    .items(&())
+                    .items(())
                    .into_iter()
                    .enumerate()
                {