Changeset 36695 in webkit for trunk/JavaScriptCore/VM

Timestamp:

Sep 19, 2008, 8:00:43 PM (17 years ago)

Author:

[email protected]

Message:

Improve peformance of local variable initialisation.

Reviewed by Maciej Stachowiak

Pull local and constant initialisation out of slideRegisterWindowForCall
and into its own opcode. This allows the JIT to generate the initialisation
code for a function directly into the instruction stream and so avoids a few
branches on function entry.

Results a 1% progression in SunSpider, particularly in a number of the bitop
tests where the called functions are very fast.

Location:

trunk/JavaScriptCore/VM

Files:

• CTI.cpp (modified) (3 diffs)
• CTI.h (modified) (1 diff)
• CodeBlock.cpp (modified) (1 diff)
• CodeGenerator.cpp (modified) (2 diffs)
• Machine.cpp (modified) (2 diffs)
• Opcode.h (modified) (1 diff)

trunk/JavaScriptCore/VM/CTI.cpp

@@ -178 +178 @@
 {
     m_jit.movl_rm(from, dst * sizeof(Register), X86::edi);
+    // FIXME: #ifndef NDEBUG, Write the correct m_type to the register.
+}
+
+ALWAYS_INLINE void CTI::emitInitialiseRegister(unsigned dst)
+{
+    m_jit.movl_i32m(reinterpret_cast<unsigned>(jsUndefined()), dst * sizeof(Register), X86::edi);
     // FIXME: #ifndef NDEBUG, Write the correct m_type to the register.
 }
@@ -526 +532 @@
 void CTI::privateCompileMainPass()
 {
+    if (m_codeBlock->codeType == FunctionCode) {
+        for (int i = -m_codeBlock->numVars; i < 0; i++)
+            emitInitialiseRegister(i);
+    }
+    for (size_t i = 0; i < m_codeBlock->constantRegisters.size(); ++i)
+        emitInitialiseRegister(i);
+
     Instruction* instruction = m_codeBlock->instructions.begin();
     unsigned instructionCount = m_codeBlock->instructions.size();
@@ -1522 +1535 @@
             break;
         }
+        case op_initialise_locals: {
+            i++;
+            break;
+        }
         case op_get_array_length:
         case op_get_by_id_chain:

trunk/JavaScriptCore/VM/CTI.h

@@ -346 +346 @@
         void emitPutResult(unsigned dst, X86Assembler::RegisterID from = X86::eax);
 
+        void emitInitialiseRegister(unsigned dst);
+
         void emitPutCTIParam(void* value, unsigned name);
         void emitPutCTIParam(X86Assembler::RegisterID from, unsigned name);

trunk/JavaScriptCore/VM/CodeBlock.cpp

@@ -352 +352 @@
     int location = it - begin;
     switch (exec->machine()->getOpcodeID(it->u.opcode)) {
+        case op_initialise_locals: {
+            printf("[%4d] initialise_locals\n", location);
+            break;
+        }
         case op_unexpected_load: {
             int r0 = (++it)->u.operand;

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -269 +269 @@
     , m_lastOpcodeID(op_end)
 {
+    emitOpcode(op_initialise_locals);
     codeBlock->globalData = m_globalData;
 
@@ -317 +318 @@
     , m_lastOpcodeID(op_end)
 {
+    emitOpcode(op_initialise_locals);
     codeBlock->globalData = m_globalData;
 

trunk/JavaScriptCore/VM/Machine.cpp

@@ -544 +544 @@
     
     // initialize local variable slots
-    for (Register* it = r - newCodeBlock->numVars; it != r; ++it)
-        (*it) = jsUndefined();
-
-    for (size_t i = 0; i < newCodeBlock->constantRegisters.size(); ++i)
-        r[i] = newCodeBlock->constantRegisters[i];
+#if ENABLE(CTI)
+    if (!newCodeBlock->ctiCode)
+#endif
+    {
+
+    }
 
     return r;
@@ -3344 +3345 @@
         NEXT_OPCODE;
     }
+    BEGIN_OPCODE(op_initialise_locals) {
+        for (Register* it = r - codeBlock->numVars + (codeBlock->codeType == EvalCode); it < r; ++it)
+            (*it) = jsUndefined();
+        for (size_t i = 0; i < codeBlock->constantRegisters.size(); ++i)
+            r[i] = codeBlock->constantRegisters[i];
+        ++vPC;
+        NEXT_OPCODE;
+    }
     BEGIN_OPCODE(op_construct) {
         /* construct dst(r) constr(r) constrProto(r) firstArg(r) argCount(n)

trunk/JavaScriptCore/VM/Opcode.h

@@ -41 +41 @@
 
     #define FOR_EACH_OPCODE_ID(macro) \
+        macro(op_initialise_locals) \
         macro(op_unexpected_load) \
         macro(op_new_object) \