<!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>[197687] 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/197687">197687</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-07 10:25:55 -0800 (Mon, 07 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Improve how DFG zero Floating Point registers
https://bugs.webkit.org/show_bug.cgi?id=155096
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-03-07
Reviewed by Geoffrey Garen.
DFG had a weird way of zeroing a FPR:
-zero a GP.
-move that to a FP.
Filip added moveZeroToDouble() for B3. This patch
uses that in the lower tiers.
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::moveZeroToDouble):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::fillSpeculateDouble):
* jit/ThunkGenerators.cpp:
(JSC::floorThunkGenerator):
(JSC::roundThunkGenerator):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitThunkGeneratorscpp">trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197686 => 197687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-07 18:24:26 UTC (rev 197686)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-07 18:25:55 UTC (rev 197687)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-03-07 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC] Improve how DFG zero Floating Point registers
+ https://bugs.webkit.org/show_bug.cgi?id=155096
+
+ Reviewed by Geoffrey Garen.
+
+ DFG had a weird way of zeroing a FPR:
+ -zero a GP.
+ -move that to a FP.
+
+ Filip added moveZeroToDouble() for B3. This patch
+ uses that in the lower tiers.
+
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::moveZeroToDouble):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::fillSpeculateDouble):
+ * jit/ThunkGenerators.cpp:
+ (JSC::floorThunkGenerator):
+ (JSC::roundThunkGenerator):
+
</ins><span class="cx"> 2016-03-07 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r197303): Web Inspector crashes web process when inspecting an element on TOT
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (197686 => 197687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2016-03-07 18:24:26 UTC (rev 197686)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2016-03-07 18:25:55 UTC (rev 197687)
</span><span class="lines">@@ -929,6 +929,12 @@
</span><span class="cx"> m_assembler.vmov(dest, src);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void moveZeroToDouble(FPRegisterID reg)
+ {
+ static double zeroConstant = 0.;
+ loadDouble(TrustedImmPtr(&zeroConstant), reg);
+ }
+
</ins><span class="cx"> void loadDouble(TrustedImmPtr address, FPRegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> move(address, addressTempRegister);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (197686 => 197687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2016-03-07 18:24:26 UTC (rev 197686)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2016-03-07 18:25:55 UTC (rev 197687)
</span><span class="lines">@@ -1133,13 +1133,17 @@
</span><span class="cx">
</span><span class="cx"> if (info.registerFormat() == DataFormatNone) {
</span><span class="cx"> if (edge->hasConstant()) {
</span><del>- GPRReg gpr = allocate();
-
</del><span class="cx"> if (edge->isNumberConstant()) {
</span><span class="cx"> FPRReg fpr = fprAllocate();
</span><del>- m_jit.move(MacroAssembler::Imm64(reinterpretDoubleToInt64(edge->asNumber())), gpr);
- m_jit.move64ToDouble(gpr, fpr);
- unlock(gpr);
</del><ins>+ int64_t doubleAsInt = reinterpretDoubleToInt64(edge->asNumber());
+ if (!doubleAsInt)
+ m_jit.moveZeroToDouble(fpr);
+ else {
+ GPRReg gpr = allocate();
+ m_jit.move(MacroAssembler::Imm64(doubleAsInt), gpr);
+ m_jit.move64ToDouble(gpr, fpr);
+ unlock(gpr);
+ }
</ins><span class="cx">
</span><span class="cx"> m_fprs.retain(fpr, virtualRegister, SpillOrderDouble);
</span><span class="cx"> info.fillDouble(*m_stream, fpr);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitThunkGeneratorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp (197686 => 197687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2016-03-07 18:24:26 UTC (rev 197686)
+++ trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2016-03-07 18:25:55 UTC (rev 197687)
</span><span class="lines">@@ -774,7 +774,6 @@
</span><span class="cx">
</span><span class="cx"> static const double oneConstant = 1.0;
</span><span class="cx"> static const double negativeHalfConstant = -0.5;
</span><del>-static const double zeroConstant = 0.0;
</del><span class="cx"> static const double halfConstant = 0.5;
</span><span class="cx">
</span><span class="cx"> MacroAssemblerCodeRef floorThunkGenerator(VM* vm)
</span><span class="lines">@@ -798,7 +797,7 @@
</span><span class="cx"> SpecializedThunkJIT::Jump intResult;
</span><span class="cx"> SpecializedThunkJIT::JumpList doubleResult;
</span><span class="cx"> if (jit.supportsFloatingPointTruncate()) {
</span><del>- jit.loadDouble(MacroAssembler::TrustedImmPtr(&zeroConstant), SpecializedThunkJIT::fpRegT1);
</del><ins>+ jit.moveZeroToDouble(SpecializedThunkJIT::fpRegT1);
</ins><span class="cx"> doubleResult.append(jit.branchDouble(MacroAssembler::DoubleEqual, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::fpRegT1));
</span><span class="cx"> SpecializedThunkJIT::JumpList slowPath;
</span><span class="cx"> // Handle the negative doubles in the slow path for now.
</span><span class="lines">@@ -854,7 +853,7 @@
</span><span class="cx"> SpecializedThunkJIT::Jump intResult;
</span><span class="cx"> SpecializedThunkJIT::JumpList doubleResult;
</span><span class="cx"> if (jit.supportsFloatingPointTruncate()) {
</span><del>- jit.loadDouble(MacroAssembler::TrustedImmPtr(&zeroConstant), SpecializedThunkJIT::fpRegT1);
</del><ins>+ jit.moveZeroToDouble(SpecializedThunkJIT::fpRegT1);
</ins><span class="cx"> doubleResult.append(jit.branchDouble(MacroAssembler::DoubleEqual, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::fpRegT1));
</span><span class="cx"> SpecializedThunkJIT::JumpList slowPath;
</span><span class="cx"> // Handle the negative doubles in the slow path for now.
</span></span></pre>
</div>
</div>
</body>
</html>