<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185371] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185371">185371</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-09 12:29:31 -0700 (Tue, 09 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>run-benchmark should either checkout JetStream 1.0.1 or support running the latest version
https://bugs.webkit.org/show_bug.cgi?id=145764
Reviewed by Darin Adler.
Added the support for checkout a subversion directory in run-benchmark and used in the plans for
JetStream and SunSpider.
* Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py:
(GenericBenchmarkBuilder):
(GenericBenchmarkBuilder.prepare): Instead of taking each argument from benchmark plan, just accept
the whole JSON as the input.
(GenericBenchmarkBuilder._checkoutWithSubverion): Added.
(GenericBenchmarkBuilder._applyPatch): Check the existence of benchmark_patch in prepare() instead.
* Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
(BenchmarkRunner.execute): Removed the check for having either 'local_copy' or 'remote_archive' in
a benchmark plan now that it's checkedi in GenericBenchmarkBuilder.prepare.
* Scripts/webkitpy/benchmark_runner/data/plans/jetstream.plan:
* Scripts/webkitpy/benchmark_runner/data/plans/sunspider.plan:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_buildergeneric_benchmark_builderpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerdataplansjetstreamplan">trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/jetstream.plan</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerdataplanssunspiderplan">trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/sunspider.plan</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185370 => 185371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-09 18:42:46 UTC (rev 185370)
+++ trunk/Tools/ChangeLog 2015-06-09 19:29:31 UTC (rev 185371)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-06-09 Ryosuke Niwa <rniwa@webkit.org>
+
+ run-benchmark should either checkout JetStream 1.0.1 or support running the latest version
+ https://bugs.webkit.org/show_bug.cgi?id=145764
+
+ Reviewed by Darin Adler.
+
+ Added the support for checkout a subversion directory in run-benchmark and used in the plans for
+ JetStream and SunSpider.
+
+ * Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py:
+ (GenericBenchmarkBuilder):
+ (GenericBenchmarkBuilder.prepare): Instead of taking each argument from benchmark plan, just accept
+ the whole JSON as the input.
+ (GenericBenchmarkBuilder._checkoutWithSubverion): Added.
+ (GenericBenchmarkBuilder._applyPatch): Check the existence of benchmark_patch in prepare() instead.
+ * Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
+ (BenchmarkRunner.execute): Removed the check for having either 'local_copy' or 'remote_archive' in
+ a benchmark plan now that it's checkedi in GenericBenchmarkBuilder.prepare.
+ * Scripts/webkitpy/benchmark_runner/data/plans/jetstream.plan:
+ * Scripts/webkitpy/benchmark_runner/data/plans/sunspider.plan:
+
</ins><span class="cx"> 2015-06-09 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove ewstool scripts used by chromium port
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_buildergeneric_benchmark_builderpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py (185370 => 185371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py 2015-06-09 18:42:46 UTC (rev 185370)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py 2015-06-09 19:29:31 UTC (rev 185371)
</span><span class="lines">@@ -16,21 +16,26 @@
</span><span class="cx">
</span><span class="cx"> class GenericBenchmarkBuilder(object):
</span><span class="cx">
</span><del>- def prepare(self, name, benchmarkPath, archiveURL, patch, createScript):
</del><ins>+ def prepare(self, name, plan):
</ins><span class="cx"> self.name = name
</span><span class="cx"> self.webRoot = tempfile.mkdtemp()
</span><span class="cx"> self.dest = os.path.join(self.webRoot, self.name)
</span><del>- if benchmarkPath:
- self._copyBenchmarkToTempDir(benchmarkPath)
</del><ins>+ if 'local_copy' in plan:
+ self._copyBenchmarkToTempDir(plan['local_copy'])
+ elif 'remote_archive' in plan:
+ self._fetchRemoteArchive(plan['remote_archive'])
+ elif 'svn_source' in plan:
+ self._checkoutWithSubverion(plan['svn_source'])
</ins><span class="cx"> else:
</span><del>- assert(archiveURL)
- self._fetchRemoteArchive(archiveURL)
</del><ins>+ raise Exception('The benchmark location was not specified')
</ins><span class="cx">
</span><span class="cx"> _log.info('Copied the benchmark into: %s' % self.dest)
</span><span class="cx"> try:
</span><del>- if createScript:
- self._runCreateScript(createScript)
- return self._applyPatch(patch)
</del><ins>+ if 'create_script' in plan:
+ self._runCreateScript(plan['create_script'])
+ if 'benchmark_patch' in plan:
+ self._applyPatch(plan['benchmark_patch'])
+ return self.webRoot
</ins><span class="cx"> except Exception:
</span><span class="cx"> self.clean()
</span><span class="cx"> raise
</span><span class="lines">@@ -62,16 +67,19 @@
</span><span class="cx"> shutil.move(firstFile, self.webRoot)
</span><span class="cx"> os.rename(os.path.join(self.webRoot, unarchivedFiles[0]), self.dest)
</span><span class="cx">
</span><ins>+ def _checkoutWithSubverion(self, subversionURL):
+ _log.info('Checking out %s to %s' % (subversionURL, self.dest))
+ errorCode = subprocess.call(['svn', 'checkout', subversionURL, self.dest])
+ if errorCode:
+ raise Exception('Cannot checkout the benchmark - Error: %s' % errorCode)
+
</ins><span class="cx"> def _applyPatch(self, patch):
</span><del>- if not patch:
- return self.webRoot
</del><span class="cx"> oldWorkingDirectory = os.getcwd()
</span><span class="cx"> os.chdir(self.dest)
</span><span class="cx"> errorCode = subprocess.call(['patch', '-p1', '-f', '-i', getPathFromProjectRoot(patch)])
</span><span class="cx"> os.chdir(oldWorkingDirectory)
</span><span class="cx"> if errorCode:
</span><span class="cx"> raise Exception('Cannot apply patch, will skip current benchmarkPath - Error: %s' % errorCode)
</span><del>- return self.webRoot
</del><span class="cx">
</span><span class="cx"> def clean(self):
</span><span class="cx"> _log.info('Cleaning Benchmark')
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py (185370 => 185371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2015-06-09 18:42:46 UTC (rev 185370)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2015-06-09 19:29:31 UTC (rev 185371)
</span><span class="lines">@@ -64,12 +64,7 @@
</span><span class="cx"> results = []
</span><span class="cx"> self.benchmarkBuilder = BenchmarkBuilderFactory.create([self.plan['benchmark_builder']])
</span><span class="cx">
</span><del>- if not self.plan.get('local_copy') and not self.plan.get('remote_archive'):
- _log.error('Either local_copy or remote_archive must be specified in the plan')
- sys.exit(2)
-
- webRoot = self.benchmarkBuilder.prepare(self.planName, self.plan.get('local_copy'), self.plan.get('remote_archive'),
- self.plan.get('benchmark_patch'), self.plan.get('create_script'))
</del><ins>+ webRoot = self.benchmarkBuilder.prepare(self.planName, self.plan)
</ins><span class="cx"> for x in xrange(int(self.plan['count'])):
</span><span class="cx"> _log.info('Start the iteration %d of current benchmark' % (x + 1))
</span><span class="cx"> self.httpServerDriver.serve(webRoot)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdataplansjetstreamplan"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/jetstream.plan (185370 => 185371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/jetstream.plan 2015-06-09 18:42:46 UTC (rev 185370)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/jetstream.plan 2015-06-09 19:29:31 UTC (rev 185371)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> "timeout" : 600,
</span><span class="cx"> "count": 5,
</span><span class="cx"> "benchmark_builder": "GenericBenchmarkBuilder",
</span><del>- "local_copy": "../../../../PerformanceTests/JetStream",
</del><ins>+ "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/JetStream/@r183091",
</ins><span class="cx"> "benchmark_patch": "data/patches/JetStream.patch",
</span><span class="cx"> "create_script": ["ruby", "create.rb"],
</span><span class="cx"> "entry_point": "JetStream-1.0.1/index.html",
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdataplanssunspiderplan"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/sunspider.plan (185370 => 185371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/sunspider.plan 2015-06-09 18:42:46 UTC (rev 185370)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/sunspider.plan 2015-06-09 19:29:31 UTC (rev 185371)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> "timeout": 300,
</span><span class="cx"> "count": 5,
</span><span class="cx"> "benchmark_builder": "GenericBenchmarkBuilder",
</span><del>- "local_copy": "../../../../PerformanceTests/SunSpider",
</del><ins>+ "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/SunSpider/@r182170",
</ins><span class="cx"> "benchmark_patch": "data/patches/SunSpider.patch",
</span><span class="cx"> "create_script": ["perl", "make-hosted"],
</span><span class="cx"> "entry_point": "hosted/sunspider-1.0.1/driver.html",
</span></span></pre>
</div>
</div>
</body>
</html>