Changeset 39182 in webkit for trunk/JavaScriptCore/bytecode/CodeBlock.cpp

Timestamp:

Dec 10, 2008, 12:05:53 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-10 Sam Weinig <​[email protected]>

Reviewed by Geoffrey Garen.

<rdar://problem/6428332> Remove the CTI return address table from CodeBlock

Step 2:

Convert the return address table from a HashMap to a sorted Vector. This
reduces the size of the data structure by ~4.5MB on Membuster head.

SunSpider reports a 0.5% progression.

• bytecode/CodeBlock.cpp: (JSC::sizeInBytes): Generic method to get the cost of a Vector. (JSC::CodeBlock::dumpStatistics): Add dumping of member sizes.
• bytecode/CodeBlock.h: (JSC::PC::PC): Struct representing NativePC -> VirtualPC mappings. (JSC::getNativePC): Helper for binary chop. (JSC::CodeBlock::getBytecodeIndex): Used to get the VirtualPC from a NativePC using a binary chop of the pcVector. (JSC::CodeBlock::pcVector): Accessor.

• interpreter/Interpreter.cpp: (JSC::vPCForPC): Use getBytecodeIndex instead of jitReturnAddressVPCMap().get(). (JSC::Interpreter::cti_op_instanceof): Ditto. (JSC::Interpreter::cti_op_resolve): Ditto. (JSC::Interpreter::cti_op_resolve_func): Ditto. (JSC::Interpreter::cti_op_resolve_skip): Ditto. (JSC::Interpreter::cti_op_resolve_with_base): Ditto. (JSC::Interpreter::cti_op_throw): Ditto. (JSC::Interpreter::cti_op_in): Ditto. (JSC::Interpreter::cti_vm_throw): Ditto.

• jit/JIT.cpp: (JSC::JIT::privateCompile): Reserve exact capacity and fill the pcVector.

File:

• trunk/JavaScriptCore/bytecode/CodeBlock.cpp (modified) (6 diffs)

trunk/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -972 +972 @@
     macro(expressionInfo) \
     macro(lineInfo) \
+    macro(pcVector)
 
 #define FOR_EACH_MEMBER_VECTOR_RARE_DATA(macro) \
@@ -982 +983 @@
     macro(stringSwitchJumpTables)
 
+template<typename T>
+static size_t sizeInBytes(const Vector<T>& vector)
+{
+    return vector.capacity() * sizeof(T);
+}
+
 void CodeBlock::dumpStatistics()
 {
 #if DUMP_CODE_BLOCK_STATISTICS
-
-    #define DEFINE_VARS(name) size_t name##IsNotEmpty = 0;
+    #define DEFINE_VARS(name) size_t name##IsNotEmpty = 0; size_t name##TotalSize = 0;
         FOR_EACH_MEMBER_VECTOR(DEFINE_VARS)
         FOR_EACH_MEMBER_VECTOR_RARE_DATA(DEFINE_VARS)
@@ -992 +998 @@
 
     // Non-vector data members
-    size_t jitReturnAddressVPCMapIsNotEmpty = 0;
     size_t evalCodeCacheIsNotEmpty = 0;
+
     size_t symbolTableIsNotEmpty = 0;
+    size_t symbolTableTotalSize = 0;
 
     size_t hasRareData = 0;
-
-    size_t symbolTableTotalSize = 0;
 
     HashSet<CodeBlock*>::const_iterator end = liveCodeBlockSet.end();
@@ -1004 +1009 @@
         CodeBlock* codeBlock = *it;
 
-        #define GET_STATS(name) if (!codeBlock->m_##name.isEmpty()) { name##IsNotEmpty++; }
+        #define GET_STATS(name) if (!codeBlock->m_##name.isEmpty()) { name##IsNotEmpty++; name##TotalSize += sizeInBytes(codeBlock->m_##name); }
             FOR_EACH_MEMBER_VECTOR(GET_STATS)
         #undef GET_STATS
-
-        if (!codeBlock->m_jitReturnAddressVPCMap.isEmpty())
-            jitReturnAddressVPCMapIsNotEmpty++;
 
         if (!codeBlock->m_symbolTable.isEmpty()) {
@@ -1018 +1020 @@
         if (codeBlock->m_rareData) {
             hasRareData++;
-            #define GET_STATS(name) if (!codeBlock->m_rareData->m_##name.isEmpty()) { name##IsNotEmpty++; }
+            #define GET_STATS(name) if (!codeBlock->m_rareData->m_##name.isEmpty()) { name##IsNotEmpty++; name##TotalSize += sizeInBytes(codeBlock->m_rareData->m_##name); }
                 FOR_EACH_MEMBER_VECTOR_RARE_DATA(GET_STATS)
             #undef GET_STATS
@@ -1032 +1034 @@
     printf("Number of CodeBlocks with rare data: %zu\n", hasRareData);
 
-    #define PRINT_STATS(name) printf("Number of CodeBlocks with " #name ": %zu\n", name##IsNotEmpty);
+    #define PRINT_STATS(name) printf("Number of CodeBlocks with " #name ": %zu\n", name##IsNotEmpty); printf("Size of all " #name ": %zu\n", name##TotalSize); 
         FOR_EACH_MEMBER_VECTOR(PRINT_STATS)
         FOR_EACH_MEMBER_VECTOR_RARE_DATA(PRINT_STATS)
     #undef PRINT_STATS
 
-    printf("Number of CodeBlocks with jitReturnAddressVPCMap: %zu\n", jitReturnAddressVPCMapIsNotEmpty);
     printf("Number of CodeBlocks with evalCodeCache: %zu\n", evalCodeCacheIsNotEmpty);
     printf("Number of CodeBlocks with symbolTable: %zu\n", symbolTableIsNotEmpty);