Revert "Refactoring: Make gtest testsuite the default."

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-benchmarks.py --arch ia32 some_suite.json
+Call e.g. with tools/run-perf.py --arch ia32 some_suite.json
 
 The suite json format is expected to be:
 {
-  "path": <relative path chunks to benchmark resources and main file>,
+  "path": <relative path chunks to perf resources and main file>,
   "name": <optional suite name, file name is default>,
   "archs": [<architecture name for which this suite is run>, ...],
   "binary": <name of binary to run, default "d8">,
   "flags": [<flag to d8>, ...],
   "run_count": <how often will this suite run (optional)>,
   "run_count_XXX": <how often will this suite run for arch XXX (optional)>,
   "resources": [<js file to be loaded before main>, ...]
-  "main": <main js benchmark runner file>,
+  "main": <main js perf runner file>,
   "results_regexp": <optional regexp>,
   "results_processor": <optional python results processor script>,
   "units": <the unit specification for the performance dashboard>,
-  "benchmarks": [
+  "tests": [
     {
-      "name": <name of the benchmark>,
+      "name": <name of the trace>,
       "results_regexp": <optional more specific regexp>,
       "results_processor": <optional python results processor script>,
       "units": <the unit specification for the performance dashboard>,
     }, ...
   ]
 }
 
-The benchmarks field can also nest other suites in arbitrary depth. A suite
+The tests field can also nest other suites in arbitrary depth. A suite
 with a "main" file is a leaf suite that can contain one more level of
-benchmarks.
+tests.
 
 A suite's results_regexp is expected to have one string place holder
-"%s" for the benchmark name. A benchmark's results_regexp overwrites suite
+"%s" for the trace name. A trace's results_regexp overwrites suite
 defaults.
 
 A suite's results_processor may point to an optional python script. If
-specified, it is called after running the benchmarks like this (with a path
+specified, it is called after running the tests like this (with a path
 relatve to the suite level's path):
 <results_processor file> <same flags as for d8> <suite level name> <output>
 
 The <output> is a temporary file containing d8 output. The results_regexp will
 be applied to the output of this script.
 
-A suite without "benchmarks" is considered a benchmark itself.
+A suite without "tests" is considered a performance test itself.
 
 Full example (suite with one runner):
 {
   "path": ["."],
   "flags": ["--expose-gc"],
   "archs": ["ia32", "x64"],
   "run_count": 5,
   "run_count_ia32": 3,
   "main": "run.js",
   "results_regexp": "^%s: (.+)$",
   "units": "score",
-  "benchmarks": [
+  "tests": [
     {"name": "Richards"},
     {"name": "DeltaBlue"},
     {"name": "NavierStokes",
      "results_regexp": "^NavierStokes: (.+)$"}
   ]
 }
 
 Full example (suite with several runners):
 {
   "path": ["."],
   "flags": ["--expose-gc"],
   "archs": ["ia32", "x64"],
   "run_count": 5,
   "units": "score",
-  "benchmarks": [
+  "tests": [
     {"name": "Richards",
      "path": ["richards"],
      "main": "run.js",
      "run_count": 3,
      "results_regexp": "^Richards: (.+)$"},
     {"name": "NavierStokes",
      "path": ["navier_stokes"],
      "main": "run.js",
      "results_regexp": "^NavierStokes: (.+)$"}
   ]
@@ skipping 54 matching lines @@
   def __add__(self, other):
     self.traces += other.traces
     self.errors += other.errors
     return self
 
   def __str__(self):  # pragma: no cover
     return str(self.ToDict())
 
 
 class Node(object):
-  """Represents a node in the benchmark suite tree structure."""
+  """Represents a node in the suite tree structure."""
   def __init__(self, *args):
     self._children = []
 
   def AppendChild(self, child):
     self._children.append(child)
 
 
 class DefaultSentinel(Node):
   """Fake parent node with all default values."""
   def __init__(self):
     super(DefaultSentinel, self).__init__()
     self.binary = "d8"
     self.run_count = 10
     self.path = []
     self.graphs = []
     self.flags = []
     self.resources = []
     self.results_regexp = None
     self.stddev_regexp = None
     self.units = "score"
     self.total = False
 
 
 class Graph(Node):
-  """Represents a benchmark suite definition.
+  """Represents a suite definition.
 
   Can either be a leaf or an inner node that provides default values.
   """
   def __init__(self, suite, parent, arch):
     super(Graph, self).__init__()
     self._suite = suite
 
     assert isinstance(suite.get("path", []), list)
     assert isinstance(suite["name"], basestring)
     assert isinstance(suite.get("flags", []), list)
@@ skipping 25 matching lines @@
 
     # A similar regular expression for the standard deviation (optional).
     if parent.stddev_regexp:
       stddev_default = parent.stddev_regexp % re.escape(suite["name"])
     else:
       stddev_default = None
     self.stddev_regexp = suite.get("stddev_regexp", stddev_default)
 
 
 class Trace(Graph):
-  """Represents a leaf in the benchmark suite tree structure.
+  """Represents a leaf in the suite tree structure.
 
   Handles collection of measurements.
   """
   def __init__(self, suite, parent, arch):
     super(Trace, self).__init__(suite, parent, arch)
     assert self.results_regexp
     self.results = []
     self.errors = []
     self.stddev = ""
 
   def ConsumeOutput(self, stdout):
     try:
       self.results.append(
           re.search(self.results_regexp, stdout, re.M).group(1))
     except:
-      self.errors.append("Regexp \"%s\" didn't match for benchmark %s."
+      self.errors.append("Regexp \"%s\" didn't match for test %s."
                          % (self.results_regexp, self.graphs[-1]))
 
     try:
       if self.stddev_regexp and self.stddev:
-        self.errors.append("Benchmark %s should only run once since a stddev "
-                           "is provided by the benchmark." % self.graphs[-1])
+        self.errors.append("Test %s should only run once since a stddev "
+                           "is provided by the test." % self.graphs[-1])
       if self.stddev_regexp:
         self.stddev = re.search(self.stddev_regexp, stdout, re.M).group(1)
     except:
-      self.errors.append("Regexp \"%s\" didn't match for benchmark %s."
+      self.errors.append("Regexp \"%s\" didn't match for test %s."
                          % (self.stddev_regexp, self.graphs[-1]))
 
   def GetResults(self):
     return Results([{
       "graphs": self.graphs,
       "units": self.units,
       "results": self.results,
       "stddev": self.stddev,
     }], self.errors)
 
 
 class Runnable(Graph):
-  """Represents a runnable benchmark suite definition (i.e. has a main file).
+  """Represents a runnable suite definition (i.e. has a main file).
   """
   @property
   def main(self):
     return self._suite.get("main", "")
 
   def ChangeCWD(self, suite_path):
     """Changes the cwd to to path defined in the current graph.
 
-    The benchmarks are supposed to be relative to the suite configuration.
+    The tests are supposed to be relative to the suite configuration.
     """
     suite_dir = os.path.abspath(os.path.dirname(suite_path))
     bench_dir = os.path.normpath(os.path.join(*self.path))
     os.chdir(os.path.join(suite_dir, bench_dir))
 
   def GetCommand(self, shell_dir):
     # TODO(machenbach): This requires +.exe if run on windows.
     return (
       [os.path.join(shell_dir, self.binary)] +
       self.flags +
@@ skipping 24 matching lines @@
                      for i in range(0, n_results)]
     res.traces.append({
       "graphs": self.graphs + ["Total"],
       "units": res.traces[0]["units"],
       "results": total_results,
       "stddev": "",
     })
     return res
 
 class RunnableTrace(Trace, Runnable):
-  """Represents a runnable benchmark suite definition that is a leaf."""
+  """Represents a runnable suite definition that is a leaf."""
   def __init__(self, suite, parent, arch):
     super(RunnableTrace, self).__init__(suite, parent, arch)
 
   def Run(self, runner):
     """Iterates over several runs and handles the output."""
     for stdout in runner():
       self.ConsumeOutput(stdout)
     return self.GetResults()
 
 
 class RunnableGeneric(Runnable):
-  """Represents a runnable benchmark suite definition with generic traces."""
+  """Represents a runnable suite definition with generic traces."""
   def __init__(self, suite, parent, arch):
     super(RunnableGeneric, self).__init__(suite, parent, arch)
 
   def Run(self, runner):
     """Iterates over several runs and handles the output."""
     traces = {}
     for stdout in runner():
       for line in stdout.strip().splitlines():
         match = GENERIC_RESULTS_RE.match(line)
         if match:
@@ skipping 12 matching lines @@
     return reduce(lambda r, t: r + t, traces.itervalues(), Results())
 
 
 def MakeGraph(suite, arch, parent):
   """Factory method for making graph objects."""
   if isinstance(parent, Runnable):
     # Below a runnable can only be traces.
     return Trace(suite, parent, arch)
   elif suite.get("main"):
     # A main file makes this graph runnable.
-    if suite.get("benchmarks"):
-      # This graph has subbenchmarks (traces).
+    if suite.get("tests"):
+      # This graph has subgraphs (traces).
       return Runnable(suite, parent, arch)
     else:
-      # This graph has no subbenchmarks, it's a leaf.
+      # This graph has no subgraphs, it's a leaf.
       return RunnableTrace(suite, parent, arch)
   elif suite.get("generic"):
     # This is a generic suite definition. It is either a runnable executable
     # or has a main js file.
     return RunnableGeneric(suite, parent, arch)
-  elif suite.get("benchmarks"):
+  elif suite.get("tests"):
     # This is neither a leaf nor a runnable.
     return Graph(suite, parent, arch)
   else:  # pragma: no cover
-    raise Exception("Invalid benchmark suite configuration.")
+    raise Exception("Invalid suite configuration.")
 
 
 def BuildGraphs(suite, arch, parent=None):
   """Builds a tree structure of graph objects that corresponds to the suite
   configuration.
   """
   parent = parent or DefaultSentinel()
 
   # TODO(machenbach): Implement notion of cpu type?
   if arch not in suite.get("archs", ["ia32", "x64"]):
     return None
 
   graph = MakeGraph(suite, arch, parent)
-  for subsuite in suite.get("benchmarks", []):
+  for subsuite in suite.get("tests", []):
     BuildGraphs(subsuite, arch, graph)
   parent.AppendChild(graph)
   return graph
 
 
 def FlattenRunnables(node):
   """Generator that traverses the tree structure and iterates over all
   runnables.
   """
   if isinstance(node, Runnable):
     yield node
   elif isinstance(node, Node):
     for child in node._children:
       for result in FlattenRunnables(child):
         yield result
   else:  # pragma: no cover
-    raise Exception("Invalid benchmark suite configuration.")
+    raise Exception("Invalid suite configuration.")
 
 
 # TODO: Implement results_processor.
 def Main(args):
   parser = optparse.OptionParser()
   parser.add_option("--arch",
                     help=("The architecture to run tests for, "
                           "'auto' or 'native' for auto-detect"),
                     default="x64")
   parser.add_option("--buildbot",
@@ skipping 22 matching lines @@
     shell_dir = os.path.join(workspace, options.outdir, "Release")
   else:
     shell_dir = os.path.join(workspace, options.outdir,
                              "%s.release" % options.arch)
 
   results = Results()
   for path in args:
     path = os.path.abspath(path)
 
     if not os.path.exists(path):  # pragma: no cover
-      results.errors.append("Benchmark file %s does not exist." % path)
+      results.errors.append("Configuration file %s does not exist." % path)
       continue
 
     with open(path) as f:
       suite = json.loads(f.read())
 
     # If no name is given, default to the file name without .json.
     suite.setdefault("name", os.path.splitext(os.path.basename(path))[0])
 
     for runnable in FlattenRunnables(BuildGraphs(suite, options.arch)):
       print ">>> Running suite: %s" % "/".join(runnable.graphs)
@@ skipping 18 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:]))