Changeset 38688 in webkit for trunk/JavaScriptCore/bytecode

Timestamp:

Nov 21, 2008, 7:34:43 PM (17 years ago)

Author:

[email protected]

Message:

2008-11-21 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

Add (really) polymorphic caching for get by id self.
Very similar to caching of prototype accesses, described below.

Oh, also, probably shouldn't have been leaking those structure list objects.

4% preogression on deltablue.

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::dump): (JSC::CodeBlock::derefStructures): (JSC::PrototypeStructureList::derefStructures):
• bytecode/Instruction.h:
• bytecode/Opcode.h:
• interpreter/Interpreter.cpp: (JSC::Interpreter::privateExecute): (JSC::Interpreter::cti_op_get_by_id_self_fail):
• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass): (JSC::JIT::privateCompileGetByIdSelfList): (JSC::JIT::patchGetByIdSelf):
• jit/JIT.h: (JSC::JIT::compileGetByIdSelfList):

Location:

trunk/JavaScriptCore/bytecode

Files:

• CodeBlock.cpp (modified) (2 diffs)
• Instruction.h (modified) (5 diffs)
• Opcode.h (modified) (1 diff)

trunk/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -643 +643 @@
             break;
         }
+        case op_get_by_id_self_list: {
+            printGetByIdOp(location, it, identifiers, "get_by_id_self_list");
+            break;
+        }
         case op_get_by_id_proto: {
             printGetByIdOp(location, it, identifiers, "get_by_id_proto");
@@ -1024 +1028 @@
         return;
     }
-    if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_proto_list)) {
-        PrototypeStructureList* prototypeStructures = vPC[4].u.prototypeStructure;
-        int count = vPC[5].u.operand;
-        for (int i = 0; i < count; ++i) {
-            PrototypeStructureList::ProtoStubInfo& info = prototypeStructures->list[i];
-            ASSERT(info.base);
-            ASSERT(info.proto);
-            ASSERT(info.stubRoutine);
-            info.base->deref();
-            info.proto->deref();
-            WTF::fastFreeExecutable(info.stubRoutine);
-        }
+    if ((vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_proto_list))
+        || (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_self_list))) {
+        PolymorphicAccessStructureList* polymorphicStructures = vPC[4].u.polymorphicStructures;
+        polymorphicStructures->derefStructures(vPC[5].u.operand);
+        delete polymorphicStructures;
         return;
     }

trunk/JavaScriptCore/bytecode/Instruction.h

@@ -34 +34 @@
 #include <wtf/VectorTraits.h>
 
-#define PROTOTYPE_LIST_CACHE_SIZE 4
+#define POLYMORPHIC_LIST_CACHE_SIZE 4
 
 namespace JSC {
@@ -43 +43 @@
 
     // Structure used by op_get_by_id_proto_list instruction to hold data off the main opcode stream.
-    struct PrototypeStructureList {
-        struct ProtoStubInfo {
+    struct PolymorphicAccessStructureList {
+        struct PolymorphicStubInfo {
             Structure* base;
             Structure* proto;
@@ -57 +57 @@
                 stubRoutine = _stubRoutine;
             }
-        } list[PROTOTYPE_LIST_CACHE_SIZE];
+        } list[POLYMORPHIC_LIST_CACHE_SIZE];
         
-        PrototypeStructureList(Structure* firstBase, Structure* firstProto, int cachedOffset, void* stubRoutine)
+        PolymorphicAccessStructureList(Structure* firstBase, Structure* firstProto, int cachedOffset, void* stubRoutine)
         {
             list[0].set(firstBase, firstProto, cachedOffset, stubRoutine);
+        }
+
+        void derefStructures(int count)
+        {
+            for (int i = 0; i < count; ++i) {
+                PolymorphicStubInfo& info = list[i];
+
+                ASSERT(info.base);
+                info.base->deref();
+
+                if (info.proto)
+                    info.proto->deref();
+
+                if (info.stubRoutine)
+                    WTF::fastFreeExecutable(info.stubRoutine);
+            }
         }
     };
@@ -78 +94 @@
         Instruction(StructureChain* structureChain) { u.structureChain = structureChain; }
         Instruction(JSCell* jsCell) { u.jsCell = jsCell; }
-        Instruction(PrototypeStructureList* prototypeStructure) { u.prototypeStructure = prototypeStructure; }
+        Instruction(PolymorphicAccessStructureList* polymorphicStructures) { u.polymorphicStructures = polymorphicStructures; }
 
         union {
@@ -87 +103 @@
             JSCell* jsCell;
             ResultType::Type resultType;
-            PrototypeStructureList* prototypeStructure;
+            PolymorphicAccessStructureList* polymorphicStructures;
         } u;
     };

trunk/JavaScriptCore/bytecode/Opcode.h

@@ -102 +102 @@
         macro(op_get_by_id) \
         macro(op_get_by_id_self) \
+        macro(op_get_by_id_self_list) \
         macro(op_get_by_id_proto) \
         macro(op_get_by_id_proto_list) \