Perfhost for ubuntu trusty

Review URL: https://codereview.chromium.org/474933005

Cr-Commit-Position: refs/heads/master@{#292930}

tools/profile_chrome/perf_controller.py

@@ -164,7 +164,8 @@ class PerfProfilerController(controllers.BaseController):
                                                     symfs_dir,
                                                     required_libs,
                                                     use_symlinks=False)
-    perfhost_path = support_binaries.FindPath('perfhost', 'linux')
+    perfhost_path = support_binaries.FindPath(
+        android_profiling_helper.GetPerfhostName(), 'linux')
 
     ui.PrintMessage('\nNote: to view the profile in perf, run:')
     ui.PrintMessage('  ' + self._GetInteractivePerfCommand(perfhost_path,

tools/telemetry/bin/README.chromium

@@ -12,3 +12,23 @@ IEDriverServer binary:
 
 ipfw and ipfw_mod.ko:
   Version 20120812
+
+perfhost_trusty:
+  Built from kernel sources following this method:
+  shell> git clone https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux
+  shell> cd linux
+  shell> git checkout v3.13
+  shell> cd tools/perf
+  shell> make
+  shell> ./perf test
+  Tests should mostly pass, except a few:
+   1: vmlinux symtab matches kallsyms                        : FAILED!
+   2: detect open syscall event                              : FAILED!
+   3: detect open syscall event on all cpus                  : FAILED!
+   4: read samples using the mmap interface                  : FAILED!
+   5: parse events tests                                     : FAILED!
+   [snip]
+   11: Check parsing of sched tracepoints fields              : FAILED!
+   12: Generate and check syscalls:sys_enter_open event fields: FAILED!
+   21: Test object code reading          :[kernel.kallsyms] ... FAILED!
+  shell> mv perf perfhost_trusty

tools/telemetry/bin/linux/perfhost_precise.sha1

+ddb9b3508fe3e8b056071fc7c3d069d13635d371
\ No newline at end of file

tools/telemetry/bin/linux/perfhost_trusty.sha1

+dabf42e27eb92f84eeb467436b06cf26e9a5a067
\ No newline at end of file

tools/telemetry/telemetry/core/platform/linux_platform_backend.py

@@ -15,6 +15,12 @@ from telemetry.util import cloud_storage
 from telemetry.util import support_binaries
 
 
+_POSSIBLE_PERFHOST_APPLICATIONS = [
+  'perfhost_precise',
+  'perfhost_trusty',
+]
+
+
 class LinuxPlatformBackend(
     posix_platform_backend.PosixPlatformBackend,
     linux_based_platform_backend.LinuxBasedPlatformBackend):
@@ -74,9 +80,9 @@ class LinuxPlatformBackend(
     if application == 'ipfw':
       self._InstallIpfw()
     elif application == 'avconv':
-      self._InstallBinary(application, 'libav-tools')
-    elif application == 'perfhost':
-      self._InstallBinary(application, 'linux-tools')
+      self._InstallBinary(application, fallback_package='libav-tools')
+    elif application in _POSSIBLE_PERFHOST_APPLICATIONS:
+      self._InstallBinary(application)
     else:
       raise NotImplementedError(
           'Please teach Telemetry how to install ' + application)
@@ -114,6 +120,8 @@ class LinuxPlatformBackend(
 
   def _InstallBinary(self, bin_name, fallback_package=None):
     bin_path = support_binaries.FindPath(bin_name, self.GetOSName())
+    if not bin_path:
+      raise Exception('Could not find the binary package %s' % bin_name)
     os.environ['PATH'] += os.pathsep + os.path.dirname(bin_path)
 
     try:
@@ -122,8 +130,8 @@ class LinuxPlatformBackend(
     except cloud_storage.CloudStorageError, e:
       logging.error(str(e))
       if fallback_package:
-        logging.error('You may proceed by manually installing %s via:\n'
-                      'sudo apt-get install %s' % (bin_name, fallback_package))
-      sys.exit(1)
+        raise Exception('You may proceed by manually installing %s via:\n'
+                        'sudo apt-get install %s' %
+                        (bin_name, fallback_package))
 
     assert self.CanLaunchApplication(bin_name), 'Failed to install ' + bin_name

tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper.py

@@ -11,6 +11,8 @@ import re
 import shutil
 import subprocess
 
+from telemetry import decorators
+from telemetry.core import platform as telemetry_platform
 from telemetry.core import util
 from telemetry.core.platform.profiler import android_prebuilt_profiler_helper
 from telemetry.util import support_binaries
@@ -81,6 +83,11 @@ def _FindMatchingUnstrippedLibraryOnHost(device, lib):
   return unstripped_host_lib
 
 
+@decorators.Cache
+def GetPerfhostName():
+  return 'perfhost_' + telemetry_platform.GetHostPlatform().GetOSVersionName()
+
+
 # Ignored directories for libraries that aren't useful for symbolization.
 _IGNORED_LIB_PATHS = [
   '/data/dalvik-cache',
@@ -98,7 +105,7 @@ def GetRequiredLibrariesForPerfProfile(profile_file):
     A set of required library file names.
   """
   with open(os.devnull, 'w') as dev_null:
-    perfhost_path = support_binaries.FindPath('perfhost', 'linux')
+    perfhost_path = support_binaries.FindPath(GetPerfhostName(), 'linux')
     perf = subprocess.Popen([perfhost_path, 'script', '-i', profile_file],
                              stdout=dev_null, stderr=subprocess.PIPE)
     _, output = perf.communicate()

tools/telemetry/telemetry/core/platform/profiler/perf_profiler.py

@@ -10,6 +10,8 @@ import subprocess
 import sys
 import tempfile
 
+from pylib.device import device_errors  # pylint: disable=F0401
+
 from telemetry.core import platform
 from telemetry.core import util
 from telemetry.core.platform import profiler
@@ -52,10 +54,11 @@ def _PrepareHostForPerf():
 
 
 def _InstallPerfHost():
+  perfhost_name = android_profiling_helper.GetPerfhostName()
   host = platform.GetHostPlatform()
-  if not host.CanLaunchApplication('perfhost'):
-    host.InstallApplication('perfhost')
-  return support_binaries.FindPath('perfhost', host.GetOSName())
+  if not host.CanLaunchApplication(perfhost_name):
+    host.InstallApplication(perfhost_name)
+  return support_binaries.FindPath(perfhost_name, 'linux')
 
 
 class _SingleProcessPerfProfiler(object):
@@ -100,7 +103,10 @@ class _SingleProcessPerfProfiler(object):
                       '"--extra-browser-args=--single-process"')
     if self._is_android:
       device = self._browser_backend.adb.device()
-      device.KillAll('perf', signum=signal.SIGINT, blocking=True)
+      try:
+        device.KillAll('perf', signum=signal.SIGINT, blocking=True)
+      except device_errors.CommandFailedError:
+        logging.warning('The perf process could not be killed on the device.')
     self._proc.send_signal(signal.SIGINT)
     exit_code = self._proc.wait()
     try:
@@ -221,8 +227,8 @@ class PerfProfiler(profiler.Profiler):
     with open(os.devnull, 'w') as devnull:
       _InstallPerfHost()
       report = subprocess.Popen(
-          ['perfhost', 'report', '--show-total-period', '-U', '-t', '^', '-i',
-           file_name],
+          [android_profiling_helper.GetPerfhostName(),
+           'report', '--show-total-period', '-U', '-t', '^', '-i', file_name],
           stdout=subprocess.PIPE, stderr=devnull).communicate()[0]
     period_by_function = {}
     for line in report.split('\n'):