<!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>[197653] 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/197653">197653</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-06 18:42:43 -0800 (Sun, 06 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Use 3 operands Add in more places
https://bugs.webkit.org/show_bug.cgi?id=155082
Reviewed by Filip Pizlo.
* assembler/MacroAssembler.h:
(JSC::MacroAssembler::addPtr):
(JSC::MacroAssembler::add32):
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::add32):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileArithAdd):
The case with child1 constant is useless.
The canonical form will have the constant as child2.
Also add register reuse for the fast-add.
Registers are a scarce resource on x86.
* jit/CCallHelpers.h:
(JSC::CCallHelpers::prepareForTailCallSlow):
* yarr/YarrJIT.cpp:
(JSC::Yarr::YarrGenerator::generate):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerh">trunk/Source/JavaScriptCore/assembler/MacroAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitCCallHelpersh">trunk/Source/JavaScriptCore/jit/CCallHelpers.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreyarrYarrJITcpp">trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197652 => 197653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-07 02:40:16 UTC (rev 197652)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-07 02:42:43 UTC (rev 197653)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-03-06 Benjamin Poulain <benjamin@webkit.org>
+
+ [JSC] Use 3 operands Add in more places
+ https://bugs.webkit.org/show_bug.cgi?id=155082
+
+ Reviewed by Filip Pizlo.
+
+ * assembler/MacroAssembler.h:
+ (JSC::MacroAssembler::addPtr):
+ (JSC::MacroAssembler::add32):
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::add32):
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileArithAdd):
+ The case with child1 constant is useless.
+ The canonical form will have the constant as child2.
+
+ Also add register reuse for the fast-add.
+ Registers are a scarce resource on x86.
+
+ * jit/CCallHelpers.h:
+ (JSC::CCallHelpers::prepareForTailCallSlow):
+ * yarr/YarrJIT.cpp:
+ (JSC::Yarr::YarrGenerator::generate):
+
</ins><span class="cx"> 2016-03-06 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Improve codegen of Compare and Test
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssembler.h (197652 => 197653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2016-03-07 02:40:16 UTC (rev 197652)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2016-03-07 02:42:43 UTC (rev 197653)
</span><span class="lines">@@ -521,6 +521,11 @@
</span><span class="cx"> add32(src, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void addPtr(RegisterID left, RegisterID right, RegisterID dest)
+ {
+ add32(left, right, dest);
+ }
+
</ins><span class="cx"> void addPtr(TrustedImm32 imm, RegisterID srcDest)
</span><span class="cx"> {
</span><span class="cx"> add32(imm, srcDest);
</span><span class="lines">@@ -793,6 +798,11 @@
</span><span class="cx"> {
</span><span class="cx"> add64(src, dest);
</span><span class="cx"> }
</span><ins>+
+ void addPtr(RegisterID left, RegisterID right, RegisterID dest)
+ {
+ add64(left, right, dest);
+ }
</ins><span class="cx">
</span><span class="cx"> void addPtr(Address src, RegisterID dest)
</span><span class="cx"> {
</span><span class="lines">@@ -1457,6 +1467,16 @@
</span><span class="cx"> } else
</span><span class="cx"> add32(imm.asTrustedImm32(), dest);
</span><span class="cx"> }
</span><ins>+
+ void add32(Imm32 imm, RegisterID src, RegisterID dest)
+ {
+ if (shouldBlind(imm)) {
+ BlindedImm32 key = additionBlindedConstant(imm);
+ add32(key.value1, src, dest);
+ add32(key.value2, dest);
+ } else
+ add32(imm.asTrustedImm32(), src, dest);
+ }
</ins><span class="cx">
</span><span class="cx"> void addPtr(Imm32 imm, RegisterID dest)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (197652 => 197653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2016-03-07 02:40:16 UTC (rev 197652)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2016-03-07 02:42:43 UTC (rev 197653)
</span><span class="lines">@@ -155,6 +155,11 @@
</span><span class="cx"> m_assembler.add(dest, dest, src);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void add32(RegisterID left, RegisterID right, RegisterID dest)
+ {
+ m_assembler.add(dest, left, right);
+ }
+
</ins><span class="cx"> void add32(TrustedImm32 imm, RegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> add32(imm, dest, dest);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (197652 => 197653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2016-03-07 02:40:16 UTC (rev 197652)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2016-03-07 02:42:43 UTC (rev 197653)
</span><span class="lines">@@ -3256,33 +3256,21 @@
</span><span class="cx"> switch (node->binaryUseKind()) {
</span><span class="cx"> case Int32Use: {
</span><span class="cx"> ASSERT(!shouldCheckNegativeZero(node->arithMode()));
</span><del>-
- if (node->child1()->isInt32Constant()) {
- int32_t imm1 = node->child1()->asInt32();
- SpeculateInt32Operand op2(this, node->child2());
- GPRTemporary result(this);
</del><span class="cx">
</span><del>- if (!shouldCheckOverflow(node->arithMode())) {
- m_jit.move(op2.gpr(), result.gpr());
- m_jit.add32(Imm32(imm1), result.gpr());
- } else
- speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branchAdd32(MacroAssembler::Overflow, op2.gpr(), Imm32(imm1), result.gpr()));
-
- int32Result(result.gpr(), node);
- return;
- }
-
</del><span class="cx"> if (node->child2()->isInt32Constant()) {
</span><span class="cx"> SpeculateInt32Operand op1(this, node->child1());
</span><span class="cx"> int32_t imm2 = node->child2()->asInt32();
</span><del>- GPRTemporary result(this);
-
</del><ins>+
</ins><span class="cx"> if (!shouldCheckOverflow(node->arithMode())) {
</span><del>- m_jit.move(op1.gpr(), result.gpr());
- m_jit.add32(Imm32(imm2), result.gpr());
- } else
- speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branchAdd32(MacroAssembler::Overflow, op1.gpr(), Imm32(imm2), result.gpr()));
</del><ins>+ GPRTemporary result(this, Reuse, op1);
+ m_jit.add32(Imm32(imm2), op1.gpr(), result.gpr());
+ int32Result(result.gpr(), node);
+ return;
+ }
</ins><span class="cx">
</span><ins>+ GPRTemporary result(this);
+ speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branchAdd32(MacroAssembler::Overflow, op1.gpr(), Imm32(imm2), result.gpr()));
+
</ins><span class="cx"> int32Result(result.gpr(), node);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -3295,14 +3283,9 @@
</span><span class="cx"> GPRReg gpr2 = op2.gpr();
</span><span class="cx"> GPRReg gprResult = result.gpr();
</span><span class="cx">
</span><del>- if (!shouldCheckOverflow(node->arithMode())) {
- if (gpr1 == gprResult)
- m_jit.add32(gpr2, gprResult);
- else {
- m_jit.move(gpr2, gprResult);
- m_jit.add32(gpr1, gprResult);
- }
- } else {
</del><ins>+ if (!shouldCheckOverflow(node->arithMode()))
+ m_jit.add32(gpr1, gpr2, gprResult);
+ else {
</ins><span class="cx"> MacroAssembler::Jump check = m_jit.branchAdd32(MacroAssembler::Overflow, gpr1, gpr2, gprResult);
</span><span class="cx">
</span><span class="cx"> if (gpr1 == gprResult)
</span><span class="lines">@@ -3329,8 +3312,7 @@
</span><span class="cx"> SpeculateWhicheverInt52Operand op1(this, node->child1());
</span><span class="cx"> SpeculateWhicheverInt52Operand op2(this, node->child2(), op1);
</span><span class="cx"> GPRTemporary result(this, Reuse, op1);
</span><del>- m_jit.move(op1.gpr(), result.gpr());
- m_jit.add64(op2.gpr(), result.gpr());
</del><ins>+ m_jit.add64(op1.gpr(), op2.gpr(), result.gpr());
</ins><span class="cx"> int52Result(result.gpr(), node, op1.format());
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitCCallHelpersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/CCallHelpers.h (197652 => 197653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/CCallHelpers.h 2016-03-07 02:40:16 UTC (rev 197652)
+++ trunk/Source/JavaScriptCore/jit/CCallHelpers.h 2016-03-07 02:42:43 UTC (rev 197653)
</span><span class="lines">@@ -2157,8 +2157,7 @@
</span><span class="cx">
</span><span class="cx"> // The new frame pointer is at framePointer + oldFrameSize - newFrameSize
</span><span class="cx"> ASSERT(newFramePointer != oldFrameSizeGPR);
</span><del>- move(framePointerRegister, newFramePointer);
- addPtr(oldFrameSizeGPR, newFramePointer);
</del><ins>+ addPtr(framePointerRegister, oldFrameSizeGPR, newFramePointer);
</ins><span class="cx">
</span><span class="cx"> // The new frame size is just the number of arguments plus the
</span><span class="cx"> // frame header size, aligned
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreyarrYarrJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp (197652 => 197653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp 2016-03-07 02:40:16 UTC (rev 197652)
+++ trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp 2016-03-07 02:42:43 UTC (rev 197653)
</span><span class="lines">@@ -1626,8 +1626,7 @@
</span><span class="cx"> if (term->quantityType == QuantifierFixedCount)
</span><span class="cx"> inputOffset -= term->parentheses.disjunction->m_minimumSize;
</span><span class="cx"> if (inputOffset) {
</span><del>- move(index, indexTemporary);
- add32(Imm32(inputOffset), indexTemporary);
</del><ins>+ add32(Imm32(inputOffset), index, indexTemporary);
</ins><span class="cx"> setSubpatternStart(indexTemporary, term->parentheses.subpatternId);
</span><span class="cx"> } else
</span><span class="cx"> setSubpatternStart(index, term->parentheses.subpatternId);
</span><span class="lines">@@ -1657,8 +1656,7 @@
</span><span class="cx"> if (term->capture() && compileMode == IncludeSubpatterns) {
</span><span class="cx"> int inputOffset = term->inputPosition - m_checked;
</span><span class="cx"> if (inputOffset) {
</span><del>- move(index, indexTemporary);
- add32(Imm32(inputOffset), indexTemporary);
</del><ins>+ add32(Imm32(inputOffset), index, indexTemporary);
</ins><span class="cx"> setSubpatternEnd(indexTemporary, term->parentheses.subpatternId);
</span><span class="cx"> } else
</span><span class="cx"> setSubpatternEnd(index, term->parentheses.subpatternId);
</span></span></pre>
</div>
</div>
</body>
</html>