diff options
| author |  Mike Klein <mtklein@google.com> | 2017-12-14 12:18:36 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-14 12:18:42 +0000 |
| commit | 43307c09b97c5a5c5174f0c4ccb79bdaf3ebf557 (patch) | |
| tree | 78e44b81d9a0206f779f3d530a704f7e9b83d24d /infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json | |
| parent | 63789ccc03f6e63caa3e6c74fee9ad18e073cecf (diff) | |
Revert "Disable extra CPUs during Nanobench"
This reverts commit 32af335e7abbf562dad8f1bd21bb013610b8b021.
Reason for revert: many unhappy android bots
Original change's description:
> Disable extra CPUs during Nanobench
>
> The previous experiment revealed that nanobench can
> run on any of the online CPUs, so rather than put
> the ones we don't need/want into powersave mode, just
> disable them.
>
> Maybe in the future we can run CPU tests on the big
> or LITTLE cpus to get perf data on higher end or
> lower end cpus, but only if we get very stable
> results from this.
>
> Bug: skia:7378
> notry=true
> notreechecks=true
> Change-Id: I057513a691093e7f73c0f5790e17fab1a5ec0bc4
> Reviewed-on: https://skia-review.googlesource.com/84820
> Reviewed-by: Kevin Lubick <kjlubick@google.com>
> Commit-Queue: Kevin Lubick <kjlubick@google.com>
TBR=borenet@google.com,mtklein@google.com,kjlubick@google.com
Change-Id: I23c37a6bde631e95f0b4ae7277ec8fcf325a00e9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7378
Reviewed-on: https://skia-review.googlesource.com/84921
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json')
| -rw-r--r-- | infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json index 358efb1873..0a813f8877 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json @@ -659,7 +659,7 @@ "-u", "\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", "/usr/bin/adb.1.0.35", - "0", + "2", "ondemand" ], "env": { @@ -669,7 +669,7 @@ "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "Set CPU 0's governor to ondemand", + "name": "Set CPU 2's governor to ondemand", "timeout": 30, "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -703,7 +703,7 @@ "-u", "\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", "/usr/bin/adb.1.0.35", - "2", + "0", "ondemand" ], "env": { @@ -713,7 +713,7 @@ "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "Set CPU 2's governor to ondemand", + "name": "Set CPU 0's governor to ondemand", "timeout": 30, "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", |