Changeset 228677 in webkit

Timestamp:

Feb 19, 2018 5:59:49 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r228313 - Move compiled selectors to StyleRule
​https://bugs.webkit.org/show_bug.cgi?id=182602

Reviewed by Zalan Bujtas.

Currently they are owned by RuleData. Several RuleData objects can refer to the same StyleRule, requiring recompilation.
Compiled selectors are context-independent so they can be shared between all clients.

• WebCore.xcodeproj/project.pbxproj:
• css/CSSSelectorList.cpp:

(WebCore::CSSSelectorList::listSize const):

Compute the number of complex selectors on the list.

• css/CSSSelectorList.h:
• css/DocumentRuleSets.cpp:

(WebCore::makeRuleSet):
(WebCore::DocumentRuleSets::classInvalidationRuleSets const):

Pass around list index along with the selector index (compiled selectors are found by list index).

• css/ElementRuleCollector.cpp:

(WebCore::ElementRuleCollector::ruleMatches):

• css/RuleSet.cpp:

(WebCore::RuleData::RuleData):

• css/RuleSet.h:

(WebCore::RuleData::compilationStatus const): Deleted.
(WebCore::RuleData::compiledSelectorCodeRef const): Deleted.
(WebCore::RuleData::setCompiledSelector const): Deleted.
(WebCore::RuleData::~RuleData): Deleted.
(WebCore::RuleData::compiledSelectorUsed const): Deleted.

• css/StyleRule.cpp:

(WebCore::StyleRule::StyleRule):

• css/StyleRule.h:

Add CompiledSelector member.

• cssjit/CompiledSelector.h: Added.

Move to a header of its own to keeps dependencies simple.

(WebCore::SelectorCompilationStatus::SelectorCompilationStatus):
(WebCore::SelectorCompilationStatus::operator Status const):

• cssjit/SelectorCompiler.h:

(): Deleted.
(WebCore::SelectorCompilationStatus::SelectorCompilationStatus): Deleted.
(WebCore::SelectorCompilationStatus::operator Status const): Deleted.

Location:

releases/WebKitGTK/webkit-2.20/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• css/CSSSelectorList.cpp (modified) (1 diff)
• css/CSSSelectorList.h (modified) (1 diff)
• css/DocumentRuleSets.cpp (modified) (2 diffs)
• css/ElementRuleCollector.cpp (modified) (2 diffs)
• css/RuleFeature.cpp (modified) (2 diffs)
• css/RuleFeature.h (modified) (2 diffs)
• css/RuleSet.cpp (modified) (4 diffs)
• css/RuleSet.h (modified) (5 diffs)
• css/StyleRule.cpp (modified) (1 diff)
• css/StyleRule.h (modified) (3 diffs)
• cssjit/CompiledSelector.h (added)
• cssjit/SelectorCompiler.h (modified) (2 diffs)

releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-09  Antti Koivisto  <antti@apple.com>
+
+        Move compiled selectors to StyleRule
+        https://bugs.webkit.org/show_bug.cgi?id=182602
+
+        Reviewed by Zalan Bujtas.
+
+        Currently they are owned by RuleData. Several RuleData objects can refer to the same StyleRule, requiring recompilation.
+        Compiled selectors are context-independent so they can be shared between all clients.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * css/CSSSelectorList.cpp:
+        (WebCore::CSSSelectorList::listSize const):
+
+        Compute the number of complex selectors on the list.
+
+        * css/CSSSelectorList.h:
+        * css/DocumentRuleSets.cpp:
+        (WebCore::makeRuleSet):
+        (WebCore::DocumentRuleSets::classInvalidationRuleSets const):
+
+        Pass around list index along with the selector index (compiled selectors are found by list index).
+
+        * css/ElementRuleCollector.cpp:
+        (WebCore::ElementRuleCollector::ruleMatches):
+        * css/RuleSet.cpp:
+        (WebCore::RuleData::RuleData):
+        * css/RuleSet.h:
+        (WebCore::RuleData::compilationStatus const): Deleted.
+        (WebCore::RuleData::compiledSelectorCodeRef const): Deleted.
+        (WebCore::RuleData::setCompiledSelector const): Deleted.
+        (WebCore::RuleData::~RuleData): Deleted.
+        (WebCore::RuleData::compiledSelectorUsed const): Deleted.
+        * css/StyleRule.cpp:
+        (WebCore::StyleRule::StyleRule):
+        * css/StyleRule.h:
+
+            Add CompiledSelector member.
+
+        * cssjit/CompiledSelector.h: Added.
+
+            Move to a header of its own to keeps dependencies simple.
+
+        (WebCore::SelectorCompilationStatus::SelectorCompilationStatus):
+        (WebCore::SelectorCompilationStatus::operator Status const):
+        * cssjit/SelectorCompiler.h:
+        (): Deleted.
+        (WebCore::SelectorCompilationStatus::SelectorCompilationStatus): Deleted.
+        (WebCore::SelectorCompilationStatus::operator Status const): Deleted.
+
 2018-02-08  Antoine Quint  <graouts@apple.com>
 

