Changeset 2777 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Nov 20, 2002, 12:53:04 AM (23 years ago)

Author:

darin

Message:

• add a couple of list operations to avoid clearing lists so much during sorting; gives 1.5% iBench

• kjs/types.h: Added replaceFirst/replaceLast.
• kjs/types.cpp: (List::replaceFirst), (List::replaceLast): Added.

• kjs/array_object.cpp: (compareWithCompareFunctionForQSort): Use replaceFirst/replaceLast.

• kjs/property_map.cpp: Put in an ifdef so I can re-add/remove the single entry to see if it has outlived its usefulness. (It hasn't yet.)

Location:

trunk/JavaScriptCore/kjs

Files:

• array_object.cpp (modified) (2 diffs)
• property_map.cpp (modified) (15 diffs)
• types.cpp (modified) (1 diff)
• types.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -215 +215 @@
         , compareFunction(cf)
         , globalObject(e->interpreter()->globalObject())
-    { }
+    {
+        arguments.append(Undefined());
+        arguments.append(Undefined());
+    }
 
     ExecState *exec;
@@ -229 +232 @@
     CompareWithCompareFunctionArguments *args = compareWithCompareFunctionArguments;
     
-    args->arguments.clear();
-    args->arguments.append(*(ValueImp **)a);
-    args->arguments.append(*(ValueImp **)b);
+    args->arguments.replaceFirst(*(ValueImp **)a);
+    args->arguments.replaceLast(*(ValueImp **)b);
     return args->compareFunction->call(args->exec, args->globalObject, args->arguments)
         .toInt32(args->exec);

trunk/JavaScriptCore/kjs/property_map.cpp

@@ -26 +26 @@
 #include "reference_list.h"
 
+// At the time I added this, the optimization still gave a 1.5% performance boost.
+#define USE_SINGLE_ENTRY 1
+
 namespace KJS {
 
@@ -36 +39 @@
 PropertyMap::~PropertyMap()
 {
+#if USE_SINGLE_ENTRY
     UString::Rep *key = _singleEntry.key;
     if (key)
         key->deref();
+#endif
     for (int i = 0; i < _tableSize; i++) {
-        key = _table[i].key;
+        UString::Rep *key = _table[i].key;
         if (key)
             key->deref();
@@ -49 +54 @@
 void PropertyMap::clear()
 {
+#if USE_SINGLE_ENTRY
     UString::Rep *key = _singleEntry.key;
     if (key) {
@@ -54 +60 @@
         _singleEntry.key = 0;
     }
+#endif
     for (int i = 0; i < _tableSize; i++) {
         UString::Rep *key = _table[i].key;
@@ -71 +78 @@
 ValueImp *PropertyMap::get(const Identifier &name, int &attributes) const
 {
-    if (!_table) {
+    UString::Rep *rep = name._ustring.rep;
+    
+    if (!_table) {
+ #if USE_SINGLE_ENTRY
         UString::Rep *key = _singleEntry.key;
-        if (name._ustring.rep == key) {
+        if (rep == key) {
             attributes = _singleEntry.attributes;
             return _singleEntry.value;
         }
+#endif
         return 0;
     }
     
-    int i = hash(name._ustring.rep);
+    int i = hash(rep);
     while (UString::Rep *key = _table[i].key) {
-        if (name._ustring.rep == key) {
+        if (rep == key) {
             attributes = _table[i].attributes;
             return _table[i].value;
@@ -93 +104 @@
 ValueImp *PropertyMap::get(const Identifier &name) const
 {
-    if (!_table) {
+    UString::Rep *rep = name._ustring.rep;
+
+    if (!_table) {
+#if USE_SINGLE_ENTRY
         UString::Rep *key = _singleEntry.key;
-        if (name._ustring.rep == key)
+        if (rep == key)
             return _singleEntry.value;
+#endif
         return 0;
     }
     
-    int i = hash(name._ustring.rep);
+    int i = hash(rep);
     while (UString::Rep *key = _table[i].key) {
-        if (name._ustring.rep == key)
+        if (rep == key)
             return _table[i].value;
         i = (i + 1) & _tableSizeMask;
@@ -111 +126 @@
 void PropertyMap::put(const Identifier &name, ValueImp *value, int attributes)
 {
+    UString::Rep *rep = name._ustring.rep;
+
+#if USE_SINGLE_ENTRY
     if (!_table) {
         UString::Rep *key = _singleEntry.key;
         if (key) {
-            if (name._ustring.rep == key) {
+            if (rep == key) {
                 _singleEntry.value = value;
                 return;
             }
         } else {
-            name._ustring.rep->ref();
-            _singleEntry.key = name._ustring.rep;
+            rep->ref();
+            _singleEntry.key = rep;
             _singleEntry.value = value;
             _singleEntry.attributes = attributes;
@@ -127 +145 @@
         }
     }
+#endif
 
     if (_keyCount * 2 >= _tableSize)
         expand();
     
-    int i = hash(name._ustring.rep);
+    int i = hash(rep);
     while (UString::Rep *key = _table[i].key) {
-        if (name._ustring.rep == key) {
+        if (rep == key) {
             // Put a new value in an existing hash table entry.
             _table[i].value = value;
@@ -143 +162 @@
     
     // Create a new hash table entry.
-    name._ustring.rep->ref();
-    _table[i].key = name._ustring.rep;
+    rep->ref();
+    _table[i].key = rep;
     _table[i].value = value;
     _table[i].attributes = attributes;
@@ -170 +189 @@
     _table = (Entry *)calloc(_tableSize, sizeof(Entry));
 
+#if USE_SINGLE_ENTRY
     UString::Rep *key = _singleEntry.key;
     if (key) {
@@ -175 +195 @@
         _singleEntry.key = 0;
     }
+#endif
     
     for (int i = 0; i != oldTableSize; ++i) {
-        key = oldTable[i].key;
+        UString::Rep *key = oldTable[i].key;
         if (key)
             insert(key, oldTable[i].value, oldTable[i].attributes);
@@ -187 +208 @@
 void PropertyMap::remove(const Identifier &name)
 {
+    UString::Rep *rep = name._ustring.rep;
+
     UString::Rep *key;
 
     if (!_table) {
+#if USE_SINGLE_ENTRY
         key = _singleEntry.key;
-        if (name._ustring.rep == key) {
+        if (rep == key) {
             key->deref();
             _singleEntry.key = 0;
             _keyCount = 0;
         }
+#endif
         return;
     }
 
     // Find the thing to remove.
-    int i = hash(name._ustring.rep);
+    int i = hash(rep);
     while ((key = _table[i].key)) {
-        if (name._ustring.rep == key)
+        if (rep == key)
             break;
         i = (i + 1) & _tableSizeMask;
@@ -227 +252 @@
 void PropertyMap::mark() const
 {
+#if USE_SINGLE_ENTRY
     if (_singleEntry.key) {
         ValueImp *v = _singleEntry.value;
@@ -232 +258 @@
             v->mark();
     }
+#endif
     for (int i = 0; i != _tableSize; ++i) {
         if (_table[i].key) {
@@ -243 +270 @@
 void PropertyMap::addEnumerablesToReferenceList(ReferenceList &list, const Object &base) const
 {
+#if USE_SINGLE_ENTRY
     UString::Rep *key = _singleEntry.key;
     if (key && !(_singleEntry.attributes & DontEnum))
         list.append(Reference(base, Identifier(key)));
+#endif
     for (int i = 0; i != _tableSize; ++i) {
         UString::Rep *key = _table[i].key;

trunk/JavaScriptCore/kjs/types.cpp

@@ -350 +350 @@
   other.hook = tmp;
 }
+
+void List::replaceFirst(ValueImp *v)
+{
+    ListNode *n = hook->next;
+    if (!m_needsMarking) {
+      v->ref();
+      n->member->deref();
+    }
+    n->member = v;
+}
+
+void List::replaceLast(ValueImp *v)
+{
+    ListNode *n = hook->prev;
+    if (!m_needsMarking) {
+      v->ref();
+      n->member->deref();
+    }
+    n->member = v;
+}

trunk/JavaScriptCore/kjs/types.h

@@ -184 +184 @@
      */
     static const List &empty();
+    
     void mark();
+    
+    void replaceFirst(ValueImp *);
+    void replaceLast(ValueImp *);
+    
   private: