<!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>[202098] 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/202098">202098</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2016-06-15 12:20:23 -0700 (Wed, 15 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>compilation policy should adapt to past behavior
https://bugs.webkit.org/show_bug.cgi?id=158759
Reviewed by Saam Barati.
This looks like a ~9% speedup on JSBench.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::~CodeBlock): Record when a CodeBlock dies without ever
making it to DFG.
(JSC::CodeBlock::thresholdForJIT): CodeBlocks that make it to DFG should
compile sooner; CodeBlocks that don't should compile later. The goal is
to use past behavior, in addition to execution counts, to determine
whether compilation is profitable.
(JSC::CodeBlock::jitAfterWarmUp):
(JSC::CodeBlock::jitSoon): Apply the thresholdForJIT rule.
* bytecode/CodeBlock.h: Moved some code into the .cpp file so I could
change stuff without recompiling.
(JSC::CodeBlock::jitAfterWarmUp): Deleted.
(JSC::CodeBlock::jitSoon): Deleted.
* bytecode/UnlinkedCodeBlock.cpp:
(JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):
* bytecode/UnlinkedCodeBlock.h:
(JSC::UnlinkedCodeBlock::didOptimize):
(JSC::UnlinkedCodeBlock::setDidOptimize): Added a piece of data to track
whether we made it to DFG.
* jit/JITOperations.cpp: Record when we make it to DFG.</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="#trunkSourceJavaScriptCorebytecodeCodeBlockh">trunk/Source/JavaScriptCore/bytecode/CodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOperationscpp">trunk/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202097 => 202098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-15 19:17:51 UTC (rev 202097)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-15 19:20:23 UTC (rev 202098)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2016-06-14 Geoffrey Garen <ggaren@apple.com>
+
+ compilation policy should adapt to past behavior
+ https://bugs.webkit.org/show_bug.cgi?id=158759
+
+ Reviewed by Saam Barati.
+
+ This looks like a ~9% speedup on JSBench.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::~CodeBlock): Record when a CodeBlock dies without ever
+ making it to DFG.
+
+ (JSC::CodeBlock::thresholdForJIT): CodeBlocks that make it to DFG should
+ compile sooner; CodeBlocks that don't should compile later. The goal is
+ to use past behavior, in addition to execution counts, to determine
+ whether compilation is profitable.
+
+ (JSC::CodeBlock::jitAfterWarmUp):
+ (JSC::CodeBlock::jitSoon): Apply the thresholdForJIT rule.
+
+ * bytecode/CodeBlock.h: Moved some code into the .cpp file so I could
+ change stuff without recompiling.
+ (JSC::CodeBlock::jitAfterWarmUp): Deleted.
+ (JSC::CodeBlock::jitSoon): Deleted.
+
+ * bytecode/UnlinkedCodeBlock.cpp:
+ (JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):
+ * bytecode/UnlinkedCodeBlock.h:
+ (JSC::UnlinkedCodeBlock::didOptimize):
+ (JSC::UnlinkedCodeBlock::setDidOptimize): Added a piece of data to track
+ whether we made it to DFG.
+
+ * jit/JITOperations.cpp: Record when we make it to DFG.
+
</ins><span class="cx"> 2016-06-15 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> Only Mac port needs ObjC API for JSC.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (202097 => 202098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-06-15 19:17:51 UTC (rev 202097)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-06-15 19:20:23 UTC (rev 202098)
</span><span class="lines">@@ -2418,7 +2418,10 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_vm->m_perBytecodeProfiler)
</span><span class="cx"> m_vm->m_perBytecodeProfiler->notifyDestruction(this);
</span><del>-
</del><ins>+
+ if (unlinkedCodeBlock()->didOptimize() == MixedTriState)
+ unlinkedCodeBlock()->setDidOptimize(FalseTriState);
+
</ins><span class="cx"> #if ENABLE(VERBOSE_VALUE_PROFILE)
</span><span class="cx"> dumpValueProfiles();
</span><span class="cx"> #endif
</span><span class="lines">@@ -4435,4 +4438,26 @@
</span><span class="cx"> return bytecodeOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+int32_t CodeBlock::thresholdForJIT(int32_t threshold)
+{
+ switch (unlinkedCodeBlock()->didOptimize()) {
+ case MixedTriState:
+ return threshold;
+ case FalseTriState:
+ return threshold * 4;
+ case TrueTriState:
+ return threshold / 2;
+ }
+}
+
+void CodeBlock::jitAfterWarmUp()
+{
+ m_llintExecuteCounter.setNewThreshold(thresholdForJIT(Options::thresholdForJITAfterWarmUp()), this);
+}
+
+void CodeBlock::jitSoon()
+{
+ m_llintExecuteCounter.setNewThreshold(thresholdForJIT(Options::thresholdForJITSoon()), this);
+}
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (202097 => 202098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2016-06-15 19:17:51 UTC (rev 202097)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2016-06-15 19:20:23 UTC (rev 202098)
</span><span class="lines">@@ -664,16 +664,10 @@
</span><span class="cx"> m_llintExecuteCounter.deferIndefinitely();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void jitAfterWarmUp()
- {
- m_llintExecuteCounter.setNewThreshold(Options::thresholdForJITAfterWarmUp(), this);
- }
</del><ins>+ int32_t thresholdForJIT(int32_t threshold);
+ void jitAfterWarmUp();
+ void jitSoon();
</ins><span class="cx">
</span><del>- void jitSoon()
- {
- m_llintExecuteCounter.setNewThreshold(Options::thresholdForJITSoon(), this);
- }
-
</del><span class="cx"> const BaselineExecutionCounter& llintExecuteCounter() const
</span><span class="cx"> {
</span><span class="cx"> return m_llintExecuteCounter;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp (202097 => 202098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2016-06-15 19:17:51 UTC (rev 202097)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2016-06-15 19:20:23 UTC (rev 202098)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> , m_firstLine(0)
</span><span class="cx"> , m_lineCount(0)
</span><span class="cx"> , m_endColumn(UINT_MAX)
</span><ins>+ , m_didOptimize(MixedTriState)
</ins><span class="cx"> , m_parseMode(info.parseMode())
</span><span class="cx"> , m_features(0)
</span><span class="cx"> , m_codeType(codeType)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h (202097 => 202098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2016-06-15 19:17:51 UTC (rev 202097)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2016-06-15 19:20:23 UTC (rev 202098)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "VirtualRegister.h"
</span><span class="cx"> #include <wtf/FastBitVector.h>
</span><span class="cx"> #include <wtf/RefCountedArray.h>
</span><ins>+#include <wtf/TriState.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -370,6 +371,9 @@
</span><span class="cx">
</span><span class="cx"> bool wasCompiledWithDebuggingOpcodes() const { return m_wasCompiledWithDebuggingOpcodes; }
</span><span class="cx">
</span><ins>+ TriState didOptimize() const { return m_didOptimize; }
+ void setDidOptimize(TriState didOptimize) { m_didOptimize = didOptimize; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> UnlinkedCodeBlock(VM*, Structure*, CodeType, const ExecutableInfo&, DebuggerMode);
</span><span class="cx"> ~UnlinkedCodeBlock();
</span><span class="lines">@@ -416,6 +420,7 @@
</span><span class="cx"> unsigned m_lineCount;
</span><span class="cx"> unsigned m_endColumn;
</span><span class="cx">
</span><ins>+ TriState m_didOptimize;
</ins><span class="cx"> SourceParseMode m_parseMode;
</span><span class="cx"> CodeFeatures m_features;
</span><span class="cx"> CodeType m_codeType;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.cpp (202097 => 202098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2016-06-15 19:17:51 UTC (rev 202097)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2016-06-15 19:20:23 UTC (rev 202098)
</span><span class="lines">@@ -1388,6 +1388,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> codeBlock->optimizeSoon();
</span><ins>+ codeBlock->unlinkedCodeBlock()->setDidOptimize(TrueTriState);
</ins><span class="cx"> return encodeResult(vm.getCTIStub(DFG::osrEntryThunkGenerator).code().executableAddress(), dataBuffer);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>