Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 1317 insertions, 0 deletions

diff --git a/taskcluster/kinds/perftest/android.yml b/taskcluster/kinds/perftest/android.yml
new file mode 100644
index 0000000000..1ed071a1a1
--- /dev/null
+++ b/taskcluster/kinds/perftest/android.yml
@@ -0,0 +1,363 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+---
+
+job-defaults:
+    fetches:
+        toolchain:
+            - linux64-node
+            - linux64-geckodriver
+
+    worker:
+        env:
+            PYTHONPATH: "testing/mozbase/mozdevice:third_party/python/six"
+
+    run:
+        sparse-profile: perftest
+        checkout: true
+        cwd: '{checkout}'
+        command: >-
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --on-try
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+hw-a51:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run ./mach perftest on a Samsung Galaxy a51
+    treeherder:
+        symbol: perftest-a51
+    platform: android-hw-a51-11-0-arm7-shippable/opt
+
+# TODO: is this right?
+hw-a51-aarch64:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run ./mach perftest on a Samsung Galaxy a51
+    treeherder:
+        symbol: perftest-a51
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+
+hw-a51-startup-fenix-cold-main-first-frame:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run android startup perftest on Fenix on a Samsung A51
+    treeherder:
+        symbol: perftest(startup-fenix-cmff)
+        tier: 2
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+    attributes:
+        cron: true
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor=mobile-browser
+            --AndroidStartUp
+            testing/performance/perftest_android_startup.js
+            --browsertime-cycles=0
+            --AndroidStartUp-test-name=cold_main_first_frame
+            --perfherder
+            --hooks
+            testing/performance/hooks_android_startup.py
+            --AndroidStartUp-product=fenix
+            --AndroidStartUp-release-channel=nightly
+
+hw-a51-startup-fenix-cold-view-nav-start:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run android startup perftest on Fenix on a Samsung A51
+    treeherder:
+        symbol: perftest(startup-fenix-cvns)
+        tier: 2
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+    attributes:
+        cron: true
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor=mobile-browser
+            --AndroidStartUp
+            testing/performance/perftest_android_startup.js
+            --browsertime-cycles=0
+            --AndroidStartUp-test-name=cold_view_nav_start
+            --perfherder
+            --hooks
+            testing/performance/hooks_android_startup.py
+            --AndroidStartUp-product=fenix
+            --AndroidStartUp-release-channel=nightly
+
+hw-a51-startup-focus-cold-main-first-frame:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run android startup perftest on Focus on a Samsung A51
+    treeherder:
+        symbol: perftest(startup-focus-cmff)
+        tier: 2
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+    attributes:
+        cron: true
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor=mobile-browser
+            --AndroidStartUp
+            testing/performance/perftest_android_startup.js
+            --browsertime-cycles=0
+            --AndroidStartUp-test-name=cold_main_first_frame
+            --perfherder
+            --hooks
+            testing/performance/hooks_android_startup.py
+            --AndroidStartUp-product=focus
+            --AndroidStartUp-release-channel=nightly
+
+hw-a51-startup-focus-cold-view-nav-start:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run android startup perftest on Focus on a Samsung A51
+    treeherder:
+        symbol: perftest(startup-focus-cvns)
+        tier: 2
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+    attributes:
+        cron: true
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor=mobile-browser
+            --AndroidStartUp
+            testing/performance/perftest_android_startup.js
+            --browsertime-cycles=0
+            --AndroidStartUp-test-name=cold_view_nav_start
+            --perfherder
+            --hooks
+            testing/performance/hooks_android_startup.py
+            --AndroidStartUp-product=focus
+            --AndroidStartUp-release-channel=nightly
+
+hw-a51-startup-geckoview-cold-main-first-frame:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run android startup perftest on Geckoview on a Samsung A51
+    treeherder:
+        symbol: perftest(startup-geckoview-cmff)
+        tier: 2
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+    attributes:
+        cron: true
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor=mobile-browser
+            --AndroidStartUp
+            testing/performance/perftest_android_startup.js
+            --browsertime-cycles=0
+            --AndroidStartUp-test-name=cold_main_first_frame
+            --perfherder
+            --hooks
+            testing/performance/hooks_android_startup.py
+            --AndroidStartUp-product=geckoview_example
+            --AndroidStartUp-release-channel=nightly
+
+hw-a51-startup-geckoview-cold-view-nav-start:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run android startup perftest on Geckoview_example on a Samsung A51
+    treeherder:
+        symbol: perftest(startup-geckoview-cvns)
+        tier: 2
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+    attributes:
+        cron: true
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor=mobile-browser
+            --AndroidStartUp
+            testing/performance/perftest_android_startup.js
+            --browsertime-cycles=0
+            --AndroidStartUp-test-name=cold_view_nav_start
+            --perfherder
+            --hooks
+            testing/performance/hooks_android_startup.py
+            --AndroidStartUp-product=geckoview_example
+            --AndroidStartUp-release-channel=nightly
+
+hw-a51-startup-chrome-m-cold-main-first-frame:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run android startup perftest on Chrome on a Samsung A51
+    treeherder:
+        symbol: perftest(startup-chrome-m-cmff)
+        tier: 2
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+    attributes:
+        cron: true
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor=mobile-browser
+            --AndroidStartUp
+            testing/performance/perftest_android_startup.js
+            --browsertime-cycles=0
+            --AndroidStartUp-test-name=cold_main_first_frame
+            --perfherder
+            --hooks
+            testing/performance/hooks_android_startup.py
+            --AndroidStartUp-product=chrome-m
+            --AndroidStartUp-release-channel=release
+
+hw-a51-perfstats-gv:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run PerfStats perftest on GeckoView on a Samsung A51
+    treeherder:
+        symbol: perftest(perfstats-gv)
+    platform: android-hw-a51-11-0-arm7-shippable/opt
+    attributes:
+        cron: false
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor mobile-browser
+            --android
+            --android-app-name org.mozilla.geckoview_example
+            --android-activity org.mozilla.geckoview_example.GeckoViewActivity
+            --android-clear-logcat
+            --android-capture-logcat logcat
+            --android-install-apk gve_nightly_api16
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --perfherder
+            --perfherder-app geckoview
+            --perfherder-metrics name:HttpChannelCompletion,unit:ms name:HttpChannelCompletion_Cache,unit:ms name:HttpChannelCompletion_Network,unit:ms name:DisplayListBuilding,unit:ms name:Reflowing,unit:ms name:Styling,unit:ms
+            --browsertime-iterations 10
+            --hooks testing/performance/hooks_perfstats.py
+            testing/performance/perftest_perfstats.js
+
+hw-a51-aarch64-perfstats-gv:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run PerfStats perftest on GeckoView on a Samsung A51
+    treeherder:
+        symbol: perftest(perfstats-gv)
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+    attributes:
+        cron: false
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor mobile-browser
+            --android
+            --android-app-name org.mozilla.geckoview_example
+            --android-activity org.mozilla.geckoview_example.GeckoViewActivity
+            --android-clear-logcat
+            --android-capture-logcat logcat
+            --android-install-apk gve_nightly_aarch64
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --perfherder
+            --perfherder-app geckoview
+            --perfherder-metrics name:HttpChannelCompletion,unit:ms name:HttpChannelCompletion_Cache,unit:ms name:HttpChannelCompletion_Network,unit:ms name:DisplayListBuilding,unit:ms name:Reflowing,unit:ms name:Styling,unit:ms
+            --browsertime-iterations 10
+            --hooks testing/performance/hooks_perfstats.py
+            testing/performance/perftest_perfstats.js
+
+hw-a51-perfstats-fenix:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run PerfStats perftest on Fenix on a Samsung A51
+    treeherder:
+        symbol: perftest(perfstats-fenix)
+    platform: android-hw-a51-11-0-arm7-shippable/opt
+    attributes:
+        cron: false
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor mobile-browser
+            --android
+            --android-app-name org.mozilla.fenix
+            --android-activity org.mozilla.fenix.IntentReceiverActivity
+            --android-clear-logcat
+            --android-capture-logcat logcat
+            --android-install-apk fenix_nightly_armeabi_v7a
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --perfherder
+            --perfherder-app fenix
+            --perfherder-metrics name:HttpChannelCompletion,unit:ms name:HttpChannelCompletion_Cache,unit:ms name:HttpChannelCompletion_Network,unit:ms name:DisplayListBuilding,unit:ms name:Reflowing,unit:ms name:Styling,unit:ms
+            --browsertime-iterations 10
+            --hooks testing/performance/hooks_perfstats.py
+            testing/performance/perftest_perfstats.js
+
+hw-a51-aarch64-perfstats-fenix:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run PerfStats perftest on Fenix on a Samsung A51
+    treeherder:
+        symbol: perftest(perfstats-fenix)
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+    attributes:
+        cron: false
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor mobile-browser
+            --android
+            --android-app-name org.mozilla.fenix
+            --android-activity org.mozilla.fenix.IntentReceiverActivity
+            --android-clear-logcat
+            --android-capture-logcat logcat
+            --android-install-apk fenix_nightly_arm64_v8a
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --perfherder
+            --perfherder-app fenix
+            --perfherder-metrics name:HttpChannelCompletion,unit:ms name:HttpChannelCompletion_Cache,unit:ms name:HttpChannelCompletion_Network,unit:ms name:DisplayListBuilding,unit:ms name:Reflowing,unit:ms name:Styling,unit:ms
+            --browsertime-iterations 10
+            --hooks testing/performance/hooks_perfstats.py
+            testing/performance/perftest_perfstats.js
+
+hw-a51-record-websites:
+    worker-type: t-bitbar-gw-perf-a51
+    description: Run perftest to record mobile websites
+    treeherder:
+        symbol: perftest(rec)
+    platform: android-hw-a51-11-0-aarch64-shippable/opt
+    require-build:
+        android-hw-a51-11-0-aarch64-shippable/opt: build-android-aarch64-shippable/opt
+    attributes:
+        cron: false
+    run-on-projects: []
+    scopes:
+        - secrets:get:project/releng/gecko/build/level-{level}/conditioned-profiles
+        - secrets:get:project/perftest/gecko/level-{level}/perftest-login
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $GECKO_PATH &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor mobile-browser
+            --android
+            --android-app-name org.mozilla.geckoview_example
+            --android-activity org.mozilla.geckoview_example.GeckoViewActivity
+            --android-clear-logcat
+            --android-capture-logcat logcat
+            --android-install-apk gve_nightly_aarch64
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --proxy
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --hooks testing/performance/hooks_recording.py
+            testing/performance/perftest_record.js
diff --git a/taskcluster/kinds/perftest/kind.yml b/taskcluster/kinds/perftest/kind.yml
new file mode 100644
index 0000000000..8a92fe55b2
--- /dev/null
+++ b/taskcluster/kinds/perftest/kind.yml
@@ -0,0 +1,48 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+---
+loader: gecko_taskgraph.loader.transform:loader
+
+kind-dependencies:
+    - toolchain
+    - build
+
+transforms:
+    - gecko_taskgraph.transforms.perftest:transforms
+    - gecko_taskgraph.transforms.source_test:transforms
+    - taskgraph.transforms.task_context
+    - gecko_taskgraph.transforms.job:transforms
+    - gecko_taskgraph.transforms.task:transforms
+
+jobs-from:
+    - android.yml
+    - linux.yml
+    - macosx.yml
+    - windows.yml
+
+job-defaults:
+    attributes:
+        retrigger: true
+    run-on-projects: []
+    use-python: default
+    treeherder:
+        kind: other
+        tier: 3
+    task-context:
+        from-object: {}
+        substitution-fields: []
+    worker:
+        taskcluster-proxy: true
+        max-run-time: 10800
+        env:
+            USE_ARTIFACT: '1'
+            HOSTUTILS_MANIFEST_PATH: "testing/config/tooltool-manifests/linux64/hostutils.manifest"
+        artifacts:
+            - type: directory
+              name: public/build
+              path: artifacts
+    run:
+        run-as-root: true
+        using: run-task
+        checkout: false
diff --git a/taskcluster/kinds/perftest/linux.yml b/taskcluster/kinds/perftest/linux.yml
new file mode 100644
index 0000000000..1016469fb8
--- /dev/null
+++ b/taskcluster/kinds/perftest/linux.yml
@@ -0,0 +1,384 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+---
+job-defaults:
+    worker-type: t-linux-talos-1804
+    fetches:
+        toolchain:
+            - linux64-node
+            - linux64-geckodriver
+        build:
+            - artifact: target.mozinfo.json
+            - artifact: target.common.tests.tar.gz
+            - artifact: target.condprof.tests.tar.gz
+            - artifact: target.perftests.tests.tar.gz
+            - artifact: target.xpcshell.tests.tar.gz
+            - artifact: target.mochitest.tests.tar.gz
+            - artifact: target.tar.bz2
+    platform: linux1804-64-shippable/opt
+    require-build:
+        linux1804-64-shippable/opt: build-linux64-shippable/opt
+    scopes:
+        - secrets:get:project/releng/gecko/build/level-{level}/conditioned-profiles
+
+try-xpcshell:
+    description: Run ./mach perftest on Linux
+    treeherder:
+        symbol: perftest(linux-xpcshell)
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --on-try
+            --flavor desktop-browser
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --xpcshell-binary ${MOZ_FETCHES_DIR}/bin/xpcshell
+            --xpcshell-mozinfo ${MOZ_FETCHES_DIR}/target.mozinfo.json
+            --xpcshell-nodejs ${MOZ_FETCHES_DIR}/node/bin/node
+            --xpcshell-xre-path ${MOZ_FETCHES_DIR}/firefox
+
+webpagetest-firefox:
+    description: Run webpagetest performance pageload tests on Firefox against Alexa top 50 websites
+    treeherder:
+        symbol: perftest(linux-webpagetest)
+        tier: 2
+    attributes:
+        cron: true
+    scopes:
+        - secrets:get:project/perftest/gecko/level-{level}/perftest-login
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 python/mozperftest/mozperftest/runner.py
+            testing/performance/perftest_WPT_firefox_init_file.js
+            --flavor=webpagetest
+            --webpagetest
+            --perfherder
+            --perfherder-metrics median
+            --perfherder-app=firefox
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+webpagetest-chrome:
+    description: Run webpagetest performance pageload tests on Chrome against Alexa top 50 websites
+    treeherder:
+        symbol: perftest-chrome(linux-webpagetest)
+        tier: 2
+    attributes:
+        cron: true
+    scopes:
+        - secrets:get:project/perftest/gecko/level-{level}/perftest-login
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 python/mozperftest/mozperftest/runner.py
+            testing/performance/perftest_WPT_chrome_init_file.js
+            --flavor=webpagetest
+            --webpagetest
+            --perfherder
+            --perfherder-metrics median
+            --perfherder-app=chrome
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+try-browsertime:
+    description: Run ./mach perftest on Linux
+    treeherder:
+        symbol: perftest(linux-bt)
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --on-try
+            --browsertime-binary ${MOZ_FETCHES_DIR}/firefox/firefox-bin
+            --flavor desktop-browser
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+domcount:
+    description: Run DOM test
+    treeherder:
+        symbol: perftest(linux-dom)
+    attributes:
+        batch: false
+        cron: true
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 python/mozperftest/mozperftest/runner.py
+            browser/base/content/test/perftest_browser_xhtml_dom.js
+            --browsertime-binary ${MOZ_FETCHES_DIR}/firefox/firefox-bin
+            --flavor desktop-browser
+            --perfherder
+            --perfherder-metrics name:totalDOMCount,unit:count name:panelMenuCount,unit:count name:lightDOMCount,unit:count name:lightDOMDetails,unit:count
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+# We'd like not to have to specify each test separately here.  See bug 1865852.
+service-worker:
+    description: Run service worker tests
+    treeherder:
+        symbol: perftest(linux-sw)
+        tier: 2
+    attributes:
+        batch: false
+        cron: false
+    run-on-projects: [autoland, mozilla-central]
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 python/mozperftest/mozperftest/runner.py
+            dom/serviceworkers/test/performance/test_caching.html
+            --mochitest-binary ${MOZ_FETCHES_DIR}/firefox/firefox-bin
+            --flavor mochitest
+            --output $MOZ_FETCHES_DIR/../artifacts &&
+            python3 python/mozperftest/mozperftest/runner.py
+            dom/serviceworkers/test/performance/test_fetch.html
+            --mochitest-binary ${MOZ_FETCHES_DIR}/firefox/firefox-bin
+            --flavor mochitest
+            --output $MOZ_FETCHES_DIR/../artifacts &&
+            python3 python/mozperftest/mozperftest/runner.py
+            dom/serviceworkers/test/performance/test_registration.html
+            --mochitest-binary ${MOZ_FETCHES_DIR}/firefox/firefox-bin
+            --flavor mochitest
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+http3:
+    description: Run HTTP/3 test
+    treeherder:
+        symbol: perftest(http3)
+    attributes:
+        batch: false
+        # Disabled due to bug 1849400
+        cron: false
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 python/mozperftest/mozperftest/runner.py
+            xpcshell/tests/netwerk/test/unit/test_http3_perf.js
+            --flavor xpcshell
+            --perfherder
+            --perfherder-metrics name:speed,unit:bps
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --xpcshell-binary ${MOZ_FETCHES_DIR}/bin/xpcshell
+            --xpcshell-mozinfo ${MOZ_FETCHES_DIR}/target.mozinfo.json
+            --xpcshell-nodejs ${MOZ_FETCHES_DIR}/node/bin/node
+            --xpcshell-cycles 13
+            --xpcshell-xre-path ${MOZ_FETCHES_DIR}/firefox
+
+livesites:
+    description: Live site performance testing
+    variants: [http3]
+    treeherder:
+        symbol: perftest({symbol})
+    attributes:
+        batch: false
+        cron: true
+    perftest:
+        - [cloudflare, netwerk/test/perf/perftest_http3_cloudflareblog.js]
+        # broken: bug 1678588
+        # - [fb-scroll, netwerk/test/perf/perftest_http3_facebook_scroll.js]
+        # broken: bug 1879851
+        # - [g-image, netwerk/test/perf/perftest_http3_google_image.js]
+        # broken: bug 1799655
+        # - [g-search, netwerk/test/perf/perftest_http3_google_search.js]
+        - [lq-fetch, netwerk/test/perf/perftest_http3_lucasquicfetch.js]
+        # broken: bug 1695871
+        # - [ytw, netwerk/test/perf/perftest_http3_youtube_watch.js]
+        # - [ytw-scroll, netwerk/test/perf/perftest_http3_youtube_watch_scroll.js]
+    perftest-metrics:
+        by-perftest:
+            cloudflare:
+                # Example of how the specify settings for each metric
+                resources:
+                    extraOptions: []
+                firstPaint: {}
+                navigationTiming: {}
+                pageTimings: {}
+                timeToContentfulPaint: {}
+            # broken: bug 1678588
+            # fb-scroll: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint, requestsPerSecond]
+            # broken: bug 1879851
+            # g-image: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint, imagesPerSecond, imageLoadTime]
+            # g-search: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint]
+            lq-fetch: [navigationTiming, pageTimings, resources, timeToContentfulPaint, resourceLoadTime, imagesLoaded, imagesMissed]
+            # broken: bug 1695871
+            # ytw: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint, droppedFrames, decodedFrames]
+            # ytw-scroll: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint, droppedFrames, decodedFrames]
+            default: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint]
+    # Leave this here so people know this exists when looking
+    # for examples
+    perftest-perfherder-global:
+        extraOptions: []
+    perftest-extra-options:
+        by-perftest:
+            cloudflare:
+                - --perfherder-split-by browserScripts.pageinfo.url
+            # g-search:
+            #     - --perfherder-split-by browserScripts.pageinfo.url
+            lq-fetch:
+                - --perfherder-split-by browserScripts.pageinfo.url
+            default: []
+    perftest-btime-variants:
+        by-perftest:
+            cloudflare:
+                - ["10s", browsertime.waitTime=10000]
+                - ["25s", browsertime.waitTime=25000]
+                - ["35s", browsertime.waitTime=35000]
+                - ["60s", browsertime.waitTime=60000]
+            # broken: bug 1678588
+            # fb-scroll:
+            #     - ["10s", browsertime.waitTime=10000]
+            #     - ["25s", browsertime.waitTime=25000]
+            #     - ["35s", browsertime.waitTime=35000]
+            #     - ["60s", browsertime.waitTime=60000]
+            # g-search:
+            #     - ["10s", browsertime.waitTime=10000]
+            #     - ["25s", browsertime.waitTime=25000]
+            #     - ["35s", browsertime.waitTime=35000]
+            #     - ["60s", browsertime.waitTime=60000]
+            lq-fetch:
+                - [null, "browsertime.waitTime=1000,browsertime.cycles=5"]
+            # broken: bug 1695871
+            # ytw:
+            #     - [null, browsertime.waitTime=20000]
+            # ytw-scroll:
+            #     - [null, browsertime.waitTime=20000]
+            default:
+                - [null, browsertime.waitTime=1000]
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 python/mozperftest/mozperftest/runner.py
+            {perftest_testname}
+            --browsertime-binary ${MOZ_FETCHES_DIR}/firefox/firefox-bin
+            --browsertime-iterations 10
+            --visualmetrics
+            --flavor desktop-browser
+            --perfherder
+            --perfherder-metrics {perftest_metrics}
+            --perfherder-simplify-names
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+controlled:
+    description: Controlled performance testing
+    treeherder:
+        symbol: perftest(controlled)
+    worker:
+        max-run-time: 14400
+    attributes:
+        batch: false
+        cron: false
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 python/mozperftest/mozperftest/runner.py
+            netwerk/test/perf/perftest_http3_controlled.js
+            --browsertime-binary ${MOZ_FETCHES_DIR}/firefox/firefox-bin
+            --browsertime-iterations 1
+            --browsertime-cycles 96
+            --hooks netwerk/test/perf/hooks_throttling.py
+            --flavor desktop-browser
+            --perfherder
+            --perfherder-metrics name:navigationTiming,unit:ms name:pageTimings,unit:ms name:resources,unit:ms name:firstPaint,unit:ms name:timeToContentfulPaint,unit:ms
+            --perfherder-simplify-names
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+perfstats:
+    description: Run PerfStats pageload test
+    treeherder:
+        symbol: perftest(linux-perfstats)
+    attributes:
+        cron: false
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --browsertime-binary ${MOZ_FETCHES_DIR}/firefox/firefox-bin
+            --flavor desktop-browser
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --perfherder
+            --perfherder-metrics name:HttpChannelCompletion,unit:ms name:HttpChannelCompletion_Cache,unit:ms name:HttpChannelCompletion_Network,unit:ms name:DisplayListBuilding,unit:ms name:Reflowing,unit:ms name:Styling,unit:ms
+            --browsertime-iterations 10
+            --hooks testing/performance/hooks_perfstats.py
+            testing/performance/perftest_perfstats.js
+
+record-websites:
+    description: Run mozperftest to record desktop websites
+    platform: linux1804-64/opt
+    require-build:
+        linux1804-64/opt: build-linux64/opt
+    treeherder:
+        symbol: perftest(rec)
+    attributes:
+        cron: false
+    run-on-projects: []
+    scopes:
+        - secrets:get:project/releng/gecko/build/level-{level}/conditioned-profiles
+        - secrets:get:project/perftest/gecko/level-{level}/perftest-login
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 python/mozperftest/mozperftest/runner.py
+            --flavor desktop-browser
+            --verbose
+            --browsertime-binary ${MOZ_FETCHES_DIR}/firefox/firefox-bin
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --proxy
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --hooks testing/performance/hooks_recording.py
+            testing/performance/perftest_record.js
+
+side-by-side:
+    description: Run mozperftest side-by-side
+    treeherder:
+        symbol: perftest(side-by-side)
+        tier: 2
+    run:
+        using: run-task
+        sparse-profile: perftest
+        checkout: true
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 python/mozperftest/mozperftest/runner.py
+            tools side-by-side
+            -t {test_name}
+            --base-platform {platform}
+            --base-revision {base_revision}
+            --new-revision {new_revision}
+            --base-branch {base_branch}
+            --new-branch {new_branch}
+
+mwu-change-detector:
+    description: Runs Mann-Whitney U-test on two revisions to detect performance changes
+    treeherder:
+        symbol: perftest-detect(mwu)
+        tier: 2
+    run:
+        using: run-task
+        sparse-profile: perftest
+        checkout: true
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 python/mozperftest/mozperftest/runner.py
+            tools change-detector
+            --task-name {task_name}
+            --base-revision {base_revision}
+            --new-revision {new_revision}
+            --base-branch {base_branch}
+            --new-branch {new_branch}
diff --git a/taskcluster/kinds/perftest/macosx.yml b/taskcluster/kinds/perftest/macosx.yml
new file mode 100644
index 0000000000..d98f7524b8
--- /dev/null
+++ b/taskcluster/kinds/perftest/macosx.yml
@@ -0,0 +1,287 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+---
+job-defaults:
+    worker-type: t-osx-1015-r8
+    fetches:
+        build:
+            - artifact: target.mozinfo.json
+            - artifact: target.common.tests.tar.gz
+            - artifact: target.condprof.tests.tar.gz
+            - artifact: target.mochitest.tests.tar.gz
+            - artifact: target.xpcshell.tests.tar.gz
+            - artifact: target.perftests.tests.tar.gz
+            - artifact: target.dmg
+              extract: false
+        toolchain:
+            - macosx64-geckodriver
+            - macosx64-node
+    platform: macosx1015-64-shippable-qr/opt
+    require-build:
+        macosx1015-64-shippable-qr/opt: build-macosx64-shippable/opt
+    scopes:
+        - secrets:get:project/releng/gecko/build/level-{level}/conditioned-profiles
+
+try-xpcshell:
+    description: Run ./mach perftest on macOs
+    treeherder:
+        symbol: perftest(macos-xpcshell)
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 -m venv . &&
+            bin/python3 python/mozperftest/mozperftest/runner.py
+            --on-try
+            --flavor desktop-browser
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --xpcshell-binary ${MOZ_FETCHES_DIR}/bin/xpcshell
+            --xpcshell-mozinfo ${MOZ_FETCHES_DIR}/target.mozinfo.json
+            --xpcshell-nodejs ${MOZ_FETCHES_DIR}/node/bin/node
+            --xpcshell-xre-path ${MOZ_FETCHES_DIR}/target.dmg
+
+try-browsertime:
+    description: Run ./mach perftest on macOs
+    treeherder:
+        symbol: perftest(macos-bt)
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 -m venv . &&
+            bin/python3 python/mozperftest/mozperftest/runner.py
+            --on-try
+            --browsertime-binary ${MOZ_FETCHES_DIR}/target.dmg
+            --browsertime-node ${MOZ_FETCHES_DIR}/node/bin/node
+            --flavor desktop-browser
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+# We'd like not to have to specify each test separately here.  See bug 1865852.
+service-worker:
+    description: Run service worker tests
+    treeherder:
+        symbol: perftest(macosx-sw)
+        tier: 2
+    attributes:
+        batch: false
+        cron: false
+    run-on-projects: [autoland, mozilla-central]
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 -m venv . &&
+            bin/python3 python/mozperftest/mozperftest/runner.py
+            dom/serviceworkers/test/performance/test_caching.html
+            --mochitest-binary ${MOZ_FETCHES_DIR}/target.dmg
+            --flavor mochitest
+            --output $MOZ_FETCHES_DIR/../artifacts &&
+            bin/python3 python/mozperftest/mozperftest/runner.py
+            dom/serviceworkers/test/performance/test_fetch.html
+            --mochitest-binary ${MOZ_FETCHES_DIR}/target.dmg
+            --flavor mochitest
+            --output $MOZ_FETCHES_DIR/../artifacts &&
+            bin/python3 python/mozperftest/mozperftest/runner.py
+            dom/serviceworkers/test/performance/test_registration.html
+            --mochitest-binary ${MOZ_FETCHES_DIR}/target.dmg
+            --flavor mochitest
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+domcount:
+    description: Run DOM test on macOS
+    treeherder:
+        symbol: perftest(macos-dom)
+    attributes:
+        batch: false
+        cron: true
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 -m venv . &&
+            bin/python3 python/mozperftest/mozperftest/runner.py
+            browser/base/content/test/perftest_browser_xhtml_dom.js
+            --browsertime-binary ${MOZ_FETCHES_DIR}/target.dmg
+            --browsertime-node ${MOZ_FETCHES_DIR}/node/bin/node
+            --flavor desktop-browser
+            --perfherder
+            --perfherder-metrics name:totalDOMCount,unit:count name:panelMenuCount,unit:count name:lightDOMCount,unit:count name:lightDOMDetails,unit:count
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+http3:
+    description: Run HTTP/3 test
+    treeherder:
+        symbol: perftest(http3)
+    attributes:
+        batch: false
+        # Disabled due to bug 1849400
+        cron: false
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 -m venv . &&
+            bin/python3 python/mozperftest/mozperftest/runner.py
+            xpcshell/tests/netwerk/test/unit/test_http3_perf.js
+            --flavor xpcshell
+            --perfherder
+            --perfherder-metrics name:speed,unit:bps
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --xpcshell-binary ${MOZ_FETCHES_DIR}/bin/xpcshell
+            --xpcshell-mozinfo ${MOZ_FETCHES_DIR}/target.mozinfo.json
+            --xpcshell-nodejs ${MOZ_FETCHES_DIR}/node/bin/node
+            --xpcshell-cycles 13
+            --xpcshell-xre-path ${MOZ_FETCHES_DIR}/target.dmg
+
+
+livesites:
+    description: Live site performance testing
+    variants: [http3]
+    treeherder:
+        symbol: perftest({symbol})
+    attributes:
+        batch: false
+        cron: true
+    perftest:
+        - [cloudflare, netwerk/test/perf/perftest_http3_cloudflareblog.js]
+        # broken: bug 1678588
+        # - [fb-scroll, netwerk/test/perf/perftest_http3_facebook_scroll.js]
+        # broken: bug 1879851
+        # - [g-image, netwerk/test/perf/perftest_http3_google_image.js]
+        # broken: bug 1799655
+        # - [g-search, netwerk/test/perf/perftest_http3_google_search.js]
+        - [lq-fetch, netwerk/test/perf/perftest_http3_lucasquicfetch.js]
+        # broken: bug 1695871
+        # - [ytw, netwerk/test/perf/perftest_http3_youtube_watch.js]
+        # - [ytw-scroll, netwerk/test/perf/perftest_http3_youtube_watch_scroll.js]
+    perftest-metrics:
+        by-perftest:
+            cloudflare:
+                # Example of how the specify settings for each metric
+                resources:
+                    extraOptions: []
+                firstPaint: {}
+                navigationTiming: {}
+                pageTimings: {}
+                timeToContentfulPaint: {}
+            # broken: bug 1678588
+            # fb-scroll: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint, requestsPerSecond]
+            # broken: bug 1879851
+            # g-image: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint, imagesPerSecond, imageLoadTime]
+            # g-search: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint]
+            lq-fetch: [navigationTiming, pageTimings, resources, timeToContentfulPaint, resourceLoadTime, imagesLoaded, imagesMissed]
+            # broken: bug 1695871
+            # ytw: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint, droppedFrames, decodedFrames]
+            # ytw-scroll: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint, droppedFrames, decodedFrames]
+            default: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint]
+    # Leave this here so people know this exists when looking
+    # for examples
+    perftest-perfherder-global:
+        extraOptions: []
+    perftest-extra-options:
+        by-perftest:
+            cloudflare:
+                - --perfherder-split-by browserScripts.pageinfo.url
+            # g-search:
+            #     - --perfherder-split-by browserScripts.pageinfo.url
+            lq-fetch:
+                - --perfherder-split-by browserScripts.pageinfo.url
+            default: []
+    perftest-btime-variants:
+        by-perftest:
+            cloudflare:
+                - ["10s", browsertime.waitTime=10000]
+                - ["25s", browsertime.waitTime=25000]
+                - ["35s", browsertime.waitTime=35000]
+                - ["60s", browsertime.waitTime=60000]
+            # broken: bug 1678588
+            # fb-scroll:
+            #     - ["10s", browsertime.waitTime=10000]
+            #     - ["25s", browsertime.waitTime=25000]
+            #     - ["35s", browsertime.waitTime=35000]
+            #     - ["60s", browsertime.waitTime=60000]
+            # g-search:
+            #     - ["10s", browsertime.waitTime=10000]
+            #     - ["25s", browsertime.waitTime=25000]
+            #     - ["35s", browsertime.waitTime=35000]
+            #     - ["60s", browsertime.waitTime=60000]
+            lq-fetch:
+                - [null, "browsertime.waitTime=1000,browsertime.cycles=5"]
+            # broken: bug 1695871
+            # ytw:
+            #     - [null, browsertime.waitTime=20000]
+            # ytw-scroll:
+            #     - [null, browsertime.waitTime=20000]
+            default:
+                - [null, browsertime.waitTime=1000]
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 -m venv . &&
+            bin/python3 python/mozperftest/mozperftest/runner.py
+            {perftest_testname}
+            --browsertime-binary ${MOZ_FETCHES_DIR}/target.dmg
+            --browsertime-node ${MOZ_FETCHES_DIR}/node/bin/node
+            --browsertime-iterations 10
+            --flavor desktop-browser
+            --perfherder
+            --perfherder-metrics {perftest_metrics}
+            --perfherder-simplify-names
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+controlled:
+    description: Controlled performance testing
+    treeherder:
+        symbol: perftest(controlled)
+    worker:
+        max-run-time: 14400
+    attributes:
+        batch: false
+        cron: false
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 -m venv . &&
+            python3 python/mozperftest/mozperftest/runner.py
+            netwerk/test/perf/perftest_http3_controlled.js
+            --browsertime-binary ${MOZ_FETCHES_DIR}/target.dmg
+            --browsertime-node ${MOZ_FETCHES_DIR}/node/bin/node
+            --browsertime-iterations 1
+            --browsertime-cycles 96
+            --hooks netwerk/test/perf/hooks_throttling.py
+            --flavor desktop-browser
+            --perfherder
+            --perfherder-metrics name:navigationTiming,unit:ms name:pageTimings,unit:ms name:resources,unit:ms name:firstPaint,unit:ms name:timeToContentfulPaint,unit:ms
+            --perfherder-simplify-names
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+perfstats:
+    description: Run PerfStats pageload test
+    treeherder:
+        symbol: perftest(macos-perfstats)
+    attributes:
+        batch: false
+        cron: false
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 -m venv . &&
+            bin/python3 python/mozperftest/mozperftest/runner.py
+            --browsertime-binary ${MOZ_FETCHES_DIR}/target.dmg
+            --browsertime-node ${MOZ_FETCHES_DIR}/node/bin/node
+            --flavor desktop-browser
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --perfherder
+            --perfherder-metrics name:HttpChannelCompletion,unit:ms name:HttpChannelCompletion_Cache,unit:ms name:HttpChannelCompletion_Network,unit:ms name:DisplayListBuilding,unit:ms name:Reflowing,unit:ms name:Styling,unit:ms
+            --browsertime-iterations 10
+            --hooks testing/performance/hooks_perfstats.py
+            testing/performance/perftest_perfstats.js
diff --git a/taskcluster/kinds/perftest/windows.yml b/taskcluster/kinds/perftest/windows.yml
new file mode 100644
index 0000000000..3e027e5741
--- /dev/null
+++ b/taskcluster/kinds/perftest/windows.yml
@@ -0,0 +1,235 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+---
+job-defaults:
+    worker-type: t-win10-64-1803-hw
+    fetches:
+        build:
+            - artifact: target.condprof.tests.tar.gz
+            - artifact: target.common.tests.tar.gz
+            - artifact: target.mochitest.tests.tar.gz
+            - artifact: target.perftests.tests.tar.gz
+            - artifact: target.zip
+        toolchain:
+            - win64-node
+            - win64-geckodriver
+    platform: windows10-64-shippable/opt
+    require-build:
+        windows10-64-shippable/opt: build-win64-shippable/opt
+    scopes:
+        - secrets:get:project/releng/gecko/build/level-{level}/conditioned-profiles
+
+try-browsertime:
+    description: Run ./mach perftest on windows
+    treeherder:
+        symbol: perftest(win-bt)
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3.exe python/mozperftest/mozperftest/runner.py
+            --on-try
+            --browsertime-binary ${MOZ_FETCHES_DIR}/firefox/firefox.exe
+            --flavor desktop-browser
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver.exe
+            --browsertime-node ${MOZ_FETCHES_DIR}/node/node.exe
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+# We'd like not to have to specify each test separately here.  See bug 1865852.
+service-worker:
+    description: Run service worker tests
+    treeherder:
+        symbol: perftest(win-sw)
+        tier: 2
+    attributes:
+        batch: false
+        cron: false
+    run-on-projects: [autoland, mozilla-central]
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3.exe python/mozperftest/mozperftest/runner.py
+            dom/serviceworkers/test/performance/test_caching.html
+            --mochitest-binary ${MOZ_FETCHES_DIR}/firefox/firefox.exe
+            --flavor mochitest
+            --output $MOZ_FETCHES_DIR/../artifacts &&
+            python3.exe python/mozperftest/mozperftest/runner.py
+            dom/serviceworkers/test/performance/test_fetch.html
+            --mochitest-binary ${MOZ_FETCHES_DIR}/firefox/firefox.exe
+            --flavor mochitest
+            --output $MOZ_FETCHES_DIR/../artifacts &&
+            python3.exe python/mozperftest/mozperftest/runner.py
+            dom/serviceworkers/test/performance/test_registration.html
+            --mochitest-binary ${MOZ_FETCHES_DIR}/firefox/firefox.exe
+            --flavor mochitest
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+domcount:
+    description: Run DOM test
+    treeherder:
+        symbol: perftest(win-dom)
+    attributes:
+        batch: false
+        cron: true
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3.exe python/mozperftest/mozperftest/runner.py
+            browser/base/content/test/perftest_browser_xhtml_dom.js
+            --browsertime-binary ${MOZ_FETCHES_DIR}/firefox/firefox.exe
+            --flavor desktop-browser
+            --perfherder
+            --perfherder-metrics name:totalDOMCount,unit:count name:panelMenuCount,unit:count name:lightDOMCount,unit:count name:lightDOMDetails,unit:count
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver.exe
+            --browsertime-node ${MOZ_FETCHES_DIR}/node/node.exe
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+
+livesites:
+    description: Live site performance testing
+    variants: [http3]
+    treeherder:
+        symbol: perftest({symbol})
+    attributes:
+        batch: false
+        cron: true
+    perftest:
+        - [cloudflare, netwerk/test/perf/perftest_http3_cloudflareblog.js]
+        # broken: bug 1678588
+        # - [fb-scroll, netwerk/test/perf/perftest_http3_facebook_scroll.js]
+        # broken: bug 1879851
+        # - [g-image, netwerk/test/perf/perftest_http3_google_image.js]
+        # broken: bug 1799655
+        # - [g-search, netwerk/test/perf/perftest_http3_google_search.js]
+        - [lq-fetch, netwerk/test/perf/perftest_http3_lucasquicfetch.js]
+        # broken: bug 1695871
+        # - [ytw, netwerk/test/perf/perftest_http3_youtube_watch.js]
+        # - [ytw-scroll, netwerk/test/perf/perftest_http3_youtube_watch_scroll.js]
+    perftest-metrics:
+        by-perftest:
+            cloudflare:
+                # Example of how the specify settings for each metric
+                resources:
+                    extraOptions: []
+                firstPaint: {}
+                navigationTiming: {}
+                pageTimings: {}
+                timeToContentfulPaint: {}
+            # broken: bug 1678588
+            # fb-scroll: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint, requestsPerSecond]
+            # broken: bug 1879851
+            # g-image: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint, imagesPerSecond, imageLoadTime]
+            # g-search: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint]
+            lq-fetch: [navigationTiming, pageTimings, resources, timeToContentfulPaint, resourceLoadTime, imagesLoaded, imagesMissed]
+            # broken: bug 1695871
+            # ytw: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint, droppedFrames, decodedFrames]
+            # ytw-scroll: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint, droppedFrames, decodedFrames]
+            default: [navigationTiming, pageTimings, resources, firstPaint, timeToContentfulPaint]
+    # Leave this here so people know this exists when looking
+    # for examples
+    perftest-perfherder-global:
+        extraOptions: []
+    perftest-extra-options:
+        by-perftest:
+            cloudflare:
+                - --perfherder-split-by browserScripts.pageinfo.url
+            # g-search:
+            #     - --perfherder-split-by browserScripts.pageinfo.url
+            lq-fetch:
+                - --perfherder-split-by browserScripts.pageinfo.url
+            default: []
+    perftest-btime-variants:
+        by-perftest:
+            cloudflare:
+                - ["10s", browsertime.waitTime=10000]
+                - ["25s", browsertime.waitTime=25000]
+                - ["35s", browsertime.waitTime=35000]
+                - ["60s", browsertime.waitTime=60000]
+            # broken: bug 1678588
+            # fb-scroll:
+            #     - ["10s", browsertime.waitTime=10000]
+            #     - ["25s", browsertime.waitTime=25000]
+            #     - ["35s", browsertime.waitTime=35000]
+            #     - ["60s", browsertime.waitTime=60000]
+            # g-search:
+            #     - ["10s", browsertime.waitTime=10000]
+            #     - ["25s", browsertime.waitTime=25000]
+            #     - ["35s", browsertime.waitTime=35000]
+            #     - ["60s", browsertime.waitTime=60000]
+            lq-fetch:
+                - [null, "browsertime.waitTime=1000,browsertime.cycles=5"]
+            # broken: bug 1695871
+            # ytw:
+            #     - [null, browsertime.waitTime=20000]
+            # ytw-scroll:
+            #     - [null, browsertime.waitTime=20000]
+            default:
+                - [null, browsertime.waitTime=1000]
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3.exe python/mozperftest/mozperftest/runner.py
+            {perftest_testname}
+            --browsertime-binary ${MOZ_FETCHES_DIR}/firefox/firefox.exe
+            --browsertime-iterations 10
+            --flavor desktop-browser
+            --perfherder
+            --perfherder-metrics {perftest_metrics}
+            --perfherder-simplify-names
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver.exe
+            --browsertime-node ${MOZ_FETCHES_DIR}/node/node.exe
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+controlled:
+    description: Controlled performance testing
+    treeherder:
+        symbol: perftest(controlled)
+    worker:
+        max-run-time: 14400
+    attributes:
+        batch: false
+        cron: false
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3.exe python/mozperftest/mozperftest/runner.py
+            netwerk/test/perf/perftest_http3_controlled.js
+            --browsertime-binary ${MOZ_FETCHES_DIR}/firefox/firefox.exe
+            --browsertime-iterations 1
+            --browsertime-cycles 96
+            --hooks netwerk/test/perf/hooks_throttling.py
+            --flavor desktop-browser
+            --perfherder
+            --perfherder-metrics name:navigationTiming,unit:ms name:pageTimings,unit:ms name:resources,unit:ms name:firstPaint,unit:ms name:timeToContentfulPaint,unit:ms
+            --perfherder-simplify-names
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver.exe
+            --browsertime-node ${MOZ_FETCHES_DIR}/node/node.exe
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+perfstats:
+    description: Run PerfStats pageload test
+    treeherder:
+        symbol: perftest(win-perfstats)
+    attributes:
+        batch: false
+        cron: false
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3.exe python/mozperftest/mozperftest/runner.py
+            --browsertime-binary ${MOZ_FETCHES_DIR}/firefox/firefox.exe
+            --flavor desktop-browser
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver.exe
+            --browsertime-node ${MOZ_FETCHES_DIR}/node/node.exe
+            --output $MOZ_FETCHES_DIR/../artifacts
+            --perfherder
+            --perfherder-metrics name:HttpChannelCompletion,unit:ms name:HttpChannelCompletion_Cache,unit:ms name:HttpChannelCompletion_Network,unit:ms name:DisplayListBuilding,unit:ms name:Reflowing,unit:ms name:Styling,unit:ms
+            --browsertime-iterations 10
+            --hooks testing/performance/hooks_perfstats.py
+            testing/performance/perftest_perfstats.js