Make JSTests ready for Android measurements.

tools/run_perf.py

 #!/usr/bin/env python
 # Copyright 2014 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Performance runner for d8.
 
 Call e.g. with tools/run-perf.py --arch ia32 some_suite.json
 
@@ skipping 201 matching lines @@
     assert isinstance(suite["name"], basestring)
     assert isinstance(suite.get("flags", []), list)
     assert isinstance(suite.get("test_flags", []), list)
     assert isinstance(suite.get("resources", []), list)
 
     # Accumulated values.
     self.path = parent.path[:] + suite.get("path", [])
     self.graphs = parent.graphs[:] + [suite["name"]]
     self.flags = parent.flags[:] + suite.get("flags", [])
     self.test_flags = parent.test_flags[:] + suite.get("test_flags", [])
-    self.resources = parent.resources[:] + suite.get("resources", [])
+
+    # Values independent of parent node.
+    self.resources = suite.get("resources", [])
 
     # Descrete values (with parent defaults).
     self.binary = suite.get("binary", parent.binary)
     self.run_count = suite.get("run_count", parent.run_count)
     self.run_count = suite.get("run_count_%s" % arch, self.run_count)
     self.timeout = suite.get("timeout", parent.timeout)
     self.timeout = suite.get("timeout_%s" % arch, self.timeout)
     self.units = suite.get("units", parent.units)
     self.total = suite.get("total", parent.total)
 
@@ skipping 279 matching lines @@
     self.pushed = set()
 
   def PostExecution(self):
     perf = perf_control.PerfControl(self.device)
     perf.SetDefaultPerfMode()
     self.device.RunShellCommand(
         ["rm", "-rf", "*"],
         cwd=AndroidPlatform.DEVICE_DIR,
     )
 
-  def _PushFile(self, host_dir, file_name):
+  def _PushFile(self, host_dir, file_name, target_rel="."):
     file_on_host = os.path.join(host_dir, file_name)
-    file_on_device = AndroidPlatform.DEVICE_DIR + file_name
+    file_on_device = os.path.join(
+        AndroidPlatform.DEVICE_DIR, target_rel, file_name)
 
     # Only push files not yet pushed in one execution.
     if file_on_host in self.pushed:
       return
     else:
       self.pushed.add(file_on_host)
 
     logging.info("adb push %s %s" % (file_on_host, file_on_device))
     self.adb.Push(file_on_host, file_on_device)
 
   def PreTests(self, node, path):
     suite_dir = os.path.abspath(os.path.dirname(path))
     if node.path:
-      bench_dir = os.path.join(suite_dir,
-                               os.path.normpath(os.path.join(*node.path)))
+      bench_rel = os.path.normpath(os.path.join(*node.path))
+      bench_abs = os.path.join(suite_dir, bench_rel)
     else:
-      bench_dir = suite_dir
+      bench_rel = "."
+      bench_abs = suite_dir
 
     self._PushFile(self.shell_dir, node.binary)
     if isinstance(node, Runnable):
-      self._PushFile(bench_dir, node.main)
+      self._PushFile(bench_abs, node.main, bench_rel)
     for resource in node.resources:
-      self._PushFile(bench_dir, resource)
+      self._PushFile(bench_abs, resource, bench_rel)
 
   def Run(self, runnable, count):
     cache = cache_control.CacheControl(self.device)
     cache.DropRamCaches()
     binary_on_device = AndroidPlatform.DEVICE_DIR + runnable.binary
     cmd = [binary_on_device] + runnable.GetCommandFlags()
+
+    # Relative path to benchmark directory.
+    if runnable.path:
+      bench_rel = os.path.normpath(os.path.join(*runnable.path))
+    else:
+      bench_rel = "."
+
     try:
       output = self.device.RunShellCommand(
           cmd,
-          cwd=AndroidPlatform.DEVICE_DIR,
+          cwd=os.path.join(AndroidPlatform.DEVICE_DIR, bench_rel),
           timeout=runnable.timeout,
           retries=0,
       )
       stdout = "\n".join(output)
       print ">>> Stdout (#%d):" % (count + 1)
       print stdout
     except device_errors.CommandTimeoutError:
       print ">>> Test timed out after %ss." % runnable.timeout
       stdout = ""
     return stdout
@@ skipping 95 matching lines @@
 
   if options.json_test_results:
     results.WriteToFile(options.json_test_results)
   else:  # pragma: no cover
     print results
 
   return min(1, len(results.errors))
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(Main(sys.argv[1:]))