Changeset 31277 in webkit

Timestamp:

Mar 24, 2008, 10:48:22 PM (17 years ago)

Author:

ggaren@apple.com

Message:

2008-03-24 Geoffrey Garen <​ggaren@apple.com>

Reviewed by Oliver Hunt.

Fixed recent 25% regression on simple for loop test. GCC seems to be
very finicky about the code that gets inlined into
Machine::privateExecute.

Everything in this patch is simply the result of experiment.

The resolve and resolve_base opcodes do not seem to have gotten slower
from this change.

• VM/Machine.cpp: (KJS::resolve): (KJS::resolveBase): (KJS::Machine::privateExecute):
• kjs/nodes.h:

Location:

branches/squirrelfish/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/Machine.cpp (modified) (2 diffs)
• kjs/nodes.h (modified) (1 diff)

branches/squirrelfish/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-03-24  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Oliver Hunt.
+        
+        Fixed recent 25% regression on simple for loop test. GCC seems to be
+        very finicky about the code that gets inlined into
+        Machine::privateExecute.
+
+        Everything in this patch is simply the result of experiment.
+        
+        The resolve and resolve_base opcodes do not seem to have gotten slower
+        from this change.
+
+        * VM/Machine.cpp:
+        (KJS::resolve):
+        (KJS::resolveBase):
+        (KJS::Machine::privateExecute):
+        * kjs/nodes.h:
+
 2008-03-24  Oliver Hunt  <oliver@apple.com>
 

branches/squirrelfish/JavaScriptCore/VM/Machine.cpp

@@ -138 +138 @@
 }
 
+static void NEVER_INLINE resolve(ExecState* exec, Instruction* vPC, Register* r, ScopeChain* scopeChain, CodeBlock* codeBlock)
+{
+    int r0 = (vPC + 1)->u.operand;
+    int k0 = (vPC + 2)->u.operand;
+
+    ScopeChainIterator iter = scopeChain->begin();
+    ScopeChainIterator end = scopeChain->end();
+    ASSERT(iter != end);
+
+    PropertySlot slot;
+    Identifier& ident = codeBlock->identifiers[k0];
+    do {
+        JSObject* o = *iter;
+        if (o->getPropertySlot(exec, ident, slot)) {
+            r[r0].u.jsValue = slot.getValue(exec, o, ident);
+            return;
+        }
+    } while (++iter != end);
+
+    ASSERT_NOT_REACHED(); // FIXME: throw an undefined variable exception
+}
+
+static void NEVER_INLINE resolveBase(ExecState* exec, Instruction* vPC, Register* r, ScopeChain* scopeChain, CodeBlock* codeBlock)
+{
+    int r0 = (vPC + 1)->u.operand;
+    int k0 = (vPC + 2)->u.operand;
+
+    ScopeChainIterator iter = scopeChain->begin();
+    ScopeChainIterator end = scopeChain->end();
+    ASSERT(iter != end);
+
+    PropertySlot slot;
+    Identifier& ident = codeBlock->identifiers[k0];
+    JSObject* base;
+    do {
+        base = *iter;
+        if (base->getPropertySlot(exec, ident, slot)) {
+            r[r0].u.jsValue = base;
+            return;
+        }
+    } while (++iter != end);
+
+    r[r0].u.jsValue = base;
+}
+
 void Machine::privateExecute(ExecutionFlag flag, ExecState* exec, ScopeChain* scopeChain, CodeBlock* codeBlock)
 {
@@ -227 +272 @@
     }
     BEGIN_OPCODE(op_resolve) {
-        int r0 = (++vPC)->u.operand;
-        int k0 = (++vPC)->u.operand;
-
-        ScopeChainIterator iter = scopeChain->begin();
-        ScopeChainIterator end = scopeChain->end();
-        ASSERT(iter != end);
-
-        PropertySlot slot;
-        Identifier& ident = codeBlock->identifiers[k0];
-        do {
-            JSObject* o = *iter;
-            if (o->getPropertySlot(exec, ident, slot)) {
-                r[r0].u.jsValue = slot.getValue(exec, o, ident);
-                ++vPC;
-                NEXT_OPCODE;
-            }
-        } while (++iter != end);
-
-        ASSERT_NOT_REACHED(); // FIXME: throw an undefined variable exception
+        resolve(exec, vPC, r, scopeChain, codeBlock);
+        vPC += 3;
+        
+        NEXT_OPCODE;
     }
     BEGIN_OPCODE(op_resolve_base) {
-        int r0 = (++vPC)->u.operand;
-        int k0 = (++vPC)->u.operand;
-
-        ScopeChainIterator iter = scopeChain->begin();
-        ScopeChainIterator end = scopeChain->end();
-        ASSERT(iter != end);
-
-        PropertySlot slot;
-        Identifier& ident = codeBlock->identifiers[k0];
-        JSObject* base;
-        do {
-            base = *iter;
-            if (base->getPropertySlot(exec, ident, slot)) {
-                r[r0].u.jsValue = base;
-
-                ++vPC;
-                NEXT_OPCODE;
-            }
-        } while (++iter != end);
-
-        r[r0].u.jsValue = base;
-
-        ++vPC;
+        resolveBase(exec, vPC, r, scopeChain, codeBlock);
+        vPC += 3;
+
         NEXT_OPCODE;
     }

branches/squirrelfish/JavaScriptCore/kjs/nodes.h

@@ -2936 +2936 @@
         virtual JSValue* execute(ExecState*) KJS_FAST_CALL;
         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-        ALWAYS_INLINE FunctionImp* makeFunction(ExecState*) KJS_FAST_CALL;
+        FunctionImp* makeFunction(ExecState*) KJS_FAST_CALL;
 
         Identifier m_ident;