<!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>[170548] trunk/Source/WebCore</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/170548">170548</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2014-06-27 13:31:31 -0700 (Fri, 27 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent unnecessary register saving in css jit.
https://bugs.webkit.org/show_bug.cgi?id=133955
Reviewed by Geoff Garen.
* cssjit/FunctionCall.h:
(WebCore::FunctionCall::prepareAndCall):
(WebCore::FunctionCall::cleanupPostCall):
(WebCore::FunctionCall::saveAllocatedCallerSavedRegisters):
(WebCore::FunctionCall::restoreAllocatedCallerSavedRegisters):
(WebCore::FunctionCall::saveAllocatedRegisters): Renamed to saveAllocatedCallerSavedRegisters.
(WebCore::FunctionCall::restoreAllocatedRegisters): Renamed to restoreAllocatedCallerSavedRegisters.
Only push caller saved registers before function calls.
* cssjit/RegisterAllocator.h:
(WebCore::RegisterAllocator::isValidRegister):
Corrected register ranges.
(WebCore::RegisterAllocator::isCallerSavedRegister): Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssjitFunctionCallh">trunk/Source/WebCore/cssjit/FunctionCall.h</a></li>
<li><a href="#trunkSourceWebCorecssjitRegisterAllocatorh">trunk/Source/WebCore/cssjit/RegisterAllocator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170547 => 170548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-27 19:54:49 UTC (rev 170547)
+++ trunk/Source/WebCore/ChangeLog 2014-06-27 20:31:31 UTC (rev 170548)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-06-27 Alex Christensen <achristensen@webkit.org>
+
+ Prevent unnecessary register saving in css jit.
+ https://bugs.webkit.org/show_bug.cgi?id=133955
+
+ Reviewed by Geoff Garen.
+
+ * cssjit/FunctionCall.h:
+ (WebCore::FunctionCall::prepareAndCall):
+ (WebCore::FunctionCall::cleanupPostCall):
+ (WebCore::FunctionCall::saveAllocatedCallerSavedRegisters):
+ (WebCore::FunctionCall::restoreAllocatedCallerSavedRegisters):
+ (WebCore::FunctionCall::saveAllocatedRegisters): Renamed to saveAllocatedCallerSavedRegisters.
+ (WebCore::FunctionCall::restoreAllocatedRegisters): Renamed to restoreAllocatedCallerSavedRegisters.
+ Only push caller saved registers before function calls.
+ * cssjit/RegisterAllocator.h:
+ (WebCore::RegisterAllocator::isValidRegister):
+ Corrected register ranges.
+ (WebCore::RegisterAllocator::isCallerSavedRegister): Added.
+
</ins><span class="cx"> 2014-06-27 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Custom scrollbars should not create ScrollbarPainters on Mac
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitFunctionCallh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/FunctionCall.h (170547 => 170548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/FunctionCall.h 2014-06-27 19:54:49 UTC (rev 170547)
+++ trunk/Source/WebCore/cssjit/FunctionCall.h 2014-06-27 20:31:31 UTC (rev 170548)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> ASSERT(m_functionAddress.executableAddress());
</span><span class="cx"> ASSERT(!m_firstArgument || (m_firstArgument && !m_secondArgument) || (m_firstArgument && m_secondArgument));
</span><span class="cx">
</span><del>- saveAllocatedRegisters();
</del><ins>+ saveAllocatedCallerSavedRegisters();
</ins><span class="cx"> m_stackAllocator.alignStackPreFunctionCall();
</span><span class="cx">
</span><span class="cx"> if (m_argumentCount == 2) {
</span><span class="lines">@@ -155,20 +155,25 @@
</span><span class="cx"> void cleanupPostCall()
</span><span class="cx"> {
</span><span class="cx"> m_stackAllocator.unalignStackPostFunctionCall();
</span><del>- restoreAllocatedRegisters();
</del><ins>+ restoreAllocatedCallerSavedRegisters();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void saveAllocatedRegisters()
</del><ins>+ void saveAllocatedCallerSavedRegisters()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_savedRegisterStackReferences.isEmpty());
</span><ins>+ ASSERT(m_savedRegisters.isEmpty());
</ins><span class="cx"> const Vector<JSC::MacroAssembler::RegisterID, registerCount>& allocatedRegisters = m_registerAllocator.allocatedRegisters();
</span><del>- Vector<StackAllocator::StackReference> stackReferences = m_stackAllocator.push(allocatedRegisters);
</del><ins>+ for (auto registerID : allocatedRegisters) {
+ if (RegisterAllocator::isCallerSavedRegister(registerID))
+ m_savedRegisters.append(registerID);
+ }
+ Vector<StackAllocator::StackReference> stackReferences = m_stackAllocator.push(m_savedRegisters);
</ins><span class="cx"> m_savedRegisterStackReferences.appendVector(stackReferences);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void restoreAllocatedRegisters()
</del><ins>+ void restoreAllocatedCallerSavedRegisters()
</ins><span class="cx"> {
</span><del>- m_stackAllocator.pop(m_savedRegisterStackReferences, m_registerAllocator.allocatedRegisters());
</del><ins>+ m_stackAllocator.pop(m_savedRegisterStackReferences, m_savedRegisters);
</ins><span class="cx"> m_savedRegisterStackReferences.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -177,8 +182,9 @@
</span><span class="cx"> StackAllocator& m_stackAllocator;
</span><span class="cx"> Vector<std::pair<JSC::MacroAssembler::Call, JSC::FunctionPtr>>& m_callRegistry;
</span><span class="cx">
</span><del>- Vector<StackAllocator::StackReference> m_savedRegisterStackReferences;
-
</del><ins>+ Vector<JSC::MacroAssembler::RegisterID, registerCount> m_savedRegisters;
+ Vector<StackAllocator::StackReference, registerCount> m_savedRegisterStackReferences;
+
</ins><span class="cx"> JSC::FunctionPtr m_functionAddress;
</span><span class="cx"> unsigned m_argumentCount;
</span><span class="cx"> JSC::MacroAssembler::RegisterID m_firstArgument;
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitRegisterAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/RegisterAllocator.h (170547 => 170548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/RegisterAllocator.h 2014-06-27 19:54:49 UTC (rev 170547)
+++ trunk/Source/WebCore/cssjit/RegisterAllocator.h 2014-06-27 20:31:31 UTC (rev 170548)
</span><span class="lines">@@ -172,15 +172,32 @@
</span><span class="cx"> static bool isValidRegister(JSC::MacroAssembler::RegisterID registerID)
</span><span class="cx"> {
</span><span class="cx"> #if CPU(ARM64)
</span><del>- return registerID >= JSC::ARM64Registers::x0 && registerID <= JSC::ARM64Registers::x15;
</del><ins>+ return (registerID >= JSC::ARM64Registers::x0 && registerID <= JSC::ARM64Registers::x14)
+ || registerID == JSC::ARM64Registers::x19;
</ins><span class="cx"> #elif CPU(ARM_THUMB2)
</span><span class="cx"> return registerID >= JSC::ARMRegisters::r0 && registerID <= JSC::ARMRegisters::r7 && registerID != JSC::ARMRegisters::r6;
</span><span class="cx"> #elif CPU(X86_64)
</span><del>- return registerID >= JSC::X86Registers::eax && registerID <= JSC::X86Registers::r14;
</del><ins>+ return (registerID >= JSC::X86Registers::eax && registerID <= JSC::X86Registers::edx)
+ || (registerID >= JSC::X86Registers::esi && registerID <= JSC::X86Registers::r15);
</ins><span class="cx"> #else
</span><span class="cx"> #error RegisterAllocator does not define the valid register range for the current architecture.
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
+ static bool isCallerSavedRegister(JSC::MacroAssembler::RegisterID registerID)
+ {
+ ASSERT(isValidRegister(registerID));
+#if CPU(ARM64)
+ return registerID >= JSC::ARM64Registers::x0 && registerID <= JSC::ARM64Registers::x14;
+#elif CPU(ARM_THUMB2)
+ return registerID >= JSC::ARMRegisters::r0 && registerID <= JSC::ARMRegisters::r3;
+#elif CPU(X86_64)
+ return (registerID >= JSC::X86Registers::eax && registerID <= JSC::X86Registers::edx)
+ || (registerID >= JSC::X86Registers::esi && registerID <= JSC::X86Registers::r11);
+#else
+#error RegisterAllocator does not define the valid caller saved register range for the current architecture.
+#endif
+ }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Deque<JSC::MacroAssembler::RegisterID> m_registers;
</span></span></pre>
</div>
</div>
</body>
</html>