Make the collator a lot faster

Cargo.toml

@@ -262,9 +262,9 @@ smallvec = { version = "1.10.0", default-features = false }
 stable_deref_trait = { version = "1.2.0", default-features = false }
 twox-hash = { version = "2.0.0", default-features = false, features = ["xxhash64"] }
 unicode-bidi = { version = "0.3.11", default-features = false }
-utf16_iter = { version = "1.0.2", default-features = false }
-utf8_iter = { version = "1.0.2", default-features = false }
-write16 = { version = "1.0.0", default-features = false }
+utf16_iter = { path = "../utf16_iter", default-features = false }
+utf8_iter = { path = "../utf8_iter", default-features = false }
+write16 = { path = "../write16", default-features = false }
 
 ## External Deps Group 2: Heavy Dev and Datagen deps. No default features.
 zip = { version = "2", default-features = false }

components/collator/Cargo.toml

@@ -24,8 +24,8 @@ icu_normalizer = { workspace = true, features = ["utf8_iter", "utf16_iter"] }
 icu_locale_core = { workspace = true, features = ["alloc"] }
 icu_properties = { workspace = true }
 icu_provider = { workspace = true }
-utf8_iter = { workspace = true }
-utf16_iter = { workspace = true }
+utf16_iter = { path = "../../../utf16_iter", features = ["icu_collections"] }
+utf8_iter = { path = "../../../utf8_iter", features = ["icu_collections"] }
 smallvec = { workspace = true, features = ["union", "const_generics", "const_new"] } # alloc
 zerovec = { workspace = true }
 

components/collator/benches/bench.rs

@@ -159,11 +159,11 @@ pub fn collator_with_locale(criterion: &mut Criterion) {
     // Furthermore, CLDR used to default to quaternary for Japanese but now defaults to tertiary
     // as for every other language for performance reasons.
     let all_strength = [
-        Strength::Primary,
-        Strength::Secondary,
+        // Strength::Primary,
+        // Strength::Secondary,
         Strength::Tertiary,
-        Strength::Quaternary,
-        Strength::Identical,
+        // Strength::Quaternary,
+        // Strength::Identical,
     ];
     let performance_parameters = [
         (
@@ -172,11 +172,16 @@ pub fn collator_with_locale(criterion: &mut Criterion) {
             &all_strength,
         ),
         (
-            locale!("da-DK"),
-            vec![&content_latin, &content_photos],
+            locale!("sv"),
+            vec![&content_latin, &content_swedish, &content_photos],
             &all_strength,
         ),
-        (locale!("fr-CA"), vec![&content_latin], &all_strength),
+        // (
+        //     locale!("da-DK"),
+        //     vec![&content_latin, &content_photos],
+        //     &all_strength,
+        // ),
+        // (locale!("fr-CA"), vec![&content_latin], &all_strength),
         (
             locale!("ja-JP"),
             vec![&content_latin, &content_jp_h, &content_jp_k, &content_asian],
@@ -197,11 +202,13 @@ pub fn collator_with_locale(criterion: &mut Criterion) {
             vec![&content_latin, &content_russian],
             &all_strength,
         ),
-        (
-            locale!("sv"),
-            vec![&content_latin, &content_swedish],
-            &all_strength,
-        ),
+        // Deliberately using Russian data with Cyrillic tailorings
+        // to test the perf of the base Cyrillic range.
+        (locale!("uk"), vec![&content_russian], &all_strength),
+        (locale!("be"), vec![&content_russian], &all_strength),
+        (locale!("kk"), vec![&content_russian], &all_strength),
+        (locale!("ky"), vec![&content_russian], &all_strength),
+        (locale!("mk"), vec![&content_russian], &all_strength),
         (
             locale!("th"),
             vec![&content_latin, &content_thai],
@@ -225,7 +232,7 @@ pub fn collator_with_locale(criterion: &mut Criterion) {
 
         for content_under_bench in files_under_bench {
             let (file_name, elements) = black_box(content_under_bench);
-            baseline_bench(&mut group, file_name, elements);
+            // baseline_bench(&mut group, file_name, elements);
 
             // index to keep order of strength in the html report
             for (index, strength) in benched_strength.iter().enumerate() {