releases/WebKitGTK/webkit-2.20/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -14008 +14008 @@
                 E43AF8E51AC5B7DD00CA717E /* CacheValidation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheValidation.h; sourceTree = "<group>"; };
                 E440AA951C68420800A265CC /* ElementAndTextDescendantIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementAndTextDescendantIterator.h; sourceTree = "<group>"; };
+                E4451077202C7E0100657D33 /* CompiledSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompiledSelector.h; sourceTree = "<group>"; };
                 E446138F0CD6331000FADA75 /* HTMLAudioElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLAudioElement.cpp; sourceTree = "<group>"; };
                 E44613900CD6331000FADA75 /* HTMLAudioElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLAudioElement.h; sourceTree = "<group>"; };
@@ -15975 +15976 @@
                         isa = PBXGroup;
                         children = (
+                                E4451077202C7E0100657D33 /* CompiledSelector.h */,
                                 26B999921803B9D900D01121 /* FunctionCall.h */,
                                 26B9998E1803AE7200D01121 /* RegisterAllocator.h */,

releases/WebKitGTK/webkit-2.20/Source/WebCore/css/CSSSelectorList.cpp

@@ -96 +96 @@
 }
 
+unsigned CSSSelectorList::listSize() const
+{
+    if (!m_selectorArray)
+        return 0;
+    unsigned size = 1;
+    CSSSelector* current = m_selectorArray;
+    while (!current->isLastInSelectorList()) {
+        if (current->isLastInTagHistory())
+            ++size;
+        ++current;
+    }
+    return size;
+}
+
 CSSSelectorList& CSSSelectorList::operator=(CSSSelectorList&& other)
 {

releases/WebKitGTK/webkit-2.20/Source/WebCore/css/CSSSelectorList.h

@@ -67 +67 @@
 
     unsigned componentCount() const;
+    unsigned listSize() const;
 
     CSSSelectorList& operator=(CSSSelectorList&&);

releases/WebKitGTK/webkit-2.20/Source/WebCore/css/DocumentRuleSets.cpp

@@ -115 +115 @@
     auto ruleSet = std::make_unique<RuleSet>();
     for (size_t i = 0; i < size; ++i)
-        ruleSet->addRule(rules[i].rule, rules[i].selectorIndex);
+        ruleSet->addRule(rules[i].rule, rules[i].selectorIndex, rules[i].selectorListIndex);
     ruleSet->shrinkToFit();
     return ruleSet;
@@ -188 +188 @@
             if (!ruleSet)
                 ruleSet = std::make_unique<RuleSet>();
-            ruleSet->addRule(feature.rule, feature.selectorIndex);
+            ruleSet->addRule(feature.rule, feature.selectorIndex, feature.selectorListIndex);
             if (feature.invalidationSelector)
                 invalidationSelectorArray[arrayIndex].append(feature.invalidationSelector);

releases/WebKitGTK/webkit-2.20/Source/WebCore/css/ElementRuleCollector.cpp

@@ -384 +384 @@
 
 #if ENABLE(CSS_SELECTOR_JIT)
-    void* compiledSelectorChecker = ruleData.compiledSelectorCodeRef().code().executableAddress();
-    if (!compiledSelectorChecker && ruleData.compilationStatus() == SelectorCompilationStatus::NotCompiled) {
-        SelectorCompilationStatus compilationStatus;
-        JSC::MacroAssemblerCodeRef compiledSelectorCodeRef;
-        compilationStatus = SelectorCompiler::compileSelector(ruleData.selector(), SelectorCompiler::SelectorContext::RuleCollector, compiledSelectorCodeRef);
-
-        ruleData.setCompiledSelector(compilationStatus, compiledSelectorCodeRef);
-        compiledSelectorChecker = ruleData.compiledSelectorCodeRef().code().executableAddress();
-    }
-
-    if (compiledSelectorChecker && ruleData.compilationStatus() == SelectorCompilationStatus::SimpleSelectorChecker) {
-        SelectorCompiler::RuleCollectorSimpleSelectorChecker selectorChecker = SelectorCompiler::ruleCollectorSimpleSelectorCheckerFunction(compiledSelectorChecker, ruleData.compilationStatus());
+    auto& compiledSelector = ruleData.rule()->compiledSelectorForListIndex(ruleData.selectorListIndex());
+    void* compiledSelectorChecker = compiledSelector.codeRef.code().executableAddress();
+    if (!compiledSelectorChecker && compiledSelector.status == SelectorCompilationStatus::NotCompiled) {
+        compiledSelector.status = SelectorCompiler::compileSelector(ruleData.selector(), SelectorCompiler::SelectorContext::RuleCollector, compiledSelector.codeRef);
+
+        compiledSelectorChecker = compiledSelector.codeRef.code().executableAddress();
+    }
+
+    if (compiledSelectorChecker && compiledSelector.status == SelectorCompilationStatus::SimpleSelectorChecker) {
+        auto selectorChecker = SelectorCompiler::ruleCollectorSimpleSelectorCheckerFunction(compiledSelectorChecker, compiledSelector.status);
 #if !ASSERT_MSG_DISABLED
         unsigned ignoreSpecificity;
@@ -421 +419 @@
 #if ENABLE(CSS_SELECTOR_JIT)
     if (compiledSelectorChecker) {
-        ASSERT(ruleData.compilationStatus() == SelectorCompilationStatus::SelectorCheckerWithCheckingContext);
-
-        SelectorCompiler::RuleCollectorSelectorCheckerWithCheckingContext selectorChecker = SelectorCompiler::ruleCollectorSelectorCheckerFunctionWithCheckingContext(compiledSelectorChecker, ruleData.compilationStatus());
+        ASSERT(compiledSelector.status == SelectorCompilationStatus::SelectorCheckerWithCheckingContext);
+
+        auto selectorChecker = SelectorCompiler::ruleCollectorSelectorCheckerFunctionWithCheckingContext(compiledSelectorChecker, compiledSelector.status);
 
 #if CSS_SELECTOR_JIT_PROFILING
-        ruleData.compiledSelectorUsed();
+        compiledSelector.useCount++;
 #endif
         selectorMatches = selectorChecker(&m_element, &context, &specificity);

releases/WebKitGTK/webkit-2.20/Source/WebCore/css/RuleFeature.cpp

@@ -169 +169 @@
     recursivelyCollectFeaturesFromSelector(selectorFeatures, *ruleData.selector());
     if (selectorFeatures.hasSiblingSelector)
-        siblingRules.append(RuleFeature(ruleData.rule(), ruleData.selectorIndex()));
+        siblingRules.append(RuleFeature(ruleData.rule(), ruleData.selectorIndex(), ruleData.selectorListIndex()));
     if (ruleData.containsUncommonAttributeSelector())
-        uncommonAttributeRules.append(RuleFeature(ruleData.rule(), ruleData.selectorIndex()));
+        uncommonAttributeRules.append(RuleFeature(ruleData.rule(), ruleData.selectorIndex(), ruleData.selectorListIndex()));
 
     for (auto& nameAndMatch : selectorFeatures.classes) {
         classRules.ensure(nameAndMatch.first, [] {
             return std::make_unique<Vector<RuleFeature>>();
-        }).iterator->value->append(RuleFeature(ruleData.rule(), ruleData.selectorIndex(), nameAndMatch.second));
+        }).iterator->value->append(RuleFeature(ruleData.rule(), ruleData.selectorIndex(), ruleData.selectorListIndex(), nameAndMatch.second));
         if (nameAndMatch.second == MatchElement::Host)
             classesAffectingHost.add(nameAndMatch.first);
     }
-
     for (auto& selectorAndMatch : selectorFeatures.attributes) {
         auto* selector = selectorAndMatch.first;
@@ -186 +185 @@
         attributeRules.ensure(selector->attribute().localName().convertToASCIILowercase(), [] {
             return std::make_unique<Vector<RuleFeature>>();
-        }).iterator->value->append(RuleFeature(ruleData.rule(), ruleData.selectorIndex(), matchElement, selector));
+        }).iterator->value->append(RuleFeature(ruleData.rule(), ruleData.selectorIndex(), ruleData.selectorListIndex(), matchElement, selector));
         if (matchElement == MatchElement::Host)
             attributesAffectingHost.add(selector->attribute().localName().convertToASCIILowercase());

releases/WebKitGTK/webkit-2.20/Source/WebCore/css/RuleFeature.h

@@ -38 +38 @@
 
 struct RuleFeature {
-    RuleFeature(StyleRule* rule, unsigned selectorIndex, std::optional<MatchElement> matchElement = std::nullopt, const CSSSelector* invalidationSelector = nullptr)
+    RuleFeature(StyleRule* rule, unsigned selectorIndex, unsigned selectorListIndex, std::optional<MatchElement> matchElement = std::nullopt, const CSSSelector* invalidationSelector = nullptr)
         : rule(rule)
         , selectorIndex(selectorIndex)
+        , selectorListIndex(selectorListIndex)
         , matchElement(matchElement)
         , invalidationSelector(invalidationSelector)
@@ -47 +48 @@
     StyleRule* rule;
     unsigned selectorIndex;
+    unsigned selectorListIndex;
     std::optional<MatchElement> matchElement;
     const CSSSelector* invalidationSelector;

releases/WebKitGTK/webkit-2.20/Source/WebCore/css/RuleSet.cpp

@@ -149 +149 @@
 }
 
-RuleData::RuleData(StyleRule* rule, unsigned selectorIndex, unsigned position)
+RuleData::RuleData(StyleRule* rule, unsigned selectorIndex, unsigned selectorListIndex, unsigned position)
     : m_rule(rule)
     , m_selectorIndex(selectorIndex)
+    , m_selectorListIndex(selectorListIndex)
     , m_position(position)
     , m_matchBasedOnRuleHash(static_cast<unsigned>(computeMatchBasedOnRuleHash(*selector())))
@@ -159 +160 @@
     , m_propertyWhitelistType(determinePropertyWhitelistType(selector()))
     , m_descendantSelectorIdentifierHashes(SelectorFilter::collectHashes(*selector()))
-#if ENABLE(CSS_SELECTOR_JIT) && CSS_SELECTOR_JIT_PROFILING
-    , m_compiledSelectorUseCount(0)
-#endif
 {
     ASSERT(m_position == position);
@@ -202 +200 @@
 }
 
-void RuleSet::addRule(StyleRule* rule, unsigned selectorIndex)
-{
-    RuleData ruleData(rule, selectorIndex, m_ruleCount++);
+void RuleSet::addRule(StyleRule* rule, unsigned selectorIndex, unsigned selectorListIndex)
+{
+    RuleData ruleData(rule, selectorIndex, selectorListIndex, m_ruleCount++);
     m_features.collectFeatures(ruleData);
 
@@ -405 +403 @@
 void RuleSet::addStyleRule(StyleRule* rule)
 {
+    unsigned selectorListIndex = 0;
     for (size_t selectorIndex = 0; selectorIndex != notFound; selectorIndex = rule->selectorList().indexOfNextSelectorAfter(selectorIndex))
-        addRule(rule, selectorIndex);
+        addRule(rule, selectorIndex, selectorListIndex++);
 }
 

releases/WebKitGTK/webkit-2.20/Source/WebCore/css/RuleSet.h

@@ -60 +60 @@
     static const unsigned maximumSelectorComponentCount = 8192;
 
-    RuleData(StyleRule*, unsigned selectorIndex, unsigned position);
+    RuleData(StyleRule*, unsigned selectorIndex, unsigned selectorListIndex, unsigned position);
 
     unsigned position() const { return m_position; }
@@ -66 +66 @@
     const CSSSelector* selector() const { return m_rule->selectorList().selectorAt(m_selectorIndex); }
     unsigned selectorIndex() const { return m_selectorIndex; }
+    unsigned selectorListIndex() const { return m_selectorListIndex; }
 
     bool canMatchPseudoElement() const { return m_canMatchPseudoElement; }
@@ -76 +77 @@
     void disableSelectorFiltering() { m_descendantSelectorIdentifierHashes[0] = 0; }
 
-#if ENABLE(CSS_SELECTOR_JIT)
-    SelectorCompilationStatus compilationStatus() const { return m_compilationStatus; }
-    JSC::MacroAssemblerCodeRef compiledSelectorCodeRef() const { return m_compiledSelectorCodeRef; }
-    void setCompiledSelector(SelectorCompilationStatus status, JSC::MacroAssemblerCodeRef codeRef) const
-    {
-        m_compilationStatus = status;
-        m_compiledSelectorCodeRef = codeRef;
-    }
-#if CSS_SELECTOR_JIT_PROFILING
-    ~RuleData()
-    {
-        if (m_compiledSelectorCodeRef.code().executableAddress())
-            dataLogF("RuleData compiled selector %d \"%s\"\n", m_compiledSelectorUseCount, selector()->selectorText().utf8().data());
-    }
-    void compiledSelectorUsed() const { m_compiledSelectorUseCount++; }
-#endif
-#endif // ENABLE(CSS_SELECTOR_JIT)
-
 private:
     RefPtr<StyleRule> m_rule;
-    unsigned m_selectorIndex : 13;
+    unsigned m_selectorIndex : 16;
+    unsigned m_selectorListIndex : 16;
     // This number was picked fairly arbitrarily. We can probably lower it if we need to.
     // Some simple testing showed <100,000 RuleData's on large sites.
@@ -106 +90 @@
     unsigned m_propertyWhitelistType : 2;
     SelectorFilter::Hashes m_descendantSelectorIdentifierHashes;
-#if ENABLE(CSS_SELECTOR_JIT)
-    mutable SelectorCompilationStatus m_compilationStatus;
-    mutable JSC::MacroAssemblerCodeRef m_compiledSelectorCodeRef;
-#if CSS_SELECTOR_JIT_PROFILING
-    mutable unsigned m_compiledSelectorUseCount;
-#endif
-#endif // ENABLE(CSS_SELECTOR_JIT)
 };
     
 struct SameSizeAsRuleData {
-#if ENABLE(CSS_SELECTOR_JIT)
-    unsigned compilationStatus;
-    void* compiledSelectorPointer;
-    void* codeRefPtr;
-#if CSS_SELECTOR_JIT_PROFILING
-    unsigned compiledSelectorUseCount;
-#endif
-#endif // ENABLE(CSS_SELECTOR_JIT)
-
     void* a;
     unsigned b;
@@ -153 +121 @@
 
     void addStyleRule(StyleRule*);
-    void addRule(StyleRule*, unsigned selectorIndex);
+    void addRule(StyleRule*, unsigned selectorIndex, unsigned selectorListIndex);
     void addPageRule(StyleRulePage*);
     void addToRuleSet(const AtomicString& key, AtomRuleMap&, const RuleData&);

releases/WebKitGTK/webkit-2.20/Source/WebCore/css/StyleRule.cpp

@@ -192 +192 @@
     , m_properties(o.properties().mutableCopy())
     , m_selectorList(o.m_selectorList)
+#if ENABLE(CSS_SELECTOR_JIT)
+    , m_compiledSelectors(o.m_compiledSelectors)
+#endif
 {
 }

releases/WebKitGTK/webkit-2.20/Source/WebCore/css/StyleRule.h

@@ -23 +23 @@
 
 #include "CSSSelectorList.h"
+#include "CompiledSelector.h"
 #include "StyleProperties.h"
 #include <wtf/RefPtr.h>
@@ -140 +141 @@
     Vector<RefPtr<StyleRule>> splitIntoMultipleRulesWithMaximumSelectorComponentCount(unsigned) const;
 
+#if ENABLE(CSS_SELECTOR_JIT)
+    CompiledSelector& compiledSelectorForListIndex(unsigned index)
+    {
+        if (m_compiledSelectors.isEmpty())
+            m_compiledSelectors.grow(m_selectorList.listSize());
+        return m_compiledSelectors[index];
+    }
+#endif
+
     static unsigned averageSizeInBytes();
 
@@ -150 +160 @@
     mutable Ref<StylePropertiesBase> m_properties;
     CSSSelectorList m_selectorList;
+
+#if ENABLE(CSS_SELECTOR_JIT)
+    Vector<CompiledSelector> m_compiledSelectors;
+#endif
 };
 

releases/WebKitGTK/webkit-2.20/Source/WebCore/cssjit/SelectorCompiler.h

@@ -28 +28 @@
 #if ENABLE(CSS_SELECTOR_JIT)
 
+#include "CompiledSelector.h"
 #include "SelectorChecker.h"
-#include <JavaScriptCore/MacroAssemblerCodeRef.h>
 
 #define CSS_SELECTOR_JIT_PROFILING 0
-
-namespace JSC {
-class MacroAssemblerCodeRef;
-}
 
 namespace WebCore {
@@ -41 +37 @@
 class CSSSelector;
 class Element;
-class RenderStyle;
-
-class SelectorCompilationStatus {
-public:
-    enum Status {
-        NotCompiled,
-        CannotCompile,
-        SimpleSelectorChecker,
-        SelectorCheckerWithCheckingContext
-    };
-
-    SelectorCompilationStatus()
-        : m_status(NotCompiled)
-    { }
-
-    SelectorCompilationStatus(Status status)
-        : m_status(status)
-    { }
-
-    operator Status() const { return m_status; }
-
-private:
-    Status m_status;
-};
 
 namespace SelectorCompiler {