<!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>[164734] 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/164734">164734</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-02-26 12:13:22 -0800 (Wed, 26 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Compilation policy management belongs in operationOptimize(), not the DFG Driver.
<https://webkit.org/b/129355>
Reviewed by Filip Pizlo.
By compilation policy, I mean the rules for determining whether to
compile, when to compile, when to attempt compilation again, etc. The
few of these policy decisions that were previously being made in the
DFG driver are now moved to operationOptimize() where we keep the rest
of the policy logic. Decisions that are based on the capabilities
supported by the DFG are moved to DFG capabiliityLevel().
I've run the following benchmarks:
1. the collection of jsc benchmarks on the jsc executable vs. its
baseline.
2. Octane 2.0 in browser without the WebInspector.
3. Octane 2.0 in browser with the WebInspector open and a breakpoint
set somewhere where it won't break.
In all of these, the results came out to be a wash as expected.
* dfg/DFGCapabilities.cpp:
(JSC::DFG::isSupported):
(JSC::DFG::mightCompileEval):
(JSC::DFG::mightCompileProgram):
(JSC::DFG::mightCompileFunctionForCall):
(JSC::DFG::mightCompileFunctionForConstruct):
(JSC::DFG::mightInlineFunctionForCall):
(JSC::DFG::mightInlineFunctionForClosureCall):
(JSC::DFG::mightInlineFunctionForConstruct):
* dfg/DFGCapabilities.h:
* dfg/DFGDriver.cpp:
(JSC::DFG::compileImpl):
* jit/JITOperations.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCapabilitiescpp">trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCapabilitiesh">trunk/Source/JavaScriptCore/dfg/DFGCapabilities.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGDrivercpp">trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp</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 (164733 => 164734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-26 19:54:23 UTC (rev 164733)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-26 20:13:22 UTC (rev 164734)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2014-02-26 Mark Lam <mark.lam@apple.com>
+
+ Compilation policy management belongs in operationOptimize(), not the DFG Driver.
+ <https://webkit.org/b/129355>
+
+ Reviewed by Filip Pizlo.
+
+ By compilation policy, I mean the rules for determining whether to
+ compile, when to compile, when to attempt compilation again, etc. The
+ few of these policy decisions that were previously being made in the
+ DFG driver are now moved to operationOptimize() where we keep the rest
+ of the policy logic. Decisions that are based on the capabilities
+ supported by the DFG are moved to DFG capabiliityLevel().
+
+ I've run the following benchmarks:
+ 1. the collection of jsc benchmarks on the jsc executable vs. its
+ baseline.
+ 2. Octane 2.0 in browser without the WebInspector.
+ 3. Octane 2.0 in browser with the WebInspector open and a breakpoint
+ set somewhere where it won't break.
+
+ In all of these, the results came out to be a wash as expected.
+
+ * dfg/DFGCapabilities.cpp:
+ (JSC::DFG::isSupported):
+ (JSC::DFG::mightCompileEval):
+ (JSC::DFG::mightCompileProgram):
+ (JSC::DFG::mightCompileFunctionForCall):
+ (JSC::DFG::mightCompileFunctionForConstruct):
+ (JSC::DFG::mightInlineFunctionForCall):
+ (JSC::DFG::mightInlineFunctionForClosureCall):
+ (JSC::DFG::mightInlineFunctionForConstruct):
+ * dfg/DFGCapabilities.h:
+ * dfg/DFGDriver.cpp:
+ (JSC::DFG::compileImpl):
+ * jit/JITOperations.cpp:
+
</ins><span class="cx"> 2014-02-26 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Auto generate bytecode information for bytecode parser and LLInt
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (164733 => 164734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2014-02-26 19:54:23 UTC (rev 164733)
+++ trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2014-02-26 20:13:22 UTC (rev 164734)
</span><span class="lines">@@ -32,41 +32,56 @@
</span><span class="cx"> #include "DFGCommon.h"
</span><span class="cx"> #include "Interpreter.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><ins>+#include "Options.h"
</ins><span class="cx">
</span><span class="cx"> namespace JSC { namespace DFG {
</span><span class="cx">
</span><ins>+bool isSupported(CodeBlock* codeBlock)
+{
+ return Options::useDFGJIT()
+ && MacroAssembler::supportsFloatingPoint()
+ && Options::bytecodeRangeToDFGCompile().isInRange(codeBlock->instructionCount());
+}
+
</ins><span class="cx"> bool mightCompileEval(CodeBlock* codeBlock)
</span><span class="cx"> {
</span><del>- return codeBlock->instructionCount() <= Options::maximumOptimizationCandidateInstructionCount();
</del><ins>+ return isSupported(codeBlock)
+ && codeBlock->instructionCount() <= Options::maximumOptimizationCandidateInstructionCount();
</ins><span class="cx"> }
</span><span class="cx"> bool mightCompileProgram(CodeBlock* codeBlock)
</span><span class="cx"> {
</span><del>- return codeBlock->instructionCount() <= Options::maximumOptimizationCandidateInstructionCount();
</del><ins>+ return isSupported(codeBlock)
+ && codeBlock->instructionCount() <= Options::maximumOptimizationCandidateInstructionCount();
</ins><span class="cx"> }
</span><span class="cx"> bool mightCompileFunctionForCall(CodeBlock* codeBlock)
</span><span class="cx"> {
</span><del>- return codeBlock->instructionCount() <= Options::maximumOptimizationCandidateInstructionCount();
</del><ins>+ return isSupported(codeBlock)
+ && codeBlock->instructionCount() <= Options::maximumOptimizationCandidateInstructionCount();
</ins><span class="cx"> }
</span><span class="cx"> bool mightCompileFunctionForConstruct(CodeBlock* codeBlock)
</span><span class="cx"> {
</span><del>- return codeBlock->instructionCount() <= Options::maximumOptimizationCandidateInstructionCount();
</del><ins>+ return isSupported(codeBlock)
+ && codeBlock->instructionCount() <= Options::maximumOptimizationCandidateInstructionCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool mightInlineFunctionForCall(CodeBlock* codeBlock)
</span><span class="cx"> {
</span><del>- return codeBlock->instructionCount() <= Options::maximumFunctionForCallInlineCandidateInstructionCount()
</del><ins>+ return isSupported(codeBlock)
+ && codeBlock->instructionCount() <= Options::maximumFunctionForCallInlineCandidateInstructionCount()
</ins><span class="cx"> && !codeBlock->ownerExecutable()->needsActivation()
</span><span class="cx"> && codeBlock->ownerExecutable()->isInliningCandidate();
</span><span class="cx"> }
</span><span class="cx"> bool mightInlineFunctionForClosureCall(CodeBlock* codeBlock)
</span><span class="cx"> {
</span><del>- return codeBlock->instructionCount() <= Options::maximumFunctionForClosureCallInlineCandidateInstructionCount()
</del><ins>+ return isSupported(codeBlock)
+ && codeBlock->instructionCount() <= Options::maximumFunctionForClosureCallInlineCandidateInstructionCount()
</ins><span class="cx"> && !codeBlock->ownerExecutable()->needsActivation()
</span><span class="cx"> && codeBlock->ownerExecutable()->isInliningCandidate();
</span><span class="cx"> }
</span><span class="cx"> bool mightInlineFunctionForConstruct(CodeBlock* codeBlock)
</span><span class="cx"> {
</span><del>- return codeBlock->instructionCount() <= Options::maximumFunctionForConstructInlineCandidateInstructionCount()
</del><ins>+ return isSupported(codeBlock)
+ && codeBlock->instructionCount() <= Options::maximumFunctionForConstructInlineCandidateInstructionCount()
</ins><span class="cx"> && !codeBlock->ownerExecutable()->needsActivation()
</span><span class="cx"> && codeBlock->ownerExecutable()->isInliningCandidate();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCapabilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCapabilities.h (164733 => 164734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCapabilities.h 2014-02-26 19:54:23 UTC (rev 164733)
+++ trunk/Source/JavaScriptCore/dfg/DFGCapabilities.h 2014-02-26 20:13:22 UTC (rev 164734)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> // Fast check functions; if they return true it is still necessary to
</span><span class="cx"> // check opcodes.
</span><ins>+bool isSupported(CodeBlock*);
</ins><span class="cx"> bool mightCompileEval(CodeBlock*);
</span><span class="cx"> bool mightCompileProgram(CodeBlock*);
</span><span class="cx"> bool mightCompileFunctionForCall(CodeBlock*);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDrivercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp (164733 => 164734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp 2014-02-26 19:54:23 UTC (rev 164733)
+++ trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp 2014-02-26 20:13:22 UTC (rev 164734)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include "DFGPlan.h"
</span><span class="cx"> #include "DFGThunks.h"
</span><span class="cx"> #include "DFGWorklist.h"
</span><del>-#include "Debugger.h"
</del><span class="cx"> #include "JITCode.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "Options.h"
</span><span class="lines">@@ -69,19 +68,6 @@
</span><span class="cx"> ASSERT(codeBlock->alternative()->jitType() == JITCode::BaselineJIT);
</span><span class="cx"> ASSERT(!profiledDFGCodeBlock || profiledDFGCodeBlock->jitType() == JITCode::DFGJIT);
</span><span class="cx">
</span><del>- if (!Options::useDFGJIT() || !MacroAssembler::supportsFloatingPoint())
- return CompilationFailed;
-
- if (!Options::bytecodeRangeToDFGCompile().isInRange(codeBlock->instructionCount()))
- return CompilationFailed;
-
- if (vm.enabledProfiler())
- return CompilationInvalidated;
-
- Debugger* debugger = codeBlock->globalObject()->debugger();
- if (debugger && (debugger->isStepping() || codeBlock->baselineAlternative()->hasDebuggerRequests()))
- return CompilationInvalidated;
-
</del><span class="cx"> if (logCompilationChanges(mode))
</span><span class="cx"> dataLog("DFG(Driver) compiling ", *codeBlock, " with ", mode, ", number of instructions = ", codeBlock->instructionCount(), "\n");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.cpp (164733 => 164734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2014-02-26 19:54:23 UTC (rev 164733)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2014-02-26 20:13:22 UTC (rev 164734)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "DFGOSREntry.h"
</span><span class="cx"> #include "DFGThunks.h"
</span><span class="cx"> #include "DFGWorklist.h"
</span><ins>+#include "Debugger.h"
</ins><span class="cx"> #include "Error.h"
</span><span class="cx"> #include "ErrorHandlingScope.h"
</span><span class="cx"> #include "GetterSetter.h"
</span><span class="lines">@@ -1007,6 +1008,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><ins>+static void updateAllPredictionsAndOptimizeAfterWarmUp(CodeBlock* codeBlock)
+{
+ codeBlock->updateAllPredictions();
+ codeBlock->optimizeAfterWarmUp();
+}
+
</ins><span class="cx"> SlowPathReturnType JIT_OPERATION operationOptimize(ExecState* exec, int32_t bytecodeIndex)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="lines">@@ -1060,9 +1067,19 @@
</span><span class="cx"> return encodeResult(0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (vm.enabledProfiler()) {
+ updateAllPredictionsAndOptimizeAfterWarmUp(codeBlock);
+ return encodeResult(0, 0);
+ }
+
+ Debugger* debugger = codeBlock->globalObject()->debugger();
+ if (debugger && (debugger->isStepping() || codeBlock->baselineAlternative()->hasDebuggerRequests())) {
+ updateAllPredictionsAndOptimizeAfterWarmUp(codeBlock);
+ return encodeResult(0, 0);
+ }
+
</ins><span class="cx"> if (codeBlock->m_shouldAlwaysBeInlined) {
</span><del>- codeBlock->updateAllPredictions();
- codeBlock->optimizeAfterWarmUp();
</del><ins>+ updateAllPredictionsAndOptimizeAfterWarmUp(codeBlock);
</ins><span class="cx"> if (Options::verboseOSR())
</span><span class="cx"> dataLog("Choosing not to optimize ", *codeBlock, " yet, because m_shouldAlwaysBeInlined == true.\n");
</span><span class="cx"> return encodeResult(0, 0);
</span></span></pre>
</div>
</div>
</body>
</html>