OXYGENHUB
# 0554aaa7ddef oxygen / docs / benchmarks.md
15.6 KiB · Markdown · last changed Check out against the manifest, without the base state 1 month ago renderedsource blame history raw
1
# Benchmarks
2
3
The harness is `crates/oxy-core/tests/bench.rs` (spec §25). It builds a
4
repository through the library, one commit at a time, then times the
5
everyday operations against thresholds:
6
7
    OXY_BENCH_DIR=~/.cache/oxy-bench \
8
      cargo test --release -p oxy-core --test bench -- --ignored --nocapture
9
10
`OXY_BENCH_FILES` (default 10 000) and `OXY_BENCH_CHANGES` (default
11
5 000) set the size. The data lands under `OXY_BENCH_DIR`; `/tmp` is often
12
a RAM disk, which hides the cost of `fsync`, so measure on a real disk.
13
14
## 2026-09-28: first run
15
16
Machine: 8 cores, x86-64, NVMe (ext4 on LVM), release build, warm cache.
17
Files are 21 lines each in 100 directories; one change in ten appends a
18
line to `hot.txt`, the rest rewrite one ordinary file.
19
20
| Operation (10 000 files, 5 000 changes) | Time | Threshold | |
21
|---|---:|---:|---|
22
| commit: import 10 000 files | 1 031 ms | 60 000 ms | ok |
23
| commit: one file (mean of 4 999) | 3 761 ms | 250 ms | **over** |
24
| status: clean working copy (stat crawl) | 2 977 ms | 2 000 ms | **over** |
25
| status: 10 files modified | 3 062 ms | 2 000 ms | **over** |
26
| commit: 10 files | 9 089 ms | 500 ms | **over** |
27
| log: whole bookmark | 408 ms | 2 000 ms | ok |
28
| blame: hot file (500 lines) | 2 920 ms | 2 000 ms | **over** |
29
| blame: ordinary file | 2 927 ms | 1 000 ms | **over** |
30
| checkpoint | 596 ms | 10 000 ms | ok |
31
| status after checkpoint | 2 873 ms | 2 000 ms | **over** |
32
| push: everything to an empty remote | 782 ms | 60 000 ms | ok |
33
| push: up to date | 4 ms | 1 000 ms | ok |
34
| clone: everything, with checkout | 3 378 ms | 60 000 ms | ok |
35
| fsck | 7 955 ms | 60 000 ms | ok |
36
| gc | 9 489 ms | 60 000 ms | ok |
37
| status after gc | 2 829 ms | 2 000 ms | **over** |
38
39
Peak resident memory over the whole run: 1 405 MiB. The run took 5 h 14 min,
40
almost all of it building the history, because each commit costs as much
41
as a status.
42
43
Smaller runs, same machine:
44
45
| Files, changes | Mean commit | Clean status | Blame (hot) | Peak memory |
46
|---|---:|---:|---:|---:|
47
| 1 000, 200 | 90 ms | 62 ms | 62 ms | 70 MiB |
48
| 1 000, 800 | 166 ms | 130 ms | 119 ms | 118 MiB |
49
| 4 000, 200 | 343 ms | 235 ms | 239 ms | 254 MiB |
50
| 10 000, 5 000 | 3 761 ms | 2 977 ms | 2 920 ms | 1 405 MiB |
51
52
### What it shows
53
54
Sync, log, checkpoints and repository maintenance are fine. Everything
55
that snapshots the working copy (status, commit, blame of the working
56
copy's base) grows with both the number of files and the length of the
57
history. Timing the phases of one snapshot at 4 000 files and 300 changes:
58
59
| Phase | Time |
60
|---|---:|
61
| load the base state (checkpoint plus the changes since) | 75–130 ms |
62
| materialize every file of the base state | 75 ms |
63
| walk the working copy against the manifest | 50 ms |
64
| build the working-copy change | 8 ms |
65
66
A clean status should be a stat walk and nothing else. The fix is backlog
67
item O10: skip loading and materializing when every file's stat matches a
68
manifest written for the same base, make the base state lazy for the
69
callers that need it, and cache materialized snapshots per state. The
70
thresholds above stay as they are until then, so the harness reports the
71
gap rather than hiding it.
72
73
## 2026-09-28: after O10a
74
75
`State::maximal` compared every pair of heads, and the benchmark's
76
bookmark has about 4 500 of them (changes to different files are
77
independent). It now walks once; commit also stops loading the base state
78
twice. Same machine and size:
79
80
| Operation (10 000 files, 5 000 changes) | Before | After | Threshold | |
81
|---|---:|---:|---:|---|
82
| commit: one file (mean of 4 999) | 3 761 ms | 861 ms | 250 ms | **over** |
83
| status: clean working copy | 2 977 ms | 803 ms | 2 000 ms | ok |
84
| status: 10 files modified | 3 062 ms | 864 ms | 2 000 ms | ok |
85
| commit: 10 files | 9 089 ms | 861 ms | 500 ms | **over** |
86
| log: whole bookmark | 408 ms | 400 ms | 2 000 ms | ok |
87
| blame: hot file | 2 920 ms | 809 ms | 2 000 ms | ok |
88
| blame: ordinary file | 2 927 ms | 828 ms | 1 000 ms | ok |
89
| status after checkpoint | 2 873 ms | 770 ms | 2 000 ms | ok |
90
| push: everything | 782 ms | 742 ms | 60 000 ms | ok |
91
| clone: everything | 3 378 ms | 1 664 ms | 60 000 ms | ok |
92
| fsck | 7 955 ms | 6 872 ms | 60 000 ms | ok |
93
| gc | 9 489 ms | 9 526 ms | 60 000 ms | ok |
94
95
Peak resident memory: 1 145 MiB (was 1 405). The run took 1 h 12 min
96
(was 5 h 14 min). Commit time no longer grows with history; what remains
97
grows with the number of files: at 10 000 files a snapshot spends about
98
320 ms loading the base state, 190 ms materializing it, 130 ms walking the
99
working copy and 40 ms building the change. That is O10b.
100
101
## 2026-09-28: after O10b
102
103
Rendering the base state, building file graphs from a checkpoint and
104
reading the working copy now run on all cores. Measured at 10 000 files
105
with 60 and 300 changes (commit time no longer depends on the length of
106
history, so the full 5 000 was not rerun):
107
108
| Phase of one snapshot, 10 000 files | After O10a | After O10b |
109
|---|---:|---:|
110
| load the base state | 320 ms | 180–280 ms |
111
| materialize the base state | 190 ms | 75 ms |
112
| walk and read the working copy | 130 ms | 80 ms |
113
| build the working-copy change | 40 ms | 40 ms |
114
| write the manifest | – | 46 ms |
115
116
| Operation, 10 000 files | After O10a | After O10b | Threshold |
117
|---|---:|---:|---:|
118
| status: clean working copy | 803 ms | 464–581 ms | 2 000 ms |
119
| commit: one file (mean) | 861 ms | 550–605 ms | 250 ms |
120
| commit: 10 files | 861 ms | 583–635 ms | 500 ms |
121
122
Loading the whole base state is now the largest cost. O10c removes it: a
123
snapshot should load and render only the files whose stat changed, which
124
needs checkpoints that can be read per file.
125
126
## 2026-09-28: O10c, first part: the in-memory state
127
128
Profiling a clean snapshot with `OXY_TIMINGS=1` (10 000 files of 40 lines,
129
200 changes) showed loading the base state dominating it. Applying the
130
changes to the in-memory graphs cost 650 ms and reading them 160 ms. A
131
checkpoint did not help: decoding one took 680 ms, as long as replaying
132
every change, because both build the same graphs for 400 000 lines. So the
133
cost was in the graph structure, not in the format:
134
135
- **Hashing.** The graph maps used SipHash over 36-byte keys, three to
136
  five times per line. The keys begin with BLAKE3 hashes, so they now use
137
  a seeded multiply-rotate hasher (`fasthash.rs`). The seed is random per
138
  process, so keys chosen by someone else cannot be aimed at one bucket.
139
- **The predecessor map.** It was written for every line and read nowhere,
140
  so it is gone.
141
- **Successor sets.** A `BTreeSet` per vertex became a sorted edge list
142
  that keeps its single successor inline. Nearly every line has one.
143
- **Line bytes.** Loading moves them into the graph instead of copying
144
  them, and chains each new line with one lookup instead of three.
145
146
Both binaries were built from the same tree and run alternately, nine
147
times each, medians shown:
148
149
| 10 000 files, 200 changes | Before | After |
150
|---|---:|---:|
151
| status: clean working copy | 0.96 s | 0.52 s |
152
| commit: one file | 0.99 s | 0.51 s |
153
| peak memory (either) | 657 MB | 239 MB |
154
155
The checkpoint format is unchanged. What remains of O10c is split into
156
O10d and O10e in the backlog:
157
158
- **O10d.** Skip reading text files whose stat matches the manifest, when
159
  the manifest recorded them equal to the base.
160
- **O10e.** Checkpoints readable per file, so a snapshot loads only the
161
  graphs it needs. This one changes the checkpoint format in spec §25.
162
163
## 2026-09-28: O10g, first part: status snapshots skip unchanged files
164
165
The manifest now records, per text file equal to the base, the key of the
166
base graph it matched: the file's node, its checkpoint graph (blob,
167
inline value or none) and the set of later changes that edited it
168
(spec §12.4). When a file's stat and key both still match, the snapshot
169
neither reads nor renders it.
170
171
`status`, `log`, `show`, `tag` and `bookmark` use a partial snapshot. It
172
loads the base for its history and builds only the graphs of files that
173
are not known unchanged. `commit`, `diff` and the rest still build the
174
whole base.
175
176
10 000 files of 40 lines, 22 changes, a version 2 checkpoint after 21 of
177
them; `OXY_TIMINGS=1`, clean working copy:
178
179
| Operation | Before | After |
180
|---|---:|---:|
181
| status | 0.55 s | 0.22 s |
182
| status peak memory | 259 MB | 51 MB |
183
| log | 0.7–0.8 s | 0.38 s |
184
| diff (full snapshot) | 0.56 s | 0.57 s |
185
186
| Phase of a clean status snapshot | Before | After |
187
|---|---:|---:|
188
| load base (whole / history only) | 317 ms | 31 ms |
189
| render base | 91 ms | 25 ms |
190
| read working copy | 68 ms | 50 ms |
191
| diff against base | 41 ms | 28 ms |
192
| write manifest | 33 ms | 35 ms |
193
194
The same for `commit` and `diff` comes next (O10h). There, only the graphs
195
the change touches are needed, and materialized states can be cached.
196
197
## 2026-09-29: O10h, commit, diff and show build only what they touch
198
199
Commit, working-copy diff, hunks and discard use the partial snapshot of
200
O10g. Files known unchanged are neither read nor rendered, and only the
201
graphs of the files the working copy changes are built. Showing a
202
committed change (`oxy show`, `oxy diff CHANGE`) builds the graphs of the
203
files that change edits and leaves the rest unrendered.
204
205
Same repository as O10g (10 000 files of 40 lines):
206
207
| Operation | After O10g | After O10h |
208
|---|---:|---:|
209
| diff (working copy) | 0.57 s, 244 MB | 0.22 s, 52 MB |
210
| commit (one file) | 0.58 s, 245 MB | 0.23 s, 52 MB |
211
| show (a one-file change) | not measured | 0.53 s, 145 MB |
212
213
Caching materialized states, planned alongside, is not needed now that
214
these commands render almost nothing.
215
216
## 2026-09-29: P5c, importing microsoft/vscode, first part
217
218
`oxy git import` on slices of microsoft/vscode's `main` (166 412 commits in
219
total), taken in the importer's own order (`git log --reverse
220
--topo-order`). The first 5 000 commits reach May 2016 with about 4 700
221
files.
222
223
The importer did work proportional to the whole tree for every commit:
224
- It cloned the previous state.
225
- It rebuilt a merge's first parent from history.
226
- It rendered, read and compared every file.
227
- It scanned every entry, with an allocation each, to decide whether each
228
  directory was still needed.
229
230
Now:
231
- Files with the same Git blob and mode as in the first parent's tree are
232
  marked unchanged and skipped, as a clean working copy's are. Paths that a
233
  merge's other parents touched are excluded.
234
- A commit's state is kept while first-parent children remain, up to 8,
235
  and the last child takes it without a clone.
236
- Needed directories come from one set of ancestors. That code is shared
237
  by snapshot and commit.
238
239
| Slice | Before | After |
240
|---|---:|---:|
241
| 300 commits (35 merges) | 65.1 s | 13.6 s |
242
| 1 000 commits (95 merges) | 271 s | 120 s, 3.3 GB |
243
| 5 000 commits (360 merges) | not finished after 80 min | 412 s, 6.3 GB, 17 MB store |
244
245
Where the 5 000-commit import spends its time (summed per phase): render
246
base 172 s, build change 99 s, bases 65 s, `git ls-tree` 56 s, read blobs
247
10 s, store 5 s.
248
249
Correctness: `oxy git verify` reproduces every commit of the 300 and
250
1 000-commit imports (1.9 million file comparisons for 1 000). A test
251
covers the case that must not be skipped: a `-s ours` merge whose other
252
side edited a file.
253
254
Next: rendering the base is still O(files) per commit, and memory grows
255
with the kept states. The full import follows.
256
257
## Linux, stage 1: the tip as one commit (2026-09-29)
258
259
The Linux tree at its tip: 95 943 files, 1.8 GB, on Earth (4 cores,
260
31 GiB), each run capped at 14 GB.
261
262
| | Git | oxy before | oxy, change format 2 |
263
|---|---:|---:|---:|
264
| First commit | 33.7 s, 42 MB | failed, 10.9 GB | 55.3 s, 9.9 GB |
265
| Store | | unreadable | 442 MB |
266
| Clean `status` | 0.26 to 0.31 s | | killed at 14 GB |
267
268
Before format 2 the commit made one change of 1.8 GB. That was over the
269
1 GiB an object may be, and the repository would not open afterwards
270
(oxygen#33, oxygen#34). Format 2 stores each insert of 4 KiB or more as
271
a text blob, so the change stays small.
272
273
Memory is the next problem. Every line is kept as its own allocation,
274
once in the change and again in the file graph, and `status` builds
275
every graph (L1b).
276
277
### Status after the commit (2026-09-29, oxygen#35)
278
279
A profile with the counting allocator (`--features alloc-stats`,
280
`OXY_TIMINGS=1`) of the first clean `status`, before it was killed:
281
282
| Phase | Time | Live after | Allocated |
283
|---|---:|---:|---:|
284
| Load base history | 17.5 s | 3.2 GB | 16 GB in 96 M allocations |
285
| Read working copy | 79.5 s | 4.9 GB | 1.8 GB |
286
| Load and render base | killed at 14 GB | | |
287
288
It had two causes, and both are fixed:
289
- **History held every line.** A history-only state now reads a stored
290
  insert's text blob only when it builds that file's graph, and a load no
291
  longer hashes each change again, which for format 2 means chunking all
292
  its text.
293
- **The manifest had no graph keys.** They are now recorded at commit, so
294
  the next status neither reads nor renders an unchanged file.
295
296
| Clean `status` on the Linux tip | Time | Peak RSS |
297
|---|---:|---:|
298
| Before | killed at 14 GB | |
299
| Lazy text and keys at commit | 3.7 s | 768 MB |
300
| And answered from the manifest | 0.72 s | 120 MB |
301
| Git | 0.22 s | 31 MB |
302
303
A clean status is now answered from the manifest alone, loading no
304
history. The manifest also records the executable bit, since a mode
305
change alters neither size nor time. Any change, a manifest older than
306
the racy window, or subrepos send it back to a full snapshot.
307
308
Still to do: status to the 0.4 s target (the walk and reading the
309
manifest); a status without a usable manifest still builds every graph
310
and is killed at 14 GB; `fsck` is killed at
311
14 GB; the first commit takes 57 s and 10.2 GB.
312
313
### Checkout and clone (2026-09-29, oxygen#35)
314
315
A checkout built and rendered every file of the target, read the whole
316
working copy, and after writing walked and hashed it all again for the
317
manifest. Switching bookmarks or cloning the Linux tree was killed at
318
14 GB. Now:
319
- a file is skipped when the manifest shows it unchanged and its graph is
320
  the same in both states;
321
- the rest are rendered 2 048 at a time, and each batch's graphs are
322
  dropped once written;
323
- the manifest is built from what the checkout already knows.
324
325
| Linux tip | oxy before | oxy now | Git |
326
|---|---:|---:|---:|
327
| Switch bookmark (one file differs) | killed at 14 GB | 7.1 to 7.4 s, 1.3 GB | 0.18 to 0.22 s, 39 MB |
328
| Local clone | killed at 14 GB | 98 s, 7.9 GB | 9.8 s, 469 MB |
329
330
A history-only load now reads a change's skeleton: the inline lines of
331
its inserts are stepped over, not decoded, and are read from the change
332
only for a graph that is built. A one-file switch then takes 5.4 to 5.6 s
333
and 0.8 GB, and the status after it 3.3 s and 600 MB (from 3.8 s).
334
335
A checkout of a working copy that is clean by the manifest now skips the
336
status snapshot, and a manifest entry inside the racy window is checked
337
by hashing the file rather than distrusting the whole manifest. A
338
one-file switch then takes 3.7 to 3.9 s and 705 MB. Where it goes:
339
checking the manifest (a walk of 96 000 files) 0.75 s, the base's and
340
the target's history 0.5 s each, their tree views 0.3 s each, planning
341
0.2 s, and writing the manifest 0.6 s.
342
343
A checkout now needs no base state at all: after the manifest check or a
344
snapshot, the manifest says which graph each file on disk renders. A
345
file is skipped when its manifest key is the target's, and a file left
346
as it was keeps its stat in the new manifest instead of being statted
347
again. What the new state lacks is found by a walk from the old heads
348
that stops at the target. A one-file switch takes 2.1 to 2.2 s and 455
349
MB: the manifest check 0.4 s, the target's history 0.5 s and tree view
350
0.3 s, planning 0.16 s, and writing the manifest 0.4 s.
351
352
Before that, most of a switch was loading history: the base's and the target's
353
history each decode the one huge first change (1.2 s and 364 MB each).
354
A clone holds the whole bundle in memory.
355