Use `TinyAsciiStr` instead of `&'static str` for baked data #5159

robertbastian · 2024-07-01T13:11:11Z

&'static str is 16 bytes (8 bytes on 32-bit), so unless a locale is longer than that, &'static str is more expensive than TinyAsciiStrs, even without considering the pointed-to-data. We very rarely (never?) have locales that are actually this long.

sffc

Seems plausible; can you measure the actual compiled binary size before and after?

sffc · 2024-07-01T16:47:51Z

provider/data/collator/data/collation_reordering_v1_marker.rs.data

@@ -42,7 +42,8 @@ macro_rules! __impl_collation_reordering_v1_marker {
                const __TH: &S = &icu::collator::provider::CollationReorderingV1 { min_high_no_reorder: 1929379840u32, reorder_table: unsafe { zerovec::ZeroVec::from_bytes_unchecked(b"\0\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0B\x0C\r\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopq'stuvwxyz{|}~\x7F\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8A\x8B\x8C\x8D\x8E\x8F\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9A\x9B\x9C\x9D\x9E\x9F\xA0\xA1\xA2\xA3\xA4\xA5\xA6\xA7\xA8\xA9\xAA\xAB\xAC\xAD\xAE\xAF\xB0\xB1\xB2\xB3\xB4\xB5\xB6\xB7\xB8\xB9\xBA\xBB\xBC\xBD\xBE\xBF\xC0\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1\xD2\xD3\xD4\xD5\xD6\xD7\xD8\xD9\xDA\xDB\xDC\xDD\xDE\xDF\xE0\xE1\xE2\xE3\xE4\xE5\xE6\xE7\xE8\xE9\xEA\xEB\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF") }, reorder_ranges: zerovec::ZeroVec::new() };
                const __YUE_U_CO_STROKE: &S = &icu::collator::provider::CollationReorderingV1 { min_high_no_reorder: 4261412864u32, reorder_table: unsafe { zerovec::ZeroVec::from_bytes_unchecked(b"\0\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0B\x0C\r\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F !\"#$%&'(\xA8\xA9\xAA\xAB\xAC\xAD\xAE\xAF\xB0\xB1\xB2\xB3\xB4\xB5\xB6\xB7\xB8\xB9\xBA\xBB\xBC\xBD\xBE\xBF\xC0\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1\xD2\xD3\xD4\xD5\xD6\xD7\xD8\xD9\xDA\xDB\xDC\xDD\xDE\xDD\xDE\xDF\xE0\xE1\xE2\xE3\xE4\xE5\xE6\xE7\xE8\xE9\xEA\xEB\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\0\xF9\xFA'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7F\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8A\x8B\x8C\x8D\x8E\x8F\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9A\x9B\x9C\x9D\x9E\x9F\xA0\xA1\xA2\xA3\xA4\xA5\xA6\xFE\xFF") }, reorder_ranges: unsafe { zerovec::ZeroVec::from_bytes_unchecked(b",\0v{}\0\0~\xA9\xFF\0\xFE") } };
                const __ZH: &S = &icu::collator::provider::CollationReorderingV1 { min_high_no_reorder: 4261412864u32, reorder_table: unsafe { zerovec::ZeroVec::from_bytes_unchecked(b"\0\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0B\x0C\r\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F !\"#$%&'(\xA7\xA8\xA9\xAA\xAB\xAC\xAD\xAE\xAF\xB0\xB1\xB2\xB3\xB4\xB5\xB6\xB7\xB8\xB9\xBA\xBB\xBC\xBD\xBE\xBF\xC0\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1\xD2\xD3\xD4\xD5\xD6\xD7\xD8\xD9\xDA\xDB\xDC\xDD\xDC\xDD\xDE\xDF\xE0\xE1\xE2\xE3\xE4\xE5\xE6\xE7\xE8\xE9\xEA\xEB\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7F\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8A\x8B\x8C\x8D\x8E\x8F\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9A\x9B\x9C\x9D\x9E\x9F\xA0\xA1\xA2\xA3\xA4\xA5\xA6\xFE\xFF") }, reorder_ranges: zerovec::ZeroVec::new() };
-                icu_provider_baked::binary_search::Data(&[("am", __AM), ("ar", __AR), ("as", __AS), ("az", __AZ), ("be", __BE), ("bg", __BE), ("bn", __AS), ("bs", __AZ), ("bs-Cyrl", __BE), ("chr", __CHR), ("el", __EL), ("fa", __AR), ("gu", __GU), ("he", __HE), ("hi", __HI), ("hr", __AZ), ("hy", __HY), ("ja", __JA), ("ka", __KA), ("kk", __BE), ("km", __KM), ("kn", __KN), ("ko", __KO), ("kok", __HI), ("ku", __KU), ("ky", __BE), ("lo", __LO), ("mk", __BE), ("ml", __ML), ("mn", __MN), ("mr", __HI), ("my", __MY), ("ne", __NE), ("or", __OR), ("pa", __PA), ("ps", __AR), ("ru", __BE), ("si", __SI), ("sr", __BE), ("sr-Latn", __AZ), ("ta", __TA), ("te", __TE), ("th", __TH), ("ug", __AR), ("uk", __BE), ("ur", __AR), ("yue-u-co-stroke", __YUE_U_CO_STROKE), ("yue-u-co-unihan", __YUE_U_CO_STROKE), ("yue-u-co-zhuyin", __YUE_U_CO_STROKE), ("zh", __ZH), ("zh-Hant-u-co-stroke", __YUE_U_CO_STROKE), ("zh-Hant-u-co-unihan", __YUE_U_CO_STROKE), ("zh-Hant-u-co-zhuyin", __YUE_U_CO_STROKE), ("zh-u-co-stroke", __YUE_U_CO_STROKE), ("zh-u-co-unihan", __YUE_U_CO_STROKE), ("zh-u-co-zhuyin", __YUE_U_CO_STROKE)])
+                use icu_provider_baked::binary_search::tinystr::tinystr;
+                icu_provider_baked::binary_search::Data(&[(tinystr!(19usize, "am"), __AM), (tinystr!(19usize, "ar"), __AR), (tinystr!(19usize, "as"), __AS), (tinystr!(19usize, "az"), __AZ), (tinystr!(19usize, "be"), __BE), (tinystr!(19usize, "bg"), __BE), (tinystr!(19usize, "bn"), __AS), (tinystr!(19usize, "bs"), __AZ), (tinystr!(19usize, "bs-Cyrl"), __BE), (tinystr!(19usize, "chr"), __CHR), (tinystr!(19usize, "el"), __EL), (tinystr!(19usize, "fa"), __AR), (tinystr!(19usize, "gu"), __GU), (tinystr!(19usize, "he"), __HE), (tinystr!(19usize, "hi"), __HI), (tinystr!(19usize, "hr"), __AZ), (tinystr!(19usize, "hy"), __HY), (tinystr!(19usize, "ja"), __JA), (tinystr!(19usize, "ka"), __KA), (tinystr!(19usize, "kk"), __BE), (tinystr!(19usize, "km"), __KM), (tinystr!(19usize, "kn"), __KN), (tinystr!(19usize, "ko"), __KO), (tinystr!(19usize, "kok"), __HI), (tinystr!(19usize, "ku"), __KU), (tinystr!(19usize, "ky"), __BE), (tinystr!(19usize, "lo"), __LO), (tinystr!(19usize, "mk"), __BE), (tinystr!(19usize, "ml"), __ML), (tinystr!(19usize, "mn"), __MN), (tinystr!(19usize, "mr"), __HI), (tinystr!(19usize, "my"), __MY), (tinystr!(19usize, "ne"), __NE), (tinystr!(19usize, "or"), __OR), (tinystr!(19usize, "pa"), __PA), (tinystr!(19usize, "ps"), __AR), (tinystr!(19usize, "ru"), __BE), (tinystr!(19usize, "si"), __SI), (tinystr!(19usize, "sr"), __BE), (tinystr!(19usize, "sr-Latn"), __AZ), (tinystr!(19usize, "ta"), __TA), (tinystr!(19usize, "te"), __TE), (tinystr!(19usize, "th"), __TH), (tinystr!(19usize, "ug"), __AR), (tinystr!(19usize, "uk"), __BE), (tinystr!(19usize, "ur"), __AR), (tinystr!(19usize, "yue-u-co-stroke"), __YUE_U_CO_STROKE), (tinystr!(19usize, "yue-u-co-unihan"), __YUE_U_CO_STROKE), (tinystr!(19usize, "yue-u-co-zhuyin"), __YUE_U_CO_STROKE), (tinystr!(19usize, "zh"), __ZH), (tinystr!(19usize, "zh-Hant-u-co-stroke"), __YUE_U_CO_STROKE), (tinystr!(19usize, "zh-Hant-u-co-unihan"), __YUE_U_CO_STROKE), (tinystr!(19usize, "zh-Hant-u-co-zhuyin"), __YUE_U_CO_STROKE), (tinystr!(19usize, "zh-u-co-stroke"), __YUE_U_CO_STROKE), (tinystr!(19usize, "zh-u-co-unihan"), __YUE_U_CO_STROKE), (tinystr!(19usize, "zh-u-co-zhuyin"), __YUE_U_CO_STROKE)])


Thought: This will improve when we move -u-co-xxx to DataMarkerAttributes... we haven't done that yet?

No, this was part of #4984

Ok but we are still planning to do it?

robertbastian · 2024-07-01T16:52:04Z

can you measure the actual compiled binary size before and after?

No I don't think I can

sffc · 2024-07-01T16:54:20Z

can you measure the actual compiled binary size before and after?

No I don't think I can

Of course you can; take one of the example binaries built with compiled data, and measure the binary size before and after this commit.

sffc · 2024-07-01T17:46:03Z

Please note that we include binary size benchmarks on the dashboard. They only get run on main.

sffc

Unless this blocks something, I'd like to have measurements so we're not working in the dark.

robertbastian · 2024-07-01T18:28:55Z

If we merge it you can inspect all our binary size benchmarks.

sffc · 2024-07-01T20:23:33Z

Running these commands:

$ cargo +nightly-2023-08-08 build --examples --profile release-opt-size -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort --target aarch64-apple-darwin
$ ls -l ./target/aarch64-apple-darwin/release-opt-size/examples/*  | awk '{print $5, $9}'

On main:

258294 ./target/aarch64-apple-darwin/release-opt-size/examples/and_list
91417 ./target/aarch64-apple-darwin/release-opt-size/examples/casemapping
55628 ./target/aarch64-apple-darwin/release-opt-size/examples/code_line_diff
76533 ./target/aarch64-apple-darwin/release-opt-size/examples/derives
54925 ./target/aarch64-apple-darwin/release-opt-size/examples/elevator_floors
38396 ./target/aarch64-apple-darwin/release-opt-size/examples/filter_langids
33574 ./target/aarch64-apple-darwin/release-opt-size/examples/first_weekday_for_region
36084 ./target/aarch64-apple-darwin/release-opt-size/examples/iso_date_manipulations
36088 ./target/aarch64-apple-darwin/release-opt-size/examples/iso_datetime_manipulations
53509 ./target/aarch64-apple-darwin/release-opt-size/examples/language_names_hash_map
36005 ./target/aarch64-apple-darwin/release-opt-size/examples/language_names_lite_map
38349 ./target/aarch64-apple-darwin/release-opt-size/examples/litemap_bincode
36366 ./target/aarch64-apple-darwin/release-opt-size/examples/litemap_postcard
59586 ./target/aarch64-apple-darwin/release-opt-size/examples/make
139606 ./target/aarch64-apple-darwin/release-opt-size/examples/make_var
36055 ./target/aarch64-apple-darwin/release-opt-size/examples/permyriad
36598 ./target/aarch64-apple-darwin/release-opt-size/examples/postcard
98655 ./target/aarch64-apple-darwin/release-opt-size/examples/syntatically_canonicalize_locales
244924 ./target/aarch64-apple-darwin/release-opt-size/examples/time_zone_rule
4202001 ./target/aarch64-apple-darwin/release-opt-size/examples/tui
37929 ./target/aarch64-apple-darwin/release-opt-size/examples/unicode_bmp_blocks_selector
54923 ./target/aarch64-apple-darwin/release-opt-size/examples/unread_emails
1190150 ./target/aarch64-apple-darwin/release-opt-size/examples/work_log
79071 ./target/aarch64-apple-darwin/release-opt-size/examples/writeable_message
59545 ./target/aarch64-apple-darwin/release-opt-size/examples/yoke_derive
59543 ./target/aarch64-apple-darwin/release-opt-size/examples/zf_derive
16854 ./target/aarch64-apple-darwin/release-opt-size/examples/zv_serde

On the branch, f2b687c:

258294 ./target/aarch64-apple-darwin/release-opt-size/examples/and_list
91417 ./target/aarch64-apple-darwin/release-opt-size/examples/casemapping
72156 ./target/aarch64-apple-darwin/release-opt-size/examples/code_line_diff
76533 ./target/aarch64-apple-darwin/release-opt-size/examples/derives
54925 ./target/aarch64-apple-darwin/release-opt-size/examples/elevator_floors
38396 ./target/aarch64-apple-darwin/release-opt-size/examples/filter_langids
33574 ./target/aarch64-apple-darwin/release-opt-size/examples/first_weekday_for_region
36084 ./target/aarch64-apple-darwin/release-opt-size/examples/iso_date_manipulations
36088 ./target/aarch64-apple-darwin/release-opt-size/examples/iso_datetime_manipulations
53509 ./target/aarch64-apple-darwin/release-opt-size/examples/language_names_hash_map
36005 ./target/aarch64-apple-darwin/release-opt-size/examples/language_names_lite_map
38349 ./target/aarch64-apple-darwin/release-opt-size/examples/litemap_bincode
36366 ./target/aarch64-apple-darwin/release-opt-size/examples/litemap_postcard
59586 ./target/aarch64-apple-darwin/release-opt-size/examples/make
139606 ./target/aarch64-apple-darwin/release-opt-size/examples/make_var
36055 ./target/aarch64-apple-darwin/release-opt-size/examples/permyriad
36598 ./target/aarch64-apple-darwin/release-opt-size/examples/postcard
98655 ./target/aarch64-apple-darwin/release-opt-size/examples/syntatically_canonicalize_locales
244924 ./target/aarch64-apple-darwin/release-opt-size/examples/time_zone_rule
4202337 ./target/aarch64-apple-darwin/release-opt-size/examples/tui
37929 ./target/aarch64-apple-darwin/release-opt-size/examples/unicode_bmp_blocks_selector
54923 ./target/aarch64-apple-darwin/release-opt-size/examples/unread_emails
1173798 ./target/aarch64-apple-darwin/release-opt-size/examples/work_log
79071 ./target/aarch64-apple-darwin/release-opt-size/examples/writeable_message
59545 ./target/aarch64-apple-darwin/release-opt-size/examples/yoke_derive
59543 ./target/aarch64-apple-darwin/release-opt-size/examples/zf_derive
16854 ./target/aarch64-apple-darwin/release-opt-size/examples/zv_serde

Most are the same. The diffs:

code_line_diff from 55628 to 72156
tui from 4202001 to 4202337
work_log from 1190150 to 1173798

sffc · 2024-07-01T20:25:51Z

Here is code_line_diff.rs:

https://github.com/unicode-org/icu4x/blob/be00c30fd04b96b79c1b0ea8e5d71d275d6cc28d/components/decimal/examples/code_line_diff.rs

Why does this one regress in size? It only uses FixedDecimalFormatter.

On the other hand, it's nice to see work_log going down in size.

sffc

Since the only motivation for this change are the metrics, we should take a metrics-first mindset. I'm not blown away by the metrics I saw and would appreciate more investigation into them. I'm approving only because I have trust in your engineering judgement to decide whether this is the right change to land.

sffc · 2024-07-01T20:35:52Z

provider/data/calendar/fingerprints.csv

 calendar/chinesecache@1, <singleton>, 754B, 134f5ec7c9bdc494
 calendar/dangicache@1, <singleton>, 754B, 79d5d32449956411
 calendar/islamicobservationalcache@1, <singleton>, 504B, 18af87d272c76f14
 calendar/islamicummalquracache@1, <singleton>, 504B, ef6ac9ff14fd3f3
 calendar/japanese@1, <singleton>, 111B, b31e52deaf52706f
 calendar/japanext@1, <singleton>, 5216B, 6c20e216c8cd6e41
-datetime/week_data@1, <lookup>, 2760B, 115 identifiers
+datetime/week_data@1, <lookup>, 1626B, 115 identifiers


Although these numbers are helpful, they are only proxy metrics. The real metric is the post-LTO binary size.

The real metrics are post-LTO binary sizes of actual programs, not our simple examples.

sffc

Same conditional approval as above.

robertbastian requested a review from younies July 1, 2024 13:11

robertbastian requested a review from a team as a code owner July 1, 2024 13:11

robertbastian requested a review from sffc July 1, 2024 15:56

sffc reviewed Jul 1, 2024

View reviewed changes

robertbastian requested a review from sffc July 1, 2024 16:52

robertbastian mentioned this pull request Jul 1, 2024

Move baked data lookup size calculations to its exporter #5161

Open

sffc requested changes Jul 1, 2024

View reviewed changes

sffc previously approved these changes Jul 1, 2024

View reviewed changes

sffc reviewed Jul 1, 2024

View reviewed changes

younies previously approved these changes Jul 1, 2024

View reviewed changes

robertbastian requested a review from younies July 2, 2024 16:30

robertbastian dismissed stale reviews from younies and sffc via 36f0a97 July 2, 2024 16:30

robertbastian requested a review from sffc July 2, 2024 16:30

sffc previously approved these changes Jul 2, 2024

View reviewed changes

younies previously approved these changes Jul 2, 2024

View reviewed changes

robertbastian marked this pull request as draft July 2, 2024 21:03

robertbastian dismissed stale reviews from younies and sffc via ff1620b July 2, 2024 21:03

robertbastian force-pushed the tiny branch 2 times, most recently from ff1620b to b09e28e Compare July 3, 2024 08:22

robertbastian added 3 commits July 3, 2024 13:19

mv

2f2f70e

gen

8a77ffd

tiny

0f99b97

gen

05664aa

robertbastian force-pushed the tiny branch from b09e28e to 05664aa Compare July 3, 2024 11:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use `TinyAsciiStr` instead of `&'static str` for baked data #5159

Use `TinyAsciiStr` instead of `&'static str` for baked data #5159

robertbastian commented Jul 1, 2024

sffc left a comment

sffc Jul 1, 2024

robertbastian Jul 1, 2024

sffc Jul 1, 2024

robertbastian commented Jul 1, 2024

sffc commented Jul 1, 2024

sffc commented Jul 1, 2024

sffc left a comment

robertbastian commented Jul 1, 2024

sffc commented Jul 1, 2024

sffc commented Jul 1, 2024

sffc left a comment

sffc Jul 1, 2024

robertbastian Jul 2, 2024

sffc left a comment

Use TinyAsciiStr instead of &'static str for baked data #5159

Are you sure you want to change the base?

Use TinyAsciiStr instead of &'static str for baked data #5159

Conversation

robertbastian commented Jul 1, 2024

sffc left a comment

Choose a reason for hiding this comment

sffc Jul 1, 2024

Choose a reason for hiding this comment

robertbastian Jul 1, 2024

Choose a reason for hiding this comment

sffc Jul 1, 2024

Choose a reason for hiding this comment

robertbastian commented Jul 1, 2024

sffc commented Jul 1, 2024

sffc commented Jul 1, 2024

sffc left a comment

Choose a reason for hiding this comment

robertbastian commented Jul 1, 2024

sffc commented Jul 1, 2024

sffc commented Jul 1, 2024

sffc left a comment

Choose a reason for hiding this comment

sffc Jul 1, 2024

Choose a reason for hiding this comment

robertbastian Jul 2, 2024

Choose a reason for hiding this comment

sffc left a comment

Choose a reason for hiding this comment

Use `TinyAsciiStr` instead of `&'static str` for baked data #5159

Use `TinyAsciiStr` instead of `&'static str` for baked data #5159