Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1874774 - Remove references to moto g5 and pixel2 devices in taskcluster. r=perftest-reviewers,jmaher,sparky

Browse Source 
As the motorola G5 and the Pixel 2 have been removed from CI we are also going to remove references to them in our documentation and taskcluster code.

Differential Revision: https://phabricator.services.mozilla.com/D199294
This commit is contained in:
andrej 2024-01-31 02:42:08 +00:00
parent ed2d54a033
commit 8f63599047
14 changed files with 52 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/mozperftest/mozperftest/argparser.py
View File

@ -74,7 +74,7 @@ class Options:
"type": str,
"default": "linux",
"help": "Platform to use on try",
"choices": ["g5", "pixel2", "linux", "mac", "win"],
"choices": ["linux", "mac", "win"],
},
"--on-try": {
"action": "store_true",

3
python/mozperftest/mozperftest/mach_commands.py
View File

@ -10,7 +10,6 @@ from mach.decorators import Command, CommandArgument, SubCommand
from mozbuild.base import MachCommandConditions as conditions
_TRY_PLATFORMS = {
"g5-browsertime": "perftest-android-hw-g5-browsertime",
"linux-xpcshell": "perftest-linux-try-xpcshell",
"mac-xpcshell": "perftest-macosx-try-xpcshell",
"linux-browsertime": "perftest-linux-try-browsertime",
@ -125,7 +124,7 @@ def run_perftest(command_context, **kwargs):
for plat in platform:
if plat not in _TRY_PLATFORMS:
# we can extend platform support here: linux, win, macOs, pixel2
# we can extend platform support here: linux, win, macOs
# by adding more jobs in taskcluster/ci/perftest/kind.yml
# then picking up the right one here
raise NotImplementedError(

71
python/mozperftest/mozperftest/system/android_perf_tuner.py
View File

@ -90,43 +90,19 @@ class PerformanceTuner:
self.log.info("setting cpu performance parameters")
commands = {}
# Samsung A51 perf tuning: Bug 1876543
# Pixel 6 perf tuning: Bug 1876545
# Samsung S21 perf tuning: Bug 1876546
if device_name is not None:
device_name = self.device.shell_output(
"getprop ro.product.model", timeout=self.timeout
)
if device_name == "Pixel 2":
# MSM8998 (4x 2.35GHz, 4x 1.9GHz)
# values obtained from:
# /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies
# /sys/devices/system/cpu/cpufreq/policy4/scaling_available_frequencies
commands.update(
{
"/sys/devices/system/cpu/cpufreq/policy0/scaling_governor": "performance",
"/sys/devices/system/cpu/cpufreq/policy4/scaling_governor": "performance",
"/sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq": "1900800",
"/sys/devices/system/cpu/cpufreq/policy4/scaling_min_freq": "2457600",
}
)
elif device_name == "Moto G (5)":
# MSM8937(8x 1.4GHz)
# values obtained from:
# /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies
for x in range(0, 8):
commands.update(
{
"/sys/devices/system/cpu/cpu{}/"
"cpufreq/scaling_governor".format(x): "performance",
"/sys/devices/system/cpu/cpu{}/"
"cpufreq/scaling_min_freq".format(x): "1401000",
}
)
else:
self.log.info(
"CPU for device with ro.product.model '{}' unknown, not scaling_governor".format(
device_name
)
self.log.info(
"CPU for device with ro.product.model '{}' unknown, not scaling_governor".format(
device_name
)
)
for key, value in commands.items():
self._set_value_and_check_exitcode(key, value)
@ -147,36 +123,11 @@ class PerformanceTuner:
"getprop ro.product.model", timeout=self.timeout
)
if device_name == "Pixel 2":
# Adreno 540 (710MHz)
# values obtained from:
# /sys/devices/soc/5000000.qcom,kgsl-3d0/kgsl/kgsl-3d0/max_clk_mhz
commands.update(
{
"/sys/devices/soc/5000000.qcom,kgsl-3d0/devfreq/"
"5000000.qcom,kgsl-3d0/governor": "performance",
"/sys/devices/soc/soc:qcom,kgsl-busmon/devfreq/"
"soc:qcom,kgsl-busmon/governor": "performance",
"/sys/devices/soc/5000000.qcom,kgsl-3d0/kgsl/kgsl-3d0/min_clock_mhz": "710",
}
)
elif device_name == "Moto G (5)":
# Adreno 505 (450MHz)
# values obtained from:
# /sys/devices/soc/1c00000.qcom,kgsl-3d0/kgsl/kgsl-3d0/max_clock_mhz
commands.update(
{
"/sys/devices/soc/1c00000.qcom,kgsl-3d0/devfreq/"
"1c00000.qcom,kgsl-3d0/governor": "performance",
"/sys/devices/soc/1c00000.qcom,kgsl-3d0/kgsl/kgsl-3d0/min_clock_mhz": "450",
}
)
else:
self.log.info(
"GPU for device with ro.product.model '{}' unknown, not setting devfreq".format(
device_name
)
self.log.info(
"GPU for device with ro.product.model '{}' unknown, not setting devfreq".format(
device_name
)
)
for key, value in commands.items():
self._set_value_and_check_exitcode(key, value)

2
python/mozperftest/mozperftest/tests/test_android.py
View File

@ -116,7 +116,7 @@ class Device:
def test_android_perf_tuning_all_calls():
# Check without mocking PerformanceTuner functions
for name in ("Moto G (5)", "Pixel 2", "?"):
for name in ["?"]:
device = Device(name)
tuner = PerformanceTuner(device)
tuner.tune_performance()

2
python/mozperftest/mozperftest/tests/test_mach_commands.py
View File

@ -162,7 +162,7 @@ def test_push_command(push_to_try, venv):
tests=[EXAMPLE_TEST],
flavor="desktop-browser",
push_to_try=True,
try_platform="g5",
try_platform="linux",
)
push_to_try.assert_called()
# XXX add assertions

29
taskcluster/ci/perftest/android.yml
View File

@ -247,35 +247,6 @@ hw-a51-aarch64-perfstats-gv:
--hooks testing/performance/hooks_perfstats.py
testing/performance/perftest_perfstats.js
hw-g5-perfstats-fenix:
worker-type: t-bitbar-gw-perf-g5
description: Run PerfStats perftest on Fenix on a G5
treeherder:
symbol: perftest(perfstats-fenix)
platform: android-hw-g5-7-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-perfstats-fenix:
worker-type: t-bitbar-gw-perf-a51
description: Run PerfStats perftest on Fenix on a Samsung A51

26
taskcluster/ci/test/browsertime-mobile.yml
View File

@ -124,21 +124,21 @@ browsertime-tp6m:
by-variant:
geckoview-no-fission:
by-test-platform:
android-hw-(g5|a51).*shippable-qr.*: [trunk-only]
android-hw-a51.*shippable-qr.*: [trunk-only]
default: []
default:
by-subtest:
wikipedia:
by-test-platform:
android-hw-(g5|a51).*shippable-qr.*: []
android-hw-a51.*shippable-qr.*: []
default: []
google-search-restaurants:
by-test-platform:
android-hw-(g5|a51).*shippable-qr.*: []
android-hw-a51.*shippable-qr.*: []
default: []
default:
by-test-platform:
android-hw-(g5|a51).*shippable-qr.*: []
android-hw-a51.*shippable-qr.*: []
default: []
default: []
@ -164,11 +164,11 @@ browsertime-tp6m-essential:
by-subtest:
allrecipes:
by-test-platform:
android-hw-(g5|a51).*shippable.*: [trunk]
android-hw-a51.*shippable.*: [trunk]
default: []
default:
by-test-platform:
android-hw-(g5|a51).*shippable.*: [trunk-only]
android-hw-a51.*shippable.*: [trunk-only]
default: []
default: []
tier:
@ -201,7 +201,7 @@ browsertime-tp6m-webextensions:
by-app:
fenix:
by-test-platform:
android-hw-(g5|a51).*shippable.*: [mozilla-central]
android-hw-a51.*shippable.*: [mozilla-central]
default: []
default: []
# TODO(Bug 1867781): promote to tier 2 after confirming no issue have been caught while runing as tier 3.
@ -215,7 +215,7 @@ browsertime-youtube-playback-mobile:
apps: [fenix, geckoview, refbrow]
subtests:
by-test-platform:
android-hw-(g5|a51).*:
android-hw-a51.*:
- [youtube-playback-h264-sfr, ytp-h264-sfr]
- [youtube-playback-hfr, ytp-hfr]
# Bug 1699469 - Disabled until a crash is fixed.
@ -228,14 +228,14 @@ browsertime-youtube-playback-mobile:
23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38
youtube-playback-hfr:
by-test-platform:
android-hw-(g5|a51).*: # remove VP9(1-34) and AV1(51-74) tests
android-hw-a51.*: # remove VP9(1-34) and AV1(51-74) tests
exclude=1,2,
3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,
51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74
default: ""
youtube-playback-widevine-hfr:
by-test-platform:
android-hw-(g5|a51).*: # remove VP9(1-34) tests
android-hw-a51.*: # remove VP9(1-34) tests
exclude=1,2,
3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34
default: ""
@ -244,7 +244,7 @@ browsertime-youtube-playback-mobile:
by-app:
geckoview:
by-test-platform:
android-hw-(g5|a51).*shippable.*: [mozilla-central]
android-hw-a51.*shippable.*: [mozilla-central]
default: []
default: []
max-run-time: 3600
@ -307,7 +307,7 @@ browsertime-tp6m-live:
by-app:
geckoview:
by-test-platform:
android-hw-(g5|a51).*shippable-qr.*: [autoland]
android-hw-a51.*shippable-qr.*: [autoland]
default: []
default: []
default: []
@ -348,7 +348,7 @@ browsertime-benchmark-speedometer-mobile:
refbrow: []
geckoview:
by-test-platform:
android-hw-(g5|a51).*shippable-qr.*: [trunk]
android-hw-a51.*shippable-qr.*: [trunk]
default: []
cstm-car-m: [mozilla-central]
default: []

9
taskcluster/docs/platforms.rst
View File

@ -77,11 +77,10 @@ Build Platforms
Android 7.0 x86-64 WebRender, Kris Taeleman, Build and test GeckoView with WebRender
Android 7.0 x86-64 Beta, ,
Android 7.0 x86-64 Release, ,
Android 7.0 MotoG5, ,
Android 8.0 Pixel2, ,
Android 8.0 Pixel2 WebRender, Kris Taeleman, Build and test GeckoView with WebRender
Android 8.0 Pixel2 AArch64, ,
Android 8.0 Pixel2 AArch64 WebRender, Kris Taeleman, Build and test GeckoView with WebRender
Android 11.0 Samsung A51 AArch64 WebRender, ,
Android 13.0 Pixel6 AArch64 WebRender, ,
Android 13.0 Pixel6 AArch64 WebRender, ,
Android 13.0 Samsung S21 AArch64 WebRender, ,
Android, ,
Testing configurations

4
testing/mozbase/mozdevice/mozdevice/adb.py
View File

@ -1089,9 +1089,7 @@ class ADBDevice(ADBCommand):
self._logger.debug("Check for su -c failed: {}".format(e))
# Check if Android's su 0 command works.
# su 0 id will hang on Pixel 2 8.1.0/OPM2.171019.029.B1/4720900
# rooted via magisk. If we already have detected su -c support,
# we can skip this check.
# If we already have detected su -c support, we can skip this check.
try:
if (
not self._have_su

4
testing/perfdocs/generated/debugging.rst
View File

@ -112,11 +112,11 @@ Be sure to read the above section first on how to debug the Raptor web extension
When running Raptor tests on Firefox on Android (i.e. geckoview), to see the console.log() output from the Raptor web extension, do the following:
#. With your android device (i.e. Google Pixel 2) all set up and connected to USB, invoke the Raptor test normally via ``./mach raptor``
#. With your android device all set up and connected to USB, invoke the Raptor test normally via ``./mach raptor``
#. Start up a local copy of the Firefox Nightly Desktop browser
#. In Firefox Desktop choose "Tools => Web Developer => WebIDE"
#. In the Firefox WebIDE dialog that appears, look under "USB Devices" listed on the top right. If your device is not there, there may be a link to install remote device tools - if that link appears click it and let that install.
#. Under "USB Devices" on the top right your android device should be listed (i.e. "Firefox Custom on Android Pixel 2" - click on your device.
#. Under "USB Devices" on the top right your android device should be listed (i.e. "Firefox Custom on Android") - click on your device.
#. The debugger opens. On the left side click on "Main Process", and click the "console" tab below - and the Raptor runner output will be included there.
#. On the left side under "Tabs" you'll also see an option for the active tab/page; select that and the Raptor content console.log() output should be included there.

4
testing/perfdocs/generated/webextension.rst
View File

@ -146,7 +146,7 @@ Prerequisites
^^^^^^^^^^^^^
#. rooted (i.e. superuser-capable), bootloader-unlocked Moto G5 or Google Pixel 2: internal (for now) `test-device setup doc. <https://docs.google.com/document/d/1XQLtvVM2U3h1jzzzpcGEDVOp4jMECsgLYJkhCfAwAnc/edit>`_
#. rooted (i.e. superuser-capable), bootloader-unlocked Google Pixel 6 or Samsung A51: internal (for now) `test-device setup doc. <https://docs.google.com/document/d/1XQLtvVM2U3h1jzzzpcGEDVOp4jMECsgLYJkhCfAwAnc/edit>`_
#. set up to run Raptor from a Firefox source tree (see `Running Locally <https://wiki.mozilla.org/Performance_sheriffing/Raptor#Running_Locally>`_)
#. `GeckoView-bootstrapped <https://wiki.mozilla.org/Performance_sheriffing/Raptor#Running_on_the_Android_GeckoView_Example_App>`_ environment
@ -322,7 +322,7 @@ Once your Android device is ready, and attached to local USB, from within your l
$ ./mach raptor --test raptor-speedometer --app=geckoview --binary="org.mozilla.geckoview_example"
Note: Speedometer on Android GeckoView is currently running on two devices in production - the Google Pixel 2 and the Moto G5 - therefore it is not guaranteed that it will run successfully on all/other untested android devices. There is an intermittent failure on the Moto G5 where speedometer just stalls (`Bug 1492222 <https://bugzilla.mozilla.org/show_bug.cgi?id=1492222>`_).
Note: Speedometer on Android GeckoView is currently running on two devices in production - the Google Pixel 6 and the Samsung A51 - therefore it is not guaranteed that it will run successfully on all/other untested android devices.
To run a Raptor page-load test (i.e. tp6m-1) on the GeckoView Example app, use this command line:

4
testing/raptor/raptor/perfdocs/debugging.rst
View File

@ -112,11 +112,11 @@ Be sure to read the above section first on how to debug the Raptor web extension
When running Raptor tests on Firefox on Android (i.e. geckoview), to see the console.log() output from the Raptor web extension, do the following:
#. With your android device (i.e. Google Pixel 2) all set up and connected to USB, invoke the Raptor test normally via ``./mach raptor``
#. With your android device all set up and connected to USB, invoke the Raptor test normally via ``./mach raptor``
#. Start up a local copy of the Firefox Nightly Desktop browser
#. In Firefox Desktop choose "Tools => Web Developer => WebIDE"
#. In the Firefox WebIDE dialog that appears, look under "USB Devices" listed on the top right. If your device is not there, there may be a link to install remote device tools - if that link appears click it and let that install.
#. Under "USB Devices" on the top right your android device should be listed (i.e. "Firefox Custom on Android Pixel 2" - click on your device.
#. Under "USB Devices" on the top right your android device should be listed (i.e. "Firefox Custom on Android") - click on your device.
#. The debugger opens. On the left side click on "Main Process", and click the "console" tab below - and the Raptor runner output will be included there.
#. On the left side under "Tabs" you'll also see an option for the active tab/page; select that and the Raptor content console.log() output should be included there.

4
testing/raptor/raptor/perfdocs/webextension.rst
View File

@ -146,7 +146,7 @@ Prerequisites
^^^^^^^^^^^^^
#. rooted (i.e. superuser-capable), bootloader-unlocked Moto G5 or Google Pixel 2: internal (for now) `test-device setup doc. <https://docs.google.com/document/d/1XQLtvVM2U3h1jzzzpcGEDVOp4jMECsgLYJkhCfAwAnc/edit>`_
#. rooted (i.e. superuser-capable), bootloader-unlocked Google Pixel 6 or Samsung A51: internal (for now) `test-device setup doc. <https://docs.google.com/document/d/1XQLtvVM2U3h1jzzzpcGEDVOp4jMECsgLYJkhCfAwAnc/edit>`_
#. set up to run Raptor from a Firefox source tree (see `Running Locally <https://wiki.mozilla.org/Performance_sheriffing/Raptor#Running_Locally>`_)
#. `GeckoView-bootstrapped <https://wiki.mozilla.org/Performance_sheriffing/Raptor#Running_on_the_Android_GeckoView_Example_App>`_ environment
@ -322,7 +322,7 @@ Once your Android device is ready, and attached to local USB, from within your l
$ ./mach raptor --test raptor-speedometer --app=geckoview --binary="org.mozilla.geckoview_example"
Note: Speedometer on Android GeckoView is currently running on two devices in production - the Google Pixel 2 and the Moto G5 - therefore it is not guaranteed that it will run successfully on all/other untested android devices. There is an intermittent failure on the Moto G5 where speedometer just stalls (`Bug 1492222 <https://bugzilla.mozilla.org/show_bug.cgi?id=1492222>`_).
Note: Speedometer on Android GeckoView is currently running on two devices in production - the Google Pixel 6 and the Samsung A51 - therefore it is not guaranteed that it will run successfully on all/other untested android devices.
To run a Raptor page-load test (i.e. tp6m-1) on the GeckoView Example app, use this command line:

67
testing/raptor/raptor/performance_tuning.py
View File

@ -135,33 +135,10 @@ class PerformanceTuner(object):
"getprop ro.product.model", timeout=self.timeout
)
if device_name == "Pixel 2":
# MSM8998 (4x 2.35GHz, 4x 1.9GHz)
# values obtained from:
# /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies
# /sys/devices/system/cpu/cpufreq/policy4/scaling_available_frequencies
commands.update(
{
"/sys/devices/system/cpu/cpufreq/policy0/scaling_governor": "performance",
"/sys/devices/system/cpu/cpufreq/policy4/scaling_governor": "performance",
"/sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq": "1900800",
"/sys/devices/system/cpu/cpufreq/policy4/scaling_min_freq": "2457600",
}
)
elif device_name == "Moto G (5)":
# MSM8937(8x 1.4GHz)
# values obtained from:
# /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies
for x in range(0, 8):
commands.update(
{
"/sys/devices/system/cpu/cpu{}/"
"cpufreq/scaling_governor".format(x): "performance",
"/sys/devices/system/cpu/cpu{}/"
"cpufreq/scaling_min_freq".format(x): "1401000",
}
)
elif device_name == "SM-A515F":
# Samsung A51 perf tuning: Bug 1876543
# Pixel 6 perf tuning: Bug 1876545
# Samsung S21 perf tuning: Bug 1876546
if device_name == "SM-A515F":
commands.update(
{
"/sys/devices/system/cpu/cpufreq/policy0/scaling_governor": "performance",
@ -196,36 +173,14 @@ class PerformanceTuner(object):
"getprop ro.product.model", timeout=self.timeout
)
if device_name == "Pixel 2":
# Adreno 540 (710MHz)
# values obtained from:
# /sys/devices/soc/5000000.qcom,kgsl-3d0/kgsl/kgsl-3d0/max_clk_mhz
commands.update(
{
"/sys/devices/soc/5000000.qcom,kgsl-3d0/devfreq/"
"5000000.qcom,kgsl-3d0/governor": "performance",
"/sys/devices/soc/soc:qcom,kgsl-busmon/devfreq/"
"soc:qcom,kgsl-busmon/governor": "performance",
"/sys/devices/soc/5000000.qcom,kgsl-3d0/kgsl/kgsl-3d0/min_clock_mhz": "710",
}
)
elif device_name == "Moto G (5)":
# Adreno 505 (450MHz)
# values obtained from:
# /sys/devices/soc/1c00000.qcom,kgsl-3d0/kgsl/kgsl-3d0/max_clock_mhz
commands.update(
{
"/sys/devices/soc/1c00000.qcom,kgsl-3d0/devfreq/"
"1c00000.qcom,kgsl-3d0/governor": "performance",
"/sys/devices/soc/1c00000.qcom,kgsl-3d0/kgsl/kgsl-3d0/min_clock_mhz": "450",
}
)
else:
self.log.info(
"GPU for device with ro.product.model '{}' unknown, not setting devfreq".format(
device_name
)
# Samsung A51 perf tuning: Bug 1876543
# Pixel 6 perf tuning: Bug 1876545
# Samsung S21 perf tuning: Bug 1876546
self.log.info(
"GPU for device with ro.product.model '{}' unknown, not setting devfreq".format(
device_name
)
)
for key, value in commands.items():
self._set_value_and_check_exitcode(key, value)