Changeset 201559 in webkit

Timestamp:

Jun 1, 2016, 11:14:25 AM (10 years ago)

Author:

akling@apple.com

Message:

Use inline capacity for StylePropertyShorthand Vectors.
<​https://webkit.org/b/158260>

Reviewed by Antti Koivisto.

Vector<StylePropertyShorthand> was a huge source of heap allocations,
just over 0.5% of all fastMalloc() bytes on PLUM. Giving it an inline capacity
of 4 turns all of it into stack allocations.

• css/CSSParser.cpp:

(WebCore::CSSParser::addProperty):

• css/CSSProperty.cpp:

(WebCore::StylePropertyMetadata::shorthandID):

• css/StylePropertyShorthand.cpp:

(WebCore::indexOfShorthandForLonghand):

• css/StylePropertyShorthand.h:
• css/makeprop.pl:

(constructShorthandsVector):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSParser.cpp (modified) (1 diff)
• css/CSSProperty.cpp (modified) (1 diff)
• css/StylePropertyShorthand.cpp (modified) (1 diff)
• css/StylePropertyShorthand.h (modified) (1 diff)
• css/makeprop.pl (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-01  Andreas Kling  <akling@apple.com>
+
+        Use inline capacity for StylePropertyShorthand Vectors.
+        <https://webkit.org/b/158260>
+
+        Reviewed by Antti Koivisto.
+
+        Vector<StylePropertyShorthand> was a huge source of heap allocations,
+        just over 0.5% of all fastMalloc() bytes on PLUM. Giving it an inline capacity
+        of 4 turns all of it into stack allocations.
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::addProperty):
+        * css/CSSProperty.cpp:
+        (WebCore::StylePropertyMetadata::shorthandID):
+        * css/StylePropertyShorthand.cpp:
+        (WebCore::indexOfShorthandForLonghand):
+        * css/StylePropertyShorthand.h:
+        * css/makeprop.pl:
+        (constructShorthandsVector):
+
 2016-06-01  Nael Ouedraogo  <nael.ouedraogo@crf.canon.fr>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -1610 +1610 @@
     }
 
-    Vector<StylePropertyShorthand> shorthands = matchingShorthandsForLonghand(propId);
+    auto shorthands = matchingShorthandsForLonghand(propId);
     if (shorthands.size() == 1)
         m_parsedProperties.append(CSSProperty(propId, WTFMove(value), important, true, CSSPropertyInvalid, m_implicitShorthand || implicit));

trunk/Source/WebCore/css/CSSProperty.cpp

@@ -44 +44 @@
         return CSSPropertyInvalid;
 
-    Vector<StylePropertyShorthand> shorthands = matchingShorthandsForLonghand(static_cast<CSSPropertyID>(m_propertyID));
+    auto shorthands = matchingShorthandsForLonghand(static_cast<CSSPropertyID>(m_propertyID));
     ASSERT(shorthands.size() && m_indexInShorthandsVector >= 0 && m_indexInShorthandsVector < shorthands.size());
     return shorthands[m_indexInShorthandsVector].id();

trunk/Source/WebCore/css/StylePropertyShorthand.cpp

@@ -69 +69 @@
 }
 
-unsigned indexOfShorthandForLonghand(CSSPropertyID shorthandID, const Vector<StylePropertyShorthand>& shorthands)
+unsigned indexOfShorthandForLonghand(CSSPropertyID shorthandID, const StylePropertyShorthandVector& shorthands)
 {
     for (unsigned i = 0, size = shorthands.size(); i < size; ++i) {

trunk/Source/WebCore/css/StylePropertyShorthand.h

@@ -62 +62 @@
 // Return the list of shorthands for a given longhand.
 // The implementation is generated in StylePropertyShorthandFunctions.cpp.
-Vector<StylePropertyShorthand> matchingShorthandsForLonghand(CSSPropertyID);
+using StylePropertyShorthandVector = Vector<StylePropertyShorthand, 4>;
+StylePropertyShorthandVector matchingShorthandsForLonghand(CSSPropertyID);
 
-unsigned indexOfShorthandForLonghand(CSSPropertyID, const Vector<StylePropertyShorthand>&);
+unsigned indexOfShorthandForLonghand(CSSPropertyID, const StylePropertyShorthandVector&);
 
 bool isShorthandCSSProperty(CSSPropertyID);

trunk/Source/WebCore/css/makeprop.pl

@@ -1006 +1006 @@
 
 print SHORTHANDS_CPP << "EOF";
-Vector<StylePropertyShorthand> matchingShorthandsForLonghand(CSSPropertyID propertyID)
+StylePropertyShorthandVector matchingShorthandsForLonghand(CSSPropertyID propertyID)
 {
     switch (propertyID) {
@@ -1014 +1014 @@
   my $shorthands = shift;
 
-  my $vector = "Vector<StylePropertyShorthand>{";
+  my $vector = "StylePropertyShorthandVector{";
   foreach my $i (0 .. $#$shorthands) {
     $vector .= ", " unless $i == 0;