<!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>[201947] trunk</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/201947">201947</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-06-10 15:55:01 -0700 (Fri, 10 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSC Stress Test failing: jsair-tests.yaml/test.js.ftl-eager-no-cjit
https://bugs.webkit.org/show_bug.cgi?id=158571
Reviewed by Keith Miller.
PerformanceTests:
Introduce a different harness for run-jsc-stress-tests, which runs for a minimum of 10
iterations and then tries to do any number of "bonus" iterations until it's been running for
two seconds. Since this is the sort of test that isn't really meant to stress anything in
particular, I think it's OK if it is time-limited in this way. The worst case is that some
of its failures will be flaky, but I think that they would have been flaky anyway given the
complexity of the test.
* JSAir/benchmark.js:
(Benchmark):
(Benchmark.prototype.runIteration):
(benchmark): Deleted.
* JSAir/jsair-tests.yaml:
* JSAir/stress-test.js: Added.
(preciseTime):
* JSAir/test.html:
* JSAir/test.js:
Tools:
Unskip the JSAir test.
* Scripts/run-javascriptcore-tests:
(runJSCStressTests):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</a></li>
<li><a href="#trunkPerformanceTestsJSAirbenchmarkjs">trunk/PerformanceTests/JSAir/benchmark.js</a></li>
<li><a href="#trunkPerformanceTestsJSAirjsairtestsyaml">trunk/PerformanceTests/JSAir/jsair-tests.yaml</a></li>
<li><a href="#trunkPerformanceTestsJSAirtesthtml">trunk/PerformanceTests/JSAir/test.html</a></li>
<li><a href="#trunkPerformanceTestsJSAirtestjs">trunk/PerformanceTests/JSAir/test.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunjavascriptcoretests">trunk/Tools/Scripts/run-javascriptcore-tests</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsJSAirstresstestjs">trunk/PerformanceTests/JSAir/stress-test.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (201946 => 201947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2016-06-10 22:26:34 UTC (rev 201946)
+++ trunk/PerformanceTests/ChangeLog 2016-06-10 22:55:01 UTC (rev 201947)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-06-10 Filip Pizlo <fpizlo@apple.com>
+
+ JSC Stress Test failing: jsair-tests.yaml/test.js.ftl-eager-no-cjit
+ https://bugs.webkit.org/show_bug.cgi?id=158571
+
+ Reviewed by Keith Miller.
+
+ Introduce a different harness for run-jsc-stress-tests, which runs for a minimum of 10
+ iterations and then tries to do any number of "bonus" iterations until it's been running for
+ two seconds. Since this is the sort of test that isn't really meant to stress anything in
+ particular, I think it's OK if it is time-limited in this way. The worst case is that some
+ of its failures will be flaky, but I think that they would have been flaky anyway given the
+ complexity of the test.
+
+ * JSAir/benchmark.js:
+ (Benchmark):
+ (Benchmark.prototype.runIteration):
+ (benchmark): Deleted.
+ * JSAir/jsair-tests.yaml:
+ * JSAir/stress-test.js: Added.
+ (preciseTime):
+ * JSAir/test.html:
+ * JSAir/test.js:
+
</ins><span class="cx"> 2016-06-09 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, teach the perf bots not to run JSAir.
</span></span></pre></div>
<a id="trunkPerformanceTestsJSAirbenchmarkjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/JSAir/benchmark.js (201946 => 201947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/JSAir/benchmark.js 2016-06-10 22:26:34 UTC (rev 201946)
+++ trunk/PerformanceTests/JSAir/benchmark.js 2016-06-10 22:55:01 UTC (rev 201947)
</span><span class="lines">@@ -24,28 +24,28 @@
</span><span class="cx"> */
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>-function benchmark()
-{
- const verbose = 0;
- const numIterations = 150;
</del><ins>+class Benchmark {
+ constructor(verbose = 0)
+ {
+ this._verbose = verbose;
+
+ this._payloads = [
+ {generate: createPayloadGbemuExecuteIteration, earlyHash: 632653144, lateHash: 372715518},
+ {generate: createPayloadImagingGaussianBlurGaussianBlur, earlyHash: 3677819581, lateHash: 1252116304},
+ {generate: createPayloadTypescriptScanIdentifier, earlyHash: 1914852601, lateHash: 837339551},
+ {generate: createPayloadJSAirACLj8C, earlyHash: 1373599940, lateHash: 3981283600}
+ ];
+ }
</ins><span class="cx">
</span><del>- let before = currentTime();
-
- var payloads = [
- {generate: createPayloadGbemuExecuteIteration, earlyHash: 632653144, lateHash: 372715518},
- {generate: createPayloadImagingGaussianBlurGaussianBlur, earlyHash: 3677819581, lateHash: 1252116304},
- {generate: createPayloadTypescriptScanIdentifier, earlyHash: 1914852601, lateHash: 837339551},
- {generate: createPayloadJSAirACLj8C, earlyHash: 1373599940, lateHash: 3981283600}
- ];
-
- for (let iteration = 0; iteration < numIterations; ++iteration) {
- for (let payload of payloads) {
</del><ins>+ runIteration()
+ {
+ for (let payload of this._payloads) {
</ins><span class="cx"> // Sadly about 17% of our time is in generate. I don't think that's really avoidable,
</span><span class="cx"> // and I don't mind testing VMs' ability to run such "data definition" code quickly. I
</span><span class="cx"> // would not have expected it to be so slow from first principles!
</span><span class="cx"> let code = payload.generate();
</span><span class="cx">
</span><del>- if (verbose) {
</del><ins>+ if (this._verbose) {
</ins><span class="cx"> print("Before allocateStack:");
</span><span class="cx"> print(code);
</span><span class="cx"> }
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> allocateStack(code);
</span><span class="cx">
</span><del>- if (verbose) {
</del><ins>+ if (this._verbose) {
</ins><span class="cx"> print("After allocateStack:");
</span><span class="cx"> print(code);
</span><span class="cx"> }
</span><span class="lines">@@ -66,7 +66,20 @@
</span><span class="cx"> throw new Error(`Wrong late hash for ${payload.generate.name}: ${hash}`);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+}
+
+function runBenchmark()
+{
+ const verbose = 0;
+ const numIterations = 150;
</ins><span class="cx">
</span><ins>+ let before = currentTime();
+
+ let benchmark = new Benchmark(verbose);
+
+ for (let iteration = 0; iteration < numIterations; ++iteration)
+ benchmark.runIteration();
+
</ins><span class="cx"> let after = currentTime();
</span><span class="cx"> return after - before;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkPerformanceTestsJSAirjsairtestsyaml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/JSAir/jsair-tests.yaml (201946 => 201947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/JSAir/jsair-tests.yaml 2016-06-10 22:26:34 UTC (rev 201946)
+++ trunk/PerformanceTests/JSAir/jsair-tests.yaml 2016-06-10 22:55:01 UTC (rev 201947)
</span><span class="lines">@@ -23,6 +23,6 @@
</span><span class="cx">
</span><span class="cx"> - path: .
</span><span class="cx"> tests:
</span><del>- - test.js
</del><ins>+ - stress-test.js
</ins><span class="cx"> cmd: defaultRunNoisyTest unless parseRunCommands
</span><span class="cx">
</span></span></pre></div>
<a id="trunkPerformanceTestsJSAirstresstestjs"></a>
<div class="addfile"><h4>Added: trunk/PerformanceTests/JSAir/stress-test.js (0 => 201947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/JSAir/stress-test.js (rev 0)
+++ trunk/PerformanceTests/JSAir/stress-test.js 2016-06-10 22:55:01 UTC (rev 201947)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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.
+ */
+"use strict";
+
+load("all.js");
+load("payload-gbemu-executeIteration.js");
+load("payload-imaging-gaussian-blur-gaussianBlur.js");
+load("payload-jsair-ACLj8C.js");
+load("payload-typescript-scanIdentifier.js");
+load("benchmark.js");
+
+let benchmark = new Benchmark();
+let before = preciseTime();
+
+// Run for at least 10 iterations.
+for (let i = 0; i < 10; ++i) {
+ print("Running mandatory iteration #" + (i + 1) + ":");
+ benchmark.runIteration();
+}
+
+// Run until we have been running for two seconds.
+while (preciseTime() < before + 2) {
+ print("Running bonus iteration:");
+ benchmark.runIteration();
+}
+
+print("Success!");
+
+
+
</ins></span></pre></div>
<a id="trunkPerformanceTestsJSAirtesthtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/JSAir/test.html (201946 => 201947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/JSAir/test.html 2016-06-10 22:26:34 UTC (rev 201946)
+++ trunk/PerformanceTests/JSAir/test.html 2016-06-10 22:55:01 UTC (rev 201947)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> <script src="benchmark.js"></script>
</span><span class="cx"> <script>
</span><span class="cx"> function runTest() {
</span><del>- var result = benchmark();
</del><ins>+ var result = runBenchmark();
</ins><span class="cx"> document.getElementById("result-summary").innerHTML = "That took " + result + " ms.";
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkPerformanceTestsJSAirtestjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/JSAir/test.js (201946 => 201947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/JSAir/test.js 2016-06-10 22:26:34 UTC (rev 201946)
+++ trunk/PerformanceTests/JSAir/test.js 2016-06-10 22:55:01 UTC (rev 201947)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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.
+ */
</ins><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> load("all.js");
</span><span class="lines">@@ -7,5 +31,5 @@
</span><span class="cx"> load("payload-typescript-scanIdentifier.js");
</span><span class="cx"> load("benchmark.js");
</span><span class="cx">
</span><del>-let result = benchmark();
</del><ins>+let result = runBenchmark();
</ins><span class="cx"> print("That took " + result + " ms.");
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (201946 => 201947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-06-10 22:26:34 UTC (rev 201946)
+++ trunk/Tools/ChangeLog 2016-06-10 22:55:01 UTC (rev 201947)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-06-10 Filip Pizlo <fpizlo@apple.com>
+
+ JSC Stress Test failing: jsair-tests.yaml/test.js.ftl-eager-no-cjit
+ https://bugs.webkit.org/show_bug.cgi?id=158571
+
+ Reviewed by Keith Miller.
+
+ Unskip the JSAir test.
+
+ * Scripts/run-javascriptcore-tests:
+ (runJSCStressTests):
+
</ins><span class="cx"> 2016-06-10 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Re-disable the UserMedia tests which are timing out.
</span></span></pre></div>
<a id="trunkToolsScriptsrunjavascriptcoretests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-javascriptcore-tests (201946 => 201947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-javascriptcore-tests 2016-06-10 22:26:34 UTC (rev 201946)
+++ trunk/Tools/Scripts/run-javascriptcore-tests 2016-06-10 22:55:01 UTC (rev 201947)
</span><span class="lines">@@ -234,8 +234,7 @@
</span><span class="cx"> @testList = (
</span><span class="cx"> "PerformanceTests/SunSpider/tests/sunspider-1.0",
</span><span class="cx"> "PerformanceTests/JetStream/cdjs/cdjs-tests.yaml",
</span><del>- # Skip this while we figure out how to handle timeouts in debug.
- # "PerformanceTests/JSAir/jsair-tests.yaml",
</del><ins>+ "PerformanceTests/JSAir/jsair-tests.yaml",
</ins><span class="cx"> "Source/JavaScriptCore/tests/executableAllocationFuzz.yaml",
</span><span class="cx"> "Source/JavaScriptCore/tests/exceptionFuzz.yaml",
</span><span class="cx"> "PerformanceTests/SunSpider/no-architecture-specific-optimizations.yaml",
</span></span></pre>
</div>
</div>
</body>
</html>