Changeset 36429 in webkit for trunk/JavaScriptCore

Timestamp:

Sep 15, 2008, 12:27:14 AM (17 years ago)

Author:

[email protected]

Message:

2008-09-15 Sam Weinig <​[email protected]>

Reviewed by Maciej Stachowiak.

Patch for ​https://bugs.webkit.org/show_bug.cgi?id=20849
Cache property names for getEnumerablePropertyNames in the StructureID.

~0.5% speedup on Sunspider overall (9.7% speedup on string-fasta). ~1% speedup
on the v8 test suite.

• kjs/JSObject.cpp: (JSC::JSObject::getPropertyNames):
• kjs/PropertyMap.cpp: (JSC::PropertyMap::getEnumerablePropertyNames):
• kjs/PropertyMap.h:
• kjs/StructureID.cpp: (JSC::StructureID::StructureID): (JSC::StructureID::getEnumerablePropertyNames):
• kjs/StructureID.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/JSObject.cpp (modified) (1 diff)
• kjs/PropertyMap.cpp (modified) (4 diffs)
• kjs/PropertyMap.h (modified) (2 diffs)
• kjs/StructureID.cpp (modified) (3 diffs)
• kjs/StructureID.h (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-09-15  Sam Weinig  <[email protected]>
+
+        Reviewed by Maciej Stachowiak.
+
+        Patch for https://bugs.webkit.org/show_bug.cgi?id=20849
+        Cache property names for getEnumerablePropertyNames in the StructureID.
+
+        ~0.5% speedup on Sunspider overall (9.7% speedup on string-fasta).  ~1% speedup
+        on the v8 test suite.
+
+        * kjs/JSObject.cpp:
+        (JSC::JSObject::getPropertyNames):
+        * kjs/PropertyMap.cpp:
+        (JSC::PropertyMap::getEnumerablePropertyNames):
+        * kjs/PropertyMap.h:
+        * kjs/StructureID.cpp:
+        (JSC::StructureID::StructureID):
+        (JSC::StructureID::getEnumerablePropertyNames):
+        * kjs/StructureID.h:
+
 2008-09-14  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/kjs/JSObject.cpp

@@ -433 +433 @@
 void JSObject::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
 {
-    m_structureID->propertyMap().getEnumerablePropertyNames(propertyNames);
+    m_structureID->getEnumerablePropertyNames(propertyNames);
 
     // Add properties from the static hashtables of properties

trunk/JavaScriptCore/kjs/PropertyMap.cpp

@@ -24 +24 @@
 #include "JSObject.h"
 #include "protect.h"
-#include "PropertyNameArray.h"
 #include <algorithm>
 #include <wtf/Assertions.h>
@@ -474 +473 @@
 }
 
-void PropertyMap::getEnumerablePropertyNames(PropertyNameArray& propertyNames) const
+void PropertyMap::getEnumerablePropertyNames(Vector<UString::Rep*>& propertyNames) const
 {
     if (!m_table)
@@ -493 +492 @@
             }
         }
-        if (!propertyNames.size()) {
-            for (int k = 0; k < i; ++k)
-                propertyNames.addKnownUnique(a[k]->key);
-        } else {
-            for (int k = 0; k < i; ++k)
-                propertyNames.add(a[k]->key);
-        }
+        propertyNames.reserveCapacity(i);
+        for (int k = 0; k < i; ++k)
+            propertyNames.append(a[k]->key);
         return;
     }
@@ -518 +513 @@
 
     // Put the keys of the sorted entries into the list.
-    for (Entry** q = sortedEnumerables.data(); q != p; ++q)
-        propertyNames.add(q[0]->key);
+    propertyNames.reserveCapacity(sortedEnumerables.size());
+    for (size_t i = 0; i < sortedEnumerables.size(); ++i)
+        propertyNames.append(sortedEnumerables[i]->key);
 }
 

trunk/JavaScriptCore/kjs/PropertyMap.h

@@ -31 +31 @@
     class JSObject;
     class JSValue;
-    class PropertyNameArray;
 
     typedef JSValue** PropertyStorage;
@@ -95 +94 @@
         size_t getOffset(const Identifier& propertyName, unsigned& attributes);
 
-        void getEnumerablePropertyNames(PropertyNameArray&) const;
+        void getEnumerablePropertyNames(Vector<UString::Rep*>&) const;
 
         bool hasGetterSetterProperties() const { return m_getterSetterFlag; }

trunk/JavaScriptCore/kjs/StructureID.cpp

@@ -29 +29 @@
 #include "identifier.h"
 #include "JSObject.h"
+#include "PropertyNameArray.h";
 #include <wtf/RefPtr.h>
 
@@ -35 +36 @@
 namespace JSC {
 
-    StructureID::StructureID(JSValue* prototype, JSType type)
+StructureID::StructureID(JSValue* prototype, JSType type)
     : m_isDictionary(false)
     , m_type(type)
@@ -46 +47 @@
     ASSERT(m_prototype);
     ASSERT(m_prototype->isObject() || m_prototype->isNull());
+}
+
+void StructureID::getEnumerablePropertyNames(PropertyNameArray& propertyNames) const
+{
+    if (m_cachedPropertyNameArray.isEmpty())
+        m_propertyMap.getEnumerablePropertyNames(m_cachedPropertyNameArray);
+
+    if (!propertyNames.size()) {
+        for (size_t i = 0; i < m_cachedPropertyNameArray.size(); ++i)
+            propertyNames.addKnownUnique(m_cachedPropertyNameArray[i]);
+    } else {
+        for (size_t i = 0; i < m_cachedPropertyNameArray.size(); ++i)
+            propertyNames.add(m_cachedPropertyNameArray[i]);
+    }
 }
 

trunk/JavaScriptCore/kjs/StructureID.h

@@ -40 +40 @@
 
     class JSValue;
+    class PropertyNameArray;
     class StructureIDChain;
 
@@ -108 +109 @@
         PropertyMap& propertyMap() { return m_propertyMap; }
 
+        void getEnumerablePropertyNames(PropertyNameArray&) const;
+
         static void transitionTo(StructureID* oldStructureID, StructureID* newStructureID, JSObject* slotBase);
 
@@ -131 +134 @@
         TransitionTable m_transitionTable;
 
+        mutable Vector<UString::Rep*> m_cachedPropertyNameArray;
+
         PropertyMap m_propertyMap;
     };