<!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>[196685] 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/196685">196685</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-02-16 21:29:34 -0800 (Tue, 16 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL should support CompareEq(String:, String:)
https://bugs.webkit.org/show_bug.cgi?id=154269
rdar://problem/24499921
Reviewed by Benjamin Poulain.
Looks like a slight pdfjs slow-down, probably because we're having some recompilations. I
think we should land the increased coverage first and fix the issues after, especially since
the regression is so small and doesn't have a statistically significant effect on the overall
score.
* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::compileCompareEq):
(JSC::FTL::DFG::LowerDFGToLLVM::compileCompareStrictEq):
(JSC::FTL::DFG::LowerDFGToLLVM::nonSpeculativeCompare):
(JSC::FTL::DFG::LowerDFGToLLVM::stringsEqual):
* tests/stress/ftl-string-equality.js: Added.
* tests/stress/ftl-string-ident-equality.js: Added.
* tests/stress/ftl-string-strict-equality.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCapabilitiescpp">trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressftlstringequalityjs">trunk/Source/JavaScriptCore/tests/stress/ftl-string-equality.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressftlstringidentequalityjs">trunk/Source/JavaScriptCore/tests/stress/ftl-string-ident-equality.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressftlstringstrictequalityjs">trunk/Source/JavaScriptCore/tests/stress/ftl-string-strict-equality.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196684 => 196685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-17 04:25:57 UTC (rev 196684)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-17 05:29:34 UTC (rev 196685)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2016-02-16 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ FTL should support CompareEq(String:, String:)
+ https://bugs.webkit.org/show_bug.cgi?id=154269
+ rdar://problem/24499921
+
+ Reviewed by Benjamin Poulain.
+
+ Looks like a slight pdfjs slow-down, probably because we're having some recompilations. I
+ think we should land the increased coverage first and fix the issues after, especially since
+ the regression is so small and doesn't have a statistically significant effect on the overall
+ score.
+
+ * ftl/FTLCapabilities.cpp:
+ (JSC::FTL::canCompile):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileCompareEq):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileCompareStrictEq):
+ (JSC::FTL::DFG::LowerDFGToLLVM::nonSpeculativeCompare):
+ (JSC::FTL::DFG::LowerDFGToLLVM::stringsEqual):
+ * tests/stress/ftl-string-equality.js: Added.
+ * tests/stress/ftl-string-ident-equality.js: Added.
+ * tests/stress/ftl-string-strict-equality.js: Added.
+
+2016-02-16 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> FTL should support NewTypedArray
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154268
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (196684 => 196685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2016-02-17 04:25:57 UTC (rev 196684)
+++ trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2016-02-17 05:29:34 UTC (rev 196685)
</span><span class="lines">@@ -337,6 +337,8 @@
</span><span class="cx"> break;
</span><span class="cx"> if (node->isBinaryUseKind(StringIdentUse))
</span><span class="cx"> break;
</span><ins>+ if (node->isBinaryUseKind(StringUse))
+ break;
</ins><span class="cx"> if (node->isBinaryUseKind(SymbolUse))
</span><span class="cx"> break;
</span><span class="cx"> if (node->isBinaryUseKind(ObjectUse))
</span><span class="lines">@@ -361,6 +363,8 @@
</span><span class="cx"> break;
</span><span class="cx"> if (node->isBinaryUseKind(StringIdentUse))
</span><span class="cx"> break;
</span><ins>+ if (node->isBinaryUseKind(StringUse))
+ break;
</ins><span class="cx"> if (node->isBinaryUseKind(ObjectUse, UntypedUse))
</span><span class="cx"> break;
</span><span class="cx"> if (node->isBinaryUseKind(UntypedUse, ObjectUse))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (196684 => 196685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-02-17 04:25:57 UTC (rev 196684)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-02-17 05:29:34 UTC (rev 196685)
</span><span class="lines">@@ -4920,7 +4920,8 @@
</span><span class="cx"> || m_node->isBinaryUseKind(ObjectUse)
</span><span class="cx"> || m_node->isBinaryUseKind(BooleanUse)
</span><span class="cx"> || m_node->isBinaryUseKind(SymbolUse)
</span><del>- || m_node->isBinaryUseKind(StringIdentUse)) {
</del><ins>+ || m_node->isBinaryUseKind(StringIdentUse)
+ || m_node->isBinaryUseKind(StringUse)) {
</ins><span class="cx"> compileCompareStrictEq();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -4987,6 +4988,31 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (m_node->isBinaryUseKind(StringUse)) {
+ LValue left = lowCell(m_node->child1());
+ LValue right = lowCell(m_node->child2());
+
+ LBasicBlock notTriviallyEqualCase = FTL_NEW_BLOCK(m_out, ("CompareStrictEq/String not trivially equal case"));
+ LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("CompareStrictEq/String continuation"));
+
+ speculateString(m_node->child1(), left);
+
+ ValueFromBlock fastResult = m_out.anchor(m_out.booleanTrue);
+ m_out.branch(
+ m_out.equal(left, right), unsure(continuation), unsure(notTriviallyEqualCase));
+
+ LBasicBlock lastNext = m_out.appendTo(notTriviallyEqualCase, continuation);
+
+ speculateString(m_node->child2(), right);
+
+ ValueFromBlock slowResult = m_out.anchor(stringsEqual(left, right));
+ m_out.jump(continuation);
+
+ m_out.appendTo(continuation, lastNext);
+ setBoolean(m_out.phi(m_out.boolean, fastResult, slowResult));
+ return;
+ }
+
</ins><span class="cx"> if (m_node->isBinaryUseKind(ObjectUse, UntypedUse)) {
</span><span class="cx"> setBoolean(
</span><span class="cx"> m_out.equal(
</span><span class="lines">@@ -7701,6 +7727,107 @@
</span><span class="cx"> setBoolean(m_out.phi(m_out.boolean, fastResult, slowResult));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ LValue stringsEqual(LValue leftJSString, LValue rightJSString)
+ {
+ LBasicBlock notTriviallyUnequalCase = FTL_NEW_BLOCK(m_out, ("stringsEqual not trivially unequal case"));
+ LBasicBlock notEmptyCase = FTL_NEW_BLOCK(m_out, ("stringsEqual not empty case"));
+ LBasicBlock leftReadyCase = FTL_NEW_BLOCK(m_out, ("stringsEqual left ready case"));
+ LBasicBlock rightReadyCase = FTL_NEW_BLOCK(m_out, ("stringsEqual right ready case"));
+ LBasicBlock left8BitCase = FTL_NEW_BLOCK(m_out, ("stringsEqual left 8-bit case"));
+ LBasicBlock right8BitCase = FTL_NEW_BLOCK(m_out, ("stringsEqual right 8-bit case"));
+ LBasicBlock loop = FTL_NEW_BLOCK(m_out, ("stringsEqual loop"));
+ LBasicBlock bytesEqual = FTL_NEW_BLOCK(m_out, ("stringsEqual bytes equal"));
+ LBasicBlock trueCase = FTL_NEW_BLOCK(m_out, ("stringsEqual true case"));
+ LBasicBlock falseCase = FTL_NEW_BLOCK(m_out, ("stringsEqual false case"));
+ LBasicBlock slowCase = FTL_NEW_BLOCK(m_out, ("stringsEqual slow case"));
+ LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("stringsEqual continuation"));
+
+ LValue length = m_out.load32(leftJSString, m_heaps.JSString_length);
+
+ m_out.branch(
+ m_out.notEqual(length, m_out.load32(rightJSString, m_heaps.JSString_length)),
+ unsure(falseCase), unsure(notTriviallyUnequalCase));
+
+ LBasicBlock lastNext = m_out.appendTo(notTriviallyUnequalCase, notEmptyCase);
+
+ m_out.branch(m_out.isZero32(length), unsure(trueCase), unsure(notEmptyCase));
+
+ m_out.appendTo(notEmptyCase, leftReadyCase);
+
+ LValue left = m_out.loadPtr(leftJSString, m_heaps.JSString_value);
+ LValue right = m_out.loadPtr(rightJSString, m_heaps.JSString_value);
+
+ m_out.branch(m_out.notNull(left), usually(leftReadyCase), rarely(slowCase));
+
+ m_out.appendTo(leftReadyCase, rightReadyCase);
+
+ m_out.branch(m_out.notNull(right), usually(rightReadyCase), rarely(slowCase));
+
+ m_out.appendTo(rightReadyCase, left8BitCase);
+
+ m_out.branch(
+ m_out.testIsZero32(
+ m_out.load32(left, m_heaps.StringImpl_hashAndFlags),
+ m_out.constInt32(StringImpl::flagIs8Bit())),
+ unsure(slowCase), unsure(left8BitCase));
+
+ m_out.appendTo(left8BitCase, right8BitCase);
+
+ m_out.branch(
+ m_out.testIsZero32(
+ m_out.load32(right, m_heaps.StringImpl_hashAndFlags),
+ m_out.constInt32(StringImpl::flagIs8Bit())),
+ unsure(slowCase), unsure(right8BitCase));
+
+ m_out.appendTo(right8BitCase, loop);
+
+ LValue leftData = m_out.loadPtr(left, m_heaps.StringImpl_data);
+ LValue rightData = m_out.loadPtr(right, m_heaps.StringImpl_data);
+
+ ValueFromBlock indexAtStart = m_out.anchor(length);
+
+ m_out.jump(loop);
+
+ m_out.appendTo(loop, bytesEqual);
+
+ LValue indexAtLoopTop = m_out.phi(m_out.int32, indexAtStart);
+ LValue indexInLoop = m_out.sub(indexAtLoopTop, m_out.int32One);
+
+ LValue leftByte = m_out.load8ZeroExt32(
+ m_out.baseIndex(m_heaps.characters8, leftData, m_out.zeroExtPtr(indexInLoop)));
+ LValue rightByte = m_out.load8ZeroExt32(
+ m_out.baseIndex(m_heaps.characters8, rightData, m_out.zeroExtPtr(indexInLoop)));
+
+ m_out.branch(m_out.notEqual(leftByte, rightByte), unsure(falseCase), unsure(bytesEqual));
+
+ m_out.appendTo(bytesEqual, trueCase);
+
+ ValueFromBlock indexForNextIteration = m_out.anchor(indexInLoop);
+ m_out.addIncomingToPhi(indexAtLoopTop, indexForNextIteration);
+ m_out.branch(m_out.notZero32(indexInLoop), unsure(loop), unsure(trueCase));
+
+ m_out.appendTo(trueCase, falseCase);
+
+ ValueFromBlock trueResult = m_out.anchor(m_out.booleanTrue);
+ m_out.jump(continuation);
+
+ m_out.appendTo(falseCase, slowCase);
+
+ ValueFromBlock falseResult = m_out.anchor(m_out.booleanFalse);
+ m_out.jump(continuation);
+
+ m_out.appendTo(slowCase, continuation);
+
+ LValue slowResultValue = vmCall(
+ m_out.int64, m_out.operation(operationCompareStringEq), m_callFrame,
+ leftJSString, rightJSString);
+ ValueFromBlock slowResult = m_out.anchor(unboxBoolean(slowResultValue));
+ m_out.jump(continuation);
+
+ m_out.appendTo(continuation, lastNext);
+ return m_out.phi(m_out.boolean, trueResult, falseResult, slowResult);
+ }
+
</ins><span class="cx"> #if FTL_USES_B3
</span><span class="cx"> enum ScratchFPRUsage {
</span><span class="cx"> DontNeedScratchFPR,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressftlstringequalityjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/ftl-string-equality.js (0 => 196685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/ftl-string-equality.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/ftl-string-equality.js 2016-02-17 05:29:34 UTC (rev 196685)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+function makeString(char) {
+ var result = "";
+ for (var i = 0; i < 10; ++i)
+ result += char;
+ return result;
+}
+
+var array = [ "a", "b", "c", "d" ];
+
+for (var i = 0; i < array.length; ++i)
+ array[i] = makeString(array[i]);
+
+function foo(array, s) {
+ for (var i = 0; i < array.length; ++i) {
+ if (array[i] == s)
+ return i;
+ }
+ return null;
+}
+
+noInline(foo);
+
+var array2 = [ "a", "b", "c", "d", "e" ];
+
+for (var i = 0; i < array2.length; ++i)
+ array2[i] = makeString(array2[i]);
+
+for (var i = 0; i < 100000; ++i) {
+ var index = i % array2.length;
+ var result = foo(array, array2[index]);
+ var expected = index >= array.length ? null : index
+ if (result !== expected)
+ throw "Error: bad result: " + result;
+}
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressftlstringidentequalityjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/ftl-string-ident-equality.js (0 => 196685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/ftl-string-ident-equality.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/ftl-string-ident-equality.js 2016-02-17 05:29:34 UTC (rev 196685)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+var array = [ "a", "b", "c", "d" ];
+
+function foo(array, s) {
+ for (var i = 0; i < array.length; ++i) {
+ if (array[i] == s)
+ return true;
+ }
+ return false;
+}
+
+noInline(foo);
+
+var result = 0;
+for (var i = 0; i < 100000; ++i)
+ result += foo(array, "d");
+
+if (result != 100000)
+ throw "Bad result: " + result;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressftlstringstrictequalityjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/ftl-string-strict-equality.js (0 => 196685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/ftl-string-strict-equality.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/ftl-string-strict-equality.js 2016-02-17 05:29:34 UTC (rev 196685)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+function makeString(char) {
+ var result = "";
+ for (var i = 0; i < 10; ++i)
+ result += char;
+ return result;
+}
+
+var array = [ "a", "b", "c", "d" ];
+
+for (var i = 0; i < array.length; ++i)
+ array[i] = makeString(array[i]);
+
+function foo(array, s) {
+ for (var i = 0; i < array.length; ++i) {
+ if (array[i] === s)
+ return i;
+ }
+ return null;
+}
+
+noInline(foo);
+
+var array2 = [ "a", "b", "c", "d", "e" ];
+
+for (var i = 0; i < array2.length; ++i)
+ array2[i] = makeString(array2[i]);
+
+for (var i = 0; i < 100000; ++i) {
+ var index = i % array2.length;
+ var result = foo(array, array2[index]);
+ var expected = index >= array.length ? null : index
+ if (result !== expected)
+ throw "Error: bad result: " + result;
+}
+
</ins></span></pre>
</div>
</div>
</body>
</html>