diff options
| author | Yunlian Jiang <yunlian@google.com> | 2017-01-23 10:06:55 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-01-23 12:38:59 -0800 |
| commit | 5775e7e3e85529f18220d5d6bc47df6c2fc79a6a (patch) | |
| tree | d31b330a9e4f5cde91eff2873c3c4f2c2974829f | |
| parent | 3fb928efb42405e386da41adf4bd674e86e23022 (diff) | |
| download | toolchain-utils-5775e7e3e85529f18220d5d6bc47df6c2fc79a6a.tar.gz | |
remove perf binary from toolchain-utils.
This reverts this CL
https://chrome-internal-review.googlesource.com/#/c/157756/,
because the bug in perf is gone.
BUG=chromium:665988
TEST=run a crosperf with perf, the report report is correct.
No 20-50% of the report attributed to 'chrome [unknown]'.
run_test.sh passes.
Change-Id: I4b2b18e9653d95bde5caf076114bf53a84c2a4fd
Reviewed-on: https://chromium-review.googlesource.com/431234
Commit-Ready: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
Reviewed-by: Caroline Tice <cmtice@chromium.org>
| -rw-r--r-- | crosperf/results_cache.py | 14 | ||||
| -rwxr-xr-x | crosperf/results_cache_unittest.py | 2 | ||||
| -rwxr-xr-x | perf.static | bin | 31722657 -> 0 bytes |
3 files changed, 1 insertions, 15 deletions
diff --git a/crosperf/results_cache.py b/crosperf/results_cache.py index b8c31c8f..29e118e8 100644 --- a/crosperf/results_cache.py +++ b/crosperf/results_cache.py @@ -240,20 +240,6 @@ class Result(object): if os.path.exists(perf_path): perf_file = '/usr/bin/perf' - # The following is a hack, to use the perf.static binary that - # was given to us by Stephane Eranian, until he can figure out - # why "normal" perf cannot properly symbolize ChromeOS perf.data files. - # Get the directory containing the 'crosperf' script. - dirname, _ = misc.GetRoot(sys.argv[0]) - perf_path = os.path.join(dirname, '..', 'perf.static') - if os.path.exists(perf_path): - # copy the executable into the chroot so that it can be found. - src_path = perf_path - dst_path = os.path.join(self.chromeos_root, 'chroot', 'tmp/perf.static') - command = 'cp %s %s' % (src_path, dst_path) - self.ce.RunCommand(command) - perf_file = '/tmp/perf.static' - command = ('%s report ' '-n ' '--symfs /build/%s ' diff --git a/crosperf/results_cache_unittest.py b/crosperf/results_cache_unittest.py index e478667b..9e97c9b1 100755 --- a/crosperf/results_cache_unittest.py +++ b/crosperf/results_cache_unittest.py @@ -544,7 +544,7 @@ class ResultTest(unittest.TestCase): self.assertEqual(tmp, ['/tmp/chroot%s' % fake_file]) self.assertEqual(mock_chrootruncmd.call_args_list[0][0], ('/tmp', - ('/tmp/perf.static report -n --symfs /build/lumpy ' + ('/usr/sbin/perf report -n --symfs /build/lumpy ' '--vmlinux /build/lumpy/usr/lib/debug/boot/vmlinux ' '--kallsyms /build/lumpy/boot/System.map-* -i ' '%s --stdio > %s') % (fake_file, fake_file))) diff --git a/perf.static b/perf.static Binary files differdeleted file mode 100755 index 48d09ba7..00000000 --- a/perf.static +++ /dev/null |