<!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>[161776] branches/jsCStack/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/161776">161776</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-11 12:31:54 -0800 (Sat, 11 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL tier-up should behave the same with CountExecution's as it does without
https://bugs.webkit.org/show_bug.cgi?id=126822
Not yet reviewed.
CountExecution nodes are inserted by the profiler. Prior to this change, their
presence would change how we inserted CheckTierUp nodes, since a CountExecution
might be inserted before a LoopHint thereby making it so the LoopHint was no
longer at the top of a loop header. This makes the code resilient against such
things. The result is that when you enable the profiler, you get the same OSR
behavior as with the profiler disabled.
* dfg/DFGNode.h:
(JSC::DFG::Node::isSemanticallySkippable):
* dfg/DFGOSREntrypointCreationPhase.cpp:
(JSC::DFG::OSREntrypointCreationPhase::run):
* dfg/DFGTierUpCheckInjectionPhase.cpp:
(JSC::DFG::TierUpCheckInjectionPhase::run):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGNodeh">branches/jsCStack/Source/JavaScriptCore/dfg/DFGNode.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGOSREntrypointCreationPhasecpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGOSREntrypointCreationPhase.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGTierUpCheckInjectionPhasecpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGTierUpCheckInjectionPhase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (161775 => 161776)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-11 20:05:17 UTC (rev 161775)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-11 20:31:54 UTC (rev 161776)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-01-11 Filip Pizlo <fpizlo@apple.com>
+
+ FTL tier-up should behave the same with CountExecution's as it does without
+ https://bugs.webkit.org/show_bug.cgi?id=126822
+
+ Not yet reviewed.
+
+ CountExecution nodes are inserted by the profiler. Prior to this change, their
+ presence would change how we inserted CheckTierUp nodes, since a CountExecution
+ might be inserted before a LoopHint thereby making it so the LoopHint was no
+ longer at the top of a loop header. This makes the code resilient against such
+ things. The result is that when you enable the profiler, you get the same OSR
+ behavior as with the profiler disabled.
+
+ * dfg/DFGNode.h:
+ (JSC::DFG::Node::isSemanticallySkippable):
+ * dfg/DFGOSREntrypointCreationPhase.cpp:
+ (JSC::DFG::OSREntrypointCreationPhase::run):
+ * dfg/DFGTierUpCheckInjectionPhase.cpp:
+ (JSC::DFG::TierUpCheckInjectionPhase::run):
+
</ins><span class="cx"> 2014-01-10 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> FTL should work with the bytecode profiler
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGNodeh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGNode.h (161775 => 161776)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGNode.h 2014-01-11 20:05:17 UTC (rev 161775)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGNode.h 2014-01-11 20:31:54 UTC (rev 161776)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2012, 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -1186,6 +1186,11 @@
</span><span class="cx"> return shouldGenerate();
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ bool isSemanticallySkippable()
+ {
+ return op() == CountExecution;
+ }
</ins><span class="cx">
</span><span class="cx"> unsigned refCount()
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGOSREntrypointCreationPhasecpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGOSREntrypointCreationPhase.cpp (161775 => 161776)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGOSREntrypointCreationPhase.cpp 2014-01-11 20:05:17 UTC (rev 161775)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGOSREntrypointCreationPhase.cpp 2014-01-11 20:31:54 UTC (rev 161776)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -63,7 +63,10 @@
</span><span class="cx"> BasicBlock* block = m_graph.block(blockIndex);
</span><span class="cx"> if (!block)
</span><span class="cx"> continue;
</span><ins>+ unsigned nodeIndex = 0;
</ins><span class="cx"> Node* firstNode = block->at(0);
</span><ins>+ while (firstNode->isSemanticallySkippable())
+ firstNode = block->at(++nodeIndex);
</ins><span class="cx"> if (firstNode->op() == LoopHint
</span><span class="cx"> && firstNode->codeOrigin == CodeOrigin(bytecodeIndex)) {
</span><span class="cx"> target = block;
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGTierUpCheckInjectionPhasecpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGTierUpCheckInjectionPhase.cpp (161775 => 161776)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGTierUpCheckInjectionPhase.cpp 2014-01-11 20:05:17 UTC (rev 161775)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGTierUpCheckInjectionPhase.cpp 2014-01-11 20:31:54 UTC (rev 161776)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -61,15 +61,41 @@
</span><span class="cx"> if (!block)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- if (block->at(0)->op() == LoopHint) {
- CodeOrigin codeOrigin = block->at(0)->codeOrigin;
- NodeType nodeType;
- if (level == FTL::CanCompileAndOSREnter && !codeOrigin.inlineCallFrame) {
- nodeType = CheckTierUpAndOSREnter;
- RELEASE_ASSERT(block->bytecodeBegin == codeOrigin.bytecodeIndex);
- } else
- nodeType = CheckTierUpInLoop;
- insertionSet.insertNode(1, SpecNone, nodeType, codeOrigin);
</del><ins>+ for (unsigned nodeIndex = 0; nodeIndex < block->size(); ++nodeIndex) {
+ Node* node = block->at(nodeIndex);
+ if (node->op() != LoopHint)
+ continue;
+
+ // We only put OSR checks for the first LoopHint in the block. Note that
+ // more than one LoopHint could happen in cases where we did a lot of CFG
+ // simplification in the bytecode parser, but it should be very rare.
+
+ CodeOrigin codeOrigin = node->codeOrigin;
+
+ if (level != FTL::CanCompileAndOSREnter || codeOrigin.inlineCallFrame) {
+ insertionSet.insertNode(
+ nodeIndex + 1, SpecNone, CheckTierUpInLoop, codeOrigin);
+ break;
+ }
+
+ bool isAtTop = true;
+ for (unsigned subNodeIndex = nodeIndex; subNodeIndex--;) {
+ if (!block->at(subNodeIndex)->isSemanticallySkippable()) {
+ isAtTop = false;
+ break;
+ }
+ }
+
+ if (!isAtTop) {
+ insertionSet.insertNode(
+ nodeIndex + 1, SpecNone, CheckTierUpInLoop, codeOrigin);
+ break;
+ }
+
+ RELEASE_ASSERT(block->bytecodeBegin == codeOrigin.bytecodeIndex);
+ insertionSet.insertNode(
+ nodeIndex + 1, SpecNone, CheckTierUpAndOSREnter, codeOrigin);
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (block->last()->op() == Return) {
</span></span></pre>
</div>
</div>
</body>
</html>