<!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>[160613] 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/160613">160613</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2013-12-14 21:41:44 -0800 (Sat, 14 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL should *really* know when things are flushed
https://bugs.webkit.org/show_bug.cgi?id=125747
Reviewed by Sam Weinig.
Fix more codegen badness. This makes V8v7's crypto am3() function run faster in the FTL
than in DFG. This means that even if we just compile those functions in V8v7 that don't
make calls, the FTL gives us a 2% speed-up over the DFG. That's pretty good considering
that we have still more optimizations to fix and we can make calls work.
* dfg/DFGSSAConversionPhase.cpp:
(JSC::DFG::SSAConversionPhase::run):
* ftl/FTLCompile.cpp:
(JSC::FTL::fixFunctionBasedOnStackMaps):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSSAConversionPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGSSAConversionPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCompilecpp">trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160612 => 160613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-15 05:29:19 UTC (rev 160612)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-15 05:41:44 UTC (rev 160613)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-12-14 Filip Pizlo <fpizlo@apple.com>
+
+ FTL should *really* know when things are flushed
+ https://bugs.webkit.org/show_bug.cgi?id=125747
+
+ Reviewed by Sam Weinig.
+
+ Fix more codegen badness. This makes V8v7's crypto am3() function run faster in the FTL
+ than in DFG. This means that even if we just compile those functions in V8v7 that don't
+ make calls, the FTL gives us a 2% speed-up over the DFG. That's pretty good considering
+ that we have still more optimizations to fix and we can make calls work.
+
+ * dfg/DFGSSAConversionPhase.cpp:
+ (JSC::DFG::SSAConversionPhase::run):
+ * ftl/FTLCompile.cpp:
+ (JSC::FTL::fixFunctionBasedOnStackMaps):
+
</ins><span class="cx"> 2013-12-14 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Unify FeatureDefines.xcconfig
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSSAConversionPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSSAConversionPhase.cpp (160612 => 160613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSSAConversionPhase.cpp 2013-12-15 05:29:19 UTC (rev 160612)
+++ trunk/Source/JavaScriptCore/dfg/DFGSSAConversionPhase.cpp 2013-12-15 05:41:44 UTC (rev 160613)
</span><span class="lines">@@ -141,6 +141,8 @@
</span><span class="cx"> }
</span><span class="cx"> RELEASE_ASSERT(node->op() == Phi || node->op() == SetArgument);
</span><span class="cx">
</span><ins>+ bool isFlushed = m_flushedLocalOps.contains(node);
+
</ins><span class="cx"> if (node->op() == Phi) {
</span><span class="cx"> Edge edge = node->children.justOneChild();
</span><span class="cx"> if (edge)
</span><span class="lines">@@ -162,7 +164,7 @@
</span><span class="cx"> OpInfo(node), Edge(predecessor->variablesAtTail[i], useKind));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_flushedLocalOps.contains(node)) {
</del><ins>+ if (isFlushed) {
</ins><span class="cx"> // Do nothing. For multiple reasons.
</span><span class="cx">
</span><span class="cx"> // Reason #1: If the local is flushed then we don't need to bother
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCompilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp (160612 => 160613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp 2013-12-15 05:29:19 UTC (rev 160612)
+++ trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp 2013-12-15 05:41:44 UTC (rev 160613)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> OSRExit& exit = jitCode->osrExit[i];
</span><span class="cx">
</span><span class="cx"> if (Options::verboseCompilation())
</span><del>- dataLog("Handling OSR stackmap #", exit.m_stackmapID, "\n");
</del><ins>+ dataLog("Handling OSR stackmap #", exit.m_stackmapID, " for ", exit.m_codeOrigin, "\n");
</ins><span class="cx">
</span><span class="cx"> StackMaps::RecordMap::iterator iter = recordMap.find(exit.m_stackmapID);
</span><span class="cx"> if (iter == recordMap.end()) {
</span></span></pre>
</div>
</div>
</body>
</html>