Repository navigation
Commit ede2986
committed
Pack the hash beside the value in map entries
String, Int64 and object-keyed map entries were laid out value, key,
hash, next. With an Int value that left 4 bytes of padding after the
value and 4 after the hash: a StringMap<Int> entry took 40 bytes on
64-bit, 48 with its header and alignment. Laying them out key, hash,
value, next makes it 32. Entries with 8 or 16-byte values keep their
size.
Measured on Windows x64: a 200,000-entry StringMap<Int> holds 9.6 MB
instead of 11.2 MB (stock hxcpp 4.3.53: 9.4 MB, with half the bucket
array); map_object peak memory 44.1 MB -> 41.6 MB; map_string 148.9 MB
-> 147.9 MB, against 114.8 MB for stock, at the same speed.
That is only part of map_string's gap. Of about 33 MB of peak memory
over stock, about 23 MB comes from HXCPP_ALIGN_ALLOC, which libhxcpp
defines on every platform since HaxeFoundation/hxcpp#1246 and stock
4.3.53 only for Emscripten: each small allocation starts 8-byte
aligned, and the benchmark keeps 400,000 key strings each built among
temporaries. About 6 MB comes from the memoized hash slot of strings of
8 or more characters, and 1 MB from the lower bucket load factor, both
kept for lookup speed. String data holds no atomics or doubles and
could skip the alignment, but that needs a change to the allocator and
the nursery's hole walker.
Tests: TestMapValues in test/haxe fills String and object-keyed maps
with Int, Float, String, Dynamic and Bool values, collects, compacts,
removes half and checks every lookup and the iteration, and changes a
map's value type as it goes; it passes before this change too, as the
layout must not change behavior. TestStringHash and TestObjectHash also
use Int values. Bench: map_string, map_object.
Refs #3701 parent 077e7d0 commit ede2986
4 files changed
Lines changed: 86 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
103 | 103 | | |
104 | 104 | | |
105 | 105 | | |
106 | | - | |
| 106 | + | |
107 | 107 | | |
108 | 108 | | |
| 109 | + | |
109 | 110 | | |
110 | 111 | | |
111 | 112 | | |
| |||
135 | 136 | | |
136 | 137 | | |
137 | 138 | | |
138 | | - | |
| 139 | + | |
| 140 | + | |
139 | 141 | | |
140 | 142 | | |
| 143 | + | |
141 | 144 | | |
142 | 145 | | |
143 | 146 | | |
| |||
231 | 234 | | |
232 | 235 | | |
233 | 236 | | |
234 | | - | |
| 237 | + | |
235 | 238 | | |
236 | 239 | | |
| 240 | + | |
237 | 241 | | |
238 | 242 | | |
239 | 243 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
30 | 31 | | |
31 | 32 | | |
32 | 33 | | |
| |||
84 | 85 | | |
85 | 86 | | |
86 | 87 | | |
| 88 | + | |
87 | 89 | | |
88 | 90 | | |
89 | 91 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
0 commit comments