<!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>[169953] 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/169953">169953</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-13 15:26:52 -0700 (Fri, 13 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make css jit allocator smarter.
https://bugs.webkit.org/show_bug.cgi?id=133834
Patch by Alex Christensen <achristensen@webkit.org> on 2014-06-13
Reviewed by Benjamin Poulain.
* cssjit/RegisterAllocator.h:
(WebCore::RegisterAllocator::allocateRegister):
(WebCore::RegisterAllocator::deallocateRegister):
(WebCore::RegisterAllocator::reserveCalleeSavedRegisters):
(WebCore::LocalRegister::LocalRegister):
(WebCore::RegisterAllocator::RegisterAllocator):
Use a Deque for the registers. Allocate from the front and deallocate to the back to cycle the register usage.
(WebCore::RegisterAllocator::allocateRegisterWithPreference):
(WebCore::LocalRegisterWithPreference::LocalRegisterWithPreference):
Added the ability to specify that we prefer a certain register if it is available while allocating.
These functions always return a register. It is just a different register than preferred if the preferred register is not available.
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeValueExactMatching):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeFunctionCallValueMatching):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsActive):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsHovered):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsNthChild):
Whenever we are allocating a register for the second argument, we should specify that we
prefer to have argumentGPR1 to reduce register swapping when preparing for a function call.
This cannot be done for argumentGPR0 because elementAddressRegister is argumentGPR0 and it is always allocated.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssjitRegisterAllocatorh">trunk/Source/WebCore/cssjit/RegisterAllocator.h</a></li>
<li><a href="#trunkSourceWebCorecssjitSelectorCompilercpp">trunk/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169952 => 169953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-13 22:24:17 UTC (rev 169952)
+++ trunk/Source/WebCore/ChangeLog 2014-06-13 22:26:52 UTC (rev 169953)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-06-13 Alex Christensen <achristensen@webkit.org>
+
+ Make css jit allocator smarter.
+ https://bugs.webkit.org/show_bug.cgi?id=133834
+
+ Reviewed by Benjamin Poulain.
+
+ * cssjit/RegisterAllocator.h:
+ (WebCore::RegisterAllocator::allocateRegister):
+ (WebCore::RegisterAllocator::deallocateRegister):
+ (WebCore::RegisterAllocator::reserveCalleeSavedRegisters):
+ (WebCore::LocalRegister::LocalRegister):
+ (WebCore::RegisterAllocator::RegisterAllocator):
+ Use a Deque for the registers. Allocate from the front and deallocate to the back to cycle the register usage.
+ (WebCore::RegisterAllocator::allocateRegisterWithPreference):
+ (WebCore::LocalRegisterWithPreference::LocalRegisterWithPreference):
+ Added the ability to specify that we prefer a certain register if it is available while allocating.
+ These functions always return a register. It is just a different register than preferred if the preferred register is not available.
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeValueExactMatching):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeFunctionCallValueMatching):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsActive):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsHovered):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsNthChild):
+ Whenever we are allocating a register for the second argument, we should specify that we
+ prefer to have argumentGPR1 to reduce register swapping when preparing for a function call.
+ This cannot be done for argumentGPR0 because elementAddressRegister is argumentGPR0 and it is always allocated.
+
</ins><span class="cx"> 2014-06-13 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> set setUsesExternalPlaybackWhileExternalScreenIsActive based on fullscreen mode
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitRegisterAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/RegisterAllocator.h (169952 => 169953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/RegisterAllocator.h 2014-06-13 22:24:17 UTC (rev 169952)
+++ trunk/Source/WebCore/cssjit/RegisterAllocator.h 2014-06-13 22:26:52 UTC (rev 169953)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #if ENABLE(CSS_SELECTOR_JIT)
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/MacroAssembler.h>
</span><del>-#include <wtf/HashSet.h>
</del><ins>+#include <wtf/Deque.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -102,9 +102,9 @@
</span><span class="cx">
</span><span class="cx"> JSC::MacroAssembler::RegisterID allocateRegister()
</span><span class="cx"> {
</span><del>- auto first = m_registers.begin();
- JSC::MacroAssembler::RegisterID registerID = static_cast<JSC::MacroAssembler::RegisterID>(*first);
- RELEASE_ASSERT(m_registers.remove(first));
</del><ins>+ RELEASE_ASSERT(m_registers.size());
+ JSC::MacroAssembler::RegisterID registerID = m_registers.first();
+ m_registers.removeFirst();
</ins><span class="cx"> ASSERT(!m_allocatedRegisters.contains(registerID));
</span><span class="cx"> m_allocatedRegisters.append(registerID);
</span><span class="cx"> return registerID;
</span><span class="lines">@@ -112,10 +112,29 @@
</span><span class="cx">
</span><span class="cx"> void allocateRegister(JSC::MacroAssembler::RegisterID registerID)
</span><span class="cx"> {
</span><del>- RELEASE_ASSERT(m_registers.remove(registerID));
- ASSERT(!m_allocatedRegisters.contains(registerID));
- m_allocatedRegisters.append(registerID);
</del><ins>+ for (auto it = m_registers.begin(); it != m_registers.end(); ++it) {
+ if (*it == registerID) {
+ m_registers.remove(it);
+ ASSERT(!m_allocatedRegisters.contains(registerID));
+ m_allocatedRegisters.append(registerID);
+ return;
+ }
+ }
+ RELEASE_ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><ins>+
+ JSC::MacroAssembler::RegisterID allocateRegisterWithPreference(JSC::MacroAssembler::RegisterID preferredRegister)
+ {
+ for (auto it = m_registers.begin(); it != m_registers.end(); ++it) {
+ if (*it == preferredRegister) {
+ m_registers.remove(it);
+ ASSERT(!m_allocatedRegisters.contains(preferredRegister));
+ m_allocatedRegisters.append(preferredRegister);
+ return preferredRegister;
+ }
+ }
+ return allocateRegister();
+ }
</ins><span class="cx">
</span><span class="cx"> void deallocateRegister(JSC::MacroAssembler::RegisterID registerID)
</span><span class="cx"> {
</span><span class="lines">@@ -123,7 +142,9 @@
</span><span class="cx"> // Most allocation/deallocation happen in stack-like order. In the common case, this
</span><span class="cx"> // just removes the last item.
</span><span class="cx"> m_allocatedRegisters.remove(m_allocatedRegisters.reverseFind(registerID));
</span><del>- RELEASE_ASSERT(m_registers.add(registerID).isNewEntry);
</del><ins>+ for (auto unallocatedRegister : m_registers)
+ RELEASE_ASSERT(unallocatedRegister != registerID);
+ m_registers.append(registerID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const Vector<JSC::MacroAssembler::RegisterID, calleeSavedRegisterCount>& reserveCalleeSavedRegisters(unsigned count)
</span><span class="lines">@@ -133,7 +154,7 @@
</span><span class="cx"> for (unsigned i = 0; i < count; ++i) {
</span><span class="cx"> JSC::MacroAssembler::RegisterID registerId = calleeSavedRegisters[i];
</span><span class="cx"> m_reservedCalleeSavedRegisters.append(registerId);
</span><del>- m_registers.add(registerId);
</del><ins>+ m_registers.append(registerId);
</ins><span class="cx"> }
</span><span class="cx"> return m_reservedCalleeSavedRegisters;
</span><span class="cx"> }
</span><span class="lines">@@ -161,7 +182,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- HashSet<unsigned, DefaultHash<unsigned>::Hash, WTF::UnsignedWithZeroKeyHashTraits<unsigned>> m_registers;
</del><ins>+ Deque<JSC::MacroAssembler::RegisterID> m_registers;
</ins><span class="cx"> Vector<JSC::MacroAssembler::RegisterID, registerCount> m_allocatedRegisters;
</span><span class="cx"> Vector<JSC::MacroAssembler::RegisterID, calleeSavedRegisterCount> m_reservedCalleeSavedRegisters;
</span><span class="cx"> };
</span><span class="lines">@@ -184,15 +205,28 @@
</span><span class="cx"> return m_register;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-private:
</del><ins>+protected:
+ explicit LocalRegister(RegisterAllocator& allocator, JSC::MacroAssembler::RegisterID registerID)
+ : m_allocator(allocator)
+ , m_register(registerID)
+ {
+ }
</ins><span class="cx"> RegisterAllocator& m_allocator;
</span><span class="cx"> JSC::MacroAssembler::RegisterID m_register;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class LocalRegisterWithPreference : public LocalRegister {
+public:
+ explicit LocalRegisterWithPreference(RegisterAllocator& allocator, JSC::MacroAssembler::RegisterID preferredRegister)
+ : LocalRegister(allocator, allocator.allocateRegisterWithPreference(preferredRegister))
+ {
+ }
+};
+
</ins><span class="cx"> inline RegisterAllocator::RegisterAllocator()
</span><span class="cx"> {
</span><span class="cx"> for (unsigned i = 0; i < WTF_ARRAY_LENGTH(callerSavedRegisters); ++i)
</span><del>- m_registers.add(callerSavedRegisters[i]);
</del><ins>+ m_registers.append(callerSavedRegisters[i]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline RegisterAllocator::~RegisterAllocator()
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (169952 => 169953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-06-13 22:24:17 UTC (rev 169952)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-06-13 22:26:52 UTC (rev 169953)
</span><span class="lines">@@ -2064,7 +2064,7 @@
</span><span class="cx">
</span><span class="cx"> void SelectorCodeGenerator::generateElementAttributeValueExactMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AtomicString& expectedValue, bool canDefaultToCaseSensitiveValueMatch)
</span><span class="cx"> {
</span><del>- LocalRegister expectedValueRegister(m_registerAllocator);
</del><ins>+ LocalRegisterWithPreference expectedValueRegister(m_registerAllocator, JSC::GPRInfo::argumentGPR1);
</ins><span class="cx"> m_assembler.move(Assembler::TrustedImmPtr(expectedValue.impl()), expectedValueRegister);
</span><span class="cx">
</span><span class="cx"> if (canDefaultToCaseSensitiveValueMatch)
</span><span class="lines">@@ -2088,7 +2088,7 @@
</span><span class="cx">
</span><span class="cx"> FunctionCall functionCall(m_assembler, m_registerAllocator, m_stackAllocator, m_functionCalls);
</span><span class="cx"> functionCall.setFunctionAddress(WTF::equalIgnoringCaseNonNull);
</span><del>- functionCall.setTwoArguments(expectedValueRegister, valueStringImpl);
</del><ins>+ functionCall.setTwoArguments(valueStringImpl, expectedValueRegister);
</ins><span class="cx"> failureCases.append(functionCall.callAndBranchOnBooleanReturnValue(Assembler::Zero));
</span><span class="cx">
</span><span class="cx"> skipCaseInsensitiveComparison.link(&m_assembler);
</span><span class="lines">@@ -2097,7 +2097,7 @@
</span><span class="cx">
</span><span class="cx"> void SelectorCodeGenerator::generateElementAttributeFunctionCallValueMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AtomicString& expectedValue, bool canDefaultToCaseSensitiveValueMatch, JSC::FunctionPtr caseSensitiveTest, JSC::FunctionPtr caseInsensitiveTest)
</span><span class="cx"> {
</span><del>- LocalRegister expectedValueRegister(m_registerAllocator);
</del><ins>+ LocalRegisterWithPreference expectedValueRegister(m_registerAllocator, JSC::GPRInfo::argumentGPR1);
</ins><span class="cx"> m_assembler.move(Assembler::TrustedImmPtr(expectedValue.impl()), expectedValueRegister);
</span><span class="cx">
</span><span class="cx"> if (canDefaultToCaseSensitiveValueMatch) {
</span><span class="lines">@@ -2186,7 +2186,7 @@
</span><span class="cx"> failureCases.append(functionCall.callAndBranchOnBooleanReturnValue(Assembler::Zero));
</span><span class="cx"> } else {
</span><span class="cx"> unsigned offsetToCheckingContext = m_stackAllocator.offsetToStackReference(m_checkingContextStackReference);
</span><del>- Assembler::RegisterID checkingContext = m_registerAllocator.allocateRegister();
</del><ins>+ Assembler::RegisterID checkingContext = m_registerAllocator.allocateRegisterWithPreference(JSC::GPRInfo::argumentGPR1);
</ins><span class="cx"> m_assembler.loadPtr(Assembler::Address(Assembler::stackPointerRegister, offsetToCheckingContext), checkingContext);
</span><span class="cx"> m_registerAllocator.deallocateRegister(checkingContext);
</span><span class="cx">
</span><span class="lines">@@ -2271,7 +2271,7 @@
</span><span class="cx"> failureCases.append(functionCall.callAndBranchOnBooleanReturnValue(Assembler::Zero));
</span><span class="cx"> } else {
</span><span class="cx"> if (fragment.relationToRightFragment == FragmentRelation::Rightmost) {
</span><del>- LocalRegister checkingContext(m_registerAllocator);
</del><ins>+ LocalRegisterWithPreference checkingContext(m_registerAllocator, JSC::GPRInfo::argumentGPR1);
</ins><span class="cx"> Assembler::Jump notResolvingStyle = jumpIfNotResolvingStyle(checkingContext);
</span><span class="cx"> addFlagsToElementStyleFromContext(checkingContext, RenderStyle::NonInheritedFlags::flagIsaffectedByHover());
</span><span class="cx"> notResolvingStyle.link(&m_assembler);
</span><span class="lines">@@ -2282,7 +2282,7 @@
</span><span class="cx"> failureCases.append(functionCall.callAndBranchOnBooleanReturnValue(Assembler::Zero));
</span><span class="cx"> } else {
</span><span class="cx"> unsigned offsetToCheckingContext = m_stackAllocator.offsetToStackReference(m_checkingContextStackReference);
</span><del>- Assembler::RegisterID checkingContext = m_registerAllocator.allocateRegister();
</del><ins>+ Assembler::RegisterID checkingContext = m_registerAllocator.allocateRegisterWithPreference(JSC::GPRInfo::argumentGPR1);
</ins><span class="cx"> m_assembler.loadPtr(Assembler::Address(Assembler::stackPointerRegister, offsetToCheckingContext), checkingContext);
</span><span class="cx"> m_registerAllocator.deallocateRegister(checkingContext);
</span><span class="cx">
</span><span class="lines">@@ -2542,7 +2542,7 @@
</span><span class="cx"> m_registerAllocator.deallocateRegister(parentElement);
</span><span class="cx">
</span><span class="cx"> // Setup the counter at 1.
</span><del>- LocalRegister elementCounter(m_registerAllocator);
</del><ins>+ LocalRegisterWithPreference elementCounter(m_registerAllocator, JSC::GPRInfo::argumentGPR1);
</ins><span class="cx"> m_assembler.move(Assembler::TrustedImm32(1), elementCounter);
</span><span class="cx">
</span><span class="cx"> // Loop over the previous adjacent elements and increment the counter.
</span></span></pre>
</div>
</div>
</body>
</html>