<!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>[192663] trunk/LayoutTests</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/192663">192663</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-11-19 15:14:55 -0800 (Thu, 19 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>js/regress/script-tests/ftl-object-sub.js needs more iterations for benchmarking.
https://bugs.webkit.org/show_bug.cgi?id=151411
Reviewed by Filip Pizlo.
Previously, in <a href="http://trac.webkit.org/projects/webkit/changeset/192392">r192392</a>, I reduced the test iteration count to make the layout
test happy and not time out. Unfortunately, this defeats the use of this test
for benchmarking. I've changed it to now use different iteration counts
depending on who is running it. run-jsc-stress-tests is fine with the higher
iteration count.
Since this test is slow and only meant to test the FTL, I also changed the run
configuration to be runFTLNoCJIT to minimize the slowness hit when running jsc
stress tests.
* js/regress/script-tests/ftl-object-sub.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsftlobjectsubjs">trunk/LayoutTests/js/regress/script-tests/ftl-object-sub.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192662 => 192663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-19 23:00:41 UTC (rev 192662)
+++ trunk/LayoutTests/ChangeLog 2015-11-19 23:14:55 UTC (rev 192663)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-11-19 Mark Lam <mark.lam@apple.com>
+
+ js/regress/script-tests/ftl-object-sub.js needs more iterations for benchmarking.
+ https://bugs.webkit.org/show_bug.cgi?id=151411
+
+ Reviewed by Filip Pizlo.
+
+ Previously, in r192392, I reduced the test iteration count to make the layout
+ test happy and not time out. Unfortunately, this defeats the use of this test
+ for benchmarking. I've changed it to now use different iteration counts
+ depending on who is running it. run-jsc-stress-tests is fine with the higher
+ iteration count.
+
+ Since this test is slow and only meant to test the FTL, I also changed the run
+ configuration to be runFTLNoCJIT to minimize the slowness hit when running jsc
+ stress tests.
+
+ * js/regress/script-tests/ftl-object-sub.js:
+
</ins><span class="cx"> 2015-11-19 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Add word-spacing support.
</span></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsftlobjectsubjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/regress/script-tests/ftl-object-sub.js (192662 => 192663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/ftl-object-sub.js 2015-11-19 23:00:41 UTC (rev 192662)
+++ trunk/LayoutTests/js/regress/script-tests/ftl-object-sub.js 2015-11-19 23:14:55 UTC (rev 192663)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-//@ runDefault
</del><ins>+//@ runFTLNoCJIT
</ins><span class="cx"> var o1 = {
</span><span class="cx"> i: 0,
</span><span class="cx"> valueOf: function() { return this.i; }
</span><span class="lines">@@ -21,11 +21,23 @@
</span><span class="cx"> }
</span><span class="cx"> noInline(foo);
</span><span class="cx">
</span><del>-for (var i = 0; i <= 10000; i++) {
</del><ins>+var iterations;
+var expectedResult;
+if (this.window) {
+ // The layout test doesn't like too many iterations and may time out.
+ iterations = 10000;
+ expectedResult = 200020;
+} else {
+ iterations = 100000;
+ expectedResult = 2000020;
+}
+
+
+for (var i = 0; i <= iterations; i++) {
</ins><span class="cx"> o1.i = i + 2;
</span><span class="cx"> o2.i = i;
</span><span class="cx"> result += foo(o1, o2);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if (result != 200020)
</del><ins>+if (result != expectedResult)
</ins><span class="cx"> throw "Bad result: " + result;
</span></span></pre>
</div>
</div>
</body>
</html>