<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[172594] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/172594">172594</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2014-08-14 11:07:00 -0700 (Thu, 14 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Create activations eagerly
https://bugs.webkit.org/show_bug.cgi?id=135942
Reviewed by Geoffrey Garen.
Prepare to rewrite activation objects into a more
sane implementation. Step 1 is reverting to eager
creation of the activation object. This results in
a 1.35x regression in earley, but otherwise has a
minimal performance impact.
The earley regression is being tracked by bug #135943
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::emitNewFunctionInternal):
(JSC::BytecodeGenerator::emitNewFunctionExpression):
(JSC::BytecodeGenerator::emitCallEval):
(JSC::BytecodeGenerator::emitPushWithScope):
(JSC::BytecodeGenerator::emitPushCatchScope):
(JSC::BytecodeGenerator::createActivationIfNecessary): Deleted.
* bytecompiler/BytecodeGenerator.h:
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_create_activation):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emit_op_create_activation):
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodescpp">trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodes32_64cpp">trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (172593 => 172594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-08-14 17:59:53 UTC (rev 172593)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-08-14 18:07:00 UTC (rev 172594)
</span><span class="lines">@@ -1,3 +1,66 @@
</span><ins>+2014-08-14 Oliver Hunt <oliver@apple.com>
+
+ Create activations eagerly
+ https://bugs.webkit.org/show_bug.cgi?id=135942
+
+ Reviewed by Geoffrey Garen.
+
+ Prepare to rewrite activation objects into a more
+ sane implementation. Step 1 is reverting to eager
+ creation of the activation object. This results in
+ a 1.35x regression in earley, but otherwise has a
+ minimal performance impact.
+
+ The earley regression is being tracked by bug #135943
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+ (JSC::BytecodeGenerator::emitNewFunctionInternal):
+ (JSC::BytecodeGenerator::emitNewFunctionExpression):
+ (JSC::BytecodeGenerator::emitCallEval):
+ (JSC::BytecodeGenerator::emitPushWithScope):
+ (JSC::BytecodeGenerator::emitPushCatchScope):
+ (JSC::BytecodeGenerator::createActivationIfNecessary): Deleted.
+ * bytecompiler/BytecodeGenerator.h:
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_create_activation):
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::emit_op_create_activation):
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+
+2014-08-14 Oliver Hunt <oliver@apple.com>
+
+ Create activations eagerly
+ https://bugs.webkit.org/show_bug.cgi?id=135942
+
+ Reviewed by Geoffrey Garen.
+
+ Prepare to rewrite activation objects into a more
+ sane implementation. Step 1 is reverting to eager
+ creation of the activation object. This results in
+ a 1.35x regression in earley, but otherwise has a
+ minimal performance impact.
+
+ The earley regression is being tracked by
+ http://webkit.org/b/135943
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+ (JSC::BytecodeGenerator::emitNewFunctionInternal):
+ (JSC::BytecodeGenerator::emitNewFunctionExpression):
+ (JSC::BytecodeGenerator::emitCallEval):
+ (JSC::BytecodeGenerator::emitPushWithScope):
+ (JSC::BytecodeGenerator::emitPushCatchScope):
+ (JSC::BytecodeGenerator::createActivationIfNecessary): Deleted.
+ * bytecompiler/BytecodeGenerator.h:
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_create_activation):
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::emit_op_create_activation):
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+
</ins><span class="cx"> 2014-08-14 Tomas Popela <tpopela@redhat.com>
</span><span class="cx">
</span><span class="cx"> Add support for ppc, ppc64, ppc64le, s390, s390x into the CMake build
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (172593 => 172594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-08-14 17:59:53 UTC (rev 172593)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-08-14 18:07:00 UTC (rev 172594)
</span><span class="lines">@@ -248,6 +248,8 @@
</span><span class="cx"> m_activationRegister = addVar();
</span><span class="cx"> emitInitLazyRegister(m_activationRegister);
</span><span class="cx"> m_codeBlock->setActivationRegister(m_activationRegister->virtualRegister());
</span><ins>+ emitOpcode(op_create_activation);
+ instructions().append(m_activationRegister->index());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_symbolTable->setCaptureStart(virtualRegisterForLocal(m_codeBlock->m_numVars).offset());
</span><span class="lines">@@ -1642,7 +1644,6 @@
</span><span class="cx">
</span><span class="cx"> RegisterID* BytecodeGenerator::emitNewFunctionInternal(RegisterID* dst, CaptureMode captureMode, unsigned index, bool doNullCheck)
</span><span class="cx"> {
</span><del>- createActivationIfNecessary();
</del><span class="cx"> emitOpcode(captureMode == IsCaptured ? op_new_captured_func : op_new_func);
</span><span class="cx"> instructions().append(dst->index());
</span><span class="cx"> instructions().append(index);
</span><span class="lines">@@ -1666,8 +1667,7 @@
</span><span class="cx"> {
</span><span class="cx"> FunctionBodyNode* function = n->body();
</span><span class="cx"> unsigned index = m_codeBlock->addFunctionExpr(makeFunction(function));
</span><del>-
- createActivationIfNecessary();
</del><ins>+
</ins><span class="cx"> emitOpcode(op_new_func_exp);
</span><span class="cx"> instructions().append(r0->index());
</span><span class="cx"> instructions().append(index);
</span><span class="lines">@@ -1695,17 +1695,8 @@
</span><span class="cx"> ASSERT(!hasWatchableVariable(m_codeBlock->argumentsRegister().offset()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BytecodeGenerator::createActivationIfNecessary()
-{
- if (!m_activationRegister)
- return;
- emitOpcode(op_create_activation);
- instructions().append(m_activationRegister->index());
-}
-
</del><span class="cx"> RegisterID* BytecodeGenerator::emitCallEval(RegisterID* dst, RegisterID* func, CallArguments& callArguments, const JSTextPosition& divot, const JSTextPosition& divotStart, const JSTextPosition& divotEnd)
</span><span class="cx"> {
</span><del>- createActivationIfNecessary();
</del><span class="cx"> return emitCall(op_call_eval, dst, func, NoExpectedFunction, callArguments, divot, divotStart, divotEnd);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2010,7 +2001,6 @@
</span><span class="cx"> m_scopeContextStack.append(context);
</span><span class="cx"> m_localScopeDepth++;
</span><span class="cx">
</span><del>- createActivationIfNecessary();
</del><span class="cx"> return emitUnaryNoDstOp(op_push_with_scope, scope);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2336,8 +2326,6 @@
</span><span class="cx">
</span><span class="cx"> void BytecodeGenerator::emitPushCatchScope(const Identifier& property, RegisterID* value, unsigned attributes)
</span><span class="cx"> {
</span><del>- createActivationIfNecessary();
-
</del><span class="cx"> ControlFlowContext context;
</span><span class="cx"> context.isFinallyBlock = false;
</span><span class="cx"> m_scopeContextStack.append(context);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h (172593 => 172594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2014-08-14 17:59:53 UTC (rev 172593)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2014-08-14 18:07:00 UTC (rev 172594)
</span><span class="lines">@@ -678,7 +678,6 @@
</span><span class="cx"> RegisterID* emitThrowExpressionTooDeepException();
</span><span class="cx">
</span><span class="cx"> void createArgumentsIfNecessary();
</span><del>- void createActivationIfNecessary();
</del><span class="cx"> RegisterID* createLazyRegisterIfNecessary(RegisterID*);
</span><span class="cx">
</span><span class="cx"> unsigned watchableVariable(int operand)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp (172593 => 172594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2014-08-14 17:59:53 UTC (rev 172593)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2014-08-14 18:07:00 UTC (rev 172594)
</span><span class="lines">@@ -679,11 +679,9 @@
</span><span class="cx"> void JIT::emit_op_create_activation(Instruction* currentInstruction)
</span><span class="cx"> {
</span><span class="cx"> int dst = currentInstruction[1].u.operand;
</span><del>-
- Jump activationCreated = branchTest64(NonZero, Address(callFrameRegister, sizeof(Register) * dst));
</del><ins>+
</ins><span class="cx"> callOperation(operationCreateActivation, 0);
</span><span class="cx"> emitStoreCell(dst, returnValueGPR);
</span><del>- activationCreated.link(this);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_create_arguments(Instruction* currentInstruction)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodes32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp (172593 => 172594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2014-08-14 17:59:53 UTC (rev 172593)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2014-08-14 18:07:00 UTC (rev 172594)
</span><span class="lines">@@ -905,11 +905,9 @@
</span><span class="cx"> void JIT::emit_op_create_activation(Instruction* currentInstruction)
</span><span class="cx"> {
</span><span class="cx"> int activation = currentInstruction[1].u.operand;
</span><del>-
- Jump activationCreated = branch32(NotEqual, tagFor(activation), TrustedImm32(JSValue::EmptyValueTag));
</del><ins>+
</ins><span class="cx"> callOperation(operationCreateActivation, 0);
</span><span class="cx"> emitStoreCell(activation, returnValueGPR);
</span><del>- activationCreated.link(this);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_create_arguments(Instruction* currentInstruction)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (172593 => 172594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-08-14 17:59:53 UTC (rev 172593)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-08-14 18:07:00 UTC (rev 172594)
</span><span class="lines">@@ -697,9 +697,7 @@
</span><span class="cx"> _llint_op_create_activation:
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadi 4[PC], t0
</span><del>- bineq TagOffset[cfr, t0, 8], EmptyValueTag, .opCreateActivationDone
</del><span class="cx"> callSlowPath(_llint_slow_path_create_activation)
</span><del>-.opCreateActivationDone:
</del><span class="cx"> dispatch(2)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (172593 => 172594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-08-14 17:59:53 UTC (rev 172593)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-08-14 18:07:00 UTC (rev 172594)
</span><span class="lines">@@ -624,9 +624,7 @@
</span><span class="cx"> _llint_op_create_activation:
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadisFromInstruction(1, t0)
</span><del>- bqneq [cfr, t0, 8], ValueEmpty, .opCreateActivationDone
</del><span class="cx"> callSlowPath(_llint_slow_path_create_activation)
</span><del>-.opCreateActivationDone:
</del><span class="cx"> dispatch(2)
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>