<!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>[160499] 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/160499">160499</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2013-12-12 11:37:21 -0800 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>CStack Branch: Change the disabling of DFG OSR entry to be based on an option
https://bugs.webkit.org/show_bug.cgi?id=125645
Rubber stamped by Filip Pizlo.
Added a new enableOSREntryToDFG option and set the default value to false.
If the option is false, prepareOSREntry() will return 0 which disables OSR
entry, as the return value is the address to jump to or 0 if we can't OSR enter.
Restored the code in emitEnterOptimizationCheck() and emitSlow_op_loop_hint()
that checks the exit value from operationOptimize().
Per a discussion with Filip, removed the enableOSREntryInLoops option and
associated use. All OSR entry to the DFG is now controlled with the new option.
* dfg/DFGOSREntry.cpp:
(JSC::DFG::prepareOSREntry):
* jit/JIT.cpp:
(JSC::JIT::emitEnterOptimizationCheck):
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_loop_hint):
(JSC::JIT::emitSlow_op_loop_hint):
* runtime/Options.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGOSREntrycpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGOSREntry.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITcpp">branches/jsCStack/Source/JavaScriptCore/jit/JIT.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITOpcodescpp">branches/jsCStack/Source/JavaScriptCore/jit/JITOpcodes.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreruntimeOptionsh">branches/jsCStack/Source/JavaScriptCore/runtime/Options.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (160498 => 160499)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-12 19:22:55 UTC (rev 160498)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-12 19:37:21 UTC (rev 160499)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2013-12-12 Michael Saboff <msaboff@apple.com>
+
+ CStack Branch: Change the disabling of DFG OSR entry to be based on an option
+ https://bugs.webkit.org/show_bug.cgi?id=125645
+
+ Rubber stamped by Filip Pizlo.
+
+ Added a new enableOSREntryToDFG option and set the default value to false.
+ If the option is false, prepareOSREntry() will return 0 which disables OSR
+ entry, as the return value is the address to jump to or 0 if we can't OSR enter.
+ Restored the code in emitEnterOptimizationCheck() and emitSlow_op_loop_hint()
+ that checks the exit value from operationOptimize().
+
+ Per a discussion with Filip, removed the enableOSREntryInLoops option and
+ associated use. All OSR entry to the DFG is now controlled with the new option.
+
+ * dfg/DFGOSREntry.cpp:
+ (JSC::DFG::prepareOSREntry):
+ * jit/JIT.cpp:
+ (JSC::JIT::emitEnterOptimizationCheck):
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_loop_hint):
+ (JSC::JIT::emitSlow_op_loop_hint):
+ * runtime/Options.h:
+
</ins><span class="cx"> 2013-12-12 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename returnFromJavaScript to handleUncaughtException.
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGOSREntrycpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGOSREntry.cpp (160498 => 160499)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGOSREntry.cpp 2013-12-12 19:22:55 UTC (rev 160498)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGOSREntry.cpp 2013-12-12 19:37:21 UTC (rev 160499)
</span><span class="lines">@@ -44,7 +44,10 @@
</span><span class="cx"> ASSERT(codeBlock->alternative());
</span><span class="cx"> ASSERT(codeBlock->alternative()->jitType() == JITCode::BaselineJIT);
</span><span class="cx"> ASSERT(!codeBlock->jitCodeMap());
</span><del>-
</del><ins>+
+ if (!Options::enableOSREntryToDFG())
+ return 0;
+
</ins><span class="cx"> if (Options::verboseOSR()) {
</span><span class="cx"> dataLog(
</span><span class="cx"> "DFG OSR in ", *codeBlock->alternative(), " -> ", *codeBlock,
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JIT.cpp (160498 => 160499)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JIT.cpp 2013-12-12 19:22:55 UTC (rev 160498)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JIT.cpp 2013-12-12 19:37:21 UTC (rev 160499)
</span><span class="lines">@@ -99,11 +99,9 @@
</span><span class="cx"> skipOptimize.append(branchAdd32(Signed, TrustedImm32(Options::executionCounterIncrementForEntry()), AbsoluteAddress(m_codeBlock->addressOfJITExecuteCounter())));
</span><span class="cx"> ASSERT(!m_bytecodeOffset);
</span><span class="cx"> callOperation(operationOptimize, m_bytecodeOffset);
</span><del>-#if 0 // FIXME: CStack - need to fix OSR entry
</del><span class="cx"> skipOptimize.append(branchTestPtr(Zero, returnValueGPR));
</span><span class="cx"> jump(returnValueGPR);
</span><span class="cx"> skipOptimize.link(this);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITOpcodescpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JITOpcodes.cpp (160498 => 160499)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JITOpcodes.cpp 2013-12-12 19:22:55 UTC (rev 160498)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JITOpcodes.cpp 2013-12-12 19:37:21 UTC (rev 160499)
</span><span class="lines">@@ -1093,20 +1093,8 @@
</span><span class="cx"> {
</span><span class="cx"> // Emit the JIT optimization check:
</span><span class="cx"> if (canBeOptimized()) {
</span><del>- if (Options::enableOSREntryInLoops()) {
- addSlowCase(branchAdd32(PositiveOrZero, TrustedImm32(Options::executionCounterIncrementForLoop()),
- AbsoluteAddress(m_codeBlock->addressOfJITExecuteCounter())));
- } else {
- // Add with saturation.
- move(TrustedImmPtr(m_codeBlock->addressOfJITExecuteCounter()), regT3);
- load32(regT3, regT2);
- Jump dontAdd = branch32(
- GreaterThan, regT2,
- TrustedImm32(std::numeric_limits<int32_t>::max() - Options::executionCounterIncrementForLoop()));
- add32(TrustedImm32(Options::executionCounterIncrementForLoop()), regT2);
- store32(regT2, regT3);
- dontAdd.link(this);
- }
</del><ins>+ addSlowCase(branchAdd32(PositiveOrZero, TrustedImm32(Options::executionCounterIncrementForLoop()),
+ AbsoluteAddress(m_codeBlock->addressOfJITExecuteCounter())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Emit the watchdog timer check:
</span><span class="lines">@@ -1118,15 +1106,13 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> // Emit the slow path for the JIT optimization check:
</span><del>- if (canBeOptimized() && Options::enableOSREntryInLoops()) {
</del><ins>+ if (canBeOptimized()) {
</ins><span class="cx"> linkSlowCase(iter);
</span><span class="cx">
</span><span class="cx"> callOperation(operationOptimize, m_bytecodeOffset);
</span><del>-#if 0 // FIXME: CStack - need to fix OSR entry
</del><span class="cx"> Jump noOptimizedEntry = branchTestPtr(Zero, returnValueGPR);
</span><span class="cx"> jump(returnValueGPR);
</span><span class="cx"> noOptimizedEntry.link(this);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> emitJumpSlowToHot(jump(), OPCODE_LENGTH(op_loop_hint));
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/Options.h (160498 => 160499)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/Options.h 2013-12-12 19:22:55 UTC (rev 160498)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/Options.h 2013-12-12 19:37:21 UTC (rev 160499)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> v(bool, reportCompileTimes, false) \
</span><span class="cx"> v(bool, verboseCFA, false) \
</span><span class="cx"> \
</span><del>- v(bool, enableOSREntryInLoops, true) \
</del><ins>+ v(bool, enableOSREntryToDFG, false) \
</ins><span class="cx"> \
</span><span class="cx"> v(bool, useExperimentalFTL, false) \
</span><span class="cx"> v(bool, useFTLTBAA, true) \
</span></span></pre>
</div>
</div>
</body>
</html>