Skip to content

Commit 2d170c3

Browse files
brianosmanSkia Commit-Bot
brianosman
authored and
Skia Commit-Bot
committed
Remove all NexusPlayer bots and driver workarounds
This device is very old and very unsupported. It doesn't officially come with a browser (Chrome needs to be sideloaded). Bug: skia:6531 skia:6670 skia:7286 skia:7921 Change-Id: I720cd3a40981694bf7befa5cafc700717dcd7cdf Reviewed-on: https://skia-review.googlesource.com/c/skia/+/219486 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
1 parent 5fc8912 commit 2d170c3

17 files changed

+1259
-2959
lines changed

‎infra/bots/gen_tasks.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,6 @@ func defaultSwarmDimensions(parts map[string]string) []string {
490490
"Nexus5": {"hammerhead", "M4B30Z_3437181"},
491491
"Nexus5x": {"bullhead", "OPR6.170623.023"},
492492
"Nexus7": {"grouper", "LMY47V_1836172"}, // 2012 Nexus 7
493-
"NexusPlayer": {"fugu", "OPR2.170623.027"},
494493
"P30": {"HWELE", "HUAWEIELE-L29"},
495494
"Pixel": {"sailfish", "PPR1.180610.009"},
496495
"Pixel2XL": {"taimen", "PPR1.180610.009"},

‎infra/bots/jobs.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,6 @@
195195
"Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android",
196196
"Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android",
197197
"Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android",
198-
"Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android",
199-
"Perf-Android-Clang-NexusPlayer-GPU-PowerVRG6430-x86-Debug-All-Android",
200-
"Perf-Android-Clang-NexusPlayer-GPU-PowerVRG6430-x86-Release-All-Android",
201198
"Perf-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android",
202199
"Perf-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_Vulkan",
203200
"Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android",
@@ -422,10 +419,6 @@
422419
"Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android",
423420
"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android",
424421
"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android",
425-
"Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android",
426-
"Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android",
427-
"Test-Android-Clang-NexusPlayer-GPU-PowerVRG6430-x86-Debug-All-Android",
428-
"Test-Android-Clang-NexusPlayer-GPU-PowerVRG6430-x86-Release-All-Android",
429422
"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android",
430423
"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_DDL1_Vulkan",
431424
"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_DDL3_Vulkan",

‎infra/bots/recipe_modules/flavor/android.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def __init__(self, m):
5353
# frequency. See also disable_for_nanobench.
5454
self.cpus_to_scale = {
5555
'Nexus5x': [4],
56-
'NexusPlayer': [0, 2], # has 2 identical chips, so scale them both.
5756
'Pixel': [2],
5857
'Pixel2XL': [4]
5958
}

‎infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -611,15 +611,15 @@
611611
"-u",
612612
"\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n",
613613
"/usr/bin/adb.1.0.35",
614-
"0",
614+
"4",
615615
"userspace"
616616
],
617617
"env": {
618618
"CHROME_HEADLESS": "1",
619619
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
620620
},
621621
"infra_step": true,
622-
"name": "Set CPU 0's governor to userspace",
622+
"name": "Set CPU 4's governor to userspace",
623623
"timeout": 30,
624624
"~followup_annotations": [
625625
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -654,14 +654,14 @@
654654
"\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint 'Setting frequency to %d' % freq\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n",
655655
"/usr/bin/adb.1.0.35",
656656
"0.6",
657-
"0"
657+
"4"
658658
],
659659
"env": {
660660
"CHROME_HEADLESS": "1",
661661
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
662662
},
663663
"infra_step": true,
664-
"name": "Scale CPU 0 to 0.600000",
664+
"name": "Scale CPU 4 to 0.600000",
665665
"timeout": 30,
666666
"~followup_annotations": [
667667
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -729,14 +729,14 @@
729729
"\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint 'Setting frequency to %d' % freq\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n",
730730
"/usr/bin/adb.1.0.35",
731731
"0.6",
732-
"0"
732+
"4"
733733
],
734734
"env": {
735735
"CHROME_HEADLESS": "1",
736736
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
737737
},
738738
"infra_step": true,
739-
"name": "Scale CPU 0 to 0.600000 (attempt 2)",
739+
"name": "Scale CPU 4 to 0.600000 (attempt 2)",
740740
"timeout": 30,
741741
"~followup_annotations": [
742742
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -804,14 +804,14 @@
804804
"\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint 'Setting frequency to %d' % freq\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n",
805805
"/usr/bin/adb.1.0.35",
806806
"0.6",
807-
"0"
807+
"4"
808808
],
809809
"env": {
810810
"CHROME_HEADLESS": "1",
811811
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
812812
},
813813
"infra_step": true,
814-
"name": "Scale CPU 0 to 0.600000 (attempt 3)",
814+
"name": "Scale CPU 4 to 0.600000 (attempt 3)",
815815
"timeout": 30,
816816
"~followup_annotations": [
817817
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -935,7 +935,7 @@
935935
},
936936
{
937937
"failure": {
938-
"humanReason": "Infra Failure: Step('Scale CPU 0 to 0.600000 (attempt 3)') (retcode: 1)"
938+
"humanReason": "Infra Failure: Step('Scale CPU 4 to 0.600000 (attempt 3)') (retcode: 1)"
939939
},
940940
"name": "$result"
941941
}

0 commit comments

Comments
 (0)