<!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>[193662] 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/193662">193662</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-12-07 16:02:09 -0800 (Mon, 07 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL lowering should tell B3 the right block frequencies
https://bugs.webkit.org/show_bug.cgi?id=151531
Reviewed by Geoffrey Garen.
This glues together the DFG's view of basic block execution counts and B3's block frequencies.
This further improves our performance on imaging-gaussian-blur. It appears to improve the steady
state throughput by almost 4%.
* ftl/FTLB3Output.h:
(JSC::FTL::Output::setFrequency):
(JSC::FTL::Output::newBlock):
(JSC::FTL::Output::insertNewBlocksBefore):
(JSC::FTL::Output::callWithoutSideEffects):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::lower):
(JSC::FTL::DFG::LowerDFGToLLVM::compileBlock):
* ftl/FTLOutput.h:
(JSC::FTL::Output::setFrequency):
(JSC::FTL::Output::insertNewBlocksBefore):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLB3Outputh">trunk/Source/JavaScriptCore/ftl/FTLB3Output.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLOutputh">trunk/Source/JavaScriptCore/ftl/FTLOutput.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (193661 => 193662)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-07 23:47:56 UTC (rev 193661)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-08 00:02:09 UTC (rev 193662)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-12-07 Filip Pizlo <fpizlo@apple.com>
+
+ FTL lowering should tell B3 the right block frequencies
+ https://bugs.webkit.org/show_bug.cgi?id=151531
+
+ Reviewed by Geoffrey Garen.
+
+ This glues together the DFG's view of basic block execution counts and B3's block frequencies.
+ This further improves our performance on imaging-gaussian-blur. It appears to improve the steady
+ state throughput by almost 4%.
+
+ * ftl/FTLB3Output.h:
+ (JSC::FTL::Output::setFrequency):
+ (JSC::FTL::Output::newBlock):
+ (JSC::FTL::Output::insertNewBlocksBefore):
+ (JSC::FTL::Output::callWithoutSideEffects):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::lower):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileBlock):
+ * ftl/FTLOutput.h:
+ (JSC::FTL::Output::setFrequency):
+ (JSC::FTL::Output::insertNewBlocksBefore):
+
</ins><span class="cx"> 2015-12-07 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Update JSC feature list for rest parameters and generators
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLB3Outputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLB3Output.h (193661 => 193662)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLB3Output.h 2015-12-07 23:47:56 UTC (rev 193661)
+++ trunk/Source/JavaScriptCore/ftl/FTLB3Output.h 2015-12-08 00:02:09 UTC (rev 193662)
</span><span class="lines">@@ -77,10 +77,15 @@
</span><span class="cx">
</span><span class="cx"> void initialize(AbstractHeapRepository&);
</span><span class="cx">
</span><ins>+ void setFrequency(double value)
+ {
+ m_frequency = value;
+ }
+
</ins><span class="cx"> LBasicBlock newBlock(const char* name = "")
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(name);
</span><del>- return m_proc.addBlock();
</del><ins>+ return m_proc.addBlock(m_frequency);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LBasicBlock insertNewBlocksBefore(LBasicBlock nextBlock)
</span><span class="lines">@@ -427,6 +432,8 @@
</span><span class="cx">
</span><span class="cx"> AbstractHeapRepository* m_heaps;
</span><span class="cx">
</span><ins>+ double m_frequency { 1 };
+
</ins><span class="cx"> private:
</span><span class="cx"> template<typename Function, typename... Args>
</span><span class="cx"> LValue callWithoutSideEffects(B3::Type type, Function function, LValue arg1, Args... args)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (193661 => 193662)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-07 23:47:56 UTC (rev 193661)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-08 00:02:09 UTC (rev 193662)
</span><span class="lines">@@ -157,6 +157,9 @@
</span><span class="cx"> #else
</span><span class="cx"> m_out.initialize(m_ftlState.module, m_ftlState.function, m_heaps);
</span><span class="cx"> #endif
</span><ins>+
+ // We use prologue frequency for all of the initialization code.
+ m_out.setFrequency(1);
</ins><span class="cx">
</span><span class="cx"> m_prologue = FTL_NEW_BLOCK(m_out, ("Prologue"));
</span><span class="cx"> LBasicBlock stackOverflow = FTL_NEW_BLOCK(m_out, ("Stack overflow"));
</span><span class="lines">@@ -168,8 +171,12 @@
</span><span class="cx"> m_highBlock = m_graph.block(blockIndex);
</span><span class="cx"> if (!m_highBlock)
</span><span class="cx"> continue;
</span><ins>+ m_out.setFrequency(m_highBlock->executionCount);
</ins><span class="cx"> m_blocks.add(m_highBlock, FTL_NEW_BLOCK(m_out, ("Block ", *m_highBlock)));
</span><span class="cx"> }
</span><ins>+
+ // Back to prologue frequency for any bocks that get sneakily created in the initialization code.
+ m_out.setFrequency(1);
</ins><span class="cx">
</span><span class="cx"> m_out.appendTo(m_prologue, stackOverflow);
</span><span class="cx"> #if FTL_USES_B3
</span><span class="lines">@@ -435,6 +442,11 @@
</span><span class="cx">
</span><span class="cx"> m_highBlock = block;
</span><span class="cx">
</span><ins>+ // Make sure that any blocks created while lowering code in the high block have the frequency of
+ // the high block. This is appropriate because B3 doesn't need precise frequencies. It just needs
+ // something roughly approximate for things like register allocation.
+ m_out.setFrequency(m_highBlock->executionCount);
+
</ins><span class="cx"> LBasicBlock lowBlock = m_blocks.get(m_highBlock);
</span><span class="cx">
</span><span class="cx"> m_nextHighBlock = 0;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOutputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOutput.h (193661 => 193662)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOutput.h 2015-12-07 23:47:56 UTC (rev 193661)
+++ trunk/Source/JavaScriptCore/ftl/FTLOutput.h 2015-12-08 00:02:09 UTC (rev 193662)
</span><span class="lines">@@ -74,6 +74,8 @@
</span><span class="cx"> ~Output();
</span><span class="cx">
</span><span class="cx"> void initialize(LModule, LValue, AbstractHeapRepository&);
</span><ins>+
+ void setFrequency(double) { }
</ins><span class="cx">
</span><span class="cx"> LBasicBlock insertNewBlocksBefore(LBasicBlock nextBlock)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>