<!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>[161031] trunk/Source</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/161031">161031</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-23 15:47:05 -0800 (Mon, 23 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add class matching to the Selector Code Generator
https://bugs.webkit.org/show_bug.cgi?id=126176
Source/JavaScriptCore:
Reviewed by Antti Koivisto and Oliver Hunt.
Add test and branch based on BaseIndex addressing for x86_64.
Fast loops are needed to compete with clang on tight loops.
* assembler/MacroAssembler.h:
* assembler/MacroAssemblerX86_64.h:
(JSC::MacroAssemblerX86_64::branch64):
(JSC::MacroAssemblerX86_64::branchPtr):
* assembler/X86Assembler.h:
(JSC::X86Assembler::cmpq_rm):
Source/WebCore:
Reviewed by Antti Koivisto.
Add selector matching based on classname to the Selector Compiler.
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::SelectorCodeGenerator):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementDataMatching):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementHasClasses):
* dom/ElementData.h:
(WebCore::ElementData::classNamesMemoryOffset):
* dom/SpaceSplitString.h:
(WebCore::SpaceSplitStringData::sizeMemoryOffset):
(WebCore::SpaceSplitStringData::tokensMemoryOffset):</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="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerX86Assemblerh">trunk/Source/JavaScriptCore/assembler/X86Assembler.h</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssjitSelectorCompilercpp">trunk/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementDatah">trunk/Source/WebCore/dom/ElementData.h</a></li>
<li><a href="#trunkSourceWebCoredomSpaceSplitStringh">trunk/Source/WebCore/dom/SpaceSplitString.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161030 => 161031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-23 23:42:52 UTC (rev 161030)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-23 23:47:05 UTC (rev 161031)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-12-23 Benjamin Poulain <benjamin@webkit.org>
+
+ Add class matching to the Selector Code Generator
+ https://bugs.webkit.org/show_bug.cgi?id=126176
+
+ Reviewed by Antti Koivisto and Oliver Hunt.
+
+ Add test and branch based on BaseIndex addressing for x86_64.
+ Fast loops are needed to compete with clang on tight loops.
+
+ * assembler/MacroAssembler.h:
+ * assembler/MacroAssemblerX86_64.h:
+ (JSC::MacroAssemblerX86_64::branch64):
+ (JSC::MacroAssemblerX86_64::branchPtr):
+ * assembler/X86Assembler.h:
+ (JSC::X86Assembler::cmpq_rm):
+
</ins><span class="cx"> 2013-12-23 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Update custom setter implementations to perform type checks
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssembler.h (161030 => 161031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2013-12-23 23:42:52 UTC (rev 161030)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2013-12-23 23:47:05 UTC (rev 161031)
</span><span class="lines">@@ -140,6 +140,9 @@
</span><span class="cx"> using MacroAssemblerBase::and32;
</span><span class="cx"> using MacroAssemblerBase::branchAdd32;
</span><span class="cx"> using MacroAssemblerBase::branchMul32;
</span><ins>+#if CPU(X86_64)
+ using MacroAssemblerBase::branchPtr;
+#endif // CPU(X86_64)
</ins><span class="cx"> using MacroAssemblerBase::branchSub32;
</span><span class="cx"> using MacroAssemblerBase::lshift32;
</span><span class="cx"> using MacroAssemblerBase::or32;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h (161030 => 161031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2013-12-23 23:42:52 UTC (rev 161030)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2013-12-23 23:47:05 UTC (rev 161031)
</span><span class="lines">@@ -486,6 +486,23 @@
</span><span class="cx"> return branch64(cond, left, scratchRegister);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ Jump branch64(RelationalCondition cond, BaseIndex address, RegisterID right)
+ {
+ m_assembler.cmpq_rm(right, address.offset, address.base, address.index, address.scale);
+ return Jump(m_assembler.jCC(x86Condition(cond)));
+ }
+
+ Jump branchPtr(RelationalCondition cond, BaseIndex left, RegisterID right)
+ {
+ return branch64(cond, left, right);
+ }
+
+ Jump branchPtr(RelationalCondition cond, BaseIndex left, TrustedImmPtr right)
+ {
+ move(right, scratchRegister);
+ return branchPtr(cond, left, scratchRegister);
+ }
+
</ins><span class="cx"> Jump branchTest64(ResultCondition cond, RegisterID reg, RegisterID mask)
</span><span class="cx"> {
</span><span class="cx"> m_assembler.testq_rr(reg, mask);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerX86Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/X86Assembler.h (161030 => 161031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/X86Assembler.h 2013-12-23 23:42:52 UTC (rev 161030)
+++ trunk/Source/JavaScriptCore/assembler/X86Assembler.h 2013-12-23 23:47:05 UTC (rev 161031)
</span><span class="lines">@@ -992,6 +992,11 @@
</span><span class="cx"> m_formatter.oneByteOp64(OP_CMP_EvGv, src, base, offset);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void cmpq_rm(RegisterID src, int offset, RegisterID base, RegisterID index, int scale)
+ {
+ m_formatter.oneByteOp64(OP_CMP_EvGv, src, base, index, scale, offset);
+ }
+
</ins><span class="cx"> void cmpq_mr(int offset, RegisterID base, RegisterID src)
</span><span class="cx"> {
</span><span class="cx"> m_formatter.oneByteOp64(OP_CMP_GvEv, src, base, offset);
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (161030 => 161031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2013-12-23 23:42:52 UTC (rev 161030)
+++ trunk/Source/WTF/wtf/Platform.h 2013-12-23 23:47:05 UTC (rev 161031)
</span><span class="lines">@@ -886,7 +886,7 @@
</span><span class="cx">
</span><span class="cx"> /* CSS Selector JIT Compiler */
</span><span class="cx"> #if !defined(ENABLE_CSS_SELECTOR_JIT)
</span><del>-#define ENABLE_CSS_SELECTOR_JIT 0
</del><ins>+#define ENABLE_CSS_SELECTOR_JIT 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* Accelerated compositing */
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161030 => 161031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-23 23:42:52 UTC (rev 161030)
+++ trunk/Source/WebCore/ChangeLog 2013-12-23 23:47:05 UTC (rev 161031)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-12-23 Benjamin Poulain <benjamin@webkit.org>
+
+ Add class matching to the Selector Code Generator
+ https://bugs.webkit.org/show_bug.cgi?id=126176
+
+ Reviewed by Antti Koivisto.
+
+ Add selector matching based on classname to the Selector Compiler.
+
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::SelectorCodeGenerator):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementDataMatching):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementHasClasses):
+ * dom/ElementData.h:
+ (WebCore::ElementData::classNamesMemoryOffset):
+ * dom/SpaceSplitString.h:
+ (WebCore::SpaceSplitStringData::sizeMemoryOffset):
+ (WebCore::SpaceSplitStringData::tokensMemoryOffset):
+
</ins><span class="cx"> 2013-12-23 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Upstream WebCore/storage changes
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (161030 => 161031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2013-12-23 23:42:52 UTC (rev 161030)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2013-12-23 23:47:05 UTC (rev 161031)
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx">
</span><span class="cx"> const QualifiedName* tagName;
</span><span class="cx"> const AtomicString* id;
</span><ins>+ Vector<const AtomicStringImpl*, 1> classNames;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef JSC::MacroAssembler Assembler;
</span><span class="lines">@@ -138,6 +139,7 @@
</span><span class="cx"> void generateElementDataMatching(Assembler::JumpList& failureCases, const SelectorFragment&);
</span><span class="cx"> void generateElementHasTagName(Assembler::JumpList& failureCases, const QualifiedName& nameToMatch);
</span><span class="cx"> void generateElementHasId(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const AtomicString& idToMatch);
</span><ins>+ void generateElementHasClasses(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const Vector<const AtomicStringImpl*>& classNames);
</ins><span class="cx">
</span><span class="cx"> Assembler m_assembler;
</span><span class="cx"> RegisterAllocator m_registerAllocator;
</span><span class="lines">@@ -220,8 +222,10 @@
</span><span class="cx"> fragment.id = &(selector->value());
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ case CSSSelector::Class:
+ fragment.classNames.append(selector->value().impl());
+ break;
</ins><span class="cx"> case CSSSelector::Unknown:
</span><del>- case CSSSelector::Class:
</del><span class="cx"> case CSSSelector::Exact:
</span><span class="cx"> case CSSSelector::Set:
</span><span class="cx"> case CSSSelector::List:
</span><span class="lines">@@ -747,7 +751,7 @@
</span><span class="cx">
</span><span class="cx"> void SelectorCodeGenerator::generateElementDataMatching(Assembler::JumpList& failureCases, const SelectorFragment& fragment)
</span><span class="cx"> {
</span><del>- if (!fragment.id)
</del><ins>+ if (!fragment.id && fragment.classNames.isEmpty())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Generate:
</span><span class="lines">@@ -758,7 +762,10 @@
</span><span class="cx"> m_assembler.loadPtr(Assembler::Address(elementAddressRegister, Element::elementDataMemoryOffset()), elementDataAddress);
</span><span class="cx"> failureCases.append(m_assembler.branchTestPtr(Assembler::Zero, elementDataAddress));
</span><span class="cx">
</span><del>- generateElementHasId(failureCases, elementDataAddress, *fragment.id);
</del><ins>+ if (fragment.id)
+ generateElementHasId(failureCases, elementDataAddress, *fragment.id);
+ if (!fragment.classNames.isEmpty())
+ generateElementHasClasses(failureCases, elementDataAddress, fragment.classNames);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void SelectorCodeGenerator::generateElementHasTagName(Assembler::JumpList& failureCases, const QualifiedName& nameToMatch)
</span><span class="lines">@@ -795,6 +802,41 @@
</span><span class="cx"> failureCases.append(m_assembler.branchPtr(Assembler::NotEqual, Assembler::Address(elementDataAddress, ElementData::idForStyleResolutionMemoryOffset()), idToMatchRegister));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SelectorCodeGenerator::generateElementHasClasses(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const Vector<const AtomicStringImpl*>& classNames)
+{
+ // Load m_classNames.
+ LocalRegister spaceSplitStringData(m_registerAllocator);
+ m_assembler.loadPtr(Assembler::Address(elementDataAddress, ElementData::classNamesMemoryOffset()), spaceSplitStringData);
+
+ // If SpaceSplitString does not have a SpaceSplitStringData pointer, it is empty -> failure case.
+ failureCases.append(m_assembler.branchTestPtr(Assembler::Zero, spaceSplitStringData));
+
+ // We loop over the classes of SpaceSplitStringData for each class name we need to match.
+ LocalRegister indexRegister(m_registerAllocator);
+ for (unsigned i = 0; i < classNames.size(); ++i) {
+ LocalRegister classNameToMatch(m_registerAllocator);
+ m_assembler.move(Assembler::TrustedImmPtr(classNames[i]), classNameToMatch);
+ m_assembler.move(Assembler::TrustedImm32(0), indexRegister);
+
+ // Beginning of a loop over all the class name of element to find the one we are looking for.
+ Assembler::Label loopStart(m_assembler.label());
+
+ // If the pointers match, proceed to the next matcher.
+ Assembler::Jump classFound = m_assembler.branchPtr(Assembler::Equal, Assembler::BaseIndex(spaceSplitStringData, indexRegister, Assembler::timesPtr(), SpaceSplitStringData::tokensMemoryOffset()), classNameToMatch);
+
+ // Increment the index.
+ m_assembler.add32(Assembler::TrustedImm32(1), indexRegister);
+
+ // If we reached the last element -> failure.
+ failureCases.append(m_assembler.branch32(Assembler::Equal, Assembler::Address(spaceSplitStringData, SpaceSplitStringData::sizeMemoryOffset()), indexRegister));
+ // Otherwise just loop over.
+ m_assembler.jump().linkTo(loopStart, &m_assembler);
+
+ // Success case.
+ classFound.link(&m_assembler);
+ }
+}
+
</ins><span class="cx"> }; // namespace SelectorCompiler.
</span><span class="cx"> }; // namespace WebCore.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementData.h (161030 => 161031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementData.h 2013-12-23 23:42:52 UTC (rev 161030)
+++ trunk/Source/WebCore/dom/ElementData.h 2013-12-23 23:47:05 UTC (rev 161031)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> void clearClass() const { m_classNames.clear(); }
</span><span class="cx"> void setClass(const AtomicString& className, bool shouldFoldCase) const { m_classNames.set(className, shouldFoldCase); }
</span><span class="cx"> const SpaceSplitString& classNames() const { return m_classNames; }
</span><ins>+ static ptrdiff_t classNamesMemoryOffset() { return OBJECT_OFFSETOF(ElementData, m_classNames); }
</ins><span class="cx">
</span><span class="cx"> const AtomicString& idForStyleResolution() const { return m_idForStyleResolution; }
</span><span class="cx"> static ptrdiff_t idForStyleResolutionMemoryOffset() { return OBJECT_OFFSETOF(ElementData, m_idForStyleResolution); }
</span></span></pre></div>
<a id="trunkSourceWebCoredomSpaceSplitStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SpaceSplitString.h (161030 => 161031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SpaceSplitString.h 2013-12-23 23:42:52 UTC (rev 161030)
+++ trunk/Source/WebCore/dom/SpaceSplitString.h 2013-12-23 23:47:05 UTC (rev 161031)
</span><span class="lines">@@ -49,6 +49,8 @@
</span><span class="cx"> bool containsAll(SpaceSplitStringData&);
</span><span class="cx">
</span><span class="cx"> unsigned size() const { return m_size; }
</span><ins>+ static ptrdiff_t sizeMemoryOffset() { return OBJECT_OFFSETOF(SpaceSplitStringData, m_size); }
+
</ins><span class="cx"> const AtomicString& operator[](size_t i)
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(i < m_size);
</span><span class="lines">@@ -74,6 +76,8 @@
</span><span class="cx"> m_refCount = tempRefCount;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static ptrdiff_t tokensMemoryOffset() { return sizeof(SpaceSplitStringData); }
+
</ins><span class="cx"> private:
</span><span class="cx"> static PassRefPtr<SpaceSplitStringData> create(const AtomicString&, unsigned tokenCount);
</span><span class="cx"> SpaceSplitStringData(const AtomicString& string, unsigned size)
</span></span></pre>
</div>
</div>
</body>
</html>