Skip to content

GitLab

T
tangled
Commit c4dcc206 authored by Caleb Rouleau's avatar Caleb Rouleau
Browse files
Options

[Benchmarking] chromium: Turn down android-nexus5x-perf. 

Also remove gpu_perftests isolate target since it apparently
isn't used anymore as a result of this change (plus the
work in crbug.com/921353 set this up to be run on Nexus 5
as part of the performance_test_suite isolate)
(and PRESUBMIT told me to).

Bug: 1042439
Change-Id: I35518250466a68ebcaa0a2c195f8ffdc8d4dd8b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2003767Reviewed-by: default avatarJohn Chen <johnchen@chromium.org>
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732474}
parent cc007f73
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 3771 deletions
docs/speed/perf_lab_platforms.md
View file @ c4dcc206
......@@ -9,7 +9,6 @@
* [android-go-perf](https://ci.chromium.org/p/chrome/builders/ci/android-go-perf): Android O (gobo).
* [android-go_webview-perf](https://ci.chromium.org/p/chrome/builders/ci/android-go_webview-perf): Android OPM1.171019.021 (gobo).
* [Android Nexus5 Perf](https://ci.chromium.org/p/chrome/builders/ci/Android%20Nexus5%20Perf): Android KOT49H.
* [android-nexus5x-perf](https://ci.chromium.org/p/chrome/builders/ci/android-nexus5x-perf): Android MMB29Q.
* [Android Nexus5X WebView Perf](https://ci.chromium.org/p/chrome/builders/ci/Android%20Nexus5X%20WebView%20Perf): Android AOSP MOB30K.
* [Android Nexus6 WebView Perf](https://ci.chromium.org/p/chrome/builders/ci/Android%20Nexus6%20WebView%20Perf): Android AOSP MOB30K.
* [android-pixel2-perf](https://ci.chromium.org/p/chrome/builders/ci/android-pixel2-perf): Android OPM1.171019.021.
......
testing/buildbot/chromium.perf.json
View file @ c4dcc206
......@@ -831,248 +831,6 @@
}
]
},
"android-nexus5x-perf": {
"isolated_scripts": [
{
"args": [
"--gtest-benchmark-name",
"base_perftests"
],
"isolate_name": "base_perftests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "base_perftests",
"override_compile_targets": [
"base_perftests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_flavor": "google",
"device_type": "bullhead",
"os": "Android",
"pool": "chrome.tests.perf"
}
],
"expiration": 7200,
"hard_timeout": 19800,
"ignore_task_failure": false,
"io_timeout": 19800,
"shards": 1
},
"trigger_script": {
"args": [
"--multiple-dimension-script-verbose",
"True"
],
"requires_simultaneous_shard_dispatch": true,
"script": "//testing/trigger_scripts/perf_device_trigger.py"
}
},
{
"args": [
"--gtest-benchmark-name",
"components_perftests"
],
"isolate_name": "components_perftests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "components_perftests",
"override_compile_targets": [
"components_perftests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_flavor": "google",
"device_type": "bullhead",
"os": "Android",
"pool": "chrome.tests.perf"
}
],
"expiration": 7200,
"hard_timeout": 19800,
"ignore_task_failure": false,
"io_timeout": 19800,
"shards": 1
},
"trigger_script": {
"args": [
"--multiple-dimension-script-verbose",
"True"
],
"requires_simultaneous_shard_dispatch": true,
"script": "//testing/trigger_scripts/perf_device_trigger.py"
}
},
{
"args": [
"--gtest-benchmark-name",
"gpu_perftests"
],
"isolate_name": "gpu_perftests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "gpu_perftests",
"override_compile_targets": [
"gpu_perftests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_flavor": "google",
"device_type": "bullhead",
"os": "Android",
"pool": "chrome.tests.perf"
}
],
"expiration": 7200,
"hard_timeout": 19800,
"ignore_task_failure": false,
"io_timeout": 19800,
"shards": 1
},
"trigger_script": {
"args": [
"--multiple-dimension-script-verbose",
"True"
],
"requires_simultaneous_shard_dispatch": true,
"script": "//testing/trigger_scripts/perf_device_trigger.py"
}
},
{
"args": [
"--gtest-benchmark-name",
"media_perftests"
],
"isolate_name": "media_perftests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "media_perftests",
"override_compile_targets": [
"media_perftests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_flavor": "google",
"device_type": "bullhead",
"os": "Android",
"pool": "chrome.tests.perf"
}
],
"expiration": 7200,
"hard_timeout": 19800,
"ignore_task_failure": false,
"io_timeout": 19800,
"shards": 1
},
"trigger_script": {
"args": [
"--multiple-dimension-script-verbose",
"True"
],
"requires_simultaneous_shard_dispatch": true,
"script": "//testing/trigger_scripts/perf_device_trigger.py"
}
},
{
"args": [
"--gtest-benchmark-name",
"tracing_perftests"
],
"isolate_name": "tracing_perftests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "tracing_perftests",
"override_compile_targets": [
"tracing_perftests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_flavor": "google",
"device_type": "bullhead",
"os": "Android",
"pool": "chrome.tests.perf"
}
],
"expiration": 7200,
"hard_timeout": 19800,
"ignore_task_failure": false,
"io_timeout": 19800,
"shards": 1
},
"trigger_script": {
"args": [
"--multiple-dimension-script-verbose",
"True"
],
"requires_simultaneous_shard_dispatch": true,
"script": "//testing/trigger_scripts/perf_device_trigger.py"
}
},
{
"args": [
"-v",
"--browser=android-chromium",
"--upload-results",
"--test-shard-map-filename=android-nexus5x-perf_map.json",
"--run-ref-build",
"--assert-gpu-compositing"
],
"isolate_name": "performance_test_suite",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "performance_test_suite",
"override_compile_targets": [
"performance_test_suite"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_flavor": "google",
"device_type": "bullhead",
"os": "Android",
"pool": "chrome.tests.perf"
}
],
"expiration": 7200,
"hard_timeout": 19800,
"ignore_task_failure": false,
"io_timeout": 19800,
"shards": 10
},
"trigger_script": {
"args": [
"--multiple-dimension-script-verbose",
"True"
],
"requires_simultaneous_shard_dispatch": true,
"script": "//testing/trigger_scripts/perf_device_trigger.py"
}
}
]
},
"android-pixel2-perf": {
"isolated_scripts": [
{
......
testing/buildbot/gn_isolate_map.pyl
View file @ c4dcc206
......@@ -842,17 +842,6 @@
"label": "//google_apis:google_apis_unittests",
"type": "console_test_launcher",
},
"gpu_perftests": {
"args": [
"gpu_perftests",
"--non-telemetry=true",
"--adb-path",
"src/third_party/android_sdk/public/platform-tools/adb",
],
"label": "//gpu:gpu_perftests",
"script": "//testing/scripts/run_performance_tests.py",
"type": "script",
},
"gpu_unittests": {
"label": "//gpu:gpu_unittests",
"type": "windowed_test_launcher",
......
tools/perf/benchmark_schedules.csv
View file @ c4dcc206
This diff is collapsed.
tools/perf/core/bot_platforms.py
View file @ c4dcc206
......@@ -333,9 +333,6 @@ _ANDROID_NEXUS_5_BENCHMARK_CONFIGS = PerfSuite(
])
_ANDROID_NEXUS_5_EXECUTABLE_CONFIGS = frozenset([
_TRACING_PERFTESTS, _COMPONENTS_PERFTESTS, _GPU_PERFTESTS])
_ANDROID_NEXUS_5X_BENCHMARK_CONFIGS = PerfSuite(
_OFFICIAL_EXCEPT_JETSTREAM2).Abridge(
['rendering.mobile', 'system_health.memory_mobile'])
_ANDROID_NEXUS_5X_WEBVIEW_BENCHMARK_CONFIGS = (
_OFFICIAL_EXCEPT_DISPLAY_LOCKING_JETSTREAM2)
_ANDROID_NEXUS_6_WEBVIEW_BENCHMARK_CONFIGS = (
......@@ -419,11 +416,6 @@ ANDROID_GO_WEBVIEW = PerfPlatform(
ANDROID_NEXUS_5 = PerfPlatform(
'Android Nexus5 Perf', 'Android KOT49H', _ANDROID_NEXUS_5_BENCHMARK_CONFIGS,
16, 'android', executables=_ANDROID_NEXUS_5_EXECUTABLE_CONFIGS)
ANDROID_NEXUS_5X = PerfPlatform(
'android-nexus5x-perf', 'Android MMB29Q',
_ANDROID_NEXUS_5X_BENCHMARK_CONFIGS,
10, # Reduced from 16 per crbug.com/1014120.
'android')
ANDROID_NEXUS_5X_WEBVIEW = PerfPlatform(
'Android Nexus5X WebView Perf', 'Android AOSP MOB30K',
_ANDROID_NEXUS_5X_WEBVIEW_BENCHMARK_CONFIGS, 16, 'android',
......
tools/perf/core/perf_data_generator.py
View file @ c4dcc206
......@@ -361,49 +361,6 @@ BUILDERS = {
'device_os_flavor': 'google',
},
},
'android-nexus5x-perf': {
'tests': [
{
'isolate': 'performance_test_suite',
'extra_args': [
'--assert-gpu-compositing',
],
},
{
'isolate': 'media_perftests',
'num_shards': 1,
'type': TEST_TYPES.GTEST,
},
{
'isolate': 'components_perftests',
'num_shards': 1,
'type': TEST_TYPES.GTEST,
},
{
'isolate': 'tracing_perftests',
'num_shards': 1,
'type': TEST_TYPES.GTEST,
},
{
'isolate': 'gpu_perftests',
'num_shards': 1,
'type': TEST_TYPES.GTEST,
},
{
'isolate': 'base_perftests',
'num_shards': 1,
'type': TEST_TYPES.GTEST,
}
],
'platform': 'android',
'dimension': {
'pool': 'chrome.tests.perf',
'os': 'Android',
'device_type': 'bullhead',
'device_os': 'MMB29Q',
'device_os_flavor': 'google',
},
},
'Android Nexus5 Perf': {
'tests': [
{
......
tools/perf/core/shard_maps/android-nexus5x-perf_map.json deleted 100644 → 0
View file @ cc007f73
{
"0": {
"benchmarks": {
"blink_perf.accessibility": {
"abridged": false
},
"blink_perf.bindings": {
"abridged": false
},
"blink_perf.canvas": {
"abridged": false
},
"blink_perf.css": {
"abridged": false
},
"blink_perf.display_locking": {
"abridged": false
},
"blink_perf.dom": {
"abridged": false
},
"blink_perf.events": {
"abridged": false
}
}
},
"1": {
"benchmarks": {
"blink_perf.image_decoder": {
"abridged": false
},
"blink_perf.layout": {
"abridged": false
},
"blink_perf.owp_storage": {
"abridged": false
},
"blink_perf.paint": {
"abridged": false
},
"blink_perf.parser": {
"end": 26,
"abridged": false
}
}
},
"2": {
"benchmarks": {
"blink_perf.parser": {
"begin": 26,
"abridged": false
},
"blink_perf.shadow_dom": {
"abridged": false
},
"blink_perf.svg": {
"abridged": false
},
"dromaeo": {
"abridged": false
},
"dummy_benchmark.noisy_benchmark_1": {
"abridged": false
},
"dummy_benchmark.stable_benchmark_1": {
"abridged": false
},
"jetstream": {
"abridged": false
},
"kraken": {
"abridged": false
},
"loading.mobile": {
"end": 67,
"abridged": false
}
}
},
"3": {
"benchmarks": {
"loading.mobile": {
"begin": 67,
"abridged": false
},
"media.mobile": {
"abridged": false
},
"octane": {
"abridged": false
},
"rasterize_and_record_micro.partial_invalidation": {
"abridged": false
},
"rasterize_and_record_micro.top_25": {
"abridged": false
},
"rendering.mobile": {
"abridged": true
},
"speedometer": {
"abridged": false
},
"speedometer-future": {
"abridged": false
},
"speedometer2": {
"abridged": false
}
}
},
"4": {
"benchmarks": {
"speedometer2-future": {
"abridged": false
},
"startup.mobile": {
"abridged": false
},
"system_health.common_mobile": {
"end": 41,
"abridged": false
}
}
},
"5": {
"benchmarks": {
"system_health.common_mobile": {
"begin": 41,
"abridged": false
},
"system_health.memory_mobile": {
"end": 8,
"abridged": true
}
}
},
"6": {
"benchmarks": {
"system_health.memory_mobile": {
"begin": 8,
"end": 16,
"abridged": true
}
}
},
"7": {
"benchmarks": {
"system_health.memory_mobile": {
"begin": 16,
"end": 24,
"abridged": true
}
}
},
"8": {
"benchmarks": {
"system_health.memory_mobile": {
"begin": 24,
"abridged": true
},
"system_health.webview_startup": {
"abridged": false
},
"tracing.tracing_with_background_memory_infra": {
"abridged": false
},
"v8.browsing_mobile": {
"end": 16,
"abridged": false
}
}
},
"9": {
"benchmarks": {
"v8.browsing_mobile": {
"begin": 16,
"abridged": false
},
"v8.browsing_mobile-future": {
"abridged": false
},
"webrtc": {
"abridged": false
}
}
},
"extra_infos": {
"num_stories": 813,
"predicted_min_shard_time": 6240.0,
"predicted_min_shard_index": 9,
"predicted_max_shard_time": 6624.0,
"predicted_max_shard_index": 7,
"shard #0": 6438.0,
"shard #1": 6466.0,
"shard #2": 6456.0,
"shard #3": 6386.0,
"shard #4": 6590.0,
"shard #5": 6366.0,
"shard #6": 6452.0,
"shard #7": 6624.0,
"shard #8": 6564.0,
"shard #9": 6240.0
}
}
\ No newline at end of file
tools/perf/cycletime_contributions.csv
View file @ c4dcc206
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment