Changed worst HashTable load factor from 1.0 to 0.5

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 3082bb090eeea8d084d383ee796559fa3df9dacf..1d6519e51991bd6051b8eae7cefcdc216abaf77b 100644 (file)
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -24,6 +24,11 @@
 #include "zend_globals.h"
 #include "zend_variables.h"
 
+#ifdef __SSE2__
+# include <mmintrin.h>
+# include <emmintrin.h>
+#endif
+
 #if ZEND_DEBUG
 # define HT_ASSERT(ht, expr) \
        ZEND_ASSERT((expr) || (HT_FLAGS(ht) & HASH_FLAG_ALLOW_COW_VIOLATION))
@@ -116,19 +121,37 @@ static zend_always_inline uint32_t zend_hash_check_size(uint32_t nSize)
 
 static zend_always_inline void zend_hash_real_init_packed_ex(HashTable *ht)
 {
-       HT_SET_DATA_ADDR(ht, pemalloc(HT_SIZE(ht), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT));
+       HT_SET_DATA_ADDR(ht, pemalloc(HT_SIZE_EX(ht->nTableSize, HT_MIN_MASK), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT));
        HT_FLAGS(ht) |= HASH_FLAG_INITIALIZED | HASH_FLAG_PACKED;
        HT_HASH_RESET_PACKED(ht);
 }
 
 static zend_always_inline void zend_hash_real_init_mixed_ex(HashTable *ht)
 {
-       (ht)->nTableMask = -(ht)->nTableSize;
-       HT_SET_DATA_ADDR(ht, pemalloc(HT_SIZE(ht), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT));
+       uint32_t nSize = ht->nTableSize;
+
+       (ht)->nTableMask = HT_SIZE_TO_MASK(nSize);
+       HT_SET_DATA_ADDR(ht, pemalloc(HT_SIZE_EX(nSize, HT_SIZE_TO_MASK(nSize)), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT));
        HT_FLAGS(ht) |= HASH_FLAG_INITIALIZED;
-       if (EXPECTED(ht->nTableMask == (uint32_t)-8)) {
+       if (EXPECTED(ht->nTableMask == HT_SIZE_TO_MASK(HT_MIN_SIZE))) {
                Bucket *arData = ht->arData;
 
+#ifdef __SSE2__
+               __m128i xmm0 = _mm_setzero_si128();
+               xmm0 = _mm_cmpeq_epi8(xmm0, xmm0);
+               _mm_storeu_si128((__m128i*)&HT_HASH_EX(arData, -16), xmm0);
+               _mm_storeu_si128((__m128i*)&HT_HASH_EX(arData, -12), xmm0);
+               _mm_storeu_si128((__m128i*)&HT_HASH_EX(arData, -8), xmm0);
+               _mm_storeu_si128((__m128i*)&HT_HASH_EX(arData, -4), xmm0);
+#else
+               HT_HASH_EX(arData, -16) = -1;
+               HT_HASH_EX(arData, -15) = -1;
+               HT_HASH_EX(arData, -14) = -1;
+               HT_HASH_EX(arData, -13) = -1;
+               HT_HASH_EX(arData, -12) = -1;
+               HT_HASH_EX(arData, -11) = -1;
+               HT_HASH_EX(arData, -10) = -1;
+               HT_HASH_EX(arData, -9) = -1;
                HT_HASH_EX(arData, -8) = -1;
                HT_HASH_EX(arData, -7) = -1;
                HT_HASH_EX(arData, -6) = -1;
@@ -137,6 +160,7 @@ static zend_always_inline void zend_hash_real_init_mixed_ex(HashTable *ht)
                HT_HASH_EX(arData, -3) = -1;
                HT_HASH_EX(arData, -2) = -1;
                HT_HASH_EX(arData, -1) = -1;
+#endif
        } else {
                HT_HASH_RESET(ht);
        }
@@ -204,7 +228,7 @@ static void ZEND_FASTCALL zend_hash_packed_grow(HashTable *ht)
                zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%u * %zu + %zu)", ht->nTableSize * 2, sizeof(Bucket), sizeof(Bucket));
        }
        ht->nTableSize += ht->nTableSize;
