diff options
| author | Tiancong Wang <tcwang@google.com> | 2019-08-23 16:36:12 -0700 |
|---|---|---|
| committer | Tiancong Wang <tcwang@google.com> | 2019-08-26 22:05:14 +0000 |
| commit | 329ad31d97551b4a1cc81529193cb40c951b4820 (patch) | |
| tree | 58b1e5ac2924f2c855bec14036eb3ccb35b2a8f9 | |
| parent | 5edca5060f78aa51cb2730051f78b9251b1d9d34 (diff) | |
| download | toolchain-utils-329ad31d97551b4a1cc81529193cb40c951b4820.tar.gz | |
crosperf: Add jetstream2 to telemetry perf tests.
As jetstream2 is added to telemetry benchmarks, we want to add it
to the list of telemetry toolchain perf tests, and add supports
in crosperf.
Also fixed some formatting problems of the file.
BUG=None
TEST=jetstream2 run locally, will be tested more on nightly tests.
Change-Id: I89f748ca8d4a194406688733e91cca47f8a3f5fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1769482
Reviewed-by: Caroline Tice <cmtice@chromium.org>
Commit-Queue: Tiancong Wang <tcwang@google.com>
Tested-by: Tiancong Wang <tcwang@google.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
| -rw-r--r-- | crosperf/default-telemetry-results.json | 3 | ||||
| -rw-r--r-- | crosperf/experiment_factory.py | 11 |
2 files changed, 7 insertions, 7 deletions
diff --git a/crosperf/default-telemetry-results.json b/crosperf/default-telemetry-results.json index fb593684..e8d387c7 100644 --- a/crosperf/default-telemetry-results.json +++ b/crosperf/default-telemetry-results.json @@ -153,6 +153,9 @@ "jetstream": [ "Score" ], + "jetstream2": [ + "Score" + ], "cros_ui_smoothness": [ "ui_percentage_smooth" ], diff --git a/crosperf/experiment_factory.py b/crosperf/experiment_factory.py index 7bc6e9fe..30514ed1 100644 --- a/crosperf/experiment_factory.py +++ b/crosperf/experiment_factory.py @@ -51,10 +51,7 @@ telemetry_toolchain_old_perf_tests = [ 'tab_switching.top_10', ] telemetry_toolchain_perf_tests = [ - 'octane', - 'kraken', - 'speedometer', - 'speedometer2', + 'octane', 'kraken', 'speedometer', 'speedometer2', 'jetstream2' ] graphics_perf_tests = [ 'graphics_GLBench', @@ -202,8 +199,8 @@ class ExperimentFactory(object): if '--story-filter=' in arg or '--story-tag-filter=' in arg: story_count += 1 if story_count > 1: - raise RuntimeError("Only one story or story-tag filter allowed in " - "a single benchmark run") + raise RuntimeError('Only one story or story-tag filter allowed in ' + 'a single benchmark run') # Rename benchmark name with an extension of 'story'-option benchmark_name = '%s@@%s' % (benchmark_name, arg.split('=')[-1]) @@ -507,6 +504,6 @@ class ExperimentFactory(object): raise RuntimeError('Skylab tool not installed correctly, please try to ' 'manually install it from %s' % setup_lab_tools) l.LogOutput('Skylab is installed at %s, please login before first use. ' - 'Login by running \'skylab login\' and follow instructions.' % + 'Login by running "skylab login" and follow instructions.' % SKYLAB_PATH) return False |