Changeset 35593 in webkit for trunk/JavaScriptCore/VM/CodeGenerator.cpp

Timestamp:

Aug 6, 2008, 3:37:34 AM (17 years ago)

Author:

[email protected]

Message:

2008-08-06 Cameron Zwarich <​[email protected]>

Reviewed by Maciej.

Bug 20286: Load constants all at once instead of using op_load
<​https://bugs.webkit.org/show_bug.cgi?id=20286>

Load constants all at once into temporary registers instead of using
individual instances of op_load.

This is a 2.6% speedup on SunSpider.

JavaScriptCore:

• JavaScriptCore.exp:
• VM/CodeBlock.cpp: (KJS::CodeBlock::dump): (KJS::CodeBlock::mark):
• VM/CodeBlock.h:
• VM/CodeGenerator.cpp: (KJS::CodeGenerator::CodeGenerator): (KJS::CodeGenerator::newTemporary): (KJS::CodeGenerator::addConstant): (KJS::CodeGenerator::addUnexpectedConstant): (KJS::CodeGenerator::emitLoad): (KJS::CodeGenerator::emitUnexpectedLoad): (KJS::CodeGenerator::emitNewError):
• VM/CodeGenerator.h:
• VM/Machine.cpp: (KJS::slideRegisterWindowForCall): (KJS::Machine::unwindCallFrame): (KJS::Machine::throwException): (KJS::Machine::execute): (KJS::Machine::privateExecute):
• VM/Machine.h:
• VM/Opcode.h:
• VM/RegisterID.h: (KJS::RegisterID::RegisterID): (KJS::RegisterID::makeConstant): (KJS::RegisterID::isTemporary):
• kjs/NodeInfo.h:
• kjs/Parser.cpp: (KJS::Parser::didFinishParsing):
• kjs/Parser.h: (KJS::Parser::parse):
• kjs/grammar.y:
• kjs/nodes.cpp: (KJS::NullNode::emitCode): (KJS::BooleanNode::emitCode): (KJS::NumberNode::emitCode): (KJS::StringNode::emitCode): (KJS::ArrayNode::emitCode): (KJS::DeleteResolveNode::emitCode): (KJS::DeleteValueNode::emitCode): (KJS::VoidNode::emitCode): (KJS::ConstDeclNode::emitCodeSingle): (KJS::ReturnNode::emitCode): (KJS::ScopeNode::ScopeNode): (KJS::ProgramNode::ProgramNode): (KJS::ProgramNode::create): (KJS::EvalNode::EvalNode): (KJS::EvalNode::create): (KJS::FunctionBodyNode::FunctionBodyNode): (KJS::FunctionBodyNode::create): (KJS::FunctionBodyNode::emitCode):
• kjs/nodes.h: (KJS::ScopeNode::neededConstants):

LayoutTests:

• fast/js/constant-count-expected.txt: Added.
• fast/js/constant-count.html: Added.
• fast/js/deep-recursion-test.html:
• fast/js/resources/constant-count.js: Added.

File:

• trunk/JavaScriptCore/VM/CodeGenerator.cpp (modified) (7 diffs)

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -203 +203 @@
     // FIXME: Move code that modifies the global object to Machine::execute.
     
+    m_codeBlock->numConstants = programNode->neededConstants();
     m_codeBlock->numVars = 1; // Allocate space for "this"
 
@@ -263 +264 @@
     , m_lastOpcodeID(op_end)
 {
+    m_codeBlock->numConstants = functionBody->neededConstants();
+
     const Node::FunctionStack& functionStack = functionBody->functionStack();
     for (size_t i = 0; i < functionStack.size(); ++i) {
@@ -307 +310 @@
     , m_lastOpcodeID(op_end)
 {
+    m_codeBlock->numConstants = evalNode->neededConstants();
     m_codeBlock->numVars = 1; // Allocate space for "this"
 }
@@ -382 +386 @@
 
     // Allocate new register ID.
-    m_temporaries.append(m_temporaries.size());
+    m_temporaries.append(m_temporaries.size() + m_codeBlock->numConstants);
     m_codeBlock->numTemporaries = max<int>(m_codeBlock->numTemporaries, m_temporaries.size());
     return &m_temporaries.last();
@@ -521 +525 @@
 }
 
-unsigned CodeGenerator::addConstant(JSValue* v)
-{
-    pair<JSValueMap::iterator, bool> result = m_jsValueMap.add(v, m_codeBlock->registers.size());
-    if (result.second) // new entry
-        m_codeBlock->registers.append(v);
-
-    return result.first->second;
+RegisterID* CodeGenerator::addConstant(JSValue* v)
+{
+    pair<JSValueMap::iterator, bool> result = m_jsValueMap.add(v, m_codeBlock->constantRegisters.size());
+    if (result.second) {
+        m_constants.append(m_codeBlock->constantRegisters.size());
+        m_constants.last().makeConstant();
+        m_codeBlock->constantRegisters.append(v);
+        ASSERT(m_codeBlock->constantRegisters.size() <= (unsigned) m_codeBlock->numConstants);
+        return &m_constants.last();
+    }
+
+    return &m_constants[result.first->second];
+}
+
+unsigned CodeGenerator::addUnexpectedConstant(JSValue* v)
+{
+    int index = m_codeBlock->regexps.size();
+    m_codeBlock->unexpectedConstants.append(v);
+    return index;
 }
 
@@ -594 +610 @@
 RegisterID* CodeGenerator::emitLoad(RegisterID* dst, bool b)
 {
-    emitOpcode(op_load);
-    instructions().append(dst->index());
-    instructions().append(addConstant(jsBoolean(b)));
-    return dst;
+    return emitLoad(dst, jsBoolean(b));
 }
 
 RegisterID* CodeGenerator::emitLoad(RegisterID* dst, double d)
 {
-    emitOpcode(op_load);
-    instructions().append(dst->index());
-    instructions().append(addConstant(jsNumber(globalExec(), d)));
-    return dst;
+    return emitLoad(dst, jsNumber(globalExec(), d));
 }
 
 RegisterID* CodeGenerator::emitLoad(RegisterID* dst, JSValue* v)
 {
-    emitOpcode(op_load);
-    instructions().append(dst->index());
-    instructions().append(addConstant(v));
+    RegisterID* constantID = addConstant(v);
+    if (dst)
+        return emitMove(dst, constantID);
+    return constantID;
+}
+
+RegisterID* CodeGenerator::emitUnexpectedLoad(RegisterID* dst, bool b)
+{
+    emitOpcode(op_unexpected_load);
+    instructions().append(dst->index());
+    instructions().append(addUnexpectedConstant(jsBoolean(b)));
     return dst;
 }
@@ -1133 +1151 @@
     instructions().append(dst->index());
     instructions().append(static_cast<int>(type));
-    instructions().append(addConstant(message));
+    instructions().append(addUnexpectedConstant(message));
     return dst;
 }