<!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>[201359] 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/201359">201359</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-05-24 15:28:20 -0700 (Tue, 24 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>We can cache lookups to JSScope::abstractResolve inside CodeBlock::finishCreation
https://bugs.webkit.org/show_bug.cgi?id=158036
Reviewed by Geoffrey Garen.
This patch implements a 1 item cache for JSScope::abstractResolve. I also tried
implementing the cache as a HashMap, but it seemed either less profitable on some
benchmarks or just as profitable on others. Therefore, it's cleaner to just
use a 1 item cache.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::CodeBlock):
(JSC::AbstractResolveKey::AbstractResolveKey):
(JSC::AbstractResolveKey::operator==):
(JSC::AbstractResolveKey::isEmptyValue):
(JSC::CodeBlock::finishCreation):
* runtime/GetPutInfo.h:
(JSC::needsVarInjectionChecks):
(JSC::ResolveOp::ResolveOp):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeGetPutInfoh">trunk/Source/JavaScriptCore/runtime/GetPutInfo.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201358 => 201359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-24 22:04:07 UTC (rev 201358)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-24 22:28:20 UTC (rev 201359)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-05-24 Saam barati <sbarati@apple.com>
+
+ We can cache lookups to JSScope::abstractResolve inside CodeBlock::finishCreation
+ https://bugs.webkit.org/show_bug.cgi?id=158036
+
+ Reviewed by Geoffrey Garen.
+
+ This patch implements a 1 item cache for JSScope::abstractResolve. I also tried
+ implementing the cache as a HashMap, but it seemed either less profitable on some
+ benchmarks or just as profitable on others. Therefore, it's cleaner to just
+ use a 1 item cache.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::CodeBlock):
+ (JSC::AbstractResolveKey::AbstractResolveKey):
+ (JSC::AbstractResolveKey::operator==):
+ (JSC::AbstractResolveKey::isEmptyValue):
+ (JSC::CodeBlock::finishCreation):
+ * runtime/GetPutInfo.h:
+ (JSC::needsVarInjectionChecks):
+ (JSC::ResolveOp::ResolveOp):
+
</ins><span class="cx"> 2016-05-24 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviwed, add a comment to describe the test's failure mode. Suggested by mlam.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (201358 => 201359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-05-24 22:04:07 UTC (rev 201358)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-05-24 22:28:20 UTC (rev 201359)
</span><span class="lines">@@ -1846,6 +1846,37 @@
</span><span class="cx"> setNumParameters(other.numParameters());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+struct AbstractResolveKey {
+ AbstractResolveKey()
+ : m_impl(nullptr)
+ { }
+ AbstractResolveKey(size_t depth, const Identifier& ident, GetOrPut getOrPut, ResolveType resolveType, InitializationMode initializationMode)
+ : m_depth(depth)
+ , m_impl(ident.impl())
+ , m_getOrPut(getOrPut)
+ , m_resolveType(resolveType)
+ , m_initializationMode(initializationMode)
+ { }
+
+
+ bool operator==(const AbstractResolveKey& other) const
+ {
+ return m_impl == other.m_impl
+ && m_depth == other.m_depth
+ && m_getOrPut == other.m_getOrPut
+ && m_resolveType == other.m_resolveType
+ && m_initializationMode == other.m_initializationMode;
+ }
+
+ bool isNull() const { return !m_impl; }
+
+ size_t m_depth;
+ UniquedStringImpl* m_impl;
+ GetOrPut m_getOrPut;
+ ResolveType m_resolveType;
+ InitializationMode m_initializationMode;
+};
+
</ins><span class="cx"> void CodeBlock::finishCreation(VM& vm, CopyParsedBlockTag, CodeBlock& other)
</span><span class="cx"> {
</span><span class="cx"> Base::finishCreation(vm);
</span><span class="lines">@@ -2014,6 +2045,19 @@
</span><span class="cx"> setCalleeSaveRegisters(RegisterSet::llintBaselineCalleeSaveRegisters());
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ AbstractResolveKey lastResolveKey;
+ ResolveOp lastCachedOp;
+ auto cachedAbstractResolve = [&] (size_t localScopeDepth, const Identifier& ident, GetOrPut getOrPut, ResolveType resolveType, InitializationMode initializationMode) -> const ResolveOp& {
+ AbstractResolveKey key(localScopeDepth, ident, getOrPut, resolveType, initializationMode);
+ if (key == lastResolveKey) {
+ ASSERT(!lastResolveKey.isNull());
+ return lastCachedOp;
+ }
+ lastCachedOp = JSScope::abstractResolve(m_globalObject->globalExec(), localScopeDepth, scope, ident, getOrPut, resolveType, initializationMode);
+ lastResolveKey = key;
+ return lastCachedOp;
+ };
+
</ins><span class="cx"> // Copy and translate the UnlinkedInstructions
</span><span class="cx"> unsigned instructionCount = unlinkedCodeBlock->instructions().count();
</span><span class="cx"> UnlinkedInstructionStream::Reader instructionReader(unlinkedCodeBlock->instructions());
</span><span class="lines">@@ -2125,7 +2169,7 @@
</span><span class="cx"> RELEASE_ASSERT(type != LocalClosureVar);
</span><span class="cx"> int localScopeDepth = pc[5].u.operand;
</span><span class="cx">
</span><del>- ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), localScopeDepth, scope, ident, Get, type, InitializationMode::NotInitialization);
</del><ins>+ const ResolveOp& op = cachedAbstractResolve(localScopeDepth, ident, Get, type, InitializationMode::NotInitialization);
</ins><span class="cx"> instructions[i + 4].u.operand = op.type;
</span><span class="cx"> instructions[i + 5].u.operand = op.depth;
</span><span class="cx"> if (op.lexicalEnvironment) {
</span><span class="lines">@@ -2162,7 +2206,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const Identifier& ident = identifier(pc[3].u.operand);
</span><del>- ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), localScopeDepth, scope, ident, Get, getPutInfo.resolveType(), InitializationMode::NotInitialization);
</del><ins>+ const ResolveOp& op = cachedAbstractResolve(localScopeDepth, ident, Get, getPutInfo.resolveType(), InitializationMode::NotInitialization);
</ins><span class="cx">
</span><span class="cx"> instructions[i + 4].u.operand = GetPutInfo(getPutInfo.resolveMode(), op.type, getPutInfo.initializationMode()).operand();
</span><span class="cx"> if (op.type == ModuleVar)
</span><span class="lines">@@ -2197,7 +2241,7 @@
</span><span class="cx"> const Identifier& ident = identifier(pc[2].u.operand);
</span><span class="cx"> int localScopeDepth = pc[5].u.operand;
</span><span class="cx"> instructions[i + 5].u.pointer = nullptr;
</span><del>- ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), localScopeDepth, scope, ident, Put, getPutInfo.resolveType(), getPutInfo.initializationMode());
</del><ins>+ const ResolveOp& op = cachedAbstractResolve(localScopeDepth, ident, Put, getPutInfo.resolveType(), getPutInfo.initializationMode());
</ins><span class="cx">
</span><span class="cx"> instructions[i + 4].u.operand = GetPutInfo(getPutInfo.resolveMode(), op.type, getPutInfo.initializationMode()).operand();
</span><span class="cx"> if (op.type == GlobalVar || op.type == GlobalVarWithVarInjectionChecks || op.type == GlobalLexicalVar || op.type == GlobalLexicalVarWithVarInjectionChecks)
</span><span class="lines">@@ -2231,7 +2275,7 @@
</span><span class="cx"> ResolveType type = static_cast<ResolveType>(pc[5].u.operand);
</span><span class="cx"> // Even though type profiling may be profiling either a Get or a Put, we can always claim a Get because
</span><span class="cx"> // we're abstractly "read"ing from a JSScope.
</span><del>- ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), localScopeDepth, scope, ident, Get, type, InitializationMode::NotInitialization);
</del><ins>+ const ResolveOp& op = cachedAbstractResolve(localScopeDepth, ident, Get, type, InitializationMode::NotInitialization);
</ins><span class="cx">
</span><span class="cx"> if (op.type == ClosureVar || op.type == ModuleVar)
</span><span class="cx"> symbolTable = op.lexicalEnvironment->symbolTable();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeGetPutInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/GetPutInfo.h (201358 => 201359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/GetPutInfo.h 2016-05-24 22:04:07 UTC (rev 201358)
+++ trunk/Source/JavaScriptCore/runtime/GetPutInfo.h 2016-05-24 22:28:20 UTC (rev 201359)
</span><span class="lines">@@ -179,6 +179,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> struct ResolveOp {
</span><ins>+ ResolveOp()
+ : depth(0)
+ , structure(nullptr)
+ , lexicalEnvironment(nullptr)
+ , watchpointSet(nullptr)
+ , importedName(nullptr)
+ { }
+
</ins><span class="cx"> ResolveOp(ResolveType type, size_t depth, Structure* structure, JSLexicalEnvironment* lexicalEnvironment, WatchpointSet* watchpointSet, uintptr_t operand, UniquedStringImpl* importedName = nullptr)
</span><span class="cx"> : type(type)
</span><span class="cx"> , depth(depth)
</span></span></pre>
</div>
</div>
</body>
</html>