Revision: 21328
Author: [email protected]
Date: Thu May 15 12:01:34 2014 UTC
Log: Run tests sorted by expected runtime.
BUG=
[email protected]
Review URL: https://codereview.chromium.org/273613005
http://code.google.com/p/v8/source/detail?r=21328
Added:
/branches/bleeding_edge/tools/testrunner/local/perfdata.py
Deleted:
/branches/bleeding_edge/tools/testrunner/network/perfdata.py
Modified:
/branches/bleeding_edge/tools/testrunner/local/execution.py
/branches/bleeding_edge/tools/testrunner/network/network_execution.py
=======================================
--- /dev/null
+++ /branches/bleeding_edge/tools/testrunner/local/perfdata.py Thu May 15
12:01:34 2014 UTC
@@ -0,0 +1,120 @@
+# 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
+# with the distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# 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 shelve
+import threading
+
+
+class PerfDataEntry(object):
+ def __init__(self):
+ self.avg = 0.0
+ self.count = 0
+
+ def AddResult(self, result):
+ kLearnRateLimiter = 99 # Greater value means slower learning.
+ # We use an approximation of the average of the last 100 results here:
+ # The existing average is weighted with kLearnRateLimiter (or less
+ # if there are fewer data points).
+ effective_count = min(self.count, kLearnRateLimiter)
+ self.avg = self.avg * effective_count + result
+ self.count = effective_count + 1
+ self.avg /= self.count
+
+
+class PerfDataStore(object):
+ def __init__(self, datadir, arch, mode):
+ filename = os.path.join(datadir, "%s.%s.perfdata" % (arch, mode))
+ self.database = shelve.open(filename, protocol=2)
+ self.closed = False
+ self.lock = threading.Lock()
+
+ def __del__(self):
+ self.close()
+
+ def close(self):
+ if self.closed: return
+ self.database.close()
+ self.closed = True
+
+ def GetKey(self, test):
+ """Computes the key used to access data for the given testcase."""
+ flags = "".join(test.flags)
+ return str("%s.%s.%s" % (test.suitename(), test.path, flags))
+
+ def FetchPerfData(self, test):
+ """Returns the observed duration for |test| as read from the store."""
+ key = self.GetKey(test)
+ if key in self.database:
+ return self.database[key].avg
+ return None
+
+ def UpdatePerfData(self, test):
+ """Updates the persisted value in the store with test.duration."""
+ testkey = self.GetKey(test)
+ self.RawUpdatePerfData(testkey, test.duration)
+
+ def RawUpdatePerfData(self, testkey, duration):
+ with self.lock:
+ if testkey in self.database:
+ entry = self.database[testkey]
+ else:
+ entry = PerfDataEntry()
+ entry.AddResult(duration)
+ self.database[testkey] = entry
+
+
+class PerfDataManager(object):
+ def __init__(self, datadir):
+ self.datadir = os.path.abspath(datadir)
+ if not os.path.exists(self.datadir):
+ os.makedirs(self.datadir)
+ self.stores = {} # Keyed by arch, then mode.
+ self.closed = False
+ self.lock = threading.Lock()
+
+ def __del__(self):
+ self.close()
+
+ def close(self):
+ if self.closed: return
+ for arch in self.stores:
+ modes = self.stores[arch]
+ for mode in modes:
+ store = modes[mode]
+ store.close()
+ self.closed = True
+
+ def GetStore(self, arch, mode):
+ with self.lock:
+ if not arch in self.stores:
+ self.stores[arch] = {}
+ modes = self.stores[arch]
+ if not mode in modes:
+ modes[mode] = PerfDataStore(self.datadir, arch, mode)
+ return modes[mode]
=======================================
--- /branches/bleeding_edge/tools/testrunner/network/perfdata.py Mon Sep 24
09:38:46 2012 UTC
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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
-# with the distribution.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# 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 shelve
-import threading
-
-
-class PerfDataEntry(object):
- def __init__(self):
- self.avg = 0.0
- self.count = 0
-
- def AddResult(self, result):
- kLearnRateLimiter = 99 # Greater value means slower learning.
- # We use an approximation of the average of the last 100 results here:
- # The existing average is weighted with kLearnRateLimiter (or less
- # if there are fewer data points).
- effective_count = min(self.count, kLearnRateLimiter)
- self.avg = self.avg * effective_count + result
- self.count = effective_count + 1
- self.avg /= self.count
-
-
-class PerfDataStore(object):
- def __init__(self, datadir, arch, mode):
- filename = os.path.join(datadir, "%s.%s.perfdata" % (arch, mode))
- self.database = shelve.open(filename, protocol=2)
- self.closed = False
- self.lock = threading.Lock()
-
- def __del__(self):
- self.close()
-
- def close(self):
- if self.closed: return
- self.database.close()
- self.closed = True
-
- def GetKey(self, test):
- """Computes the key used to access data for the given testcase."""
- flags = "".join(test.flags)
- return str("%s.%s.%s" % (test.suitename(), test.path, flags))
-
- def FetchPerfData(self, test):
- """Returns the observed duration for |test| as read from the store."""
- key = self.GetKey(test)
- if key in self.database:
- return self.database[key].avg
- return None
-
- def UpdatePerfData(self, test):
- """Updates the persisted value in the store with test.duration."""
- testkey = self.GetKey(test)
- self.RawUpdatePerfData(testkey, test.duration)
-
- def RawUpdatePerfData(self, testkey, duration):
- with self.lock:
- if testkey in self.database:
- entry = self.database[testkey]
- else:
- entry = PerfDataEntry()
- entry.AddResult(duration)
- self.database[testkey] = entry
-
-
-class PerfDataManager(object):
- def __init__(self, datadir):
- self.datadir = os.path.abspath(datadir)
- if not os.path.exists(self.datadir):
- os.makedirs(self.datadir)
- self.stores = {} # Keyed by arch, then mode.
- self.closed = False
- self.lock = threading.Lock()
-
- def __del__(self):
- self.close()
-
- def close(self):
- if self.closed: return
- for arch in self.stores:
- modes = self.stores[arch]
- for mode in modes:
- store = modes[mode]
- store.close()
- self.closed = True
-
- def GetStore(self, arch, mode):
- with self.lock:
- if not arch in self.stores:
- self.stores[arch] = {}
- modes = self.stores[arch]
- if not mode in modes:
- modes[mode] = PerfDataStore(self.datadir, arch, mode)
- return modes[mode]
=======================================
--- /branches/bleeding_edge/tools/testrunner/local/execution.py Wed May 14
13:30:57 2014 UTC
+++ /branches/bleeding_edge/tools/testrunner/local/execution.py Thu May 15
12:01:34 2014 UTC
@@ -31,6 +31,7 @@
from pool import Pool
from . import commands
+from . import perfdata
from . import utils
@@ -59,7 +60,12 @@
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):
@@ -88,7 +94,7 @@
# 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:
@@ -124,6 +130,11 @@
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()
=======================================
--- /branches/bleeding_edge/tools/testrunner/network/network_execution.py
Fri Jun 14 14:57:14 2013 UTC
+++ /branches/bleeding_edge/tools/testrunner/network/network_execution.py
Thu May 15 12:01:34 2014 UTC
@@ -33,8 +33,8 @@
import time
from . import distro
-from . import perfdata
from ..local import execution
+from ..local import perfdata
from ..objects import peer
from ..objects import workpacket
from ..server import compression
@@ -54,6 +54,8 @@
self.suites = suites
num_tests = 0
datapath = os.path.join("out", "testrunner_data")
+ # TODO(machenbach): These fields should exist now in the superclass.
+ # But there is no super constructor call. Check if this is a problem.
self.perf_data_manager = perfdata.PerfDataManager(datapath)
self.perfdata = self.perf_data_manager.GetStore(context.arch,
context.mode)
for s in suites:
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
