Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (161030 => 161031)
--- trunk/Source/_javascript_Core/ChangeLog 2013-12-23 23:42:52 UTC (rev 161030)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-12-23 23:47:05 UTC (rev 161031)
@@ -1,3 +1,20 @@
+2013-12-23 Benjamin Poulain <[email protected]>
+
+ 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):
+
2013-12-23 Oliver Hunt <[email protected]>
Update custom setter implementations to perform type checks
Modified: trunk/Source/_javascript_Core/assembler/MacroAssembler.h (161030 => 161031)
--- trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2013-12-23 23:42:52 UTC (rev 161030)
+++ trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2013-12-23 23:47:05 UTC (rev 161031)
@@ -140,6 +140,9 @@
using MacroAssemblerBase::and32;
using MacroAssemblerBase::branchAdd32;
using MacroAssemblerBase::branchMul32;
+#if CPU(X86_64)
+ using MacroAssemblerBase::branchPtr;
+#endif // CPU(X86_64)
using MacroAssemblerBase::branchSub32;
using MacroAssemblerBase::lshift32;
using MacroAssemblerBase::or32;
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h (161030 => 161031)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h 2013-12-23 23:42:52 UTC (rev 161030)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h 2013-12-23 23:47:05 UTC (rev 161031)
@@ -486,6 +486,23 @@
return branch64(cond, left, scratchRegister);
}
+ 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);
+ }
+
Jump branchTest64(ResultCondition cond, RegisterID reg, RegisterID mask)
{
m_assembler.testq_rr(reg, mask);
Modified: trunk/Source/_javascript_Core/assembler/X86Assembler.h (161030 => 161031)
--- trunk/Source/_javascript_Core/assembler/X86Assembler.h 2013-12-23 23:42:52 UTC (rev 161030)
+++ trunk/Source/_javascript_Core/assembler/X86Assembler.h 2013-12-23 23:47:05 UTC (rev 161031)
@@ -992,6 +992,11 @@
m_formatter.oneByteOp64(OP_CMP_EvGv, src, base, offset);
}
+ void cmpq_rm(RegisterID src, int offset, RegisterID base, RegisterID index, int scale)
+ {
+ m_formatter.oneByteOp64(OP_CMP_EvGv, src, base, index, scale, offset);
+ }
+
void cmpq_mr(int offset, RegisterID base, RegisterID src)
{
m_formatter.oneByteOp64(OP_CMP_GvEv, src, base, offset);
Modified: trunk/Source/WTF/wtf/Platform.h (161030 => 161031)
--- 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)
@@ -886,7 +886,7 @@
/* CSS Selector JIT Compiler */
#if !defined(ENABLE_CSS_SELECTOR_JIT)
-#define ENABLE_CSS_SELECTOR_JIT 0
+#define ENABLE_CSS_SELECTOR_JIT 1
#endif
/* Accelerated compositing */
Modified: trunk/Source/WebCore/ChangeLog (161030 => 161031)
--- 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)
@@ -1,3 +1,22 @@
+2013-12-23 Benjamin Poulain <[email protected]>
+
+ 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):
+
2013-12-23 Daniel Bates <[email protected]>
[iOS] Upstream WebCore/storage changes
Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (161030 => 161031)
--- 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)
@@ -100,6 +100,7 @@
const QualifiedName* tagName;
const AtomicString* id;
+ Vector<const AtomicStringImpl*, 1> classNames;
};
typedef JSC::MacroAssembler Assembler;
@@ -138,6 +139,7 @@
void generateElementDataMatching(Assembler::JumpList& failureCases, const SelectorFragment&);
void generateElementHasTagName(Assembler::JumpList& failureCases, const QualifiedName& nameToMatch);
void generateElementHasId(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const AtomicString& idToMatch);
+ void generateElementHasClasses(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const Vector<const AtomicStringImpl*>& classNames);
Assembler m_assembler;
RegisterAllocator m_registerAllocator;
@@ -220,8 +222,10 @@
fragment.id = &(selector->value());
break;
}
+ case CSSSelector::Class:
+ fragment.classNames.append(selector->value().impl());
+ break;
case CSSSelector::Unknown:
- case CSSSelector::Class:
case CSSSelector::Exact:
case CSSSelector::Set:
case CSSSelector::List:
@@ -747,7 +751,7 @@
void SelectorCodeGenerator::generateElementDataMatching(Assembler::JumpList& failureCases, const SelectorFragment& fragment)
{
- if (!fragment.id)
+ if (!fragment.id && fragment.classNames.isEmpty())
return;
// Generate:
@@ -758,7 +762,10 @@
m_assembler.loadPtr(Assembler::Address(elementAddressRegister, Element::elementDataMemoryOffset()), elementDataAddress);
failureCases.append(m_assembler.branchTestPtr(Assembler::Zero, elementDataAddress));
- generateElementHasId(failureCases, elementDataAddress, *fragment.id);
+ if (fragment.id)
+ generateElementHasId(failureCases, elementDataAddress, *fragment.id);
+ if (!fragment.classNames.isEmpty())
+ generateElementHasClasses(failureCases, elementDataAddress, fragment.classNames);
}
inline void SelectorCodeGenerator::generateElementHasTagName(Assembler::JumpList& failureCases, const QualifiedName& nameToMatch)
@@ -795,6 +802,41 @@
failureCases.append(m_assembler.branchPtr(Assembler::NotEqual, Assembler::Address(elementDataAddress, ElementData::idForStyleResolutionMemoryOffset()), idToMatchRegister));
}
+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);
+ }
+}
+
}; // namespace SelectorCompiler.
}; // namespace WebCore.
Modified: trunk/Source/WebCore/dom/ElementData.h (161030 => 161031)
--- 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)
@@ -49,6 +49,7 @@
void clearClass() const { m_classNames.clear(); }
void setClass(const AtomicString& className, bool shouldFoldCase) const { m_classNames.set(className, shouldFoldCase); }
const SpaceSplitString& classNames() const { return m_classNames; }
+ static ptrdiff_t classNamesMemoryOffset() { return OBJECT_OFFSETOF(ElementData, m_classNames); }
const AtomicString& idForStyleResolution() const { return m_idForStyleResolution; }
static ptrdiff_t idForStyleResolutionMemoryOffset() { return OBJECT_OFFSETOF(ElementData, m_idForStyleResolution); }
Modified: trunk/Source/WebCore/dom/SpaceSplitString.h (161030 => 161031)
--- 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)
@@ -49,6 +49,8 @@
bool containsAll(SpaceSplitStringData&);
unsigned size() const { return m_size; }
+ static ptrdiff_t sizeMemoryOffset() { return OBJECT_OFFSETOF(SpaceSplitStringData, m_size); }
+
const AtomicString& operator[](size_t i)
{
RELEASE_ASSERT(i < m_size);
@@ -74,6 +76,8 @@
m_refCount = tempRefCount;
}
+ static ptrdiff_t tokensMemoryOffset() { return sizeof(SpaceSplitStringData); }
+
private:
static PassRefPtr<SpaceSplitStringData> create(const AtomicString&, unsigned tokenCount);
SpaceSplitStringData(const AtomicString& string, unsigned size)
