From cb885923d8cf59ae2850d859b13586a36df61fbe Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Thu, 1 Dec 2022 17:04:10 +0000 Subject: [PATCH] Revert "Add working Perf tests for Fuchsia" This reverts commit d8d86bd3329d05fdcc5402140917eb70b340c9c6. Reason for revert: Seems this causes an issue with the dimensions ? File "/b/s/w/ir/kitchen-checkout/recipe_engine/recipe_modules/swarming/api.py", line 463, in with_dimensions assert isinstance(k, basestring) and (isinstance(v, basestring) Original change's description: > Add working Perf tests for Fuchsia > > Utilize VM in perf pool for Fuchsia (separate CL) > > Bug: b/232740856 > Change-Id: Ia69f72bbf2046db3bc9b1e5edabda6cc4a339fe6 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/285721 > Reviewed-by: Jeremy Leconte > Commit-Queue: Christoffer Jansson > Reviewed-by: Mirko Bonadei > Cr-Commit-Position: refs/heads/main@{#38787} Bug: b/232740856 Change-Id: Ibedff26cfe38fae0eb36158d5cd9f2bdfded319f No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/285800 Reviewed-by: Jeremy Leconte Auto-Submit: Jeremy Leconte Commit-Queue: Jeremy Leconte Bot-Commit: rubber-stamper@appspot.gserviceaccount.com Owners-Override: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#38790} --- BUILD.gn | 16 -------- infra/specs/client.webrtc.perf.json | 61 +---------------------------- infra/specs/gn_isolate_map.pyl | 4 -- infra/specs/mixins.pyl | 21 +--------- infra/specs/mixins_webrtc.pyl | 19 --------- infra/specs/test_suites.pyl | 5 --- infra/specs/waterfalls.pyl | 12 +++--- 7 files changed, 8 insertions(+), 130 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 433e22e7b9..ca60bdc24b 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -722,22 +722,6 @@ if (rtc_include_tests && !build_with_chromium) { } } - rtc_test("fuchsia_perf_tests") { - testonly = true - deps = [ - #TODO(fxbug.dev/115601) - Enable when fixed - #"call:call_perf_tests", - #"video:video_pc_full_stack_tests", - "modules/audio_coding:audio_coding_perf_tests", - "modules/audio_processing:audio_processing_perf_tests", - "pc:peerconnection_perf_tests", - "test:test_main", - "video:video_full_stack_tests", - ] - - data = webrtc_perf_tests_resources - } - rtc_test("webrtc_nonparallel_tests") { testonly = true deps = [ "rtc_base:rtc_base_nonparallel_tests" ] diff --git a/infra/specs/client.webrtc.perf.json b/infra/specs/client.webrtc.perf.json index 5901abd5f1..4f61d9ce6d 100644 --- a/infra/specs/client.webrtc.perf.json +++ b/infra/specs/client.webrtc.perf.json @@ -30,7 +30,6 @@ "android_devices": "1", "device_os": "M", "device_type": "shamu", - "gce": 0, "os": "Android", "pool": "WebRTC-perf" } @@ -66,7 +65,6 @@ "android_devices": "1", "device_os": "M", "device_type": "shamu", - "gce": 0, "os": "Android", "pool": "WebRTC-perf" } @@ -110,7 +108,6 @@ "android_devices": "1", "device_os": "M", "device_type": "hammerhead", - "gce": 0, "os": "Android", "pool": "WebRTC-perf" } @@ -146,7 +143,6 @@ "android_devices": "1", "device_os": "M", "device_type": "hammerhead", - "gce": 0, "os": "Android", "pool": "WebRTC-perf" } @@ -189,7 +185,6 @@ { "android_devices": "1", "device_type": "walleye", - "gce": 0, "os": "Android", "pool": "WebRTC-perf" } @@ -224,7 +219,6 @@ { "android_devices": "1", "device_type": "walleye", - "gce": 0, "os": "Android", "pool": "WebRTC-perf" } @@ -267,7 +261,6 @@ { "android_devices": "1", "device_type": "redfin", - "gce": 0, "os": "Android", "pool": "WebRTC-perf" } @@ -302,7 +295,6 @@ { "android_devices": "1", "device_type": "redfin", - "gce": 0, "os": "Android", "pool": "WebRTC-perf" } @@ -346,7 +338,6 @@ "android_devices": "1", "device_os": "MMB29Q", "device_type": "bullhead", - "gce": 0, "os": "Android", "pool": "WebRTC-perf" } @@ -382,7 +373,6 @@ "android_devices": "1", "device_os": "MMB29Q", "device_type": "bullhead", - "gce": 0, "os": "Android", "pool": "WebRTC-perf" } @@ -425,7 +415,6 @@ { "android_devices": "1", "device_type": "walleye", - "gce": 0, "os": "Android", "pool": "WebRTC-perf" } @@ -460,7 +449,6 @@ { "android_devices": "1", "device_type": "walleye", - "gce": 0, "os": "Android", "pool": "WebRTC-perf" } @@ -503,7 +491,6 @@ { "android_devices": "1", "device_type": "redfin", - "gce": 0, "os": "Android", "pool": "WebRTC-perf" } @@ -538,7 +525,6 @@ { "android_devices": "1", "device_type": "redfin", - "gce": 0, "os": "Android", "pool": "WebRTC-perf" } @@ -553,45 +539,7 @@ } ] }, - "Perf Fuchsia": { - "isolated_scripts": [ - { - "args": [ - "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb", - "--nologs" - ], - "idempotent": false, - "isolate_name": "fuchsia_perf_tests", - "merge": { - "args": [ - "--test-suite", - "fuchsia_perf_tests" - ], - "script": "//tools_webrtc/perf/process_perf_results.py" - }, - "name": "fuchsia_perf_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gce": 1, - "os": "Ubuntu-18.04", - "pool": "WebRTC-perf" - } - ], - "hard_timeout": 10800, - "io_timeout": 10800, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test_id_prefix": "ninja://:fuchsia_perf_tests/" - } - ] - }, + "Perf Fuchsia": {}, "Perf Linux Bionic": { "isolated_scripts": [ { @@ -617,7 +565,6 @@ "can_use_on_swarming_builders": true, "dimension_sets": [ { - "gce": 0, "os": "Ubuntu-18.04", "pool": "WebRTC-perf" } @@ -652,7 +599,6 @@ "can_use_on_swarming_builders": true, "dimension_sets": [ { - "gce": 0, "os": "Ubuntu-18.04", "pool": "WebRTC-perf" } @@ -691,7 +637,6 @@ "dimension_sets": [ { "cpu": "x86-64", - "gce": 0, "os": "Mac-11", "pool": "WebRTC-perf" } @@ -727,7 +672,6 @@ "dimension_sets": [ { "cpu": "x86-64", - "gce": 0, "os": "Mac-11", "pool": "WebRTC-perf" } @@ -765,7 +709,6 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "gce": 0, "os": "Mac-12", "pool": "WebRTC-perf" } @@ -803,7 +746,6 @@ "can_use_on_swarming_builders": true, "dimension_sets": [ { - "gce": 0, "os": "Windows-10", "pool": "WebRTC-perf" } @@ -838,7 +780,6 @@ "can_use_on_swarming_builders": true, "dimension_sets": [ { - "gce": 0, "os": "Windows-10", "pool": "WebRTC-perf" } diff --git a/infra/specs/gn_isolate_map.pyl b/infra/specs/gn_isolate_map.pyl index 7d1857225f..25ab4f2e2d 100644 --- a/infra/specs/gn_isolate_map.pyl +++ b/infra/specs/gn_isolate_map.pyl @@ -59,10 +59,6 @@ "label": "//sdk/android:android_instrumentation_test_apk", "type": "console_test_launcher", }, - "fuchsia_perf_tests": { - "label": "//:fuchsia_perf_tests", - "type": "raw", - }, "low_bandwidth_audio_test": { "label": "//audio:low_bandwidth_audio_test", "type": "console_test_launcher", diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index 84cacd70b1..626c26fad8 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -192,15 +192,6 @@ 'args': ['--out-dir', '${ISOLATED_OUTDIR}'] } }, - 'perf-fuchsia-perf-tests': { - 'merge': { - 'script': '//tools_webrtc/perf/process_perf_results.py', - 'args': ['--test-suite', 'fuchsia_perf_tests'] - }, - '$mixin_append': { - 'args': ['--nologs'] - } - }, 'perf-low-bandwidth-audio-perf-test': { 'merge': { 'script': '//tools_webrtc/perf/process_perf_results.py', @@ -218,17 +209,7 @@ 'swarming': { 'idempotent': False, 'dimensions': { - 'pool': 'WebRTC-perf', - 'gce': 0 - } - } - }, - 'perf-pool-vm': { - 'idempotent': False, - 'swarming': { - 'dimensions': { - 'pool': 'WebRTC-perf', - 'gce': 1 + 'pool': 'WebRTC-perf' } } }, diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl index 65cabfa4e9..f026f7fa04 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl @@ -136,15 +136,6 @@ } } }, - 'perf-fuchsia-perf-tests': { - 'merge': { - 'script': '//tools_webrtc/perf/process_perf_results.py', - 'args': ['--test-suite', 'fuchsia_perf_tests'], - }, - '$mixin_append': { - 'args': ['--nologs'], - }, - }, 'perf-low-bandwidth-audio-perf-test': { 'merge': { 'script': '//tools_webrtc/perf/process_perf_results.py', @@ -166,16 +157,6 @@ 'idempotent': False, 'dimensions': { 'pool': 'WebRTC-perf', - 'gce': 0, - }, - }, - }, - 'perf-pool-vm': { - 'idempotent': False, - 'swarming': { - 'dimensions': { - 'pool': 'WebRTC-perf', - 'gce': 1, }, }, }, diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl index ece0551f69..0769355409 100644 --- a/infra/specs/test_suites.pyl +++ b/infra/specs/test_suites.pyl @@ -116,11 +116,6 @@ 'voip_unittests': {}, 'webrtc_nonparallel_tests': {}, }, - 'fuchsia_compatible_perf_tests': { - 'fuchsia_perf_tests': { - 'mixins': ['perf-fuchsia-perf-tests'], - }, - }, 'fuchsia_compatible_tests': { 'audio_decoder_unittests': {}, 'common_audio_unittests': {}, diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index e91569af2b..255ff3a991 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -337,13 +337,13 @@ 'os_type': 'linux', 'mixins': [ - 'linux-bionic', 'x86-64', 'perf-pool-vm', 'timeout-3h', - 'perf-output', 'has_native_resultdb_integration', - 'chromium-tester-service-account' + 'linux-bionic', 'x86-64', 'perf-pool', 'timeout-3h', 'perf-output', + 'has_native_resultdb_integration', 'chromium-tester-service-account' ], - 'test_suites': { - 'isolated_scripts': 'fuchsia_compatible_perf_tests', - } + # TODO(b/232740856): Reenable when Fuchsia has it's own bot to run perf tests. + # 'test_suites': { + #  'isolated_scripts': 'desktop_perf_tests', + # } }, 'Perf Linux Bionic': { 'os_type':