<!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>[161599] 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/161599">161599</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-09 16:15:53 -0800 (Thu, 09 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>DFG and FTL should have separate compilation worklists
https://bugs.webkit.org/show_bug.cgi?id=126722
Reviewed by Mark Hahnenberg.
There are a number of architectural changes here:
- DFGDriver.cpp is now the only place that decides whether or not to do a
concurrent compile. Previously this decision was oddly squirreled away in
VM.cpp.
- VM no longer points to a worklist. That was always kind of weird since there was
only one worklist per process anyway.
- There are now two worklists: one for all DFG compiles and one for all FTL
compiles.
- The FTL worklist is now parallel by default.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::checkIfOptimizationThresholdReached):
* dfg/DFGCommon.h:
* dfg/DFGDriver.cpp:
(JSC::DFG::compileImpl):
(JSC::DFG::compile):
* dfg/DFGDriver.h:
* dfg/DFGOperations.cpp:
* dfg/DFGWorklist.cpp:
(JSC::DFG::initializeGlobalDFGWorklistOnce):
(JSC::DFG::ensureGlobalDFGWorklist):
(JSC::DFG::existingGlobalDFGWorklistOrNull):
(JSC::DFG::initializeGlobalFTLWorklistOnce):
(JSC::DFG::ensureGlobalFTLWorklist):
(JSC::DFG::existingGlobalFTLWorklistOrNull):
(JSC::DFG::ensureGlobalWorklistFor):
* dfg/DFGWorklist.h:
* jit/JITOperations.cpp:
* runtime/Options.h:
* runtime/VM.cpp:
(JSC::cleanWorklist):
(JSC::VM::~VM):
(JSC::prepareToDiscardCodeFor):
(JSC::VM::prepareToDiscardCode):
(JSC::VM::gatherConservativeRoots):
* runtime/VM.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorebytecodeCodeBlockcpp">branches/jsCStack/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGCommonh">branches/jsCStack/Source/JavaScriptCore/dfg/DFGCommon.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGDrivercpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGDriver.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGDriverh">branches/jsCStack/Source/JavaScriptCore/dfg/DFGDriver.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGOperationscpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGOperations.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGWorklistcpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGWorklist.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGWorklisth">branches/jsCStack/Source/JavaScriptCore/dfg/DFGWorklist.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITOperationscpp">branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreruntimeOptionsh">branches/jsCStack/Source/JavaScriptCore/runtime/Options.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreruntimeVMcpp">branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreruntimeVMh">branches/jsCStack/Source/JavaScriptCore/runtime/VM.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 (161598 => 161599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-10 00:15:25 UTC (rev 161598)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-10 00:15:53 UTC (rev 161599)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2014-01-09 Filip Pizlo <fpizlo@apple.com>
+
+ DFG and FTL should have separate compilation worklists
+ https://bugs.webkit.org/show_bug.cgi?id=126722
+
+ Reviewed by Mark Hahnenberg.
+
+ There are a number of architectural changes here:
+
+ - DFGDriver.cpp is now the only place that decides whether or not to do a
+ concurrent compile. Previously this decision was oddly squirreled away in
+ VM.cpp.
+
+ - VM no longer points to a worklist. That was always kind of weird since there was
+ only one worklist per process anyway.
+
+ - There are now two worklists: one for all DFG compiles and one for all FTL
+ compiles.
+
+ - The FTL worklist is now parallel by default.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::checkIfOptimizationThresholdReached):
+ * dfg/DFGCommon.h:
+ * dfg/DFGDriver.cpp:
+ (JSC::DFG::compileImpl):
+ (JSC::DFG::compile):
+ * dfg/DFGDriver.h:
+ * dfg/DFGOperations.cpp:
+ * dfg/DFGWorklist.cpp:
+ (JSC::DFG::initializeGlobalDFGWorklistOnce):
+ (JSC::DFG::ensureGlobalDFGWorklist):
+ (JSC::DFG::existingGlobalDFGWorklistOrNull):
+ (JSC::DFG::initializeGlobalFTLWorklistOnce):
+ (JSC::DFG::ensureGlobalFTLWorklist):
+ (JSC::DFG::existingGlobalFTLWorklistOrNull):
+ (JSC::DFG::ensureGlobalWorklistFor):
+ * dfg/DFGWorklist.h:
+ * jit/JITOperations.cpp:
+ * runtime/Options.h:
+ * runtime/VM.cpp:
+ (JSC::cleanWorklist):
+ (JSC::VM::~VM):
+ (JSC::prepareToDiscardCodeFor):
+ (JSC::VM::prepareToDiscardCode):
+ (JSC::VM::gatherConservativeRoots):
+ * runtime/VM.h:
+
</ins><span class="cx"> 2014-01-09 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> CStack: Rename "host zone" to "reserved zone".
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/bytecode/CodeBlock.cpp (161598 => 161599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-01-10 00:15:25 UTC (rev 161598)
+++ branches/jsCStack/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-01-10 00:15:53 UTC (rev 161599)
</span><span class="lines">@@ -3030,7 +3030,7 @@
</span><span class="cx"> bool CodeBlock::checkIfOptimizationThresholdReached()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>- if (DFG::Worklist* worklist = m_vm->worklist.get()) {
</del><ins>+ if (DFG::Worklist* worklist = DFG::existingGlobalDFGWorklistOrNull()) {
</ins><span class="cx"> if (worklist->compilationState(DFG::CompilationKey(this, DFG::DFGMode))
</span><span class="cx"> == DFG::Worklist::Compiled) {
</span><span class="cx"> optimizeNextInvocation();
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGCommonh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGCommon.h (161598 => 161599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGCommon.h 2014-01-10 00:15:25 UTC (rev 161598)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGCommon.h 2014-01-10 00:15:53 UTC (rev 161599)
</span><span class="lines">@@ -87,15 +87,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool enableConcurrentJIT()
-{
-#if ENABLE(CONCURRENT_JIT)
- return Options::enableConcurrentJIT() && Options::numberOfCompilerThreads();
-#else
- return false;
-#endif
-}
-
</del><span class="cx"> inline bool enableInt52()
</span><span class="cx"> {
</span><span class="cx"> #if USE(JSVALUE64)
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGDrivercpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGDriver.cpp (161598 => 161599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGDriver.cpp 2014-01-10 00:15:25 UTC (rev 161598)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGDriver.cpp 2014-01-10 00:15:53 UTC (rev 161599)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> static CompilationResult compileImpl(
</span><span class="cx"> VM& vm, CodeBlock* codeBlock, CompilationMode mode, unsigned osrEntryBytecodeIndex,
</span><span class="cx"> const Operands<JSValue>& mustHandleValues,
</span><del>- PassRefPtr<DeferredCompilationCallback> callback, Worklist* worklist)
</del><ins>+ PassRefPtr<DeferredCompilationCallback> callback)
</ins><span class="cx"> {
</span><span class="cx"> SamplingRegion samplingRegion("DFG Compilation (Driver)");
</span><span class="cx">
</span><span class="lines">@@ -97,7 +97,14 @@
</span><span class="cx"> RefPtr<Plan> plan = adoptRef(
</span><span class="cx"> new Plan(codeBlock, mode, osrEntryBytecodeIndex, mustHandleValues));
</span><span class="cx">
</span><del>- if (worklist) {
</del><ins>+ bool enableConcurrentJIT;
+#if ENABLE(CONCURRENT_JIT)
+ enableConcurrentJIT = Options::enableConcurrentJIT();
+#else // ENABLE(CONCURRENT_JIT)
+ enableConcurrentJIT = false;
+#endif // ENABLE(CONCURRENT_JIT)
+ if (enableConcurrentJIT) {
+ Worklist* worklist = ensureGlobalWorklistFor(mode);
</ins><span class="cx"> plan->callback = callback;
</span><span class="cx"> if (logCompilationChanges())
</span><span class="cx"> dataLog("Deferring DFG compilation of ", *codeBlock, " with queue length ", worklist->queueLength(), ".\n");
</span><span class="lines">@@ -111,7 +118,7 @@
</span><span class="cx"> #else // ENABLE(DFG_JIT)
</span><span class="cx"> static CompilationResult compileImpl(
</span><span class="cx"> VM&, CodeBlock*, CompilationMode, unsigned, const Operands<JSValue>&,
</span><del>- PassRefPtr<DeferredCompilationCallback>, Worklist*)
</del><ins>+ PassRefPtr<DeferredCompilationCallback>)
</ins><span class="cx"> {
</span><span class="cx"> return CompilationFailed;
</span><span class="cx"> }
</span><span class="lines">@@ -120,11 +127,11 @@
</span><span class="cx"> CompilationResult compile(
</span><span class="cx"> VM& vm, CodeBlock* codeBlock, CompilationMode mode, unsigned osrEntryBytecodeIndex,
</span><span class="cx"> const Operands<JSValue>& mustHandleValues,
</span><del>- PassRefPtr<DeferredCompilationCallback> passedCallback, Worklist* worklist)
</del><ins>+ PassRefPtr<DeferredCompilationCallback> passedCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<DeferredCompilationCallback> callback = passedCallback;
</span><span class="cx"> CompilationResult result = compileImpl(
</span><del>- vm, codeBlock, mode, osrEntryBytecodeIndex, mustHandleValues, callback, worklist);
</del><ins>+ vm, codeBlock, mode, osrEntryBytecodeIndex, mustHandleValues, callback);
</ins><span class="cx"> if (result != CompilationDeferred)
</span><span class="cx"> callback->compilationDidComplete(codeBlock, result);
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGDriverh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGDriver.h (161598 => 161599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGDriver.h 2014-01-10 00:15:25 UTC (rev 161598)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGDriver.h 2014-01-10 00:15:53 UTC (rev 161599)
</span><span class="lines">@@ -40,16 +40,13 @@
</span><span class="cx">
</span><span class="cx"> namespace DFG {
</span><span class="cx">
</span><del>-class Worklist;
-
</del><span class="cx"> JS_EXPORT_PRIVATE unsigned getNumCompilations();
</span><span class="cx">
</span><span class="cx"> // If the worklist is non-null, we do a concurrent compile. Otherwise we do a synchronous
</span><span class="cx"> // compile. Even if we do a synchronous compile, we call the callback with the result.
</span><span class="cx"> CompilationResult compile(
</span><span class="cx"> VM&, CodeBlock*, CompilationMode, unsigned osrEntryBytecodeIndex,
</span><del>- const Operands<JSValue>& mustHandleValues,
- PassRefPtr<DeferredCompilationCallback>, Worklist*);
</del><ins>+ const Operands<JSValue>& mustHandleValues, PassRefPtr<DeferredCompilationCallback>);
</ins><span class="cx">
</span><span class="cx"> } } // namespace JSC::DFG
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGOperationscpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGOperations.cpp (161598 => 161599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGOperations.cpp 2014-01-10 00:15:25 UTC (rev 161598)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGOperations.cpp 2014-01-10 00:15:53 UTC (rev 161599)
</span><span class="lines">@@ -1138,7 +1138,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Worklist::State worklistState;
</span><del>- if (Worklist* worklist = vm->worklist.get()) {
</del><ins>+ if (Worklist* worklist = existingGlobalFTLWorklistOrNull()) {
</ins><span class="cx"> worklistState = worklist->completeAllReadyPlansForVM(
</span><span class="cx"> *vm, CompilationKey(codeBlock->baselineVersion(), FTLMode));
</span><span class="cx"> } else
</span><span class="lines">@@ -1168,7 +1168,7 @@
</span><span class="cx"> // We need to compile the code.
</span><span class="cx"> compile(
</span><span class="cx"> *vm, codeBlock->newReplacement().get(), FTLMode, UINT_MAX, Operands<JSValue>(),
</span><del>- ToFTLDeferredCompilationCallback::create(codeBlock), vm->ensureWorklist());
</del><ins>+ ToFTLDeferredCompilationCallback::create(codeBlock));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> char* JIT_OPERATION triggerOSREntryNow(
</span><span class="lines">@@ -1200,8 +1200,10 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ Worklist* worklist = existingGlobalFTLWorklistOrNull();
+
</ins><span class="cx"> Worklist::State worklistState;
</span><del>- if (Worklist* worklist = vm->worklist.get()) {
</del><ins>+ if (worklist) {
</ins><span class="cx"> worklistState = worklist->completeAllReadyPlansForVM(
</span><span class="cx"> *vm, CompilationKey(codeBlock->baselineVersion(), FTLForOSREntryMode));
</span><span class="cx"> } else
</span><span class="lines">@@ -1250,10 +1252,9 @@
</span><span class="cx"> Operands<JSValue> mustHandleValues;
</span><span class="cx"> jitCode->reconstruct(
</span><span class="cx"> exec, codeBlock, CodeOrigin(bytecodeIndex), streamIndex, mustHandleValues);
</span><del>- CompilationResult forEntryResult = DFG::compile(
</del><ins>+ CompilationResult forEntryResult = compile(
</ins><span class="cx"> *vm, codeBlock->newReplacement().get(), FTLForOSREntryMode, bytecodeIndex,
</span><del>- mustHandleValues, ToFTLForOSREntryDeferredCompilationCallback::create(codeBlock),
- vm->ensureWorklist());
</del><ins>+ mustHandleValues, ToFTLForOSREntryDeferredCompilationCallback::create(codeBlock));
</ins><span class="cx">
</span><span class="cx"> // But we also want to trigger a replacement compile. Of course, we don't want to
</span><span class="cx"> // trigger it if we don't need to. Note that this is kind of weird because we might
</span><span class="lines">@@ -1266,11 +1267,11 @@
</span><span class="cx"> CompilationKey keyForReplacement(codeBlock->baselineVersion(), FTLMode);
</span><span class="cx"> if (codeBlock->codeType() != GlobalCode
</span><span class="cx"> && !codeBlock->hasOptimizedReplacement()
</span><del>- && (!vm->worklist.get()
- || vm->worklist->compilationState(keyForReplacement) == Worklist::NotKnown)) {
</del><ins>+ && (!worklist
+ || worklist->compilationState(keyForReplacement) == Worklist::NotKnown)) {
</ins><span class="cx"> compile(
</span><span class="cx"> *vm, codeBlock->newReplacement().get(), FTLMode, UINT_MAX, Operands<JSValue>(),
</span><del>- ToFTLDeferredCompilationCallback::create(codeBlock), vm->ensureWorklist());
</del><ins>+ ToFTLDeferredCompilationCallback::create(codeBlock));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (forEntryResult != CompilationSuccessful)
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGWorklistcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGWorklist.cpp (161598 => 161599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGWorklist.cpp 2014-01-10 00:15:25 UTC (rev 161598)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGWorklist.cpp 2014-01-10 00:15:53 UTC (rev 161599)
</span><span class="lines">@@ -262,20 +262,60 @@
</span><span class="cx"> static_cast<Worklist*>(argument)->runThread();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Worklist* theGlobalWorklist;
</del><ins>+static Worklist* theGlobalDFGWorklist;
</ins><span class="cx">
</span><del>-static void initializeGlobalWorklistOnce()
</del><ins>+static void initializeGlobalDFGWorklistOnce()
</ins><span class="cx"> {
</span><del>- theGlobalWorklist = Worklist::create(Options::numberOfCompilerThreads()).leakRef();
</del><ins>+ theGlobalDFGWorklist = Worklist::create(Options::numberOfDFGCompilerThreads()).leakRef();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Worklist* globalWorklist()
</del><ins>+Worklist* ensureGlobalDFGWorklist()
</ins><span class="cx"> {
</span><del>- static WTF::ThreadingOnce initializeGlobalWorklistKeyOnce;
- initializeGlobalWorklistKeyOnce.callOnce(initializeGlobalWorklistOnce);
- return theGlobalWorklist;
</del><ins>+ static WTF::ThreadingOnce initializeGlobalDFGWorklistKeyOnce;
+ initializeGlobalDFGWorklistKeyOnce.callOnce(initializeGlobalDFGWorklistOnce);
+ return theGlobalDFGWorklist;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+Worklist* existingGlobalDFGWorklistOrNull()
+{
+ return theGlobalDFGWorklist;
+}
+
+static Worklist* theGlobalFTLWorklist;
+
+static void initializeGlobalFTLWorklistOnce()
+{
+ theGlobalFTLWorklist = Worklist::create(Options::numberOfFTLCompilerThreads()).leakRef();
+}
+
+Worklist* ensureGlobalFTLWorklist()
+{
+ static WTF::ThreadingOnce initializeGlobalFTLWorklistKeyOnce;
+ initializeGlobalFTLWorklistKeyOnce.callOnce(initializeGlobalFTLWorklistOnce);
+ return theGlobalFTLWorklist;
+}
+
+Worklist* existingGlobalFTLWorklistOrNull()
+{
+ return theGlobalFTLWorklist;
+}
+
+Worklist* ensureGlobalWorklistFor(CompilationMode mode)
+{
+ switch (mode) {
+ case InvalidCompilationMode:
+ RELEASE_ASSERT_NOT_REACHED();
+ return 0;
+ case DFGMode:
+ return ensureGlobalDFGWorklist();
+ case FTLMode:
+ case FTLForOSREntryMode:
+ return ensureGlobalFTLWorklist();
+ }
+ RELEASE_ASSERT_NOT_REACHED();
+ return 0;
+}
+
</ins><span class="cx"> } } // namespace JSC::DFG
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(DFG_JIT)
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGWorklisth"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGWorklist.h (161598 => 161599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGWorklist.h 2014-01-10 00:15:25 UTC (rev 161598)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGWorklist.h 2014-01-10 00:15:53 UTC (rev 161599)
</span><span class="lines">@@ -95,11 +95,16 @@
</span><span class="cx"> unsigned m_numberOfActiveThreads;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-// For now we use a single global worklist. It's not clear that this
-// is the right thing to do, but it is what we do, for now. This function
-// will lazily create one when it's needed.
-Worklist* globalWorklist();
</del><ins>+// For DFGMode compilations.
+Worklist* ensureGlobalDFGWorklist();
+Worklist* existingGlobalDFGWorklistOrNull();
</ins><span class="cx">
</span><ins>+// For FTLMode and FTLForOSREntryMode compilations.
+Worklist* ensureGlobalFTLWorklist();
+Worklist* existingGlobalFTLWorklistOrNull();
+
+Worklist* ensureGlobalWorklistFor(CompilationMode);
+
</ins><span class="cx"> } } // namespace JSC::DFG
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(DFG_JIT)
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.cpp (161598 => 161599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.cpp 2014-01-10 00:15:25 UTC (rev 161598)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.cpp 2014-01-10 00:15:53 UTC (rev 161599)
</span><span class="lines">@@ -1075,13 +1075,14 @@
</span><span class="cx">
</span><span class="cx"> // We cannot be in the process of asynchronous compilation and also have an optimized
</span><span class="cx"> // replacement.
</span><ins>+ DFG::Worklist* worklist = DFG::existingGlobalDFGWorklistOrNull();
</ins><span class="cx"> ASSERT(
</span><del>- !vm.worklist
- || !(vm.worklist->compilationState(DFG::CompilationKey(codeBlock, DFG::DFGMode)) != DFG::Worklist::NotKnown
</del><ins>+ !worklist
+ || !(worklist->compilationState(DFG::CompilationKey(codeBlock, DFG::DFGMode)) != DFG::Worklist::NotKnown
</ins><span class="cx"> && codeBlock->hasOptimizedReplacement()));
</span><span class="cx">
</span><span class="cx"> DFG::Worklist::State worklistState;
</span><del>- if (vm.worklist) {
</del><ins>+ if (worklist) {
</ins><span class="cx"> // The call to DFG::Worklist::completeAllReadyPlansForVM() will complete all ready
</span><span class="cx"> // (i.e. compiled) code blocks. But if it completes ours, we also need to know
</span><span class="cx"> // what the result was so that we don't plow ahead and attempt OSR or immediate
</span><span class="lines">@@ -1100,7 +1101,7 @@
</span><span class="cx"> // probably a waste of memory. Our goal here is to complete code blocks as soon as
</span><span class="cx"> // possible in order to minimize the chances of us executing baseline code after
</span><span class="cx"> // optimized code is already available.
</span><del>- worklistState = vm.worklist->completeAllReadyPlansForVM(
</del><ins>+ worklistState = worklist->completeAllReadyPlansForVM(
</ins><span class="cx"> vm, DFG::CompilationKey(codeBlock, DFG::DFGMode));
</span><span class="cx"> } else
</span><span class="cx"> worklistState = DFG::Worklist::NotKnown;
</span><span class="lines">@@ -1186,8 +1187,7 @@
</span><span class="cx">
</span><span class="cx"> CompilationResult result = DFG::compile(
</span><span class="cx"> vm, codeBlock->newReplacement().get(), DFG::DFGMode, bytecodeIndex,
</span><del>- mustHandleValues, JITToDFGDeferredCompilationCallback::create(),
- vm.ensureWorklist());
</del><ins>+ mustHandleValues, JITToDFGDeferredCompilationCallback::create());
</ins><span class="cx">
</span><span class="cx"> if (result != CompilationSuccessful)
</span><span class="cx"> return encodeResult(0, 0);
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/Options.h (161598 => 161599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/Options.h 2014-01-10 00:15:25 UTC (rev 161598)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/Options.h 2014-01-10 00:15:53 UTC (rev 161599)
</span><span class="lines">@@ -143,7 +143,8 @@
</span><span class="cx"> v(bool, ftlCrashes, false) /* fool-proof way of checking that you ended up in the FTL. ;-) */\
</span><span class="cx"> \
</span><span class="cx"> v(bool, enableConcurrentJIT, true) \
</span><del>- v(unsigned, numberOfCompilerThreads, computeNumberOfWorkerThreads(2) - 1) \
</del><ins>+ v(unsigned, numberOfDFGCompilerThreads, computeNumberOfWorkerThreads(2) - 1) \
+ v(unsigned, numberOfFTLCompilerThreads, computeNumberOfWorkerThreads(8) - 1) \
</ins><span class="cx"> \
</span><span class="cx"> v(bool, enableProfiler, false) \
</span><span class="cx"> \
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp (161598 => 161599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp 2014-01-10 00:15:25 UTC (rev 161598)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp 2014-01-10 00:15:53 UTC (rev 161599)
</span><span class="lines">@@ -314,6 +314,16 @@
</span><span class="cx"> m_typedArrayController = adoptRef(new SimpleTypedArrayController());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(DFG_JIT)
+static void cleanWorklist(VM& vm, DFG::Worklist* worklist)
+{
+ if (!worklist)
+ return;
+ worklist->waitUntilAllPlansForVMAreReady(vm);
+ worklist->removeAllReadyPlansForVM(vm);
+}
+#endif // ENABLE(DFG_JIT)
+
</ins><span class="cx"> VM::~VM()
</span><span class="cx"> {
</span><span class="cx"> // Never GC, ever again.
</span><span class="lines">@@ -322,10 +332,8 @@
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> // Make sure concurrent compilations are done, but don't install them, since there is
</span><span class="cx"> // no point to doing so.
</span><del>- if (worklist) {
- worklist->waitUntilAllPlansForVMAreReady(*this);
- worklist->removeAllReadyPlansForVM(*this);
- }
</del><ins>+ cleanWorklist(*this, DFG::existingGlobalDFGWorklistOrNull());
+ cleanWorklist(*this, DFG::existingGlobalFTLWorklistOrNull());
</ins><span class="cx"> #endif // ENABLE(DFG_JIT)
</span><span class="cx">
</span><span class="cx"> // Clear this first to ensure that nobody tries to remove themselves from it.
</span><span class="lines">@@ -499,16 +507,23 @@
</span><span class="cx"> interpreter->stopSampling();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void VM::prepareToDiscardCode()
</del><ins>+#if ENABLE(DFG_JIT)
+static void prepareToDiscardCodeFor(VM& vm, DFG::Worklist* worklist)
</ins><span class="cx"> {
</span><del>-#if ENABLE(DFG_JIT)
</del><span class="cx"> if (!worklist)
</span><span class="cx"> return;
</span><del>-
- worklist->completeAllPlansForVM(*this);
-#endif
</del><ins>+ worklist->completeAllPlansForVM(vm);
</ins><span class="cx"> }
</span><ins>+#endif // ENABLE(DFG_JIT)
</ins><span class="cx">
</span><ins>+void VM::prepareToDiscardCode()
+{
+#if ENABLE(DFG_JIT)
+ prepareToDiscardCodeFor(*this, DFG::existingGlobalDFGWorklistOrNull());
+ prepareToDiscardCodeFor(*this, DFG::existingGlobalFTLWorklistOrNull());
+#endif // ENABLE(DFG_JIT)
+}
+
</ins><span class="cx"> void VM::discardAllCode()
</span><span class="cx"> {
</span><span class="cx"> prepareToDiscardCode();
</span><span class="lines">@@ -749,15 +764,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
-DFG::Worklist* VM::ensureWorklist()
-{
- if (!DFG::enableConcurrentJIT())
- return 0;
- if (!worklist)
- worklist = DFG::globalWorklist();
- return worklist.get();
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(LLINT_C_LOOP)
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/VM.h (161598 => 161599)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/VM.h 2014-01-10 00:15:25 UTC (rev 161598)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/VM.h 2014-01-10 00:15:53 UTC (rev 161599)
</span><span class="lines">@@ -97,7 +97,6 @@
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> namespace DFG {
</span><span class="cx"> class LongLivedState;
</span><del>- class Worklist;
</del><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(DFG_JIT)
</span><span class="cx"> #if ENABLE(FTL_JIT)
</span><span class="lines">@@ -201,10 +200,6 @@
</span><span class="cx">
</span><span class="cx"> void makeUsableFromMultipleThreads() { heap.machineThreads().makeUsableFromMultipleThreads(); }
</span><span class="cx">
</span><del>-#if ENABLE(DFG_JIT)
- DFG::Worklist* ensureWorklist();
-#endif // ENABLE(DFG_JIT)
-
</del><span class="cx"> private:
</span><span class="cx"> RefPtr<JSLock> m_apiLock;
</span><span class="cx">
</span><span class="lines">@@ -221,7 +216,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> OwnPtr<DFG::LongLivedState> dfgState;
</span><del>- RefPtr<DFG::Worklist> worklist;
</del><span class="cx"> #endif // ENABLE(DFG_JIT)
</span><span class="cx">
</span><span class="cx"> VMType vmType;
</span></span></pre>
</div>
</div>
</body>
</html>