diff options
| author | Zhizhou Yang <zhizhouy@google.com> | 2019-04-24 15:19:33 -0700 |
|---|---|---|
| committer | Zhizhou Yang <zhizhouy@google.com> | 2019-04-25 22:01:20 +0000 |
| commit | 3663e85d9af7420c7d2afc2e50f41287938bdf0c (patch) | |
| tree | 7b5af7c80cf0bcec45cff218b46ddab01cc5064a /crosperf | |
| parent | 0f6b2486208d213ddb61beb8825003100fd619c7 (diff) | |
| download | toolchain-utils-3663e85d9af7420c7d2afc2e50f41287938bdf0c.tar.gz | |
crosperf: Use --fast to prevent copying sysinfo for telemetry_Crosperf
We don't need sysinfo collected by perf from DUT. --fast will stop
copying sysinfo but was orignially disabled for profiling runs because
of a conflict in autotest profiler. Now that we don't use autotest
profiler any more, this patch will turn on --fast for telemetry_Crosperf
no matter profiler_args are present or not.
BUG=chromium:956174
TEST=Passed unit tests; Tested both with profiler_args and without,
checked the sysinfo directory and it was empty.
Change-Id: Id99db48d6ae9043309c5113d0a6d9afd6e3c095b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1583018
Reviewed-by: Luis Lozano <llozano@chromium.org>
Tested-by: Zhizhou Yang <zhizhouy@google.com>
Diffstat (limited to 'crosperf')
| -rw-r--r-- | crosperf/suite_runner.py | 8 | ||||
| -rwxr-xr-x | crosperf/suite_runner_unittest.py | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/crosperf/suite_runner.py b/crosperf/suite_runner.py index a4191948..0318db19 100644 --- a/crosperf/suite_runner.py +++ b/crosperf/suite_runner.py @@ -2,6 +2,7 @@ # Copyright (c) 2013 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. + """SuiteRunner defines the interface from crosperf to test script.""" from __future__ import print_function @@ -227,11 +228,8 @@ class SuiteRunner(object): autotest_dir_arg = '--autotest_dir %s' % label.autotest_path profiler_args = GetProfilerArgs(profiler_args) - fast_arg = '' - if not profiler_args: - # --fast works unless we are doing profiling (autotest limitation). - # --fast avoids unnecessary copies of syslogs. - fast_arg = '--fast' + # --fast avoids unnecessary copies of syslogs. + fast_arg = '--fast' args_string = '' if test_args: # Strip double quotes off args (so we can wrap them in single diff --git a/crosperf/suite_runner_unittest.py b/crosperf/suite_runner_unittest.py index 4da27e17..081c828a 100755 --- a/crosperf/suite_runner_unittest.py +++ b/crosperf/suite_runner_unittest.py @@ -292,8 +292,8 @@ class SuiteRunnerTest(unittest.TestCase): self.assertEqual(args_list[0], '/tmp/chromeos') self.assertEqual(args_list[1], ('/usr/bin/test_that --autotest_dir ' - '~/trunk/src/third_party/autotest/files ' - ' --board=lumpy --args=" run_local=False test=octane ' + '~/trunk/src/third_party/autotest/files --fast ' + '--board=lumpy --args=" run_local=False test=octane ' 'profiler=custom_perf profiler_args=\'record -a -e ' 'cycles,instructions\'" lumpy1.cros telemetry_Crosperf')) self.assertEqual(args_dict['cros_sdk_options'], |