Run tests sorted by expected runtime.

tools/testrunner/local/execution.py

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 13 matching lines @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 import os
 import time
 
 from pool import Pool
 from . import commands
+from . import perfdata
 from . import utils
 
 
 class Job(object):
   def __init__(self, command, dep_command, test_id, timeout, verbose):
     self.command = command
     self.dep_command = dep_command
     self.id = test_id
     self.timeout = timeout
     self.verbose = verbose
 
 
 def RunTest(job):
   start_time = time.time()
   if job.dep_command is not None:
     dep_output = commands.Execute(job.dep_command, job.verbose, job.timeout)
     # TODO(jkummerow): We approximate the test suite specific function
     # IsFailureOutput() by just checking the exit code here. Currently
     # only cctests define dependencies, for which this simplification is
     # correct.
     if dep_output.exit_code != 0:
       return (job.id, dep_output, time.time() - start_time)
   output = commands.Execute(job.command, job.verbose, job.timeout)
   return (job.id, output, time.time() - start_time)
 
 class Runner(object):
 
   def __init__(self, suites, progress_indicator, context):
+    datapath = os.path.join("out", "testrunner_data")
+    self.perf_data_manager = perfdata.PerfDataManager(datapath)
+    self.perfdata = self.perf_data_manager.GetStore(context.arch, context.mode)
     self.tests = [ t for s in suites for t in s.tests ]
+    for t in self.tests:
+      t.duration = self.perfdata.FetchPerfData(t) or 1.0
     self._CommonInit(len(self.tests), progress_indicator, context)
 
   def _CommonInit(self, num_tests, progress_indicator, context):
     self.indicator = progress_indicator
     progress_indicator.runner = self
     self.context = context
     self.succeeded = 0
     self.total = num_tests
     self.remaining = num_tests
     self.failed = []
     self.crashed = 0
 
   def Run(self, jobs):
     self.indicator.Starting()
     self._RunInternal(jobs)
     self.indicator.Done()
     if self.failed or self.remaining:
       return 1
     return 0
 
   def _RunInternal(self, jobs):
     pool = Pool(jobs)
     test_map = {}
     # TODO(machenbach): Instead of filling the queue completely before
     # pool.imap_unordered, make this a generator that already starts testing
     # while the queue is filled.
     queue = []
     queued_exception = None
-    for test in self.tests:
+    for test in sorted(self.tests, key=lambda t: t.duration, reverse=True):
       assert test.id >= 0
       test_map[test.id] = test
       try:
         command = self.GetCommand(test)
       except Exception, e:
         # If this failed, save the exception and re-raise it later (after
         # all other tests have had a chance to run).
         queued_exception = e
         continue
       timeout = self.context.timeout
@@ skipping 15 matching lines @@
         test.output = result[1]
         test.duration = result[2]
         has_unexpected_output = test.suite.HasUnexpectedOutput(test)
         if has_unexpected_output:
           self.failed.append(test)
           if test.output.HasCrashed():
             self.crashed += 1
         else:
           self.succeeded += 1
         self.remaining -= 1
+        try:
+          self.perfdata.UpdatePerfData(test)
+        except Exception, e:
+          print("UpdatePerfData exception: %s" % e)
+          pass  # Just keep working.
         self.indicator.HasRun(test, has_unexpected_output)
     finally:
       pool.terminate()
     if queued_exception:
       raise queued_exception
 
 
   def GetCommand(self, test):
     d8testflag = []
     shell = test.suite.shell()
     if shell == "d8":
       d8testflag = ["--test"]
     if utils.IsWindows():
       shell += ".exe"
     cmd = (self.context.command_prefix +
            [os.path.abspath(os.path.join(self.context.shell_dir, shell))] +
            d8testflag +
            ["--random-seed=%s" % self.context.random_seed] +
            test.suite.GetFlagsForTestCase(test, self.context) +
            self.context.extra_flags)
     return cmd
 
 
 class BreakNowException(Exception):
   def __init__(self, value):
     self.value = value
   def __str__(self):
     return repr(self.value)