Changeset 36427 in webkit for trunk/JavaScriptCore

Timestamp:

Sep 14, 2008, 11:26:15 PM (17 years ago)

Author:

[email protected]

Message:

2008-09-14 Maciej Stachowiak <​[email protected]>

Reviewed by Cameron Zwarich.

• speed up JS construction by extracting "prototype" lookup so PIC applies.

~0.5% speedup on SunSpider
Speeds up some of the V8 tests as well, most notably earley-boyer.

• VM/CTI.cpp: (JSC::CTI::compileOpCall): Account for extra arg for prototype. (JSC::CTI::privateCompileMainPass): Account for increased size of op_construct.
• VM/CodeGenerator.cpp: (JSC::CodeGenerator::emitConstruct): Emit separate lookup to get prototype property.
• VM/Machine.cpp: (JSC::Machine::privateExecute): Expect prototype arg in op_construct. (JSC::Machine::cti_op_construct_JSConstruct): ditto (JSC::Machine::cti_op_construct_NotJSConstruct): ditto

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CTI.cpp (modified) (3 diffs)
• VM/CodeGenerator.cpp (modified) (2 diffs)
• VM/Machine.cpp (modified) (7 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-09-14  Maciej Stachowiak  <[email protected]>
+
+        Reviewed by Cameron Zwarich.
+        
+        - speed up JS construction by extracting "prototype" lookup so PIC applies.
+        
+        ~0.5% speedup on SunSpider
+        Speeds up some of the V8 tests as well, most notably earley-boyer.
+
+        * VM/CTI.cpp:
+        (JSC::CTI::compileOpCall): Account for extra arg for prototype.
+        (JSC::CTI::privateCompileMainPass): Account for increased size of op_construct.
+        * VM/CodeGenerator.cpp:
+        (JSC::CodeGenerator::emitConstruct): Emit separate lookup to get prototype property.
+        * VM/Machine.cpp:
+        (JSC::Machine::privateExecute): Expect prototype arg in op_construct.
+        (JSC::Machine::cti_op_construct_JSConstruct): ditto
+        (JSC::Machine::cti_op_construct_NotJSConstruct): ditto
+
 2008-09-10  Alexey Proskuryakov  <[email protected]>
 

trunk/JavaScriptCore/VM/CTI.cpp

@@ -413 +413 @@
 {
     if (type == OpConstruct) {
-        emitPutArgConstant(reinterpret_cast<unsigned>(instruction + i), 12);
+        emitPutArgConstant(reinterpret_cast<unsigned>(instruction + i), 16);
+        emitPutArgConstant(instruction[i + 5].u.operand, 12);
         emitPutArgConstant(instruction[i + 4].u.operand, 8);
-        emitPutArgConstant(instruction[i + 3].u.operand, 4);
+        emitGetPutArg(instruction[i + 3].u.operand, 4, X86::ecx);
     } else {
         emitPutArgConstant(reinterpret_cast<unsigned>(instruction + i), 16);
@@ -434 +435 @@
         m_jit.emitRestoreArgumentReference();
 
-       emitGetCTIParam(CTI_ARGS_r, X86::edi); // edi := r
+        emitGetCTIParam(CTI_ARGS_r, X86::edi); // edi := r
 
         m_jit.cmpl_i32r(reinterpret_cast<unsigned>(JSImmediate::impossibleValue()), X86::eax);
@@ -825 +826 @@
         case op_construct: {
             compileOpCall(instruction, i, OpConstruct);
-            i += 5;
+            i += 6;
             break;
         }

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -1101 +1101 @@
     // is safe.
 
+    RefPtr<RegisterID> protectFunc = func;
+
+    // Reserve space for prototype
+    RefPtr<RegisterID> funcProto = newTemporary();
+
     // Reserve space for call frame.
     Vector<RefPtr<RegisterID>, RegisterFile::CallFrameHeaderSize> callFrame;
@@ -1114 +1119 @@
     }
 
+    emitGetById(funcProto.get(), func, globalExec()->propertyNames().prototype);
+
     emitOpcode(op_construct);
     instructions().append(dst->index());
     instructions().append(func->index());
+    instructions().append(funcProto->index());
     instructions().append(argv.size() ? argv[0]->index() : m_temporaries.size()); // argv
     instructions().append(argv.size()); // argc

trunk/JavaScriptCore/VM/Machine.cpp

@@ -3280 +3280 @@
     }
     BEGIN_OPCODE(op_construct) {
-        /* construct dst(r) constr(r) firstArg(r) argCount(n)
+        /* construct dst(r) constr(r) constrProto(r) firstArg(r) argCount(n)
 
            Invoke register "constr" as a constructor. For JS
@@ -3288 +3288 @@
            value is passed. In either case, the firstArg and argCount
            registers are interpreted as for the "call" opcode.
+
+           Register constrProto must contain the prototype property of
+           register constsr. This is to enable polymorphic inline
+           caching of this lookup.
         */
 
         int dst = (++vPC)->u.operand;
         int constr = (++vPC)->u.operand;
+        int constrProto = (++vPC)->u.operand;
         int firstArg = (++vPC)->u.operand;
         int argCount = (++vPC)->u.operand;
@@ -3308 +3313 @@
 
             JSObject* prototype;
-            JSValue* p = constructor->get(exec, exec->propertyNames().prototype);
+            JSValue* p = r[constrProto].jsValue(exec);
             if (p->isObject())
                 prototype = static_cast<JSObject*>(p);
@@ -4430 +4435 @@
     
     JSValue* constrVal = ARG_src1;
-    int firstArg = ARG_int2;
-    int argCount = ARG_int3;
+    JSValue* constrProtoVal = ARG_src2;
+    int firstArg = ARG_int3;
+    int argCount = ARG_int4;
 
     ConstructData constructData;
@@ -4439 +4445 @@
         constrVal->getConstructData(constructData);
 
-    // Removing this line of code causes a measurable regression on squirrelfish.
+    // Removing this line of code causes a measurable regression on sunspider.
     JSObject* constructor = static_cast<JSObject*>(constrVal);
 
@@ -4448 +4454 @@
 
     JSObject* prototype;
-    JSValue* p = constructor->get(exec, exec->propertyNames().prototype);
+    JSValue* p = constrProtoVal;
     if (p->isObject())
         prototype = static_cast<JSObject*>(p);
@@ -4486 +4492 @@
 
     JSValue* constrVal = ARG_src1;
-    int firstArg = ARG_int2;
-    int argCount = ARG_int3;
+    int firstArg = ARG_int3;
+    int argCount = ARG_int4;
 
     ConstructData constructData;