Skip to content

GitLab

T
tangled
Commit f5211095 authored by Ryan Heise's avatar Ryan Heise Committed by Commit Bot
Browse files
Options

Change Mac ARM perf tests to be the same as high-end x86 Macs 

Remove x86 Chrome on ARM Mac perf tests (no longer relevant)
Change sharding to 7 to take advantage of https://chromium-review.googlesource.com/c/chromium/src/+/2548360

Bug: chromium:1138953
Change-Id: I626d9c43a02290afdd592e58c11c9bba1cc6054a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2548360Reviewed-by: default avatarJohn Chen <johnchen@chromium.org>
Commit-Queue: Ryan Heise <heiserya@google.com>
Auto-Submit: Ryan Heise <heiserya@google.com>
Cr-Commit-Position: refs/heads/master@{#829895}
parent d7ff8e3b
Hide whitespace changes
Inline Side-by-side
Showing with 275 additions and 154 deletions
docs/speed/perf_lab_platforms.md
View file @ f5211095
......@@ -24,7 +24,6 @@
* [mac-10_12_laptop_low_end-perf](https://ci.chromium.org/p/chrome/builders/ci/mac-10_12_laptop_low_end-perf): MacBook Air, Core i5 1.8 GHz, 8GB RAM, 128GB SSD, HD Graphics.
* [mac-10_13_laptop_high_end-perf](https://ci.chromium.org/p/chrome/builders/ci/mac-10_13_laptop_high_end-perf): MacBook Pro, Core i7 2.8 GHz, 16GB RAM, 256GB SSD, Radeon 55.
* [mac-arm_dtk_arm-perf](https://ci.chromium.org/p/chrome/builders/ci/mac-arm_dtk_arm-perf): Mac ARM DTK (ARM Chrome).
* [mac-arm_dtk_x86-perf](https://ci.chromium.org/p/chrome/builders/ci/mac-arm_dtk_x86-perf): Mac ARM DTK (X86 Chrome).
## Win
......
testing/buildbot/chromium.perf.json
View file @ f5211095
......@@ -1176,52 +1176,7 @@
"ignore_task_failure": false,
"io_timeout": 21600,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 1
},
"trigger_script": {
"args": [
"--multiple-dimension-script-verbose",
"True"
],
"requires_simultaneous_shard_dispatch": true,
"script": "//testing/trigger_scripts/perf_device_trigger.py"
}
}
]
},
"mac-arm_dtk_x86-perf": {
"isolated_scripts": [
{
"args": [
"-v",
"--browser=release",
"--upload-results",
"--test-shard-map-filename=mac-arm_dtk_x86-perf_map.json",
"--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": [
{
"cpu": "arm",
"os": "Mac",
"pool": "chrome.tests.perf"
}
],
"expiration": 7200,
"hard_timeout": 21600,
"ignore_task_failure": false,
"io_timeout": 21600,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 1
"shards": 8
},
"trigger_script": {
"args": [
......
tools/perf/core/bot_platforms.py
View file @ f5211095
......@@ -331,10 +331,16 @@ _MAC_LOW_END_EXECUTABLE_CONFIGS = frozenset([
_load_library_perf_tests(),
_performance_browser_tests(210),
])
_MAC_ARM_DTK_BENCHMARK_CONFIGS = PerfSuite([
'loading.desktop',
]).Abridge([
'loading.desktop',
_MAC_ARM_DTK_BENCHMARK_CONFIGS = PerfSuite(OFFICIAL_BENCHMARK_CONFIGS).Remove([
'blink_perf.display_locking',
'v8.runtime_stats.top_25',
])
_MAC_ARM_DTK_EXECUTABLE_CONFIGS = frozenset([
_base_perftests(300),
_dawn_perf_tests(330),
_media_perftests(),
_performance_browser_tests(190),
_views_perftests(),
])
_WIN_10_BENCHMARK_CONFIGS = PerfSuite(OFFICIAL_BENCHMARK_CONFIGS).Remove([
......@@ -464,18 +470,12 @@ MAC_LOW_END = PerfPlatform(
26,
'mac',
executables=_MAC_LOW_END_EXECUTABLE_CONFIGS)
MAC_ARM_DTK_X86 = PerfPlatform(
'mac-arm_dtk_x86-perf',
'Mac ARM DTK (X86 Chrome)',
_MAC_ARM_DTK_BENCHMARK_CONFIGS,
1,
'mac')
MAC_ARM_DTK_ARM = PerfPlatform(
'mac-arm_dtk_arm-perf',
'Mac ARM DTK (ARM Chrome)',
_MAC_ARM_DTK_BENCHMARK_CONFIGS,
1,
'mac')
MAC_ARM_DTK_ARM = PerfPlatform('mac-arm_dtk_arm-perf',
'Mac ARM DTK (ARM Chrome)',
_MAC_ARM_DTK_BENCHMARK_CONFIGS,
8,
'mac',
executables=_MAC_ARM_DTK_EXECUTABLE_CONFIGS)
# Win
WIN_10_LOW_END = PerfPlatform(
......
tools/perf/core/perf_data_generator.py
View file @ f5211095
......@@ -632,23 +632,6 @@ BUILDERS = {
'MacBookAir7,2_x86-64-i5-5350U_Intel Broadwell HD Graphics 6000_8192_APPLE SSD SM0128G'
},
},
'mac-arm_dtk_x86-perf': {
'tests': [
{
'isolate': 'performance_test_suite',
'extra_args': [
'--assert-gpu-compositing',
],
},
],
'platform':
'mac',
'dimension': {
'cpu': 'arm',
'os': 'Mac',
'pool': 'chrome.tests.perf',
},
},
'mac-arm_dtk_arm-perf': {
'tests': [
{
......
tools/perf/core/shard_maps/mac-arm_dtk_arm-perf_map.json
View file @ f5211095
{
"0": {
"benchmarks": {
"blink_perf.accessibility": {
"abridged": false
},
"blink_perf.bindings": {
"abridged": false
},
"blink_perf.css": {
"abridged": false
},
"blink_perf.dom": {
"abridged": false
},
"blink_perf.events": {
"abridged": false
},
"blink_perf.image_decoder": {
"end": 4,
"abridged": false
}
},
"executables": {
"base_perftests": {
"path": "base_perftests",
"arguments": [
"--test-launcher-jobs=1",
"--test-launcher-retry-limit=0"
]
}
}
},
"1": {
"benchmarks": {
"blink_perf.image_decoder": {
"begin": 4,
"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
},
"blink_perf.webaudio": {
"abridged": false
},
"dromaeo": {
"abridged": false
},
"dummy_benchmark.noisy_benchmark_1": {
"abridged": false
},
"dummy_benchmark.stable_benchmark_1": {
"abridged": false
},
"jetstream": {
"abridged": false
},
"jetstream2": {
"abridged": false
},
"kraken": {
"abridged": false
},
"loading.desktop": {
"abridged": true
"end": 20,
"abridged": false
}
},
"executables": {
"dawn_perf_tests": {
"path": "dawn_perf_tests",
"arguments": [
"--test-launcher-jobs=1",
"--test-launcher-retry-limit=0"
]
}
}
},
"3": {
"benchmarks": {
"loading.desktop": {
"begin": 20,
"abridged": false
},
"media.desktop": {
"abridged": false
},
"memory.desktop": {
"abridged": false
},
"octane": {
"abridged": false
}
},
"executables": {
"media_perftests": {
"path": "media_perftests",
"arguments": [
"--single-process-tests",
"--test-launcher-retry-limit=0",
"--isolated-script-test-filter=*::-*_unoptimized::*_unaligned::*unoptimized_aligned"
]
}
}
},
"4": {
"benchmarks": {
"power.desktop": {
"abridged": false
},
"rasterize_and_record_micro.top_25": {
"abridged": false
},
"rendering.desktop": {
"end": 90,
"abridged": false
}
},
"executables": {
"performance_browser_tests": {
"path": "browser_tests",
"arguments": [
"--full-performance-run",
"--test-launcher-jobs=1",
"--test-launcher-retry-limit=0",
"--ui-test-action-timeout=60000",
"--ui-test-action-max-timeout=60000",
"--test-launcher-timeout=60000",
"--gtest_filter=*/TabCapturePerformanceTest.*:*/CastV2PerformanceTest.*"
]
}
}
},
"5": {
"benchmarks": {
"rendering.desktop": {
"begin": 90,
"end": 240,
"abridged": false
}
}
},
"6": {
"benchmarks": {
"rendering.desktop": {
"begin": 240,
"abridged": false
},
"speedometer": {
"abridged": false
},
"speedometer-future": {
"abridged": false
},
"speedometer2": {
"abridged": false
},
"speedometer2-future": {
"abridged": false
},
"system_health.common_desktop": {
"abridged": false
},
"system_health.memory_desktop": {
"end": 2,
"abridged": false
}
}
},
"7": {
"benchmarks": {
"system_health.memory_desktop": {
"begin": 2,
"abridged": false
},
"tab_switching.typical_25": {
"abridged": false
},
"tracing.tracing_with_background_memory_infra": {
"abridged": false
},
"v8.browsing_desktop": {
"abridged": false
},
"v8.browsing_desktop-future": {
"abridged": false
},
"webrtc": {
"abridged": false
}
},
"executables": {
"views_perftests": {
"path": "views_perftests",
"arguments": [
"--xvfb"
]
}
}
},
"extra_infos": {
"num_stories": 10,
"predicted_min_shard_time": 492.0,
"predicted_min_shard_index": 0,
"predicted_max_shard_time": 492.0,
"predicted_max_shard_index": 0,
"shard #0": 492.0
"num_stories": 1063,
"predicted_min_shard_time": 1418.0,
"predicted_min_shard_index": 3,
"predicted_max_shard_time": 1500,
"predicted_max_shard_index": 5,
"shard #0": 1480.0,
"shard #1": 1480,
"shard #2": 1482.0,
"shard #3": 1418.0,
"shard #4": 1490.0,
"shard #5": 1500,
"shard #6": 1490,
"shard #7": 1497.0
}
}
\ No newline at end of file
tools/perf/core/shard_maps/mac-arm_dtk_x86-perf_map.json deleted 100644 → 0
View file @ d7ff8e3b
{
"0": {
"benchmarks": {
"loading.desktop": {
"abridged": true
}
}
},
"extra_infos": {
"num_stories": 10,
"predicted_min_shard_time": 616.0,
"predicted_min_shard_index": 0,
"predicted_max_shard_time": 616.0,
"predicted_max_shard_index": 0,
"shard #0": 616.0
}
}
\ No newline at end of file
tools/perf/core/shard_maps/timing_data/mac-arm_dtk_arm-perf_timing.json
View file @ f5211095
[
{
"duration": "33.0",
"duration": "35.0",
"name": "loading.desktop/AirBnB_warm"
},
{
"duration": "32.0",
"duration": "33.0",
"name": "loading.desktop/Aljayyash_cold"
},
{
"duration": "25.0",
"duration": "26.0",
"name": "loading.desktop/AllRecipes_cold"
},
{
......@@ -16,15 +16,15 @@
"name": "loading.desktop/Baidu_warm"
},
{
"duration": "21.0",
"duration": "22.0",
"name": "loading.desktop/Naver_cold"
},
{
"duration": "20.0",
"duration": "22.0",
"name": "loading.desktop/Orange_cold"
},
{
"duration": "21.0",
"duration": "22.0",
"name": "loading.desktop/Orange_warm"
},
{
......@@ -32,11 +32,31 @@
"name": "loading.desktop/Taobao_warm"
},
{
"duration": "21.0",
"duration": "22.0",
"name": "loading.desktop/TheOnion_cold"
},
{
"duration": "22.0",
"duration": "24.0",
"name": "loading.desktop/ru.wikipedia_warm"
},
{
"duration": "300.0",
"name": "base_perftests/_gtest_"
},
{
"duration": "330.0",
"name": "dawn_perf_tests/_gtest_"
},
{
"duration": "16.0",
"name": "media_perftests/_gtest_"
},
{
"duration": "190.0",
"name": "performance_browser_tests/_gtest_"
},
{
"duration": "7.0",
"name": "views_perftests/_gtest_"
}
]
\ No newline at end of file
tools/perf/core/shard_maps/timing_data/mac-arm_dtk_x86-perf_timing.json deleted 100644 → 0
View file @ d7ff8e3b
[
{
"duration": "44.0",
"name": "loading.desktop/AirBnB_warm"
},
{
"duration": "43.0",
"name": "loading.desktop/Aljayyash_cold"
},
{
"duration": "31.0",
"name": "loading.desktop/AllRecipes_cold"
},
{
"duration": "25.0",
"name": "loading.desktop/Baidu_warm"
},
{
"duration": "24.0",
"name": "loading.desktop/Naver_cold"
},
{
"duration": "24.0",
"name": "loading.desktop/Orange_cold"
},
{
"duration": "26.0",
"name": "loading.desktop/Orange_warm"
},
{
"duration": "34.0",
"name": "loading.desktop/Taobao_warm"
},
{
"duration": "29.0",
"name": "loading.desktop/TheOnion_cold"
},
{
"duration": "28.0",
"name": "loading.desktop/ru.wikipedia_warm"
}
]
\ No newline at end of file
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