crosperf: Remove outdated tests
kraken was removed from telemetry. It is replaced by jetstream2 which is
already in some of crosperf suites.
While here remove other out-dated suites.
BUG=b:279523653
TEST=unit tests
Change-Id: Ie65e604df2c9b38541e3b62e54670bd6a8be9433
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/4475491
Tested-by: Denis Nikitin <denik@chromium.org>
Reviewed-by: George Burgess <gbiv@chromium.org>
Commit-Queue: Denis Nikitin <denik@chromium.org>
diff --git a/crosperf/experiment_factory.py b/crosperf/experiment_factory.py
index 2a9dae7..6d2ca0a 100644
--- a/crosperf/experiment_factory.py
+++ b/crosperf/experiment_factory.py
@@ -28,33 +28,8 @@
# specified sets. Here we define sets of tests that users may want
# to run together.
-telemetry_perfv2_tests = [
- "kraken",
- "octane",
-]
-
-telemetry_pagecycler_tests = [
- "page_cycler_v2.intl_ar_fa_he",
- "page_cycler_v2.intl_es_fr_pt-BR",
- "page_cycler_v2.intl_hi_ru",
- "page_cycler_v2.intl_ja_zh",
- "page_cycler_v2.intl_ko_th_vi",
- "page_cycler_v2.typical_25",
-]
-
-telemetry_toolchain_old_perf_tests = [
- "page_cycler_v2.intl_es_fr_pt-BR",
- "page_cycler_v2.intl_hi_ru",
- "page_cycler_v2.intl_ja_zh",
- "page_cycler_v2.intl_ko_th_vi",
- "page_cycler_v2.netsim.top_10",
- "page_cycler_v2.typical_25",
- "spaceport",
- "tab_switching.top_10",
-]
telemetry_toolchain_perf_tests = [
"octane",
- "kraken",
"speedometer",
"speedometer2",
"jetstream2",
@@ -68,13 +43,10 @@
]
# TODO: disable rendering.desktop by default as the benchmark is
# currently in a bad state
-# page_cycler_v2.typical_25 is deprecated and the recommend replacement is
-# loading.desktop@@typical (crbug.com/916340)
telemetry_crosbolt_perf_tests = [
"octane",
- "kraken",
"speedometer2",
- "jetstream",
+ "jetstream2",
"loading.desktop",
# 'rendering.desktop',
]
@@ -84,12 +56,6 @@
"tast.video.PlaybackPerfVP91080P30FPS",
]
-# 'cheets_AntutuTest',
-# 'cheets_PerfBootServer',
-# 'cheets_CandyCrushTest',
-# 'cheets_LinpackTest',
-# ]
-
dso_list = [
"all",
"chrome",
@@ -307,37 +273,7 @@
)
if suite == "telemetry_Crosperf":
- if test_name == "all_perfv2":
- self.AppendBenchmarkSet(
- benchmarks,
- telemetry_perfv2_tests,
- test_args,
- iterations,
- rm_chroot_tmp,
- perf_args,
- suite,
- show_all_results,
- retries,
- run_local,
- cwp_dso,
- weight,
- )
- elif test_name == "all_pagecyclers":
- self.AppendBenchmarkSet(
- benchmarks,
- telemetry_pagecycler_tests,
- test_args,
- iterations,
- rm_chroot_tmp,
- perf_args,
- suite,
- show_all_results,
- retries,
- run_local,
- cwp_dso,
- weight,
- )
- elif test_name == "all_crosbolt_perf":
+ if test_name == "all_crosbolt_perf":
self.AppendBenchmarkSet(
benchmarks,
telemetry_crosbolt_perf_tests,
@@ -400,21 +336,6 @@
# run_local=False,
# cwp_dso=cwp_dso,
# weight=weight))
- elif test_name == "all_toolchain_perf_old":
- self.AppendBenchmarkSet(
- benchmarks,
- telemetry_toolchain_old_perf_tests,
- test_args,
- iterations,
- rm_chroot_tmp,
- perf_args,
- suite,
- show_all_results,
- retries,
- run_local,
- cwp_dso,
- weight,
- )
else:
benchmark = Benchmark(
benchmark_name,
diff --git a/crosperf/experiment_factory_unittest.py b/crosperf/experiment_factory_unittest.py
index 8050ebd..2196fcd 100755
--- a/crosperf/experiment_factory_unittest.py
+++ b/crosperf/experiment_factory_unittest.py
@@ -259,7 +259,7 @@
bench_list = []
ef.AppendBenchmarkSet(
bench_list,
- experiment_factory.telemetry_perfv2_tests,
+ experiment_factory.telemetry_crosbolt_perf_tests,
"",
1,
False,
@@ -272,14 +272,15 @@
0,
)
self.assertEqual(
- len(bench_list), len(experiment_factory.telemetry_perfv2_tests)
+ len(bench_list),
+ len(experiment_factory.telemetry_crosbolt_perf_tests),
)
self.assertTrue(isinstance(bench_list[0], benchmark.Benchmark))
bench_list = []
ef.AppendBenchmarkSet(
bench_list,
- experiment_factory.telemetry_pagecycler_tests,
+ experiment_factory.telemetry_toolchain_perf_tests,
"",
1,
False,
@@ -292,7 +293,8 @@
0,
)
self.assertEqual(
- len(bench_list), len(experiment_factory.telemetry_pagecycler_tests)
+ len(bench_list),
+ len(experiment_factory.telemetry_toolchain_perf_tests),
)
self.assertTrue(isinstance(bench_list[0], benchmark.Benchmark))
