eliott/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop synced 2026-04-25 17:15:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

gh-8932: Add more PGO instrumentation (gh-13158)

Browse Source
This commit is contained in:
mr. m
2026-04-09 22:41:27 +02:00
committed by GitHub
parent fc2eb5a20b
commit 0a7e81f532
6 changed files with 1735 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/update_external_patches.py
View File

@@ -55,7 +55,7 @@ def main():
name = patch.get("name")
if not phab_id or not name:
die(f"Patch entry missing 'id' or 'name': {patch}")
name = name.replace(" ", "_").lower()
name = name.replace(" ", "_").replace(".", "_").lower()
output_file = os.path.join(OUTPUT_DIR, "firefox", f"{name}.patch")
print(f"Processing Phabricator patch: {phab_id} -> {output_file}")
download_phab_patch(phab_id, output_file)

441
src/external-patches/firefox/ff150_1_pgo_patch_for_bug-1962418.patch Normal file
View File

@@ -0,0 +1,441 @@
diff --git a/build/pgo/index.html b/build/pgo/index.html
--- a/build/pgo/index.html
+++ b/build/pgo/index.html
@@ -3,11 +3,50 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global Quitter */
- var list = [
+ var defaultTimeout = 2 * 1000;
+ var extendedTimeout = 2 * 60 * 1000;
+ var superExtendedTimeout = 5 * 60 * 1000;
+ var hasExtendedCorpus =
+ new URLSearchParams(location.search).get("extendedCorpus") == "true";
+
+ function waitTimeout(time) {
+ return new Promise(resolve => {
+ window.setTimeout(() => {
+ resolve();
+ }, time);
+ });
+ }
+
+ /**
+ * An item in the PGO training corpus
+ */
+ class Item {
+ url;
+ timeout;
+
+ constructor(url, timeout = defaultTimeout) {
+ this.url = url;
+ this.timeout = timeout;
+ }
+
+ async run() {
+ var subWindow = window.open(this.url);
+
+ // Prevent the perf-reftest-singletons from calling alert()
+ subWindow.tpRecordTime = function () {};
+
+ // Wait until the timeout is finished
+ await waitTimeout(this.timeout);
+
+ subWindow.close();
+ }
+ }
+
+ var defaultItemUrls = [
"blueprint/elements.html",
"blueprint/forms.html",
"blueprint/grid.html",
"blueprint/sample.html",
"js-input/3d-thingy.html",
@@ -72,42 +111,46 @@
"talos/tests/perf-reftest-singletons/style-sharing.html",
"talos/tests/perf-reftest-singletons/svg-text-textLength-1.html",
"talos/tests/perf-reftest-singletons/svg-text-getExtentOfChar-1.html",
"talos/tests/perf-reftest-singletons/tiny-traversal-singleton.html",
"talos/tests/perf-reftest-singletons/window-named-property-get.html",
- "webkit/PerformanceTests/Speedometer/index.html",
- "http://localhost:8000/index.html?startAutomatically=true",
- "webkit/PerformanceTests/webaudio/index.html?raptor&rendering-buffer-length=30",
];
- var defaultInterval = 2000;
- var idx = 0;
- var w;
- window.onload = function () {
- w = window.open("about:blank");
- window.setTimeout(loadURL, defaultInterval);
- };
- function loadURL() {
- var interval = defaultInterval;
- var testURL = list[idx++];
- if (testURL.includes("webkit") || testURL.includes("localhost")) {
- interval = 120000;
- }
- w.close();
- w = window.open(testURL);
- // Prevent the perf-reftest-singletons from calling alert()
- w.tpRecordTime = function () {};
+ // Start with items with the default timeout
+ var items = defaultItemUrls.map(x => new Item(x));
- if (idx < list.length) {
- window.setTimeout(loadURL, interval);
- } else {
- window.setTimeout(Quitter.quit, interval);
- }
+ // Add items that needs longer timeouts
+ items.push(
+ new Item("webkit/PerformanceTests/Speedometer/index.html", extendedTimeout),
+ new Item(
+ "http://localhost:8000/index.html?startAutomatically=true",
+ extendedTimeout
+ ),
+ new Item(
+ "webkit/PerformanceTests/webaudio/index.html?raptor&rendering-buffer-length=30",
+ extendedTimeout
+ )
+ );
+
+ // Add optional items if there is a 'pgo-extended-corpus' provided
+ if (hasExtendedCorpus) {
+ items.push(
+ new Item(
+ "http://localhost:8001/index.html?startAutomatically=true&testIterationCount=3&worstCaseCount=1",
+ superExtendedTimeout
+ )
+ );
}
- var i;
- for (i = 0; i < list.length; i++) {
+ window.onload = async function () {
+ for (let item of items) {
+ await item.run();
+ }
+ Quitter.quit();
+ };
+
+ for (let item of items) {
// eslint-disable-next-line no-unsanitized/method
- document.write(list[i]);
+ document.write(item.url);
document.write("<br>");
}
</script>
diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
--- a/build/pgo/profileserver.py
+++ b/build/pgo/profileserver.py
@@ -56,12 +56,33 @@
test_name=name,
)
return rc
+class ProfileServerCLI(CLI):
+ def __init__(self, args=sys.argv[1:]):
+ CLI.__init__(self, args=args)
+
+ def add_options(self, parser):
+ CLI.add_options(self, parser)
+
+ # add profileserver options
+ parser.add_option(
+ "-e",
+ "--extended-corpus",
+ dest="extended_corpus_dir",
+ help="Directory of the optional extended corpus.",
+ metavar=None,
+ default=None,
+ )
+
+ def extended_corpus_dir(self):
+ return self.options.extended_corpus_dir
+
+
if __name__ == "__main__":
- cli = CLI()
+ cli = ProfileServerCLI()
debug_args, interactive = cli.debugger_arguments()
runner_args = cli.runner_args()
build = MozbuildObject.from_environment()
@@ -72,29 +93,51 @@
except BinaryNotFoundException as e:
print(f"{e}\n\n{e.help()}\n")
sys.exit(1)
binary = os.path.normpath(os.path.abspath(binary))
+ extended_corpus_dir = cli.extended_corpus_dir()
+ has_extended_corpus = extended_corpus_dir is not None
+
path_mappings = {
k: os.path.join(build.topsrcdir, v) for k, v in PATH_MAPPINGS.items()
}
httpd = MozHttpd(
port=PORT,
docroot=os.path.join(build.topsrcdir, "build", "pgo"),
path_mappings=path_mappings,
)
httpd.start(block=False)
+ # Speedometer3 must run in its own server. The benchmark assumes that it
+ # is in a root path, and will fail if it's not.
sp3_httpd = MozHttpd(
port=8000,
docroot=os.path.join(
build.topsrcdir, "third_party", "webkit", "PerformanceTests", "Speedometer3"
),
path_mappings=path_mappings,
)
sp3_httpd.start(block=False)
print("started SP3 server on port 8000")
+
+ if has_extended_corpus:
+ js3_dir = os.path.join(extended_corpus_dir, "JetStream")
+
+ if not os.path.exists(js3_dir):
+ print(f"Error: JetStream directory does not exist at {js3_dir}")
+ sys.exit(1)
+
+ # JetStream3 must run in its own server. The benchmark assumes that it
+ # is in a root path, and will fail if it's not.
+ js3_httpd = MozHttpd(
+ port=8001,
+ docroot=js3_dir,
+ )
+ js3_httpd.start(block=False)
+ print("started JS3 server on port 8001")
+
locations = ServerLocations()
locations.add_host(host="127.0.0.1", port=PORT, options="primary,privileged")
old_profraw_files = glob.glob("*.profraw")
for f in old_profraw_files:
@@ -167,10 +210,12 @@
if logfile:
print("Firefox output (%s):" % logfile)
with open(logfile) as f:
print(f.read())
sp3_httpd.stop()
+ if has_extended_corpus:
+ js3_httpd.stop()
httpd.stop()
get_crashreports(profilePath, name="Profile initialization")
sys.exit(ret)
jarlog = os.getenv("JARLOG_FILE")
@@ -182,21 +227,26 @@
if "UPLOAD_PATH" in env:
process_args["logfile"] = os.path.join(
env["UPLOAD_PATH"], "profile-run-2.log"
)
- cmdargs = ["http://localhost:%d/index.html" % PORT]
+ cmdargs = [
+ "http://localhost:%d/index.html?extendedCorpus=%s"
+ % (PORT, str(has_extended_corpus).lower())
+ ]
runner = FirefoxRunner(
profile=profile,
binary=binary,
cmdargs=cmdargs,
env=env,
process_args=process_args,
)
runner.start(debug_args=debug_args, interactive=interactive)
ret = runner.wait()
sp3_httpd.stop()
+ if has_extended_corpus:
+ js3_httpd.stop()
httpd.stop()
if ret:
print("Firefox exited with code %d during profiling" % ret)
logfile = process_args.get("logfile")
if logfile:
diff --git a/python/mozbuild/mozbuild/build_commands.py b/python/mozbuild/mozbuild/build_commands.py
--- a/python/mozbuild/mozbuild/build_commands.py
+++ b/python/mozbuild/mozbuild/build_commands.py
@@ -10,10 +10,11 @@
import mozpack.path as mozpath
from mach.decorators import Command, CommandArgument
from mozbuild.backend import backends
+from mozbuild.bootstrap import bootstrap_toolchain
from mozbuild.mozconfig import MozconfigLoader
from mozbuild.util import (
MOZBUILD_METRICS_PATH,
ensure_l10n_central,
get_latest_file,
@@ -275,10 +276,21 @@
raise Exception("Cannot specify targets (%s) in MOZ_PGO=1 builds" % what)
instr = command_context._spawn(BuildDriver)
orig_topobjdir = instr._topobjdir
instr._topobjdir = mozpath.join(instr._topobjdir, "instrumented")
+ # Allow opt-in of using the pgo-extended-corpus
+ use_extended_corpus = (
+ configure_args and "MOZ_PGO_EXTENDED_CORPUS=1" in configure_args
+ )
+
+ # Get the location of the pgo-extended-corpus, if we are using it
+ if use_extended_corpus:
+ pgo_extended_corpus = bootstrap_toolchain("pgo-extended-corpus")
+ if not pgo_extended_corpus:
+ raise Exception("Cannot find pgo-extended-corpus.")
+
append_env = {"MOZ_PROFILE_GENERATE": "1"}
status = instr.build(
command_context.metrics,
what=what,
jobs=jobs,
@@ -312,10 +324,13 @@
pgo_env["JARLOG_FILE"] = mozpath.join(orig_topobjdir, "jarlog/en-US.log")
pgo_cmd = [
command_context.virtualenv_manager.python_path,
mozpath.join(command_context.topsrcdir, "build/pgo/profileserver.py"),
]
+ if use_extended_corpus:
+ pgo_cmd.extend(["--extended-corpus", str(pgo_extended_corpus)])
+
subprocess.check_call(pgo_cmd, cwd=instr.topobjdir, env=pgo_env)
# Set the default build to MOZ_PROFILE_USE
append_env = {"MOZ_PROFILE_USE": "1"}
diff --git a/taskcluster/kinds/fetch/benchmarks.yml b/taskcluster/kinds/fetch/benchmarks.yml
--- a/taskcluster/kinds/fetch/benchmarks.yml
+++ b/taskcluster/kinds/fetch/benchmarks.yml
@@ -15,5 +15,22 @@
fetch:
type: static-url
url: https://github.com/mozilla/perf-automation/releases/download/V1/web-tooling-benchmark-b2ac25c897c9.zip
sha256: 93b0b51df0cec3ca9bfa0bdf81d782306dcf18532e39b3ff3180409125daaff1
size: 5444135
+
+# A collection of benchmarks for use in PGO profiling runs. Currently it is
+# just JetStream3.
+#
+# Keep this in sync with the version used in performance testing by updating:
+# 1. `testing/raptor/raptor/tests/benchmarks/jetstream3-desktop.toml`
+# 2. `testing/raptor/raptor/tests/benchmarks/jetstream3-mobile.toml`
+pgo-extended-corpus:
+ description: JetStream3 benchmark suite
+ fetch:
+ type: static-url
+ url: https://github.com/WebKit/JetStream/archive/a3f5c45465f5271bed385321a0587bd4202682d6.tar.gz
+ sha256: 0af66b94bfbc2eb67cbe6c30bbafd13d7789f8f8623d308783194934601b5fdd
+ size: 194426956
+ artifact-name: pgo-extended-corpus.tar.zst
+ strip-components: 1
+ add-prefix: pgo-extended-corpus/JetStream/
diff --git a/taskcluster/kinds/generate-profile/kind.yml b/taskcluster/kinds/generate-profile/kind.yml
--- a/taskcluster/kinds/generate-profile/kind.yml
+++ b/taskcluster/kinds/generate-profile/kind.yml
@@ -3,10 +3,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
---
loader: taskgraph.loader.transform:loader
kind-dependencies:
+ - fetch
- toolchain
- instrumented-build
transforms:
- gecko_taskgraph.transforms.build_attrs:transforms
@@ -22,10 +23,13 @@
treeherder:
symbol: Bpgo(run)
kind: build
tier: 1
use-python: default
+ fetches:
+ fetch:
+ - pgo-extended-corpus
tasks:
linux64-shippable/opt:
description: "Linux64 Profile Generation"
shipping-phase: build
diff --git a/taskcluster/scripts/misc/run-profileserver-macos.sh b/taskcluster/scripts/misc/run-profileserver-macos.sh
--- a/taskcluster/scripts/misc/run-profileserver-macos.sh
+++ b/taskcluster/scripts/misc/run-profileserver-macos.sh
@@ -13,8 +13,8 @@
export LLVM_PROFDATA=$MOZ_FETCHES_DIR/clang/bin/llvm-profdata
set -v
./mach python python/mozbuild/mozbuild/action/install.py $MOZ_FETCHES_DIR/target.dmg $MOZ_FETCHES_DIR
-./mach python build/pgo/profileserver.py --binary $MOZ_FETCHES_DIR/*.app/Contents/MacOS/firefox
+./mach python build/pgo/profileserver.py --binary $MOZ_FETCHES_DIR/*.app/Contents/MacOS/firefox --extended-corpus $MOZ_FETCHES_DIR/pgo-extended-corpus/
tar -Jcvf $UPLOAD_PATH/profdata.tar.xz merged.profdata en-US.log
diff --git a/taskcluster/scripts/misc/run-profileserver.sh b/taskcluster/scripts/misc/run-profileserver.sh
--- a/taskcluster/scripts/misc/run-profileserver.sh
+++ b/taskcluster/scripts/misc/run-profileserver.sh
@@ -35,8 +35,8 @@
# Move our fetched firefox into objdir/dist so the jarlog entries will match
# the paths when the final PGO stage packages the build.
mkdir -p $PGO_RUNDIR
mkdir -p $UPLOAD_PATH
mv $MOZ_FETCHES_DIR/firefox $PGO_RUNDIR
-./mach python build/pgo/profileserver.py --binary $PGO_RUNDIR/firefox/firefox
+./mach python build/pgo/profileserver.py --binary $PGO_RUNDIR/firefox/firefox --extended-corpus $MOZ_FETCHES_DIR/pgo-extended-corpus/
tar -acvf $UPLOAD_PATH/profdata.tar.xz merged.profdata en-US.log
diff --git a/testing/mozharness/scripts/android_emulator_pgo.py b/testing/mozharness/scripts/android_emulator_pgo.py
--- a/testing/mozharness/scripts/android_emulator_pgo.py
+++ b/testing/mozharness/scripts/android_emulator_pgo.py
@@ -22,10 +22,11 @@
from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
PAGES = [
"js-input/webkit/PerformanceTests/Speedometer/index.html",
"js-input/webkit/PerformanceTests/Speedometer3/index.html?startAutomatically=true",
+ # TODO: Add support for the pgo-extended-corpus to get JetStream3 running here.
"blueprint/sample.html",
"blueprint/forms.html",
"blueprint/grid.html",
"blueprint/elements.html",
"js-input/3d-thingy.html",
diff --git a/testing/raptor/raptor/tests/benchmarks/jetstream3-desktop.toml b/testing/raptor/raptor/tests/benchmarks/jetstream3-desktop.toml
--- a/testing/raptor/raptor/tests/benchmarks/jetstream3-desktop.toml
+++ b/testing/raptor/raptor/tests/benchmarks/jetstream3-desktop.toml
@@ -14,10 +14,12 @@
test_url = "http://<host>:<port>/"
type = "benchmark"
unit = "score"
support_class = "jetstream3.py"
repository = "https://github.com/webkit/jetstream"
+# Keep this in sync with the version used in PGO instrumentation by updating
+# `taskcluster/kinds/fetch/benchmarks.yml`.
repository_revision = "a3f5c45465f5271bed385321a0587bd4202682d6"
test_script = "jetstream3.js"
["jetstream3"]
suite_name = "JetStream3.0"
diff --git a/testing/raptor/raptor/tests/benchmarks/jetstream3-mobile.toml b/testing/raptor/raptor/tests/benchmarks/jetstream3-mobile.toml
--- a/testing/raptor/raptor/tests/benchmarks/jetstream3-mobile.toml
+++ b/testing/raptor/raptor/tests/benchmarks/jetstream3-mobile.toml
@@ -19,10 +19,12 @@
test_url = "http://<host>:<port>/"
type = "benchmark"
unit = "score"
support_class = "jetstream3.py"
repository = "https://github.com/webkit/jetstream"
+# Keep this in sync with the version used in PGO instrumentation by updating
+# `taskcluster/kinds/fetch/benchmarks.yml`.
repository_revision = "a3f5c45465f5271bed385321a0587bd4202682d6"
test_script = "jetstream3.js"
["jetstream3"]
suite_name = "JetStream3.0"

409
src/external-patches/firefox/ff150_2_pgo_patch_for_bug-2011620.patch Normal file
View File

@@ -0,0 +1,409 @@
diff --git a/build/pgo/index.html b/build/pgo/index.html
--- a/build/pgo/index.html
+++ b/build/pgo/index.html
@@ -10,10 +10,11 @@
"blueprint/forms.html",
"blueprint/grid.html",
"blueprint/sample.html",
"js-input/3d-thingy.html",
"js-input/crypto-otp.html",
+ "js-input/normalizer_bench.html",
"js-input/sunspider/3d-cube.html",
"js-input/sunspider/3d-morph.html",
"js-input/sunspider/3d-raytrace.html",
"js-input/sunspider/access-binary-trees.html",
"js-input/sunspider/access-fannkuch.html",
diff --git a/build/pgo/js-input/normalizer_bench.html b/build/pgo/js-input/normalizer_bench.html
new file mode 100644
--- /dev/null
+++ b/build/pgo/js-input/normalizer_bench.html
@@ -0,0 +1,358 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<!--
+
+The test language content came from
+https://github.com/unicode-org/test-corpora/blob/799a249ec67b37e6e884b95c38287793e731fcb0/gutenberg/Carroll-11/out/google/txt/LANG/8860606395858576540_11-h-1.htm.txt
+where LANG is the language code.
+
+The test content is the third paragraph of the first chapter of Alice's Adventures in Wonderland by Lewis Carroll from Project Gutenberg machine translated by Google.
+
+The content came with the following license:
+
+UNICODE LICENSE V3
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 2023-2024 Unicode, Inc.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of data files and any associated documentation (the "Data Files") or
+software and any associated documentation (the "Software") to deal in the
+Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell
+copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that either (a)
+this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.
+
+SPDX-License-Identifier: Unicode-3.0
+
+
+
+(End UNICODE LICENSE V3)
+
+
+
+The following applies to parts of this file other than the test language content:
+
+Any copyright is dedicated to the Public Domain.
+http://creativecommons.org/publicdomain/zero/1.0/
+
+-->
+<title>Normalizer bench</title>
+<body>
+<h1>Normalizer Bench</h1>
+<dl>
+ <dt>S</dt>
+ <dd>Short: NFD fits in 32 UTF-16 code units. French and German are adjusted to take a substring that contains a non-ASCII character. (Long input contains the same information in each language instead of having a fixed UTF-16 length.)</dd>
+ <dt>L</dt>
+ <dd>Latin1.</dd>
+ <dt>U</dt>
+ <dd>Forced UTF-16 form for Latin1 languages. (One non-Latin1 character added to the string.)</dd>
+ <dt>W</dt>
+ <dd>Forced write: In the UTF-16 case, a singleton is prepended to force the normalizer to start writing from the start. In the Latin1 case, a character with a compatibility decomposition is prepended, since there are no singletons in Latin1. This means the effect is seen only in the K forms.</dd>
+ <dt>C</dt>
+ <dd>Forced copy: In the UTF-16 case, a singleton is appended to force the normalizer to make a copy even when normalizing from NFC to a C form or from NFD to a D form. In the Latin1 case, a character with a compatibility decomposition is appended, since there are no singletons in Latin1. This means the effect is seen only in the K form corresponding to the input C or D form.</dd>
+</dl>
+
+<p>Bench not started.</p>
+
+<table>
+<thead><tr><th>Input</th><th>NFC</th><th>NFKC</th><th>NFD</th><th>NFKD</th></tr></thead>
+<tbody><tr><td colspan="5">Bench not run.</td></tr></tbody>
+</table>
+<script>
+
+// Inclusion is as follows:
+//
+// English represents ASCII
+//
+// Multiple high-population Latin1 languages due to competing
+// diacritic frenquencies.
+//
+// Multiple Latin2 languages due to competing diacritic frenquencies.
+//
+// Vietnamese: Multi-diacritic Latin above the pass-through bound.
+//
+// Greek: Frequent-accent Latin-like non-Latin.
+//
+// Bengali: Combining starters
+//
+// Chinese: Normalization-invariant in the fast trie range.
+//
+// Japanese: Varies under normalization in the fast trie range.
+//
+// Korean: Arithmetic composition/decomposition.
+
+let rawData = [
+ {
+ lang: "en",
+ text: "There was nothing so very remarkable in that; nor did Alice think it so very much out of the way to hear the Rabbit say to itself, \"Oh dear! Oh dear! I shall be late!\" (when she thought it over afterwards, it occurred to her that she ought to have wondered at this, but at the time it all seemed quite natural); but when the Rabbit actually took a watch out of its waistcoat-pocket, and looked at it, and then hurried on, Alice started to her feet, for it flashed across her mind that she had never before seen a rabbit with either a waistcoat-pocket, or a watch to take out of it, and burning with curiosity, she ran across the field after it, and fortunately was just in time to see it pop down a large rabbit-hole under the hedge.",
+ },
+ {
+ lang: "fr",
+ text: "Il n'y avait rien de si remarquable à cela ; et Alice ne trouvait pas non plus si étrange d'entendre le Lapin se dire : « Oh là là ! Oh là là ! Je vais être en retard ! » (En y repensant plus tard, il lui vint à l'esprit qu'elle aurait dû s'en étonner, mais sur le moment tout semblait tout naturel) ; mais lorsque le Lapin sortit effectivement une montre de la poche de son gilet , la regarda et se hâta de partir, Alice se leva d'un bond, car il lui traversa l'esprit qu'elle n'avait jamais vu auparavant un lapin avec une poche de gilet ou une montre à y prendre, et, brûlante de curiosité, elle traversa le champ à sa poursuite, et heureusement, elle arriva juste à temps pour le voir sauter dans un grand terrier sous la haie.",
+ },
+ {
+ lang: "es",
+ text: "No había nada de extraordinario en eso; ni a Alicia le pareció tan extraño oír al Conejo decirse a sí mismo: \"¡Ay, Dios mío! ¡Ay, Dios mío! ¡Llegaré tarde!\" (Cuando lo pensó después, se le ocurrió que debería haberse sorprendido, pero en ese momento todo le pareció bastante natural); pero cuando el Conejo sacó un reloj del bolsillo del chaleco , lo miró y luego se apresuró a seguir adelante, Alicia se puso de pie de un salto, pues recordó que nunca antes había visto un conejo con un bolsillo del chaleco ni un reloj que sacar de él, y, ardiendo de curiosidad, corrió por el campo tras él, y afortunadamente llegó justo a tiempo de verlo caer por una gran madriguera bajo el seto.",
+ },
+ {
+ lang: "pt",
+ text: "Não havia nada de tão extraordinário nisso; nem Alice achou tão fora do comum ouvir o Coelho dizer para si mesmo: \"Oh, céus! Oh, céus! Vou me atrasar!\" (quando ela pensou nisso depois, ocorreu-lhe que deveria ter se perguntado sobre isso, mas na hora tudo parecia bastante natural); mas quando o Coelho realmente tirou um relógio do bolso do colete , olhou para ele e então saiu apressado, Alice se levantou, pois lhe ocorreu que nunca tinha visto um coelho com um bolso no colete ou um relógio para tirar dele, e queimando de curiosidade, ela correu pelo campo atrás dele e, felizmente, chegou bem a tempo de vê-lo pular por uma grande toca de coelho sob a cerca viva.",
+ },
+ {
+ lang: "de",
+ text: "Daran war nichts besonders Bemerkenswertes; und Alice fand es auch nicht besonders ungewöhnlich, das Kaninchen zu sich selbst sagen zu hören: \"Oh je! Oh je! Ich werde zu spät kommen!\" (als sie später darüber nachdachte, kam ihr der Gedanke, dass sie sich darüber hätte wundern sollen, aber in dem Moment schien ihr alles ganz natürlich); aber als das Kaninchen tatsächlich eine Uhr aus seiner Westentasche nahm , sie ansah und dann weitereilte, sprang Alice auf, denn ihr schoss durch den Kopf, dass sie noch nie zuvor ein Kaninchen mit einer Westentasche oder einer Uhr gesehen hatte, die es herausnehmen konnte, und brennend vor Neugier rannte sie hinter ihm über das Feld her und kam glücklicherweise gerade noch rechtzeitig, um zu sehen, wie es in ein großes Kaninchenloch unter der Hecke verschwand.",
+ },
+ {
+ lang: "pl",
+ text: "Nie było w tym nic aż tak niezwykłego; Alicja też nie wydało się aż tak dziwne, że usłyszała Królika mówiącego do siebie: „Ojej! Ojej! Spóźnię się!” (kiedy później o tym pomyślała, przyszło jej do głowy, że powinna była się temu dziwić, ale wtedy wydawało się to całkiem naturalne); ale kiedy Królik rzeczywiście wyjął zegarek z kieszeni kamizelki i spojrzał na niego, a potem pospieszył dalej, Alicja zerwała się na równe nogi, bo błysnęła jej myśl, że nigdy wcześniej nie widziała królika z kieszenią kamizelki lub zegarkiem, który mógłby z niej wyjąć, i płonąc ciekawością, pobiegła za nim przez pole i na szczęście zdążyła zobaczyć, jak wpada do dużej króliczej nory pod żywopłotem.",
+ },
+ {
+ lang: "ro",
+ text: "Nu era nimic atât de remarcabil în asta; nici Alice nu s-a gândit atât de mult să-l audă pe Iepure spunându-și: „O, dragă! O, dragă! Voi întârzia!” (când s-a gândit după aceea, i-a trecut prin minte că ar fi trebuit să se întrebe de asta, dar la vremea aceea totul părea destul de firesc); dar când Iepurele a scos de fapt un ceas din buzunarul vestei și s-a uitat la el, apoi s-a grăbit mai departe, Alice a început să se ridice, căci îi trecu prin minte că nu mai văzuse niciodată un iepure cu buzunarul vestei sau cu un ceas de scos din el și, arzând de curiozitate, a fugit prin câmp după el, din fericire, să vadă că iepurașul a căzut într-un timp. gardul viu.",
+ },
+ {
+ lang: "hr",
+ text: "U tome nije bilo ničeg tako izuzetnog ; niti je Alice mislila da je toliko neobično čuti zeca kako govori sam sebi: \"O, Bože! O, Bože! Zakasnit ću!\" (kada je kasnije razmišljala, palo joj je na pamet da se tome trebala zapitati, ali tada je sve to izgledalo sasvim prirodno); ali kad je zec zaista izvadio sat iz džepa prsluka i pogledao ga, a zatim požurio dalje, Alice je krenula na noge, jer joj je sinulo u glavi da nikada prije nije vidjela zeca ni s džepom na prsluku, ni sa satom koji bi iz njega izvadio, i izgarajući od znatiželje, potrčala je preko polja za njim, i srećom stigla je baš na vrijeme da vidi kako iskače velika zečja rupa ispod živice.",
+ },
+ {
+ lang: "cs",
+ text: "Nebylo v tom nic tak pozoruhodného ; Ani Alice si nemyslela, že by to bylo tak od věci slyšet, jak si Králík říká: \"Ach miláčku! Ach drahá! Přijdu pozdě!\" (když si to potom rozmyslela, napadlo ji, že se tomu měla divit, ale v tu chvíli to všechno vypadalo docela přirozeně); ale když Králík skutečně vytáhl hodinky z kapsy vesty , podíval se na ně a pak spěchal dál, Alice se postavila na nohy, protože jí blesklo hlavou, že ještě nikdy neviděla králíka s kapsičkou ve vestě, ani s hodinkami, které by z ní vytáhla, a hořel zvědavostí, rozběhla se za nimi přes pole a on naštěstí viděl, jak to pod velkou dírou právě prasklo.",
+ },
+ {
+ lang: "vi",
+ text: "Chẳng có gì quá đáng chú ý trong chuyện đó; Alice cũng chẳng thấy có gì quá khác thường khi nghe Thỏ tự nhủ: \"Ôi trời! Ôi trời! Mình sẽ bị muộn mất!\" (sau này khi nghĩ lại, cô bé thấy lẽ ra mình phải ngạc nhiên về điều này, nhưng lúc đó mọi chuyện có vẻ hoàn toàn bình thường); nhưng khi Thỏ thực sự lấy một chiếc đồng hồ ra khỏi túi áo gi-lê , nhìn đồng hồ rồi vội vã chạy đi, Alice bật dậy, vì cô chợt nghĩ rằng mình chưa bao giờ thấy một con thỏ nào có túi áo gi-lê, hay lấy đồng hồ ra khỏi túi, và vì tò mò, cô bé chạy qua cánh đồng theo sau nó, và may mắn thay là vừa kịp lúc nhìn thấy nó chui xuống một cái hang thỏ lớn dưới hàng rào.",
+ },
+ {
+ lang: "el",
+ text: "Δεν υπήρχε τίποτα τόσο αξιοσημείωτο σε αυτό. Ούτε η Άλις πίστευε ότι ήταν τόσο παράξενο να ακούει το Κουνέλι να λέει στον εαυτό του: \"Ω αγάπη μου! Ω αγαπητέ! Θα αργήσω!\" (όταν το σκέφτηκε μετά, της πέρασε από το μυαλό ότι θα έπρεπε να αναρωτηθεί γι' αυτό, αλλά εκείνη τη στιγμή όλα φαινόταν αρκετά φυσιολογικά). αλλά όταν το κουνέλι έβγαλε ένα ρολόι από την τσέπη του γιλέκου του και το κοίταξε, και μετά βιάστηκε, η Αλίκη άρχισε να σηκώνεται, γιατί πέρασε από το μυαλό της ότι δεν είχε ξαναδεί κουνέλι με τσέπη γιλέκου ή ρολόι για να βγάλει από αυτό και καιγόταν από περιέργεια, έτρεξε λίγο μετά το κοίταξε στο χωράφι. κουνέλι-τρύπα κάτω από τον φράκτη.",
+ },
+ {
+ lang: "bn",
+ text: "এর মধ্যে খুব উল্লেখযোগ্য কিছু ছিল না; খরগোশ নিজেকে বলতে শুনে অ্যালিস খুব বেশি ভাবেনি, \"ওহ প্রিয়! ওহ প্রিয়! আমার দেরি হবে!\" (পরে যখন সে এটা ভেবেছিল, তখন তার মনে হয়েছিল যে এই বিষয়ে তার আশ্চর্য হওয়া উচিত ছিল, কিন্তু সেই সময়ে সবকিছুই স্বাভাবিক বলে মনে হয়েছিল); কিন্তু খরগোশটি যখন তার কোমরের পকেট থেকে একটি ঘড়ি বের করে সেটির দিকে তাকাল, এবং তারপরে তাড়াহুড়ো করে, অ্যালিস তার পায়ের দিকে যেতে শুরু করে, কারণ এটি তার মনের মধ্যে ছড়িয়ে পড়ে যে সে আগে কখনও একটি কোমর-পকেট বা ঘড়ি নিয়ে খরগোশকে দেখেনি, এবং কৌতূহলে জ্বলতে থাকে, সে ক্ষেতের দিকে ছুটে যায় এবং তা দেখার জন্য ঠিক সময় পায়ে চলে যায়। হেজের নীচে একটি বড় খরগোশের গর্ত।",
+ },
+ {
+ lang: "zh",
+ text: "这并没有什么特别之处；爱丽丝也不觉得听到兔子自言自语“哦，天哪！哦，天哪！我要迟到了！”有什么不寻常的（后来她仔细想了想，觉得她应该对此感到奇怪，但当时这一切都显得很自然）；但是当兔子真的从背心口袋里掏出一块手表，看了看，然后匆匆走开时，爱丽丝跳了起来，因为她突然想到，她从来没有见过一只兔子有背心口袋，或者从里面掏出一块手表，她好奇心爆棚，追着它跑过田野，幸运的是，她正好看到它从树篱下的一个大兔子洞里钻了出来。",
+ },
+ {
+ lang: "ja",
+ text: "そこには特に驚くべきことは何もありませんでした。また、ウサギが「あらまあ！あらまあ！遅れちゃう！」と独り言を言っているのを聞いても、アリスはそれほど不自然だとは思いませんでした（あとで考えてみると、これは不思議に思うべきだったのだと気づきましたが、そのときはまったく当然のことのように思えました）。しかし、ウサギが実際にチョッキのポケットから時計を取り出し、それを見てから急いで歩き去ったとき、アリスは飛び上がりました。というのも、チョッキのポケットも、そこから取り出す時計も、ウサギを見たことがない、ということが頭をよぎったからです。好奇心に燃えて、アリスは野原を横切ってウサギを追って走りました。そして運よく、ウサギが垣根の下の大きなウサギの穴に飛び込むのを見るのにちょうど間に合いました。",
+ },
+ {
+ lang: "ko",
+ text: "영어: 그 안에는 그렇게 특별한 것이 없었다. 앨리스는 토끼가 \"아이고! 아이고! 늦겠다!\"라고 중얼거리는 것을 듣고도 그다지 이상하게 생각하지 않았다.(그녀가 나중에 생각해 보니, 그녀가 그것에 대해 궁금해해야 했지만 당시에는 모든 것이 아주 자연스러워 보였다.) 하지만 토끼가 조끼 주머니에서 시계를 꺼내 보고 서둘러 가자 앨리스는 일어섰다. 조끼 주머니나 시계를 꺼낼 토끼를 이전에 본 적이 없다는 생각이 번쩍 들었기 때문이다. 호기심에 불타는 앨리스는 들판을 가로질러 토끼를 쫓아갔고, 다행히 울타리 아래의 큰 토끼굴로 토끼가 뛰어드는 것을 볼 수 있었다.",
+ },
+];
+
+// Global variable for hopefully fooling side effect analysis.
+let escapesScope = "";
+
+let data = [];
+
+function isAscii(s) {
+ for (c of s) {
+ if (c > '\u007F') {
+ return false;
+ }
+ }
+ return true;
+}
+
+function isLatin1(s) {
+ for (c of s) {
+ if (c > '\u00FF') {
+ return false;
+ }
+ }
+ return true;
+}
+
+function cat(a, b) {
+ let ab = a + b;
+ // Flatten rope
+ escapesScope = ab.toUpperCase();
+ return ab;
+}
+
+function asArr(s) {
+ return [s, s];
+}
+
+function append(lang, text) {
+ let nfd = text.normalize("NFD");
+ if (isLatin1(text)) {
+ data.push({
+ label: lang + "_NFC_L",
+ text: asArr(text),
+ });
+ data.push({
+ label: lang + "_NFC_L_W",
+ text: asArr(cat("\u00A0", text)),
+ });
+ data.push({
+ label: lang + "_NFC_L_C",
+ text: asArr(cat(text, "\u00A0")),
+ });
+ data.push({
+ label: lang + "_NFC_U",
+ text: asArr(cat("\u2014", text)),
+ });
+ data.push({
+ label: lang + "_NFC_U_W",
+ text: asArr(cat("\u2126", text)),
+ });
+ data.push({
+ label: lang + "_NFC_U_C",
+ text: asArr(cat(text, "\u2126")),
+ });
+ if (nfd != text) {
+ data.push({
+ label: lang + "_NFD_U",
+ text: asArr(cat("\u2014", nfd)),
+ });
+ data.push({
+ label: lang + "_NFD_U_W",
+ text: asArr(cat("\u2126", nfd)),
+ });
+ data.push({
+ label: lang + "_NFD_U_C",
+ text: asArr(cat(nfd, "\u2126")),
+ });
+ }
+ } else {
+ data.push({
+ label: lang + "_NFC",
+ text: asArr(text),
+ });
+ data.push({
+ label: lang + "_NFC_W",
+ text: asArr(cat("\u2126", text)),
+ });
+ data.push({
+ label: lang + "_NFC_C",
+ text: asArr(cat(text, "\u2126")),
+ });
+ if (nfd != text) {
+ data.push({
+ label: lang + "_NFD",
+ text: asArr(nfd),
+ });
+ data.push({
+ label: lang + "_NFD_W",
+ text: asArr(cat("\u2126", nfd)),
+ });
+ data.push({
+ label: lang + "_NFD_C",
+ text: asArr(cat(nfd, "\u2126")),
+ });
+ }
+ }
+}
+
+function makeShort(s) {
+ let wasAscii = isAscii(s);
+ let nfd = s.normalize("NFD");
+ for (let start = 0; start < s.length; start += 10) {
+ // 31 to leave space for the write/copy forcing character.
+ let sub = s.substring(start, start + 31);
+ if (wasAscii || !isAscii(sub)) {
+ return sub.normalize("NFC");
+ }
+ }
+}
+
+for (entry of rawData) {
+ if (entry.text != entry.text.normalize("NFC")) {
+ console.log("NOT NFC: " + entry.lang)
+ }
+ append(entry.lang, entry.text);
+}
+
+for (entry of rawData) {
+ append(entry.lang + "_S", makeShort(entry.text));
+}
+
+function benchEntry(entry, iterations) {
+ let tr = document.createElement("tr");
+ let label = document.createElement("td");
+ label.textContent = entry.label;
+ tr.appendChild(label);
+
+ for (f of normalizationForms) {
+ let arr = entry.text;
+ let t = Date.now();
+ for (let i = 0; i < iterations; ++i) {
+ escapesScope = arr[i & 1].normalize(f);
+ }
+ let d = Date.now() - t;
+ let td = document.createElement("td");
+ td.textContent = d;
+ tr.appendChild(td);
+ }
+
+ tbody.appendChild(tr);
+}
+
+let normalizationForms = [
+ "NFC",
+ "NFKC",
+ "NFD",
+ "NFKD"
+];
+
+let tbody = document.getElementsByTagName("tbody")[0];
+tbody.removeChild(tbody.firstChild);
+let p = document.getElementsByTagName("p")[0];
+p.textContent = "Bench running.";
+
+function pgo() {
+ for (entry of data) {
+ benchEntry(entry, 10);
+ }
+ p.textContent = "Lower is better. Benching done.";
+}
+
+function bench() {
+ if (!data.length) {
+ p.textContent = "Lower is better. Benching done.";
+ return;
+ }
+ let entry = data.shift();
+ benchEntry(entry, 200_000);
+ setTimeout(bench);
+}
+
+// bench() or pgo()
+pgo();
+</script>
+</body>
+</html>
diff --git a/testing/mozharness/scripts/android_emulator_pgo.py b/testing/mozharness/scripts/android_emulator_pgo.py
--- a/testing/mozharness/scripts/android_emulator_pgo.py
+++ b/testing/mozharness/scripts/android_emulator_pgo.py
@@ -28,10 +28,11 @@
"blueprint/forms.html",
"blueprint/grid.html",
"blueprint/elements.html",
"js-input/3d-thingy.html",
"js-input/crypto-otp.html",
+ "js-input/normalizer_bench.html",
"js-input/sunspider/3d-cube.html",
"js-input/sunspider/3d-morph.html",
"js-input/sunspider/3d-raytrace.html",
"js-input/sunspider/access-binary-trees.html",
"js-input/sunspider/access-fannkuch.html",
diff --git a/toolkit/content/license.html b/toolkit/content/license.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -5786,10 +5786,11 @@
<li><code>third_party/rust/yoke-derive</code></li>
<li><code>third_party/rust/zerofrom</code></li>
<li><code>third_party/rust/zerofrom-derive</code></li>
<li><code>third_party/rust/zerovec</code></li>
<li><code>third_party/rust/zerovec-derive</code></li>
+ <li><code>build/pgo/js-input/normalizer_bench.html</code></li>
</ul>
</td>
<td>
<pre>
UNICODE LICENSE V3

868
src/external-patches/firefox/ff150_3_pgo_patch_for_bug-2014422.patch Normal file
View File

@@ -0,0 +1,868 @@
diff --git a/build/pgo/index.html b/build/pgo/index.html
--- a/build/pgo/index.html
+++ b/build/pgo/index.html
@@ -49,10 +49,11 @@
"blueprint/forms.html",
"blueprint/grid.html",
"blueprint/sample.html",
"js-input/3d-thingy.html",
"js-input/crypto-otp.html",
+ "js-input/collator_bench.html",
"js-input/normalizer_bench.html",
"js-input/sunspider/3d-cube.html",
"js-input/sunspider/3d-morph.html",
"js-input/sunspider/3d-raytrace.html",
"js-input/sunspider/access-binary-trees.html",
diff --git a/build/pgo/js-input/collator_bench.html b/build/pgo/js-input/collator_bench.html
new file mode 100644
--- /dev/null
+++ b/build/pgo/js-input/collator_bench.html
@@ -0,0 +1,817 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<!--
+The test content comes from
+https://github.com/unicode-org/icu4x/tree/main/components/collator/benches/data
+which came under the following license:
+
+UNICODE LICENSE V3
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 2020-2024 Unicode, Inc.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of data files and any associated documentation (the "Data Files") or
+software and any associated documentation (the "Software") to deal in the
+Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell
+copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that either (a)
+this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.
+
+SPDX-License-Identifier: Unicode-3.0
+
+—
+
+Portions of ICU4X may have been adapted from ICU4C and/or ICU4J.
+ICU 1.8.1 to ICU 57.1 © 1995-2016 International Business Machines Corporation and others.
+
+
+(End Unicode-3.0 with IBM trailer)
+
+
+The following applies to parts of this file other that the test language content:
+
+Any copyright is dedicated to the Public Domain.
+http://creativecommons.org/publicdomain/zero/1.0/
+
+-->
+<title>Collator bench</title>
+<body>
+<h1>Collator Bench</h1>
+
+<p>Bench not started.</p>
+
+<table>
+<thead><tr><th>Workload</th><th>Time</th></tr></thead>
+<tbody><tr><td colspan="2">Bench not run.</td></tr></tbody>
+</table>
+
+<script>
+let zh = [
+ "林賢得",
+ "趙士齊",
+ "曾正耀",
+ "柯敏盛",
+ "王彩霞",
+ "張致蒨",
+ "黃議德",
+ "洪禮君",
+ "李美瑩",
+ "張雅雯",
+ "劉鳳興",
+ "方映芬",
+ "謝于櫻",
+ "歐陽有慧",
+ "林啟人",
+ "張綵芳",
+ "劉淑華",
+ "侯嘉珍",
+ "吳晏平",
+ "李麗枝",
+ "陳辰揚",
+ "劉大榮",
+ "陳孟伶",
+ "許筱萍",
+ "莊培鑫",
+ "詹浚昇",
+ "趙修霖",
+ "劉逸竹",
+ "黃小娟",
+ "張英琦",
+ "郭嘉偉",
+ "姚方潔",
+ "李澤育",
+ "黃加欣",
+ "章瓊方",
+ "葉佩真",
+ "李勝雄",
+ "董姿利",
+ "陳懿映",
+ "鄭宜芳",
+ "李忠和",
+ "楊宏祥",
+ "王道仁",
+ "鄭慶哲",
+ "蔡娟娟",
+ "施健鴻",
+ "藍子桓",
+ "汪孟涵",
+ "邱奕明",
+ "林政緯",
+];
+
+let sv = [
+ "Söderholm, Carl",
+ "Pettersson, Robert",
+ "Håg, Petter",
+ "Erikson, Daniel",
+ "Ericsson, Marie",
+ "Sjöman, Olle",
+ "Åberg, Carita",
+ "Ericson, Lars",
+ "Ericsson, Mona",
+ "Hägglund, Frida",
+ "Eriksson, John",
+ "Palmén, Thomas",
+ "Johansson, Åke",
+ "Hagelstam, Stina",
+ "Sjöberg, Cecilia",
+ "Johansson, Andreas",
+ "Johansson, André",
+ "Palme, Anders",
+ "Erixon, Ida",
+ "Ahlström, Olof",
+ "Lind, Axel",
+ "Johansson, Annika",
+ "Sohlberg, Jonas",
+ "Johansson, Anna",
+];
+
+let en = [
+ "Lowry, Keith",
+ "Lowry, Adam",
+ "Long, Amelia",
+ "Long, Bob",
+ "Torrigiano, Pietro",
+ "Torrigiano, Giovanni",
+ "Glyde, Henry George",
+ "Glyde, Anne",
+ "Barnard, Rev. William Henry",
+ "Barnard, John",
+ "Béraud, Jean",
+ "Pacher, Michael",
+ "Waldo, Samuel Lovett",
+ "Eun-ho, Kim",
+ "Hook, James Clarke",
+ "Rible, Dave",
+ "Bowling, Frank",
+ "Kettle, Tilly",
+ "Wilson, George Washington",
+ "Herrera Barnuevo, Sebastian de",
+ "Laurence, Samuel",
+ "Oost the Elder, Jacob van",
+ "Nourse, Elizabeth",
+ "Pietersz the Younger, Pieter",
+ "Vorsterman the Elder, Lucas",
+ "Cézanne, Paul",
+ "Cézanne, Marie",
+ "Tischbein, Johann Heinrich Wilhelm",
+ "Bossche, Aert van den",
+ "Dawson, David",
+ "Siberechts, Jan",
+ "Flipart, Charles",
+ "Bastien-Lepage, Jules",
+ "Carpenter, Ed",
+ "Lorenzetti, Ugolino",
+ "Halswelle, Keeley",
+ "Jefferys, James",
+ "Cowles, Russell",
+ "Stuempfig, Walter",
+ "Foote, Will Howe",
+ "Maltwood, Katherine Emma",
+ "Traylor, Bill",
+ "Krieghoff, Cornelius",
+ "Campigli, Massimo",
+ "Yun Ge",
+ "Sallee, Charles",
+ "Gardner, Todd",
+ "Dixon, Ken",
+ "Forsyth, William",
+ "Godfrey, DeWitt",
+ "Oliveira, Nathan",
+ "Stott, Edward",
+ "Tiepolo, Giovanni Battista",
+ "Winter, Friedrich",
+ "Gaywood, Richard",
+ "Apt the Elder, Ulrich",
+];
+
+let kana_kanji = [
+ "蔡賢皇",
+ "タバタ,ミワコ",
+ "せき,ゆきお",
+ "アキヤマ,キヨシ",
+ "邱信益",
+ "劉柏麟",
+ "アオキ,ヨシミ",
+ "かさま,のりまさ",
+ "まつうら,えりこ",
+ "洪永昌",
+ "むろぞの,ひろあき",
+ "カドタ,アキヒロ",
+ "李維楨",
+ "劉芳蘭",
+ "ヨシダ,カズヨシ",
+ "キタガワ,ヨシテル",
+ "のじま,のりお",
+ "カトウ,タカシ",
+ "鄭淑米",
+ "ヤマモト,マサトシ",
+ "たまき,なおこ",
+ "カワイ,トシオ",
+ "李曉菁",
+ "郭添新",
+ "林雅君",
+ "かとう,としや",
+ "陳明楷",
+ "セキネ,カズアキ",
+ "オジ,ヤスヒロ",
+ "かじもと,たくや",
+ "かどた,あきひろ",
+ "マツモト,タケシ",
+ "はっとり,たかゆき",
+ "蔡秉昆",
+ "ニシオカ,シンイチ",
+ "オガワ,ヨシオ",
+ "アラキ,カツジ",
+ "郭佳鑫",
+ "イシモト,ケンジ",
+ "アマノ,トオル",
+ "ひびの,ひろし",
+ "ムラカミ,ヒロキ",
+ "鍾淑萍",
+ "吳敏真",
+ "オオヤ,ヒデホ",
+ "吳振成",
+ "タケヨシ,セイノスケ",
+ "許郁敏",
+ "杜宛諭",
+ "オシマ,ナスオ",
+];
+
+let pl = [
+ "Kowalska",
+ "Piotrowska",
+ "Jasiński",
+ "Wróblewski",
+ "Szymański",
+ "Kowalski",
+ "Zieliński",
+ "Górska",
+ "Michalski",
+ "Olszewska",
+ "Pawłowski",
+ "Pietrzak",
+ "Wróblewski",
+ "Kwiatkowski",
+ "Nowicki",
+ "Stępień",
+ "Olszewski",
+ "Zalewski",
+ "Małecki",
+ "Zalewska",
+ "Nowacki",
+ "Błaszczyk",
+ "Tomaszewska",
+ "Marciniak",
+ "Jakubowska",
+ "Kozłowska",
+ "Malinowska",
+ "Król",
+ "Rutkowska",
+ "Cieślak",
+ "Kamiński",
+ "Zajączkowski",
+ "Wieczorek",
+ "Sokołowska",
+ "Ostrowska",
+ "Walczak",
+ "Dudek",
+ "Kozłowski",
+ "Baran",
+ "Ostrowski",
+ "Małecka",
+ "Witkowski",
+ "Wiśniewski",
+ "Lewandowski",
+ "Wójcik",
+ "Dąbrowski",
+ "Grabowska",
+ "Tomaszewski",
+ "Stępniak",
+ "Rutkowski",
+ "Piotrowski",
+ "Krawiec",
+ "Witkowska",
+ "Wojciechowska",
+ "Michalska",
+ "Pawłowska",
+ "Woźniak",
+ "Lewandowska",
+ "Sikora",
+ "Kwiatkowska",
+ "Wójcicki",
+ "Wójtowicz",
+ "Grabowski",
+ "Duda",
+ "Zielińska",
+ "Jasińska",
+ "Jankowska",
+ "Sokołowski",
+ "Górski",
+ "Wróbel",
+ "Wiśniewska",
+ "Nowak",
+ "Woźny",
+ "Jankowski",
+ "Michalak",
+ "Malinowski",
+ "Wojciechowski",
+ "Nowicka",
+ "Dąbrowska",
+ "Kamińska",
+ "Szymańska",
+ "Królak",
+ "Krawczyk",
+ "Adamczyk",
+ "Jakubowski",
+ "Szewczyk",
+];
+
+let ko = [
+ "이진동",
+ "한종태",
+ "박범근",
+ "노운동",
+ "이대규",
+ "서성출",
+ "이재훈",
+ "이영우",
+ "최강기",
+ "정장조",
+ "박동식",
+ "한경애",
+ "박선식",
+ "박정자",
+ "박태규",
+ "이성춘",
+ "김병강",
+ "류복호",
+ "정수보",
+ "전정근",
+ "윤근수",
+ "최해섭",
+ "허성필",
+ "이만상",
+ "이정동",
+ "김영학",
+ "최남영",
+ "정순수",
+ "차성순",
+ "심영숙",
+ "이태일",
+ "오재옥",
+ "전병주",
+ "윤삼호",
+ "서준욱",
+ "박계술",
+ "허병권",
+ "이동기",
+ "송식수",
+ "양태만",
+ "박갑수",
+ "김수광",
+ "최돈수",
+ "한낙완",
+ "박재학",
+ "배근호",
+ "김용술",
+ "빈석석",
+ "시수수",
+ "김상덕",
+];
+
+let th = [
+ "วรรณะ คณาญาติ",
+ "ชุติมา อัญญณรงค์กุล",
+ "สันติ เลิศสกุลพันธ์",
+ "จินตนา อาภานันท์",
+ "ประทุม เจริญชอบ",
+ "บุญส่ง เปี่ยมพลาย",
+ "ซิมค้วง แซ่เตง",
+ "นันทวัน เจียรอุดมทรัพย์",
+ "นลพร ภิญโญบริสุทธิ์",
+ "วุฒิ มีสุข",
+ "ณรงศักดิ์ ตั้งเจริญสุขจีระ",
+ "วัดช่องนนทรี วัดช่องนนทรี",
+ "ไพศาล จ๋วงพานิช",
+ "พัชรี เกตุหอม",
+ "สมพงษ์ ศรีสากล",
+ "จิโรจน์ ไพฑูรย์",
+ "ณรงค์ โพธิพุกกะนะ",
+ "พิมพรรณ เปรมธาดา",
+ "สายหยุด จันทร",
+ "สมาน ค้าคล่อง",
+ "ชูชาติ เอี่ยมสุทธา",
+ "วีระเกียรติ ตั้งอมรรัตน์",
+ "พีระ กอสุวรรณสกุล",
+ "บุญเชิด เลิศนิมิตร",
+ "พัชรินทร์ โต๊ะวนิชรักษา",
+ "จินตนา เกตุสัมพันธ์",
+ "วันเพ็ญ กิ่งใบสมบูรณ์",
+ "สงวน แกล้วกล้า",
+ "จงกล ลานเจริญ",
+ "ทัศนา แซ่เล้า",
+ "ทัศนีย์ เสรีพกกะณะ",
+ "ขจรศักดิ์ โพธินามทอง",
+ "ธนิตร เนาวศักดิ์",
+ "อารี นาคะสิงห์",
+ "ไพโรจน์ หาญพงษ์ธรรม",
+ "บุญฤทธิ์ นุ้ยขาว",
+ "ณรงค์ ไทยสุริยะ",
+ "สมชาย ศรบรรจง",
+ "ทัศนีย์ ชัยกุล",
+ "จินดาพร ศรีสุขสันต์",
+ "รพีวรรณ สัมปชัญญะ",
+ "สุรินทร์ แสงรัตน์",
+ "วรรณรักษ์ วัฒนวุฒิพงศ์",
+ "เรียมรัตน์ เกตุกาญจน์",
+ "สัตยา ศรีอ่อน",
+ "วิมล มาลัยทอง",
+ "บักจุ้ย แซ่เฮ้ง",
+ "ฮายูรซิงห์ กัมบีร์",
+ "ผาสิต หิรัญญชาติธาดา",
+ "พรพิศ อาภรณ์ศิริพงษ์",
+];
+
+let filenames = [
+ "2005-07-06_15-43-20.jpg",
+ "2005-07-06_16-17-35.jpg",
+ "2005-07-08_17-54-43.jpg",
+ "2005-07-08_14-52-26.jpg",
+ "2005-07-08_15-39-27.jpg",
+ "2005-07-05_16-21-40.jpg",
+ "2005-07-06_17-53-21.jpg",
+ "2005-07-04_09-42-55.jpg",
+ "2005-07-08_17-55-18.jpg",
+ "2005-07-08_15-38-43.jpg",
+ "2005-07-05_22-54-56.jpg",
+ "2005-07-05_13-40-25.jpg",
+ "2005-07-04_16-47-37.jpg",
+ "2005-07-04_22-47-53.jpg",
+ "2005-07-08_17-05-43.jpg",
+ "2005-07-05_15-48-20.jpg",
+ "2005-07-06_16-33-59.jpg",
+ "2005-07-08_11-46-56.jpg",
+ "2005-07-06_16-28-24.jpg",
+ "2005-07-06_11-13-43.jpg",
+ "2005-07-08_15-16-39.jpg",
+ "2005-07-05_22-52-45.jpg",
+ "2005-07-06_11-46-46.jpg",
+ "2005-07-06_17-11-37.jpg",
+ "2005-07-08_14-48-43.jpg",
+ "2005-07-08_18-01-44.jpg",
+ "2005-07-09_17-13-13.jpg",
+ "2005-07-05_13-45-12.jpg",
+ "2005-07-05_14-16-55.jpg",
+ "2005-07-06_18-05-15.jpg",
+ "2005-07-08_16-13-50.jpg",
+ "2005-07-05_15-32-51.jpg",
+ "2005-07-05_14-15-11.jpg",
+ "2005-07-04_19-12-45.jpg",
+ "2005-07-06_10-53-00.jpg",
+ "2005-07-09_17-27-52.jpg",
+ "2005-07-07_17-45-36.jpg",
+ "2005-07-07_16-33-57.jpg",
+ "2005-07-05_20-49-29.jpg",
+ "2005-07-05_16-38-57.jpg",
+ "2005-07-05_14-17-19.jpg",
+ "2005-07-08_18-23-52.jpg",
+ "2005-07-05_17-42-41.jpg",
+ "2005-07-06_10-57-46.jpg",
+ "2005-07-06_15-32-40.jpg",
+ "2005-07-06_10-52-05.jpg",
+ "2005-07-04_20-21-50.jpg",
+ "2005-07-06_14-33-47.jpg",
+ "2005-07-08_17-07-00.jpg",
+ "2005-07-07_16-59-07.jpg",
+ "2005-07-09_15-37-06.jpg",
+ "2005-07-05_13-46-57.jpg",
+ "2005-07-08_13-38-43.jpg",
+ "2005-07-08_13-33-13.jpg",
+ "2005-07-07_17-38-03.jpg",
+ "2005-07-08_15-31-34.jpg",
+ "2005-07-06_16-19-59.jpg",
+ "2005-07-05_17-47-56.jpg",
+ "2005-07-06_17-59-31.jpg",
+ "2005-07-04_22-51-31.jpg",
+ "2005-07-08_13-33-54.jpg",
+ "2005-07-04_09-46-15.jpg",
+ "2005-07-07_17-33-40.jpg",
+ "2005-07-05_12-37-31.jpg",
+ "2005-07-08_15-42-53.jpg",
+ "2005-07-08_18-41-35.jpg",
+ "2005-07-05_15-47-57.jpg",
+ "2005-07-08_12-01-39.jpg",
+ "2005-07-04_22-51-06.jpg",
+ "2005-07-04_21-37-42.jpg",
+ "2005-07-09_17-13-09.jpg",
+ "2005-07-07_11-14-14.jpg",
+ "2005-07-05_13-43-26.jpg",
+ "2005-07-05_13-36-55.jpg",
+ "2005-07-05_18-32-09.jpg",
+ "2005-07-06_11-53-07.jpg",
+ "2005-07-05_12-32-10.jpg",
+ "2005-07-06_10-46-22.jpg",
+ "2005-07-08_11-50-26.jpg",
+ "2005-07-05_21-02-28.jpg",
+ "2005-07-04_22-47-21.jpg",
+ "2005-07-04_10-55-57.jpg",
+ "2005-07-09_15-38-52.jpg",
+ "2005-07-08_17-10-59.jpg",
+ "2005-07-08_14-50-40.jpg",
+ "2005-07-08_18-00-22.jpg",
+ "2005-07-07_18-19-18.jpg",
+ "2005-07-09_15-12-18.jpg",
+ "2005-07-08_14-49-53.jpg",
+ "2005-07-05_13-46-33.jpg",
+ "2005-07-06_17-25-07.jpg",
+ "2005-07-09_15-44-05.jpg",
+ "2005-07-05_17-26-36.jpg",
+ "2005-07-08_15-44-03.jpg",
+ "2005-07-05_13-33-39.jpg",
+ "2005-07-06_21-29-25.jpg",
+ "2005-07-08_11-51-44.jpg",
+ "2005-07-08_15-12-48.jpg",
+ "2005-07-06_16-25-39.jpg",
+ "2005-07-08_18-21-32.jpg",
+ "2005-07-05_12-32-21.jpg",
+ "2005-07-05_13-38-14.jpg",
+ "2005-07-08_15-43-51.jpg",
+ "2005-07-05_12-41-56.jpg",
+ "2005-07-08_15-25-53.jpg",
+ "2005-07-04_10-56-04.jpg",
+ "2005-07-06_11-18-37.jpg",
+ "2005-07-05_18-43-06.jpg",
+ "2005-07-06_16-09-17.jpg",
+ "2005-07-04_10-59-20.jpg",
+ "2005-07-06_16-22-39.jpg",
+ "2005-07-06_16-33-04.jpg",
+ "2005-07-06_16-44-58.jpg",
+ "2005-07-08_13-33-08.jpg",
+ "2005-07-08_11-12-54.jpg",
+ "2005-07-08_12-06-15.jpg",
+ "2005-07-04_09-46-43.jpg",
+ "2005-07-08_11-04-34.jpg",
+ "2005-07-08_16-48-35.jpg",
+ "2005-07-05_21-03-24.jpg",
+ "2005-07-08_11-48-22.jpg",
+ "2005-07-04_10-56-33.jpg",
+ "2005-07-05_12-11-03.jpg",
+ "2005-07-06_11-51-57.jpg",
+ "2005-07-05_17-19-16.jpg",
+ "2005-07-05_22-42-16.jpg",
+ "2005-07-05_18-08-29.jpg",
+ "2005-07-09_15-38-39.jpg",
+ "2005-07-08_11-46-06.jpg",
+ "2005-07-06_12-01-09.jpg",
+ "2005-07-06_19-46-20.jpg",
+ "2005-07-08_15-43-40.jpg",
+ "2005-07-08_17-03-43.jpg",
+ "2005-07-08_15-42-33.jpg",
+ "2005-07-07_17-31-19.jpg",
+ "2005-07-06_11-00-25.jpg",
+ "2005-07-06_14-59-14.jpg",
+ "2005-07-08_14-50-54.jpg",
+ "2005-07-04_22-30-53.jpg",
+ "2005-07-05_22-30-33.jpg",
+ "2005-07-06_21-03-50.jpg",
+ "2005-07-09_17-10-49.jpg",
+ "2005-07-07_17-01-31.jpg",
+ "2005-07-05_18-51-01.jpg",
+ "2005-07-07_15-47-10.jpg",
+ "2005-07-08_15-18-06.jpg",
+ "2005-07-09_17-18-52.jpg",
+ "2005-07-05_17-49-27.jpg",
+ "2005-07-06_16-27-05.jpg",
+ "2005-07-09_15-39-08.jpg",
+ "2005-07-09_17-27-41.jpg",
+ "2005-07-06_18-05-05.jpg",
+ "2005-07-04_09-46-05.jpg",
+ "2005-07-07_20-32-22.jpg",
+ "2005-07-08_12-36-22.jpg",
+ "2005-07-04_09-34-17.jpg",
+ "2005-07-05_17-04-38.jpg",
+ "2005-07-05_16-48-19.jpg",
+ "2005-07-05_22-38-05.jpg",
+ "2005-07-06_21-28-54.jpg",
+ "2005-07-05_17-39-17.jpg",
+ "2005-07-05_20-53-24.jpg",
+ "2005-07-05_14-13-48.jpg",
+ "2005-07-05_15-40-10.jpg",
+ "2005-07-05_14-10-06.jpg",
+ "2005-07-04_09-41-26.jpg",
+ "2005-07-06_18-36-09.jpg",
+ "2005-07-05_20-58-48.jpg",
+ "2005-07-05_14-09-25.jpg",
+ "2005-07-05_21-10-03.jpg",
+ "2005-07-05_15-23-57.jpg",
+ "2005-07-04_09-43-23.jpg",
+ "2005-07-08_11-48-10.jpg",
+ "2005-07-08_15-40-33.jpg",
+ "2005-07-07_16-59-54.jpg",
+ "2005-07-08_17-44-46.jpg",
+ "2005-07-08_14-50-50.jpg",
+ "2005-07-04_22-24-58.jpg",
+ "2005-07-08_17-06-13.jpg",
+ "2005-07-09_16-43-05.jpg",
+ "2005-07-07_17-02-23.jpg",
+ "2005-07-09_15-36-49.jpg",
+ "2005-07-05_13-50-04.jpg",
+ "2005-07-09_15-40-07.jpg",
+ "2005-07-09_17-40-47.jpg",
+ "2005-07-04_16-22-19.jpg",
+ "2005-07-05_14-16-07.jpg",
+ "2005-07-07_17-19-58.jpg",
+ "2005-07-05_13-43-50.jpg",
+ "2005-07-05_15-35-30.jpg",
+ "2005-07-06_16-05-30.jpg",
+ "2005-07-06_15-14-38.jpg",
+ "2005-07-06_15-28-12.jpg",
+ "2005-07-08_15-23-38.jpg",
+ "2005-07-07_16-41-58.jpg",
+ "2005-07-04_11-00-06.jpg",
+ "2005-07-08_17-50-13.jpg",
+ "2005-07-08_11-46-44.jpg",
+ "2005-07-09_17-02-15.jpg",
+ "2005-07-05_14-09-50.jpg",
+ "2005-07-05_17-54-23.jpg",
+ "2005-07-07_18-35-47.jpg",
+ "2005-07-05_22-27-52.jpg",
+ "2005-07-06_14-59-23.jpg",
+ "2005-07-04_22-55-16.jpg",
+ "2005-07-04_22-23-01.jpg",
+];
+
+function toUTF16(str) {
+ // Normalize to force flattening of rope.
+ return (str + "\u2014").normalize();
+}
+
+let data = [
+ {
+ name: "Dates as file names, root collation",
+ coll: "en",
+ arr: filenames,
+ },
+ {
+ name: "Dates as file names, root collation, numeric",
+ coll: "en-u-kn-true",
+ arr: filenames,
+ },
+ {
+ name: "Dates as file names, tailoring",
+ coll: "sv",
+ arr: filenames,
+ },
+ {
+ name: "Dates as file names, tailoring, numeric",
+ coll: "sv-u-kn-true",
+ arr: filenames,
+ },
+ // Root collation
+ {
+ name: "English Latin1",
+ coll: "en",
+ arr: en,
+ },
+ {
+ name: "English UTF-16",
+ coll: "en",
+ arr: en.map(toUTF16),
+ },
+ // Swedish stands in for code paths of interest
+ // to pretty much all tailored Latin except Vietnamese
+ // and German phonebook.
+ {
+ name: "Swedish Latin1",
+ coll: "sv",
+ arr: sv,
+ },
+ {
+ name: "Swedish UTF-16",
+ coll: "sv",
+ arr: sv.map(toUTF16),
+ },
+ // For Latin1 to UTF-16 comparisons.
+ {
+ name: "Polish Latin1/UTF-16 mix",
+ coll: "pl",
+ arr: pl,
+ },
+ // Algorithmically simple tailoring case
+ // with large data structure size.
+ {
+ name: "Chinese (Pinyin order)",
+ coll: "zh-u-co-pinyin",
+ arr: zh,
+ },
+ // Bench/PGO value-add of another order unclear.
+ {
+ name: "Chinese (stroke order)",
+ coll: "zh-u-co-stroke",
+ arr: zh,
+ },
+ // Bench/PGO value-add unclear if Greek is added.
+ {
+ name: "Japanese",
+ coll: "ja",
+ arr: kana_kanji,
+ },
+ // Algorithmic special case.
+ {
+ name: "Korean",
+ coll: "ko",
+ arr: ko,
+ },
+ // Unverified if this workload actually exercises the interesting code paths.
+ {
+ name: "Thai",
+ coll: "th",
+ arr: th,
+ },
+ // TODO: Add Greek, Vietnamese, Bengali
+];
+
+// Global variable for hopefully fooling side effect analysis.
+let escapesScope = "";
+
+function benchEntry(entry, iterations) {
+ let tr = document.createElement("tr");
+ let label = document.createElement("td");
+ label.textContent = entry.name;
+ tr.appendChild(label);
+
+ let c = new Intl.Collator(entry.coll);
+ let t = Date.now();
+ for (let i = 0; i < iterations; ++i) {
+ // Make a shallow copy and then sort it in place
+ // instead of calling `toSorted()` on the unvalidated
+ // assumption that in-place sorting is more common on
+ // the Web.
+ escapesScope = entry.arr.slice();
+ escapesScope.sort(c.compare);
+ }
+ let d = Date.now() - t;
+ let td = document.createElement("td");
+ td.textContent = d;
+ tr.appendChild(td);
+
+ tbody.appendChild(tr);
+}
+
+let tbody = document.getElementsByTagName("tbody")[0];
+tbody.removeChild(tbody.firstChild);
+let p = document.getElementsByTagName("p")[0];
+p.textContent = "Bench running.";
+
+function pgo() {
+ for (entry of data) {
+ benchEntry(entry, 10);
+ }
+ p.textContent = "Lower is better. Benching done.";
+}
+
+function bench() {
+ if (!data.length) {
+ p.textContent = "Lower is better. Benching done.";
+ return;
+ }
+ let entry = data.shift();
+ benchEntry(entry, 5_000);
+ setTimeout(bench);
+}
+
+// bench() or pgo()
+pgo();
+</script>
+</body>
+</html>
diff --git a/testing/mozharness/scripts/android_emulator_pgo.py b/testing/mozharness/scripts/android_emulator_pgo.py
--- a/testing/mozharness/scripts/android_emulator_pgo.py
+++ b/testing/mozharness/scripts/android_emulator_pgo.py
@@ -29,10 +29,11 @@
"blueprint/forms.html",
"blueprint/grid.html",
"blueprint/elements.html",
"js-input/3d-thingy.html",
"js-input/crypto-otp.html",
+ "js-input/collator_bench.html",
"js-input/normalizer_bench.html",
"js-input/sunspider/3d-cube.html",
"js-input/sunspider/3d-morph.html",
"js-input/sunspider/3d-raytrace.html",
"js-input/sunspider/access-binary-trees.html",
diff --git a/toolkit/content/license.html b/toolkit/content/license.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -5788,10 +5788,11 @@
<li><code>third_party/rust/zerofrom</code></li>
<li><code>third_party/rust/zerofrom-derive</code></li>
<li><code>third_party/rust/zerovec</code></li>
<li><code>third_party/rust/zerovec-derive</code></li>
<li><code>build/pgo/js-input/normalizer_bench.html</code></li>
+ <li><code>build/pgo/js-input/collator_bench.html</code></li>
</ul>
</td>
<td>
<pre>
UNICODE LICENSE V3

15
src/external-patches/manifest.json
View File

@@ -40,5 +40,20 @@
"type": "phabricator",
"id": "D291714",
"name": "gh-12979 Clip dirty_rect to device_size"
},
{
"type": "phabricator",
"id": "D256645",
"name": "FF150 1 PGO patch for bug-1962418"
},
{
"type": "phabricator",
"id": "D279829",
"name": "FF150 2 PGO patch for bug-2011620"
},
{
"type": "phabricator",
"id": "D281762",
"name": "FF150 3 PGO patch for bug-2014422"
}
]

2
src/zen/common/sys/ZenActorsManager.sys.mjs
View File

@@ -54,7 +54,7 @@ let JSWINDOWACTORS = {
},
},
allFrames: true,
matches: ["*://*/*"],
remoteTypes: ["web", "file"],
enablePreference: "zen.glance.enabled",
},
};