<!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>[184625] branches/safari-601.1.32-branch/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/184625">184625</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-05-20 00:56:54 -0700 (Wed, 20 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/184542">r184542</a>. rdar://problem/20679710</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreChangeLog">branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">branches/safari-601.1.32-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">branches/safari-601.1.32-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">branches/safari-601.1.32-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601132branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog (184624 => 184625)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog 2015-05-20 07:55:58 UTC (rev 184624)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog 2015-05-20 07:56:54 UTC (rev 184625)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2015-05-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r184542.
+
+ 2015-05-18 Filip Pizlo <fpizlo@apple.com>
+
+ Better optimize 'if' with ternaries conditional tests.
+ https://bugs.webkit.org/show_bug.cgi?id=144136
+
+ Reviewed by Benjamin Poulain.
+
+ This is the last fix I'll do for this for now. BooleanToNumber(Untyped:) where the input
+ is proved to be either BoolInt32 or Boolean should be optimized to just masking the
+ lowest bit.
+
+ This is another 37% speed-up on JSRegress/slow-ternaries.
+
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileBooleanToNumber):
+
+2015-05-20 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r184540.
</span><span class="cx">
</span><span class="cx"> 2015-05-18 Filip Pizlo <fpizlo@apple.com>
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (184624 => 184625)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-05-20 07:55:58 UTC (rev 184624)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-05-20 07:56:54 UTC (rev 184625)
</span><span class="lines">@@ -3029,6 +3029,18 @@
</span><span class="cx">
</span><span class="cx"> case UntypedUse: {
</span><span class="cx"> JSValueOperand value(this, node->child1());
</span><ins>+
+ if (!m_interpreter.needsTypeCheck(node->child1(), SpecBoolInt32 | SpecBoolean)) {
+ GPRTemporary result(this);
+
+ GPRReg valueGPR = value.payloadGPR();
+ GPRReg resultGPR = result.gpr();
+
+ m_jit.move(valueGPR, resultGPR);
+ int32Result(result.gpr(), node);
+ break;
+ }
+
</ins><span class="cx"> GPRTemporary resultTag(this);
</span><span class="cx"> GPRTemporary resultPayload(this);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (184624 => 184625)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-05-20 07:55:58 UTC (rev 184624)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-05-20 07:56:54 UTC (rev 184625)
</span><span class="lines">@@ -3136,6 +3136,13 @@
</span><span class="cx"> JSValueOperand value(this, node->child1());
</span><span class="cx"> GPRTemporary result(this);
</span><span class="cx">
</span><ins>+ if (!m_interpreter.needsTypeCheck(node->child1(), SpecBoolInt32 | SpecBoolean)) {
+ m_jit.move(value.gpr(), result.gpr());
+ m_jit.and32(TrustedImm32(1), result.gpr());
+ int32Result(result.gpr(), node);
+ break;
+ }
+
</ins><span class="cx"> m_jit.move(value.gpr(), result.gpr());
</span><span class="cx"> m_jit.xor64(TrustedImm32(static_cast<int32_t>(ValueFalse)), result.gpr());
</span><span class="cx"> JITCompiler::Jump isBoolean = m_jit.branchTest64(
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (184624 => 184625)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-05-20 07:55:58 UTC (rev 184624)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-05-20 07:56:54 UTC (rev 184625)
</span><span class="lines">@@ -1068,6 +1068,11 @@
</span><span class="cx"> case UntypedUse: {
</span><span class="cx"> LValue value = lowJSValue(m_node->child1());
</span><span class="cx">
</span><ins>+ if (!m_interpreter.needsTypeCheck(m_node->child1(), SpecBoolInt32 | SpecBoolean)) {
+ setInt32(m_out.bitAnd(m_out.castToInt32(value), m_out.int32One));
+ return;
+ }
+
</ins><span class="cx"> LBasicBlock booleanCase = FTL_NEW_BLOCK(m_out, ("BooleanToNumber boolean case"));
</span><span class="cx"> LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("BooleanToNumber continuation"));
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>