<!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>[179931] 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/179931">179931</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-11 09:11:22 -0800 (Wed, 11 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>run-jsc-stress tests should detect the number of processors on the remote machine too
https://bugs.webkit.org/show_bug.cgi?id=141196
Reviewed by Darin Adler.
* Scripts/run-javascriptcore-tests:
(runJSCStressTests): Pass through the --child-processes argument.
* Scripts/run-jsc-stress-tests: Added determineNumberOfProcessors function
to detect the number of local and remote processors with the same algorithm.
Additionally introduced $numChildProcesses to emphasize it isn't necessarily
same as $numProcessors.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunjavascriptcoretests">trunk/Tools/Scripts/run-javascriptcore-tests</a></li>
<li><a href="#trunkToolsScriptsrunjscstresstests">trunk/Tools/Scripts/run-jsc-stress-tests</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (179930 => 179931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-11 17:10:01 UTC (rev 179930)
+++ trunk/Tools/ChangeLog 2015-02-11 17:11:22 UTC (rev 179931)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-02-11 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><ins>+ run-jsc-stress tests should detect the number of processors on the remote machine too
+ https://bugs.webkit.org/show_bug.cgi?id=141196
+
+ Reviewed by Darin Adler.
+
+ * Scripts/run-javascriptcore-tests:
+ (runJSCStressTests): Pass through the --child-processes argument.
+ * Scripts/run-jsc-stress-tests: Added determineNumberOfProcessors function
+ to detect the number of local and remote processors with the same algorithm.
+ Additionally introduced $numChildProcesses to emphasize it isn't necessarily
+ same as $numProcessors.
+
+2015-02-11 Csaba Osztrogonác <ossy@webkit.org>
+
</ins><span class="cx"> run-jsc-stress-tests should pass JSC_timeout to remote hosts
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141164
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptsrunjavascriptcoretests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-javascriptcore-tests (179930 => 179931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-javascriptcore-tests 2015-02-11 17:10:01 UTC (rev 179930)
+++ trunk/Tools/Scripts/run-javascriptcore-tests 2015-02-11 17:11:22 UTC (rev 179931)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> my $showHelp;
</span><span class="cx"> my $extraTests;
</span><span class="cx"> my $jsDriverArgs;
</span><ins>+my $childProcesses;
</ins><span class="cx">
</span><span class="cx"> my $buildJSC = 1;
</span><span class="cx">
</span><span class="lines">@@ -80,6 +81,7 @@
</span><span class="cx"> --tarball Create a tarball of the bundle produced by running the JSC stress tests.
</span><span class="cx"> --remote= Run the JSC stress tests on the specified remote host. Implies --tarball.
</span><span class="cx"> --extra-tests= Path to a file containing extra tests
</span><ins>+ --child-processes= Specify the number of child processes.
</ins><span class="cx">
</span><span class="cx"> EOF
</span><span class="cx">
</span><span class="lines">@@ -93,6 +95,7 @@
</span><span class="cx"> 'jsc-stress!' => \$runJSCStress,
</span><span class="cx"> 'tarball!' => \$createTarball,
</span><span class="cx"> 'remote=s' => \$remoteHost,
</span><ins>+ 'child-processes=s' => \$childProcesses,
</ins><span class="cx"> 'help' => \$showHelp
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -278,6 +281,11 @@
</span><span class="cx"> push(@jscStressDriverCmd, $remoteHost);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ($childProcesses) {
+ push(@jscStressDriverCmd, "--child-processes");
+ push(@jscStressDriverCmd, $childProcesses);
+ }
+
</ins><span class="cx"> # End option processing, the rest of the arguments are tests
</span><span class="cx"> push(@jscStressDriverCmd, "--");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (179930 => 179931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests 2015-02-11 17:10:01 UTC (rev 179930)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2015-02-11 17:11:22 UTC (rev 179931)
</span><span class="lines">@@ -87,23 +87,7 @@
</span><span class="cx"> }.join(' ')
</span><span class="cx"> end
</span><span class="cx">
</span><del>-begin
- $numProcessors = `sysctl -n hw.activecpu 2>/dev/null`.to_i
-rescue
- $numProcessors = 0
-end
</del><span class="cx">
</span><del>-if $numProcessors == 0
- $numProcessors = `nproc --all 2>/dev/null`.to_i
-end
-if $numProcessors == 0
- $numProcessors = 1
-end
-
-if ENV["WEBKIT_TEST_CHILD_PROCESSES"]
- $numProcessors = ENV["WEBKIT_TEST_CHILD_PROCESSES"].to_i
-end
-
</del><span class="cx"> $jscPath = nil
</span><span class="cx"> $doNotMessWithVMPath = false
</span><span class="cx"> $enableFTL = false
</span><span class="lines">@@ -199,7 +183,7 @@
</span><span class="cx"> uri = URI("ssh://" + arg)
</span><span class="cx"> $remoteUser, $remoteHost, $remotePort = uri.user, uri.host, uri.port
</span><span class="cx"> when '--child-processes'
</span><del>- $numProcessors = arg.to_i
</del><ins>+ $numChildProcesses = arg.to_i
</ins><span class="cx"> when '--arch'
</span><span class="cx"> $architecture = arg
</span><span class="cx"> when '--os'
</span><span class="lines">@@ -542,7 +526,7 @@
</span><span class="cx"> def addRunCommand(kind, command, outputHandler, errorHandler)
</span><span class="cx"> $didAddRunCommand = true
</span><span class="cx"> plan = Plan.new($benchmarkDirectory, command, baseOutputName(kind), outputHandler, errorHandler)
</span><del>- if $numProcessors > 1 and $runCommandOptions[:isSlow]
</del><ins>+ if $numChildProcesses > 1 and $runCommandOptions[:isSlow]
</ins><span class="cx"> $runlist.unshift plan
</span><span class="cx"> else
</span><span class="cx"> $runlist << plan
</span><span class="lines">@@ -1249,17 +1233,6 @@
</span><span class="cx"> }
</span><span class="cx"> end
</span><span class="cx">
</span><del>-if $enableFTL and ENV["JSC_timeout"]
- # Currently, using the FTL is a performance regression particularly in real
- # (i.e. non-loopy) benchmarks. Account for this in the timeout.
- ENV["JSC_timeout"] = (ENV["JSC_timeout"].to_i * 2).to_s
-end
-
-if ENV["JSC_timeout"]
- # In the worst case, the processors just interfere with each other.
- # Increase the timeout proportionally to the number of processors.
- ENV["JSC_timeout"] = (ENV["JSC_timeout"].to_i.to_f * Math.sqrt($numProcessors)).to_i.to_s
-end
</del><span class="cx">
</span><span class="cx"> puts
</span><span class="cx">
</span><span class="lines">@@ -1298,6 +1271,35 @@
</span><span class="cx"> result
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+def runCommandOnTester(cmd)
+ if $remote
+ result = sshRead(cmd)
+ else
+ result = `#{cmd}`
+ end
+end
+
+def numberOfProcessors
+ begin
+ numProcessors = runCommandOnTester("sysctl -n hw.activecpu 2>/dev/null").to_i
+ rescue
+ numProcessors = 0
+ end
+
+ if numProcessors == 0
+ begin
+ numProcessors = runCommandOnTester("nproc --all 2>/dev/null").to_i
+ rescue
+ numProcessors == 0
+ end
+ end
+
+ if numProcessors == 0
+ numProcessors = 1
+ end
+ return numProcessors
+end
+
</ins><span class="cx"> def runAndMonitorTestRunnerCommand(*cmd)
</span><span class="cx"> numberOfTests = 0
</span><span class="cx"> Dir.chdir($runnerDir) {
</span><span class="lines">@@ -1389,7 +1391,7 @@
</span><span class="cx"> def runMakeTestRunner
</span><span class="cx"> raise if $remote
</span><span class="cx"> Dir.chdir($runnerDir) {
</span><del>- runAndMonitorTestRunnerCommand("make", "-j", $numProcessors.to_s, "-s", "-f", "Makefile")
</del><ins>+ runAndMonitorTestRunnerCommand("make", "-j", $numChildProcesses.to_s, "-s", "-f", "Makefile")
</ins><span class="cx"> }
</span><span class="cx"> end
</span><span class="cx">
</span><span class="lines">@@ -1434,6 +1436,26 @@
</span><span class="cx"> $outputDir = $outputDir.realpath
</span><span class="cx"> $runnerDir = $outputDir + ".runner"
</span><span class="cx">
</span><ins>+if !$numChildProcesses
+ if ENV["WEBKIT_TEST_CHILD_PROCESSES"]
+ $numChildProcesses = ENV["WEBKIT_TEST_CHILD_PROCESSES"].to_i
+ else
+ $numChildProcesses = numberOfProcessors
+ end
+end
+
+if $enableFTL and ENV["JSC_timeout"]
+ # Currently, using the FTL is a performance regression particularly in real
+ # (i.e. non-loopy) benchmarks. Account for this in the timeout.
+ ENV["JSC_timeout"] = (ENV["JSC_timeout"].to_i * 2).to_s
+end
+
+if ENV["JSC_timeout"]
+ # In the worst case, the processors just interfere with each other.
+ # Increase the timeout proportionally to the number of processors.
+ ENV["JSC_timeout"] = (ENV["JSC_timeout"].to_i.to_f * Math.sqrt($numChildProcesses)).to_i.to_s
+end
+
</ins><span class="cx"> def runBundle
</span><span class="cx"> raise unless $bundle
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>