<!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>[194553] trunk/Source/JavaScriptCore</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/194553">194553</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-01-04 13:33:37 -0800 (Mon, 04 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL B3 should do all of the non-bitop binary snippets
https://bugs.webkit.org/show_bug.cgi?id=152709
Reviewed by Mark Lam.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::compileValueAdd):
(JSC::FTL::DFG::LowerDFGToLLVM::compileStrCat):
(JSC::FTL::DFG::LowerDFGToLLVM::compileArithMul):
(JSC::FTL::DFG::LowerDFGToLLVM::compileArithDiv):
* tests/stress/object-add.js: Added.
(foo):
(things.valueOf):
* tests/stress/object-div.js: Added.
(foo):
(things.valueOf):
* tests/stress/object-mul.js: Added.
(foo):
(things.valueOf):
* tests/stress/untyped-add.js: Added.
(foo):
(valueOf):
* tests/stress/untyped-div.js: Added.
(foo):
(valueOf):
* tests/stress/untyped-mul.js: Added.
(foo):
(valueOf):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressobjectaddjs">trunk/Source/JavaScriptCore/tests/stress/object-add.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressobjectdivjs">trunk/Source/JavaScriptCore/tests/stress/object-div.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressobjectmuljs">trunk/Source/JavaScriptCore/tests/stress/object-mul.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressuntypedaddjs">trunk/Source/JavaScriptCore/tests/stress/untyped-add.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressuntypeddivjs">trunk/Source/JavaScriptCore/tests/stress/untyped-div.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressuntypedmuljs">trunk/Source/JavaScriptCore/tests/stress/untyped-mul.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194552 => 194553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-04 21:28:02 UTC (rev 194552)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-04 21:33:37 UTC (rev 194553)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2016-01-04 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ FTL B3 should do all of the non-bitop binary snippets
+ https://bugs.webkit.org/show_bug.cgi?id=152709
+
+ Reviewed by Mark Lam.
+
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileValueAdd):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileStrCat):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileArithMul):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileArithDiv):
+ * tests/stress/object-add.js: Added.
+ (foo):
+ (things.valueOf):
+ * tests/stress/object-div.js: Added.
+ (foo):
+ (things.valueOf):
+ * tests/stress/object-mul.js: Added.
+ (foo):
+ (things.valueOf):
+ * tests/stress/untyped-add.js: Added.
+ (foo):
+ (valueOf):
+ * tests/stress/untyped-div.js: Added.
+ (foo):
+ (valueOf):
+ * tests/stress/untyped-mul.js: Added.
+ (foo):
+ (valueOf):
+
+2016-01-04 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> FTL B3 should do the ArithSub binary snippet
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152705
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (194552 => 194553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-01-04 21:28:02 UTC (rev 194552)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-01-04 21:33:37 UTC (rev 194553)
</span><span class="lines">@@ -51,6 +51,9 @@
</span><span class="cx"> #include "FTLOutput.h"
</span><span class="cx"> #include "FTLThunks.h"
</span><span class="cx"> #include "FTLWeightedTarget.h"
</span><ins>+#include "JITAddGenerator.h"
+#include "JITDivGenerator.h"
+#include "JITMulGenerator.h"
</ins><span class="cx"> #include "JITSubGenerator.h"
</span><span class="cx"> #include "JSArrowFunction.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="lines">@@ -1596,7 +1599,11 @@
</span><span class="cx">
</span><span class="cx"> void compileValueAdd()
</span><span class="cx"> {
</span><ins>+#if FTL_USES_B3
+ emitBinarySnippet<JITAddGenerator>(operationValueAdd);
+#else // FTL_USES_B3
</ins><span class="cx"> compileUntypedBinaryOp<ValueAddDescriptor>();
</span><ins>+#endif // FTL_USES_B3
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compileStrCat()
</span><span class="lines">@@ -1845,7 +1852,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case UntypedUse: {
</span><ins>+#if FTL_USES_B3
+ emitBinarySnippet<JITMulGenerator>(operationValueMul);
+#else // FTL_USES_B3
</ins><span class="cx"> compileUntypedBinaryOp<ArithMulDescriptor>();
</span><ins>+#endif // FTL_USES_B3
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1914,7 +1925,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case UntypedUse: {
</span><ins>+#if FTL_USES_B3
+ emitBinarySnippet<JITDivGenerator, NeedScratchFPR>(operationValueDiv);
+#else // FTL_USES_B3
</ins><span class="cx"> compileUntypedBinaryOp<ArithDivDescriptor, HasConstInt32OperandOptimization, HasConstDoubleOperandOptimization>();
</span><ins>+#endif // FTL_USES_B3
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressobjectaddjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/object-add.js (0 => 194553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/object-add.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/object-add.js 2016-01-04 21:33:37 UTC (rev 194553)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+function foo(a, b) {
+ return a + b;
+}
+
+noInline(foo);
+
+var things = [{valueOf: function() { return 4; }}];
+var results = [5];
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo(things[i % things.length], 1);
+ var expected = results[i % results.length];
+ if (result != expected)
+ throw "Error: bad result for i = " + i + ": " + result;
+}
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressobjectdivjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/object-div.js (0 => 194553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/object-div.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/object-div.js 2016-01-04 21:33:37 UTC (rev 194553)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+function foo(a, b) {
+ return a / b;
+}
+
+noInline(foo);
+
+var things = [{valueOf: function() { return 4; }}];
+var results = [2];
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo(things[i % things.length], 2);
+ var expected = results[i % results.length];
+ if (result != expected)
+ throw "Error: bad result for i = " + i + ": " + result;
+}
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressobjectmuljs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/object-mul.js (0 => 194553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/object-mul.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/object-mul.js 2016-01-04 21:33:37 UTC (rev 194553)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+function foo(a, b) {
+ return a * b;
+}
+
+noInline(foo);
+
+var things = [{valueOf: function() { return 4; }}];
+var results = [8];
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo(things[i % things.length], 2);
+ var expected = results[i % results.length];
+ if (result != expected)
+ throw "Error: bad result for i = " + i + ": " + result;
+}
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressuntypedaddjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/untyped-add.js (0 => 194553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/untyped-add.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/untyped-add.js 2016-01-04 21:33:37 UTC (rev 194553)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+function foo(a, b) {
+ return a + b;
+}
+
+noInline(foo);
+
+var things = [1, 2.5, "3", {valueOf: function() { return 4; }}];
+var results = [2, 3.5, "31", 5];
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo(things[i % things.length], 1);
+ var expected = results[i % results.length];
+ if (result != expected)
+ throw "Error: bad result for i = " + i + ": " + result;
+}
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressuntypeddivjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/untyped-div.js (0 => 194553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/untyped-div.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/untyped-div.js 2016-01-04 21:33:37 UTC (rev 194553)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+function foo(a, b) {
+ return a / b;
+}
+
+noInline(foo);
+
+var things = [1, 2.5, "3", {valueOf: function() { return 4; }}];
+var results = [0.5, 1.25, 1.5, 2];
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo(things[i % things.length], 2);
+ var expected = results[i % results.length];
+ if (result != expected)
+ throw "Error: bad result for i = " + i + ": " + result;
+}
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressuntypedmuljs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/untyped-mul.js (0 => 194553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/untyped-mul.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/untyped-mul.js 2016-01-04 21:33:37 UTC (rev 194553)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+function foo(a, b) {
+ return a * b;
+}
+
+noInline(foo);
+
+var things = [1, 2.5, "3", {valueOf: function() { return 4; }}];
+var results = [2, 5, 6, 8];
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo(things[i % things.length], 2);
+ var expected = results[i % results.length];
+ if (result != expected)
+ throw "Error: bad result for i = " + i + ": " + result;
+}
+
</ins></span></pre>
</div>
</div>
</body>
</html>