<!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>[260610] 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/260610">260610</a></dd>
<dt>Author</dt> <dd>ysuzuki@apple.com</dd>
<dt>Date</dt> <dd>2020-04-23 17:12:00 -0700 (Thu, 23 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Support `--report-execution-time` to report execution time for each JSC stress test
https://bugs.webkit.org/show_bug.cgi?id=210938

Reviewed by Saam Barati.

We can run `run-javascriptcore-tests` with `--report-execution-time` option to report execution time for each JSC stress test,
to figure out which test is taking a long time. It appends execution-time to the verbose log. To see it stderr, --verbose is also
required.

$ run-javascriptcore-tests .... --verbose --report-execution-time

* Scripts/run-javascriptcore-tests:
(runJSCStressTests):
* Scripts/run-jsc-stress-tests:
* Scripts/webkitruby/jsc-stress-test-writer-default.rb:</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>
<li><a href="#trunkToolsScriptswebkitrubyjscstresstestwriterdefaultrb">trunk/Tools/Scripts/webkitruby/jsc-stress-test-writer-default.rb</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (260609 => 260610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2020-04-24 00:07:25 UTC (rev 260609)
+++ trunk/Tools/ChangeLog       2020-04-24 00:12:00 UTC (rev 260610)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2020-04-23  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        Support `--report-execution-time` to report execution time for each JSC stress test
+        https://bugs.webkit.org/show_bug.cgi?id=210938
+
+        Reviewed by Saam Barati.
+
+        We can run `run-javascriptcore-tests` with `--report-execution-time` option to report execution time for each JSC stress test,
+        to figure out which test is taking a long time. It appends execution-time to the verbose log. To see it stderr, --verbose is also
+        required.
+
+        $ run-javascriptcore-tests .... --verbose --report-execution-time
+
+        * Scripts/run-javascriptcore-tests:
+        (runJSCStressTests):
+        * Scripts/run-jsc-stress-tests:
+        * Scripts/webkitruby/jsc-stress-test-writer-default.rb:
+
</ins><span class="cx"> 2020-04-23  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Text manipulation does not account for text in fully clipped containers
</span></span></pre></div>
<a id="trunkToolsScriptsrunjavascriptcoretests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-javascriptcore-tests (260609 => 260610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-javascriptcore-tests     2020-04-24 00:07:25 UTC (rev 260609)
+++ trunk/Tools/Scripts/run-javascriptcore-tests        2020-04-24 00:12:00 UTC (rev 260610)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> my $rubyRunner;
</span><span class="cx"> my $testWriter;
</span><span class="cx"> my $memoryLimited;
</span><ins>+my $reportExecutionTime;
</ins><span class="cx"> 
</span><span class="cx"> my $report;
</span><span class="cx"> my $buildbotMaster;
</span><span class="lines">@@ -272,6 +273,8 @@
</span><span class="cx">   --memory-limited              Indicate that we are targeting the test for a memory limited device.
</span><span class="cx">                                 Skip tests tagged with //\@skip if \$memoryLimited
</span><span class="cx"> 
</span><ins>+  --report-execution-time       Print execution time for each stress test.
+
</ins><span class="cx">   --filter                      Only run tests whose name matches the given regular expression.
</span><span class="cx">   --env-vars                    Pass a list of environment variables to set before running tests.
</span><span class="cx">                                 Each environment variable should be separated by a space.
</span><span class="lines">@@ -334,6 +337,7 @@
</span><span class="cx">     'ruby-runner' => \$rubyRunner,
</span><span class="cx">     'test-writer=s' => \$testWriter,
</span><span class="cx">     'memory-limited' => \$memoryLimited,
</span><ins>+    'report-execution-time' => \$reportExecutionTime,
</ins><span class="cx">     'filter=s' => \$filter,
</span><span class="cx">     'help' => \$showHelp,
</span><span class="cx">     'env-vars=s' => \$envVars,
</span><span class="lines">@@ -787,6 +791,10 @@
</span><span class="cx">         push(@jscStressDriverCmd, "--memory-limited");
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    if ($reportExecutionTime) {
+        push(@jscStressDriverCmd, "--report-execution-time");
+    }
+
</ins><span class="cx">     if ($filter) {
</span><span class="cx">         push(@jscStressDriverCmd, "--filter");
</span><span class="cx">         push(@jscStressDriverCmd, $filter);
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (260609 => 260610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests 2020-04-24 00:07:25 UTC (rev 260609)
+++ trunk/Tools/Scripts/run-jsc-stress-tests    2020-04-24 00:12:00 UTC (rev 260610)
</span><span class="lines">@@ -121,6 +121,7 @@
</span><span class="cx"> $mode = "full"
</span><span class="cx"> $buildType = "release"
</span><span class="cx"> $forceCollectContinuously = false
</span><ins>+$reportExecutionTime = false
</ins><span class="cx"> 
</span><span class="cx"> def usage
</span><span class="cx">     puts "run-jsc-stress-tests -j <shell path> <collections path> [<collections path> ...]"
</span><span class="lines">@@ -150,6 +151,7 @@
</span><span class="cx">     puts "                            \"ruby\" to use ruby scripts for systems without a unix shell."
</span><span class="cx">     puts "--remote                    Specify a remote host on which to run tests from command line argument."
</span><span class="cx">     puts "--remote-config-file        Specify a remote host on which to run tests from JSON file."
</span><ins>+    puts "--report-execution-time     Print execution time for each test."
</ins><span class="cx">     puts "--child-processes    (-c)   Specify the number of child processes."
</span><span class="cx">     puts "--filter                    Only run tests whose name matches the given regular expression."
</span><span class="cx">     puts "--help               (-h)   Print this message."
</span><span class="lines">@@ -185,6 +187,7 @@
</span><span class="cx">                ['--test-writer', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx">                ['--remote', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx">                ['--remote-config-file', GetoptLong::REQUIRED_ARGUMENT],
</span><ins>+               ['--report-execution-time', GetoptLong::NO_ARGUMENT],
</ins><span class="cx">                ['--model', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx">                ['--child-processes', '-c', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx">                ['--filter', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="lines">@@ -236,6 +239,8 @@
</span><span class="cx">         $remoteHosts << RemoteHost.new("default-#{$remoteHosts.length}", uri.user, uri.host, uri.port)
</span><span class="cx">     when '--remote-config-file'
</span><span class="cx">         $remoteConfigFile = arg
</span><ins>+    when '--report-execution-time'
+        $reportExecutionTime = true
</ins><span class="cx">     when '--child-processes'
</span><span class="cx">         $numChildProcesses = arg.to_i
</span><span class="cx">     when '--filter'
</span></span></pre></div>
<a id="trunkToolsScriptswebkitrubyjscstresstestwriterdefaultrb"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitruby/jsc-stress-test-writer-default.rb (260609 => 260610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitruby/jsc-stress-test-writer-default.rb 2020-04-24 00:07:25 UTC (rev 260609)
+++ trunk/Tools/Scripts/webkitruby/jsc-stress-test-writer-default.rb    2020-04-24 00:12:00 UTC (rev 260610)
</span><span class="lines">@@ -263,8 +263,12 @@
</span><span class="cx">     end
</span><span class="cx">     
</span><span class="cx">     def successCommand
</span><del>-        if $progressMeter or $verbosity >= 2
-            "rm -f #{failFile} ; echo PASS: #{Shellwords.shellescape(@name)}"
</del><ins>+        executionTimeMessage = ""
+        if $reportExecutionTime
+            executionTimeMessage = " $(($SECONDS - $START_TIME))s"
+        end
+        if $progressMeter or $reportExecutionTime or $verbosity >= 2
+            "rm -f #{failFile} ; echo PASS: #{Shellwords.shellescape(@name)}#{executionTimeMessage}"
</ins><span class="cx">         else
</span><span class="cx">             "rm -f #{failFile}"
</span><span class="cx">         end
</span><span class="lines">@@ -277,6 +281,9 @@
</span><span class="cx">     def writeRunScript(filename)
</span><span class="cx">         File.open(filename, "w") {
</span><span class="cx">             | outp |
</span><ins>+            if $reportExecutionTime
+                outp.puts "START_TIME=$SECONDS"
+            end
</ins><span class="cx">             outp.puts "echo Running #{Shellwords.shellescape(@name)}"
</span><span class="cx">             cmd  = "(" + shellCommand + " || (echo $? > #{failFile})) 2>&1 "
</span><span class="cx">             cmd += @outputHandler.call(@name)
</span></span></pre>
</div>
</div>

</body>
</html>