<!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>[160607] branches/jsCStack/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/160607">160607</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2013-12-14 16:43:57 -0800 (Sat, 14 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, revert <a href="http://trac.webkit.org/projects/webkit/changeset/156746">r156746</a>, "FTL: split overflow checks into non-overflow arithmetic and an additional call to the overflow intrinsic check."
This introduces redundancies that LLVM can't handle. Reverting this change brings the
FTL up to being on-par with the DFG on V8v7/encrypt.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileAddSub):
(JSC::FTL::LowerDFGToLLVM::compileArithMul):
(JSC::FTL::LowerDFGToLLVM::compileArithNegate):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (160606 => 160607)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-15 00:21:25 UTC (rev 160606)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-15 00:43:57 UTC (rev 160607)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2013-12-14 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ Unreviewed, revert r156746, "FTL: split overflow checks into non-overflow arithmetic and an additional call to the overflow intrinsic check."
+
+ This introduces redundancies that LLVM can't handle. Reverting this change brings the
+ FTL up to being on-par with the DFG on V8v7/encrypt.
+
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileAddSub):
+ (JSC::FTL::LowerDFGToLLVM::compileArithMul):
+ (JSC::FTL::LowerDFGToLLVM::compileArithNegate):
+
+2013-12-14 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> cStack: Calling into FTL-generated code should be fast
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125649
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (160606 => 160607)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2013-12-15 00:21:25 UTC (rev 160606)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2013-12-15 00:43:57 UTC (rev 160607)
</span><span class="lines">@@ -711,17 +711,16 @@
</span><span class="cx"> case Int32Use: {
</span><span class="cx"> LValue left = lowInt32(m_node->child1());
</span><span class="cx"> LValue right = lowInt32(m_node->child2());
</span><del>- LValue result = isSub ? m_out.sub(left, right) : m_out.add(left, right);
</del><span class="cx">
</span><span class="cx"> if (bytecodeCanTruncateInteger(m_node->arithNodeFlags())) {
</span><del>- setInt32(result);
</del><ins>+ setInt32(isSub ? m_out.sub(left, right) : m_out.add(left, right));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LValue overflow = isSub ? m_out.subWithOverflow32(left, right) : m_out.addWithOverflow32(left, right);
</del><ins>+ LValue result = isSub ? m_out.subWithOverflow32(left, right) : m_out.addWithOverflow32(left, right);
</ins><span class="cx">
</span><del>- speculate(Overflow, noValue(), 0, m_out.extractValue(overflow, 1));
- setInt32(result);
</del><ins>+ speculate(Overflow, noValue(), 0, m_out.extractValue(result, 1));
+ setInt32(m_out.extractValue(result, 0));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -737,11 +736,10 @@
</span><span class="cx">
</span><span class="cx"> LValue left = lowInt52(m_node->child1());
</span><span class="cx"> LValue right = lowInt52(m_node->child2());
</span><del>- LValue result = isSub ? m_out.sub(left, right) : m_out.add(left, right);
</del><span class="cx">
</span><del>- LValue overflow = isSub ? m_out.subWithOverflow64(left, right) : m_out.addWithOverflow64(left, right);
- speculate(Int52Overflow, noValue(), 0, m_out.extractValue(overflow, 1));
- setInt52(result);
</del><ins>+ LValue result = isSub ? m_out.subWithOverflow64(left, right) : m_out.addWithOverflow64(left, right);
+ speculate(Int52Overflow, noValue(), 0, m_out.extractValue(result, 1));
+ setInt52(m_out.extractValue(result, 0));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -765,11 +763,15 @@
</span><span class="cx"> case Int32Use: {
</span><span class="cx"> LValue left = lowInt32(m_node->child1());
</span><span class="cx"> LValue right = lowInt32(m_node->child2());
</span><del>- LValue result = m_out.mul(left, right);
</del><ins>+
+ LValue result;
</ins><span class="cx">
</span><del>- if (!bytecodeCanTruncateInteger(m_node->arithNodeFlags())) {
</del><ins>+ if (bytecodeCanTruncateInteger(m_node->arithNodeFlags()))
+ result = m_out.mul(left, right);
+ else {
</ins><span class="cx"> LValue overflowResult = m_out.mulWithOverflow32(left, right);
</span><span class="cx"> speculate(Overflow, noValue(), 0, m_out.extractValue(overflowResult, 1));
</span><ins>+ result = m_out.extractValue(overflowResult, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!bytecodeCanIgnoreNegativeZero(m_node->arithNodeFlags())) {
</span><span class="lines">@@ -793,11 +795,10 @@
</span><span class="cx"> Int52Kind kind;
</span><span class="cx"> LValue left = lowWhicheverInt52(m_node->child1(), kind);
</span><span class="cx"> LValue right = lowInt52(m_node->child2(), opposite(kind));
</span><del>- LValue result = m_out.mul(left, right);
</del><span class="cx">
</span><del>-
</del><span class="cx"> LValue overflowResult = m_out.mulWithOverflow64(left, right);
</span><span class="cx"> speculate(Int52Overflow, noValue(), 0, m_out.extractValue(overflowResult, 1));
</span><ins>+ LValue result = m_out.extractValue(overflowResult, 0);
</ins><span class="cx">
</span><span class="cx"> if (!bytecodeCanIgnoreNegativeZero(m_node->arithNodeFlags())) {
</span><span class="cx"> LBasicBlock slowCase = FTL_NEW_BLOCK(m_out, ("ArithMul slow case"));
</span><span class="lines">@@ -1010,16 +1011,18 @@
</span><span class="cx"> case Int32Use: {
</span><span class="cx"> LValue value = lowInt32(m_node->child1());
</span><span class="cx">
</span><del>- LValue result = m_out.neg(value);
- if (!bytecodeCanTruncateInteger(m_node->arithNodeFlags())) {
- if (bytecodeCanIgnoreNegativeZero(m_node->arithNodeFlags())) {
- // We don't have a negate-with-overflow intrinsic. Hopefully this
- // does the trick, though.
- LValue overflowResult = m_out.subWithOverflow32(m_out.int32Zero, value);
- speculate(Overflow, noValue(), 0, m_out.extractValue(overflowResult, 1));
- } else
- speculate(Overflow, noValue(), 0, m_out.testIsZero32(value, m_out.constInt32(0x7fffffff)));
-
</del><ins>+ LValue result;
+ if (bytecodeCanTruncateInteger(m_node->arithNodeFlags()))
+ result = m_out.neg(value);
+ else if (bytecodeCanIgnoreNegativeZero(m_node->arithNodeFlags())) {
+ // We don't have a negate-with-overflow intrinsic. Hopefully this
+ // does the trick, though.
+ LValue overflowResult = m_out.subWithOverflow32(m_out.int32Zero, value);
+ speculate(Overflow, noValue(), 0, m_out.extractValue(overflowResult, 1));
+ result = m_out.extractValue(overflowResult, 0);
+ } else {
+ speculate(Overflow, noValue(), 0, m_out.testIsZero32(value, m_out.constInt32(0x7fffffff)));
+ result = m_out.neg(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> setInt32(result);
</span><span class="lines">@@ -1040,7 +1043,7 @@
</span><span class="cx"> LValue value = lowInt52(m_node->child1());
</span><span class="cx"> LValue overflowResult = m_out.subWithOverflow64(m_out.int64Zero, value);
</span><span class="cx"> speculate(Int52Overflow, noValue(), 0, m_out.extractValue(overflowResult, 1));
</span><del>- LValue result = m_out.neg(value);
</del><ins>+ LValue result = m_out.extractValue(overflowResult, 0);
</ins><span class="cx"> speculate(NegativeZero, noValue(), 0, m_out.isZero64(result));
</span><span class="cx"> setInt52(result);
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>