-       HT_SET_DATA_ADDR(ht, perealloc2(HT_GET_DATA_ADDR(ht), HT_SIZE(ht), HT_USED_SIZE(ht), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT));
+       HT_SET_DATA_ADDR(ht, perealloc2(HT_GET_DATA_ADDR(ht), HT_SIZE_EX(ht->nTableSize, HT_MIN_MASK), HT_USED_SIZE(ht), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT));
 }
 
 ZEND_API void ZEND_FASTCALL zend_hash_real_init(HashTable *ht, zend_bool packed)
@@ -235,11 +259,12 @@ ZEND_API void ZEND_FASTCALL zend_hash_packed_to_hash(HashTable *ht)
 {
        void *new_data, *old_data = HT_GET_DATA_ADDR(ht);
        Bucket *old_buckets = ht->arData;
+       uint32_t nSize = ht->nTableSize;
 
        HT_ASSERT_RC1(ht);
        HT_FLAGS(ht) &= ~HASH_FLAG_PACKED;
-       new_data = pemalloc(HT_SIZE_EX(ht->nTableSize, -ht->nTableSize), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT);
-       ht->nTableMask = -ht->nTableSize;
+       new_data = pemalloc(HT_SIZE_EX(nSize, HT_SIZE_TO_MASK(nSize)), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT);
+       ht->nTableMask = HT_SIZE_TO_MASK(ht->nTableSize);
        HT_SET_DATA_ADDR(ht, new_data);
        memcpy(ht->arData, old_buckets, sizeof(Bucket) * ht->nNumUsed);
        pefree(old_data, GC_FLAGS(ht) & IS_ARRAY_PERSISTENT);
@@ -275,7 +300,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_extend(HashTable *ht, uint32_t nSize, zend
                        ZEND_ASSERT(HT_FLAGS(ht) & HASH_FLAG_PACKED);
                        if (nSize > ht->nTableSize) {
                                ht->nTableSize = zend_hash_check_size(nSize);
-                               HT_SET_DATA_ADDR(ht, perealloc2(HT_GET_DATA_ADDR(ht), HT_SIZE(ht), HT_USED_SIZE(ht), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT));
+                               HT_SET_DATA_ADDR(ht, perealloc2(HT_GET_DATA_ADDR(ht), HT_SIZE_EX(ht->nTableSize, HT_MIN_MASK), HT_USED_SIZE(ht), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT));
                        }
                } else {
                        ZEND_ASSERT(!(HT_FLAGS(ht) & HASH_FLAG_PACKED));
@@ -283,9 +308,9 @@ ZEND_API void ZEND_FASTCALL zend_hash_extend(HashTable *ht, uint32_t nSize, zend
                                void *new_data, *old_data = HT_GET_DATA_ADDR(ht);
                                Bucket *old_buckets = ht->arData;
                                nSize = zend_hash_check_size(nSize);
-                               new_data = pemalloc(HT_SIZE_EX(nSize, -nSize), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT);
                                ht->nTableSize = nSize;
-                               ht->nTableMask = -ht->nTableSize;
+                               new_data = pemalloc(HT_SIZE_EX(nSize, HT_SIZE_TO_MASK(nSize)), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT);
+                               ht->nTableMask = HT_SIZE_TO_MASK(ht->nTableSize);
                                HT_SET_DATA_ADDR(ht, new_data);
                                memcpy(ht->arData, old_buckets, sizeof(Bucket) * ht->nNumUsed);
                                pefree(old_data, GC_FLAGS(ht) & IS_ARRAY_PERSISTENT);
@@ -970,9 +995,9 @@ static void ZEND_FASTCALL zend_hash_do_resize(HashTable *ht)
                uint32_t nSize = ht->nTableSize + ht->nTableSize;
                Bucket *old_buckets = ht->arData;
 
-               new_data = pemalloc(HT_SIZE_EX(nSize, -nSize), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT);
                ht->nTableSize = nSize;
-               ht->nTableMask = -ht->nTableSize;
+               new_data = pemalloc(HT_SIZE_EX(nSize, HT_SIZE_TO_MASK(nSize)), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT);
+               ht->nTableMask = HT_SIZE_TO_MASK(ht->nTableSize);
                HT_SET_DATA_ADDR(ht, new_data);
                memcpy(ht->arData, old_buckets, sizeof(Bucket) * ht->nNumUsed);
                pefree(old_data, GC_FLAGS(ht) & IS_ARRAY_PERSISTENT);
@@ -1879,7 +1904,7 @@ ZEND_API HashTable* ZEND_FASTCALL zend_array_dup(HashTable *source)
                target->nNumUsed = source->nNumUsed;
                target->nNumOfElements = source->nNumOfElements;
                target->nNextFreeElement = source->nNextFreeElement;
-               HT_SET_DATA_ADDR(target, emalloc(HT_SIZE(target)));
+               HT_SET_DATA_ADDR(target, emalloc(HT_SIZE_EX(target->nTableSize, HT_MIN_MASK)));
                target->nInternalPointer =
                        (source->nInternalPointer < source->nNumUsed) ?
                                source->nInternalPointer : 0;

diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index a57f5ae8fe09afa2ae9668d8c5d5e6e43864962e..75eadbef07a79c053af888b14a3d6b7e5eedb82e 100644 (file)
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -297,6 +297,8 @@ struct _zend_array {
 #define HT_HASH(ht, idx) \
        HT_HASH_EX((ht)->arData, idx)
 
+#define HT_SIZE_TO_MASK(nTableSize) \
+       ((uint32_t)(-((nTableSize) + (nTableSize))))
 #define HT_HASH_SIZE(nTableMask) \
        (((size_t)(uint32_t)-(int32_t)(nTableMask)) * sizeof(uint32_t))
 #define HT_DATA_SIZE(nTableSize) \

diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
index 15e8bc5fe0aa08f522155d4c88465741185b52d1..d40f1886e47adee006577ecf3509357dfb420be1 100644 (file)
--- a/ext/opcache/zend_persist.c
+++ b/ext/opcache/zend_persist.c
@@ -114,17 +114,17 @@ static void zend_hash_persist(HashTable *ht, zend_persist_func_t pPersistElement
                void *data = HT_GET_DATA_ADDR(ht);
                zend_accel_store(data, HT_USED_SIZE(ht));
                HT_SET_DATA_ADDR(ht, data);
-       } else if (ht->nNumUsed < (uint32_t)(-(int32_t)ht->nTableMask) / 2) {
+       } else if (ht->nNumUsed < (uint32_t)(-(int32_t)ht->nTableMask) / 4) {
                /* compact table */
                void *old_data = HT_GET_DATA_ADDR(ht);
                Bucket *old_buckets = ht->arData;
                uint32_t hash_size;
 
                if (ht->nNumUsed <= HT_MIN_SIZE) {
-                       hash_size = HT_MIN_SIZE;
+                       hash_size = HT_MIN_SIZE * 2;
                } else {
                        hash_size = (uint32_t)(-(int32_t)ht->nTableMask);
-                       while (hash_size >> 1 > ht->nNumUsed) {
+                       while (hash_size >> 2 > ht->nNumUsed) {
                                hash_size >>= 1;
                        }
                }

diff --git a/ext/opcache/zend_persist_calc.c b/ext/opcache/zend_persist_calc.c
index 27d9fefb3cd32bd947f7984f8d6c18ba4a06fe0c..4dee76b3a356e37e775b50b1d7fc8f15c87f4053 100644 (file)
--- a/ext/opcache/zend_persist_calc.c
+++ b/ext/opcache/zend_persist_calc.c
@@ -60,15 +60,15 @@ static void zend_hash_persist_calc(HashTable *ht, void (*pPersistElement)(zval *
                return;
        }
 
-       if (!(HT_FLAGS(ht) & HASH_FLAG_PACKED) && ht->nNumUsed < (uint32_t)(-(int32_t)ht->nTableMask) / 2) {
+       if (!(HT_FLAGS(ht) & HASH_FLAG_PACKED) && ht->nNumUsed < (uint32_t)(-(int32_t)ht->nTableMask) / 4) {
                /* compact table */
                uint32_t hash_size;
 
                if (ht->nNumUsed <= HT_MIN_SIZE) {
-                       hash_size = HT_MIN_SIZE;
+                       hash_size = HT_MIN_SIZE * 2;
                } else {
                        hash_size = (uint32_t)(-(int32_t)ht->nTableMask);
-                       while (hash_size >> 1 > ht->nNumUsed) {
+                       while (hash_size >> 2 > ht->nNumUsed) {
                                hash_size >>= 1;
                        }
                }