Changeset 272621 in webkit

Timestamp:

Feb 9, 2021 4:34:26 PM (3 years ago)

Author:

ysuzuki@apple.com

Message:

REGRESSION(r269017): Speedometer2 1% regression
​https://bugs.webkit.org/show_bug.cgi?id=221640

Reviewed by Mark Lam.

Reverting r269017, r269478, and r272095 because of Speedometer2 ~1% regression.

• wtf/HashTable.h:

(WTF::KeyTraits>::inlineLookup):
(WTF::KeyTraits>::lookupForWriting):
(WTF::KeyTraits>::fullLookupForWriting):
(WTF::KeyTraits>::addUniqueForInitialization):
(WTF::KeyTraits>::add):

• wtf/HashTraits.h:
• wtf/MetaAllocator.cpp:

(WTF::MetaAllocator::addFreeSpace):

• wtf/MetaAllocator.h:

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/HashTable.h (modified) (12 diffs)
• wtf/HashTraits.h (modified) (2 diffs)
• wtf/MetaAllocator.cpp (modified) (1 diff)
• wtf/MetaAllocator.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-02-09  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        REGRESSION(r269017): Speedometer2 1% regression
+        https://bugs.webkit.org/show_bug.cgi?id=221640
+
+        Reviewed by Mark Lam.
+
+        Reverting r269017, r269478, and r272095 because of Speedometer2 ~1% regression.
+
+        * wtf/HashTable.h:
+        (WTF::KeyTraits>::inlineLookup):
+        (WTF::KeyTraits>::lookupForWriting):
+        (WTF::KeyTraits>::fullLookupForWriting):
+        (WTF::KeyTraits>::addUniqueForInitialization):
+        (WTF::KeyTraits>::add):
+        * wtf/HashTraits.h:
+        * wtf/MetaAllocator.cpp:
+        (WTF::MetaAllocator::addFreeSpace):
+        * wtf/MetaAllocator.h:
+
 2021-02-09  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WTF/wtf/HashTable.h

@@ -60 +60 @@
 #endif
 
-#define HASH_TABLE_RELEASE_ASSERT(condition) if (UNLIKELY(!(condition))) CRASH();
-
 #if DUMP_HASHTABLE_STATS
 
@@ -678 +676 @@
         unsigned h = HashTranslator::hash(key);
         unsigned i = h & sizeMask;
-        unsigned initialIndex = i;
 
 #if DUMP_HASHTABLE_STATS
@@ -718 +715 @@
                 k = 1 | doubleHash(h);
             i = (i + k) & sizeMask;
-            if constexpr (KeyTraits::assertNotFull)
-                HASH_TABLE_RELEASE_ASSERT(i != initialIndex);
         }
     }
@@ -735 +730 @@
         unsigned h = HashTranslator::hash(key);
         unsigned i = h & sizeMask;
-        unsigned initialIndex = i;
 
 #if DUMP_HASHTABLE_STATS
@@ -782 +776 @@
                 k = 1 | doubleHash(h);
             i = (i + k) & sizeMask;
-            if constexpr (KeyTraits::assertNotFull)
-                HASH_TABLE_RELEASE_ASSERT(i != initialIndex);
         }
     }
@@ -799 +791 @@
         unsigned h = HashTranslator::hash(key);
         unsigned i = h & sizeMask;
-        unsigned initialIndex = i;
 
 #if DUMP_HASHTABLE_STATS
@@ -846 +837 @@
                 k = 1 | doubleHash(h);
             i = (i + k) & sizeMask;
-            if constexpr (KeyTraits::assertNotFull)
-                HASH_TABLE_RELEASE_ASSERT(i != initialIndex);
         }
     }
@@ -868 +857 @@
         unsigned h = HashTranslator::hash(key);
         unsigned i = h & sizeMask;
-        unsigned initialIndex = i;
 
 #if DUMP_HASHTABLE_STATS
@@ -898 +886 @@
                 k = 1 | doubleHash(h);
             i = (i + k) & sizeMask;
-            if constexpr (KeyTraits::assertNotFull)
-                HASH_TABLE_RELEASE_ASSERT(i != initialIndex);
         }
 
@@ -952 +938 @@
         unsigned h = HashTranslator::hash(key);
         unsigned i = h & sizeMask;
-        unsigned initialIndex = i;
 
 #if DUMP_HASHTABLE_STATS
@@ -999 +984 @@
                 k = 1 | doubleHash(h);
             i = (i + k) & sizeMask;
-            if constexpr (KeyTraits::assertNotFull)
-                HASH_TABLE_RELEASE_ASSERT(i != initialIndex);
         }
 
@@ -1659 +1642 @@
     }
 
-#undef HASH_TABLE_RELEASE_ASSERT
-
 } // namespace WTF
 

trunk/Source/WTF/wtf/HashTraits.h

@@ -52 +52 @@
     // a hash table will have at least N entries.
     static constexpr unsigned minimumTableSize = 8;
-
-    // Whenever traversing the hash table, assert it is not full
-    static constexpr bool assertNotFull = false;
 };
 
@@ -384 +381 @@
 };
 
-template<typename Traits>
-struct HardenedHashTraits : public Traits {
-    static constexpr bool assertNotFull = true;
-};
-
 // Useful for classes that want complete control over what is empty and what is deleted,
 // and how to construct both.

trunk/Source/WTF/wtf/MetaAllocator.cpp

@@ -308 +308 @@
     FreeSpacePtr end = start + sizeInBytes;
 
-    auto leftNeighbor = m_freeSpaceEndAddressMap.find(start);
-    auto rightNeighbor = m_freeSpaceStartAddressMap.find(end);
+    HashMap<FreeSpacePtr, FreeSpaceNode*>::iterator leftNeighbor = m_freeSpaceEndAddressMap.find(start);
+    HashMap<FreeSpacePtr, FreeSpaceNode*>::iterator rightNeighbor = m_freeSpaceStartAddressMap.find(end);
 
     if (leftNeighbor != m_freeSpaceEndAddressMap.end()) {

trunk/Source/WTF/wtf/MetaAllocator.h

@@ -194 +194 @@
     
     Tree m_freeSpaceSizeMap;
-    HashMap<FreeSpacePtr, FreeSpaceNode*, DefaultHash<FreeSpacePtr>, HardenedHashTraits<HashTraits<FreeSpacePtr>>> m_freeSpaceStartAddressMap;
-    HashMap<FreeSpacePtr, FreeSpaceNode*, DefaultHash<FreeSpacePtr>, HardenedHashTraits<HashTraits<FreeSpacePtr>>> m_freeSpaceEndAddressMap;
+    HashMap<FreeSpacePtr, FreeSpaceNode*> m_freeSpaceStartAddressMap;
+    HashMap<FreeSpacePtr, FreeSpaceNode*> m_freeSpaceEndAddressMap;
     HashMap<uintptr_t, size_t> m_pageOccupancyMap;