<!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>[200531] 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/200531">200531</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-05-06 15:57:32 -0700 (Fri, 06 May 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add JSC options reportBaselineCompileTimes and reportDFGCompileTimes.
https://bugs.webkit.org/show_bug.cgi?id=157427

Reviewed by Filip Pizlo and Keith Miller.

The compile times reporting options are now:
    reportCompileTimes         -&gt; report compile times in all tiers.
    reportBaselineCompileTimes -&gt; report compile times in baseline JIT.
    reportDFGCompileTimes      -&gt; report compile times in DFG and FTL.
    reportFTLCompileTimes      -&gt; report compile times in FTL.

Also updated reportTotalCompileTimes() to collect stats that include the baseline
JIT.  compileTimeStats() is now moved into JIT.cpp (from DFGPlan.cpp). 

* dfg/DFGPlan.cpp:
(JSC::DFG::Plan::reportCompileTimes):
(JSC::DFG::Plan::compileInThread):
(JSC::DFG::Plan::compileInThreadImpl):
(JSC::DFG::Plan::cancel):
(JSC::DFG::Plan::compileTimeStats): Deleted.
* dfg/DFGPlan.h:
(JSC::DFG::Plan::compileTimeStats): Deleted.
* jit/JIT.cpp:
(JSC::ctiPatchCallByReturnAddress):
(JSC::JIT::privateCompile):
(JSC::JIT::stackPointerOffsetFor):
(JSC::JIT::reportCompileTimes):
(JSC::JIT::computeCompileTimes):
(JSC::JIT::compileTimeStats):
* jit/JIT.h:
(JSC::JIT::shouldEmitProfiling):
* jsc.cpp:
(runJSC):
* runtime/Options.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPlancpp">trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPlanh">trunk/Source/JavaScriptCore/dfg/DFGPlan.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITcpp">trunk/Source/JavaScriptCore/jit/JIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITh">trunk/Source/JavaScriptCore/jit/JIT.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionsh">trunk/Source/JavaScriptCore/runtime/Options.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (200530 => 200531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-05-06 22:47:16 UTC (rev 200530)
+++ trunk/Source/JavaScriptCore/ChangeLog        2016-05-06 22:57:32 UTC (rev 200531)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-05-06  Mark Lam  &lt;mark.lam@apple.com&gt;
+
+        Add JSC options reportBaselineCompileTimes and reportDFGCompileTimes.
+        https://bugs.webkit.org/show_bug.cgi?id=157427
+
+        Reviewed by Filip Pizlo and Keith Miller.
+
+        The compile times reporting options are now:
+            reportCompileTimes         -&gt; report compile times in all tiers.
+            reportBaselineCompileTimes -&gt; report compile times in baseline JIT.
+            reportDFGCompileTimes      -&gt; report compile times in DFG and FTL.
+            reportFTLCompileTimes      -&gt; report compile times in FTL.
+
+        Also updated reportTotalCompileTimes() to collect stats that include the baseline
+        JIT.  compileTimeStats() is now moved into JIT.cpp (from DFGPlan.cpp). 
+
+        * dfg/DFGPlan.cpp:
+        (JSC::DFG::Plan::reportCompileTimes):
+        (JSC::DFG::Plan::compileInThread):
+        (JSC::DFG::Plan::compileInThreadImpl):
+        (JSC::DFG::Plan::cancel):
+        (JSC::DFG::Plan::compileTimeStats): Deleted.
+        * dfg/DFGPlan.h:
+        (JSC::DFG::Plan::compileTimeStats): Deleted.
+        * jit/JIT.cpp:
+        (JSC::ctiPatchCallByReturnAddress):
+        (JSC::JIT::privateCompile):
+        (JSC::JIT::stackPointerOffsetFor):
+        (JSC::JIT::reportCompileTimes):
+        (JSC::JIT::computeCompileTimes):
+        (JSC::JIT::compileTimeStats):
+        * jit/JIT.h:
+        (JSC::JIT::shouldEmitProfiling):
+        * jsc.cpp:
+        (runJSC):
+        * runtime/Options.h:
+
</ins><span class="cx"> 2016-05-05  Benjamin Poulain  &lt;bpoulain@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [JSC] Get rid of NonNegZeroDouble, it is broken
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPlancpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp (200530 => 200531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp        2016-05-06 22:47:16 UTC (rev 200530)
+++ trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp        2016-05-06 22:57:32 UTC (rev 200531)
</span><span class="lines">@@ -90,15 +90,19 @@
</span><span class="cx"> #include &quot;FTLState.h&quot;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+namespace JSC {
+
+extern double totalDFGCompileTime;
+extern double totalFTLCompileTime;
+extern double totalFTLDFGCompileTime;
+extern double totalFTLB3CompileTime;
+
+}
+
</ins><span class="cx"> namespace JSC { namespace DFG {
</span><span class="cx"> 
</span><span class="cx"> namespace {
</span><span class="cx"> 
</span><del>-double totalDFGCompileTime;
-double totalFTLCompileTime;
-double totalFTLDFGCompileTime;
-double totalFTLB3CompileTime;
-
</del><span class="cx"> void dumpAndVerifyGraph(Graph&amp; graph, const char* text, bool forceDump = false)
</span><span class="cx"> {
</span><span class="cx">     GraphDumpMode modeForFinalValidate = DumpGraph;
</span><span class="lines">@@ -160,6 +164,7 @@
</span><span class="cx"> bool Plan::reportCompileTimes() const
</span><span class="cx"> {
</span><span class="cx">     return Options::reportCompileTimes()
</span><ins>+        || Options::reportDFGCompileTimes()
</ins><span class="cx">         || (Options::reportFTLCompileTimes() &amp;&amp; isFTL(mode));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -169,9 +174,9 @@
</span><span class="cx">     
</span><span class="cx">     double before = 0;
</span><span class="cx">     CString codeBlockName;
</span><del>-    if (computeCompileTimes())
</del><ins>+    if (UNLIKELY(computeCompileTimes()))
</ins><span class="cx">         before = monotonicallyIncreasingTimeMS();
</span><del>-    if (reportCompileTimes())
</del><ins>+    if (UNLIKELY(reportCompileTimes()))
</ins><span class="cx">         codeBlockName = toCString(*codeBlock);
</span><span class="cx">     
</span><span class="cx">     CompilationScope compilationScope;
</span><span class="lines">@@ -185,19 +190,19 @@
</span><span class="cx">     RELEASE_ASSERT((path == CancelPath) == (stage == Cancelled));
</span><span class="cx">     
</span><span class="cx">     double after = 0;
</span><del>-    if (computeCompileTimes())
</del><ins>+    if (UNLIKELY(computeCompileTimes())) {
</ins><span class="cx">         after = monotonicallyIncreasingTimeMS();
</span><span class="cx">     
</span><del>-    if (Options::reportTotalCompileTimes()) {
-        if (isFTL(mode)) {
-            totalFTLCompileTime += after - before;
-            totalFTLDFGCompileTime += m_timeBeforeFTL - before;
-            totalFTLB3CompileTime += after - m_timeBeforeFTL;
-        } else
-            totalDFGCompileTime += after - before;
</del><ins>+        if (Options::reportTotalCompileTimes()) {
+            if (isFTL(mode)) {
+                totalFTLCompileTime += after - before;
+                totalFTLDFGCompileTime += m_timeBeforeFTL - before;
+                totalFTLB3CompileTime += after - m_timeBeforeFTL;
+            } else
+                totalDFGCompileTime += after - before;
+        }
</ins><span class="cx">     }
</span><del>-    
-    if (reportCompileTimes()) {
</del><ins>+    if (UNLIKELY(reportCompileTimes())) {
</ins><span class="cx">         const char* pathName;
</span><span class="cx">         switch (path) {
</span><span class="cx">         case FailPath:
</span><span class="lines">@@ -458,7 +463,7 @@
</span><span class="cx">         FTL::State state(dfg);
</span><span class="cx">         FTL::lowerDFGToB3(state);
</span><span class="cx">         
</span><del>-        if (computeCompileTimes())
</del><ins>+        if (UNLIKELY(computeCompileTimes()))
</ins><span class="cx">             m_timeBeforeFTL = monotonicallyIncreasingTimeMS();
</span><span class="cx">         
</span><span class="cx">         if (Options::b3AlwaysFailsBeforeCompile()) {
</span><span class="lines">@@ -651,19 +656,6 @@
</span><span class="cx">     stage = Cancelled;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-HashMap&lt;CString, double&gt; Plan::compileTimeStats()
-{
-    HashMap&lt;CString, double&gt; result;
-    if (Options::reportTotalCompileTimes()) {
-        result.add(&quot;Compile Time&quot;, totalDFGCompileTime + totalFTLCompileTime);
-        result.add(&quot;DFG Compile Time&quot;, totalDFGCompileTime);
-        result.add(&quot;FTL Compile Time&quot;, totalFTLCompileTime);
-        result.add(&quot;FTL (DFG) Compile Time&quot;, totalFTLDFGCompileTime);
-        result.add(&quot;FTL (B3) Compile Time&quot;, totalFTLB3CompileTime);
-    }
-    return result;
-}
-
</del><span class="cx"> } } // namespace JSC::DFG
</span><span class="cx"> 
</span><span class="cx"> #endif // ENABLE(DFG_JIT)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPlanh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPlan.h (200530 => 200531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPlan.h        2016-05-06 22:47:16 UTC (rev 200530)
+++ trunk/Source/JavaScriptCore/dfg/DFGPlan.h        2016-05-06 22:57:32 UTC (rev 200531)
</span><span class="lines">@@ -110,8 +110,6 @@
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;DeferredCompilationCallback&gt; callback;
</span><span class="cx"> 
</span><del>-    JS_EXPORT_PRIVATE static HashMap&lt;CString, double&gt; compileTimeStats();
-
</del><span class="cx"> private:
</span><span class="cx">     bool computeCompileTimes() const;
</span><span class="cx">     bool reportCompileTimes() const;
</span><span class="lines">@@ -125,14 +123,6 @@
</span><span class="cx">     double m_timeBeforeFTL;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-#else // ENABLE(DFG_JIT)
-
-class Plan : public RefCounted&lt;Plan&gt; {
-    // Dummy class to allow !ENABLE(DFG_JIT) to build.
-public:
-    static HashMap&lt;CString, double&gt; compileTimeStats() { return HashMap&lt;CString, double&gt;(); }
-};
-
</del><span class="cx"> #endif // ENABLE(DFG_JIT)
</span><span class="cx"> 
</span><span class="cx"> } } // namespace JSC::DFG
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.cpp (200530 => 200531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.cpp        2016-05-06 22:47:16 UTC (rev 200530)
+++ trunk/Source/JavaScriptCore/jit/JIT.cpp        2016-05-06 22:57:32 UTC (rev 200531)
</span><span class="lines">@@ -52,6 +52,12 @@
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span><ins>+double totalBaselineCompileTime;
+double totalDFGCompileTime;
+double totalFTLCompileTime;
+double totalFTLDFGCompileTime;
+double totalFTLB3CompileTime;
+
</ins><span class="cx"> void ctiPatchCallByReturnAddress(ReturnAddressPtr returnAddress, FunctionPtr newCalleeFunction)
</span><span class="cx"> {
</span><span class="cx">     MacroAssembler::repatchCall(
</span><span class="lines">@@ -484,6 +490,10 @@
</span><span class="cx"> 
</span><span class="cx"> CompilationResult JIT::privateCompile(JITCompilationEffort effort)
</span><span class="cx"> {
</span><ins>+    double before = 0;
+    if (UNLIKELY(computeCompileTimes()))
+        before = monotonicallyIncreasingTimeMS();
+
</ins><span class="cx">     DFG::CapabilityLevel level = m_codeBlock-&gt;capabilityLevel();
</span><span class="cx">     switch (level) {
</span><span class="cx">     case DFG::CannotCompile:
</span><span class="lines">@@ -741,7 +751,20 @@
</span><span class="cx">     m_codeBlock-&gt;shrinkToFit(CodeBlock::LateShrink);
</span><span class="cx">     m_codeBlock-&gt;setJITCode(
</span><span class="cx">         adoptRef(new DirectJITCode(result, withArityCheck, JITCode::BaselineJIT)));
</span><del>-    
</del><ins>+
+    double after;
+    if (UNLIKELY(computeCompileTimes())) {
+        after = monotonicallyIncreasingTimeMS();
+
+        if (Options::reportTotalCompileTimes())
+            totalBaselineCompileTime += after - before;
+    }
+    if (UNLIKELY(reportCompileTimes())) {
+        CString codeBlockName = toCString(*m_codeBlock);
+        
+        dataLog(&quot;Optimized &quot;, codeBlockName, &quot; with Baseline JIT into &quot;, patchBuffer.size(), &quot; bytes in &quot;, after - before, &quot; ms.\n&quot;);
+    }
+
</ins><span class="cx"> #if ENABLE(JIT_VERBOSE)
</span><span class="cx">     dataLogF(&quot;JIT generated code for %p at [%p, %p).\n&quot;, m_codeBlock, result.executableMemory()-&gt;start(), result.executableMemory()-&gt;end());
</span><span class="cx"> #endif
</span><span class="lines">@@ -801,6 +824,34 @@
</span><span class="cx">     return virtualRegisterForLocal(frameRegisterCountFor(codeBlock) - 1).offset();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool JIT::reportCompileTimes()
+{
+    return Options::reportCompileTimes() || Options::reportBaselineCompileTimes();
+}
+
+bool JIT::computeCompileTimes()
+{
+    return reportCompileTimes() || Options::reportTotalCompileTimes();
+}
+
+HashMap&lt;CString, double&gt; JIT::compileTimeStats()
+{
+    HashMap&lt;CString, double&gt; result;
+    if (Options::reportTotalCompileTimes()) {
+        result.add(&quot;Total Compile Time&quot;, totalBaselineCompileTime + totalDFGCompileTime + totalFTLCompileTime);
+        result.add(&quot;Baseline Compile Time&quot;, totalBaselineCompileTime);
+#if ENABLE(DFG_JIT)
+        result.add(&quot;DFG Compile Time&quot;, totalDFGCompileTime);
+#if ENABLE(FTL_JIT)
+        result.add(&quot;FTL Compile Time&quot;, totalFTLCompileTime);
+        result.add(&quot;FTL (DFG) Compile Time&quot;, totalFTLDFGCompileTime);
+        result.add(&quot;FTL (B3) Compile Time&quot;, totalFTLB3CompileTime);
+#endif // ENABLE(FTL_JIT)
+#endif // ENABLE(DFG_JIT)
+    }
+    return result;
+}
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx"> 
</span><span class="cx"> #endif // ENABLE(JIT)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.h (200530 => 200531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.h        2016-05-06 22:47:16 UTC (rev 200530)
+++ trunk/Source/JavaScriptCore/jit/JIT.h        2016-05-06 22:57:32 UTC (rev 200531)
</span><span class="lines">@@ -253,6 +253,8 @@
</span><span class="cx">         static unsigned frameRegisterCountFor(CodeBlock*);
</span><span class="cx">         static int stackPointerOffsetFor(CodeBlock*);
</span><span class="cx"> 
</span><ins>+        JS_EXPORT_PRIVATE static HashMap&lt;CString, double&gt; compileTimeStats();
+
</ins><span class="cx">     private:
</span><span class="cx">         JIT(VM*, CodeBlock* = 0);
</span><span class="cx"> 
</span><span class="lines">@@ -897,6 +899,9 @@
</span><span class="cx">         bool shouldEmitProfiling() { return false; }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+        static bool reportCompileTimes();
+        static bool computeCompileTimes();
+
</ins><span class="cx">         Interpreter* m_interpreter;
</span><span class="cx"> 
</span><span class="cx">         Vector&lt;CallRecord&gt; m_calls;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (200530 => 200531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp        2016-05-06 22:47:16 UTC (rev 200530)
+++ trunk/Source/JavaScriptCore/jsc.cpp        2016-05-06 22:57:32 UTC (rev 200531)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include &quot;CodeBlock.h&quot;
</span><span class="cx"> #include &quot;Completion.h&quot;
</span><span class="cx"> #include &quot;CopiedSpaceInlines.h&quot;
</span><del>-#include &quot;DFGPlan.h&quot;
</del><span class="cx"> #include &quot;Disassembler.h&quot;
</span><span class="cx"> #include &quot;Exception.h&quot;
</span><span class="cx"> #include &quot;ExceptionHelpers.h&quot;
</span><span class="lines">@@ -39,6 +38,7 @@
</span><span class="cx"> #include &quot;HeapStatistics.h&quot;
</span><span class="cx"> #include &quot;InitializeThreading.h&quot;
</span><span class="cx"> #include &quot;Interpreter.h&quot;
</span><ins>+#include &quot;JIT.h&quot;
</ins><span class="cx"> #include &quot;JSArray.h&quot;
</span><span class="cx"> #include &quot;JSArrayBuffer.h&quot;
</span><span class="cx"> #include &quot;JSCInlines.h&quot;
</span><span class="lines">@@ -2264,14 +2264,15 @@
</span><span class="cx">         printf(&quot;JSC OSR EXIT FUZZ: encountered %u static checks.\n&quot;, numberOfStaticOSRExitFuzzChecks());
</span><span class="cx">         printf(&quot;JSC OSR EXIT FUZZ: encountered %u dynamic checks.\n&quot;, numberOfOSRExitFuzzChecks());
</span><span class="cx">     }
</span><del>-#endif
-    auto compileTimeStats = DFG::Plan::compileTimeStats();
</del><ins>+
+    auto compileTimeStats = JIT::compileTimeStats();
</ins><span class="cx">     Vector&lt;CString&gt; compileTimeKeys;
</span><span class="cx">     for (auto&amp; entry : compileTimeStats)
</span><span class="cx">         compileTimeKeys.append(entry.key);
</span><span class="cx">     std::sort(compileTimeKeys.begin(), compileTimeKeys.end());
</span><span class="cx">     for (CString key : compileTimeKeys)
</span><span class="cx">         printf(&quot;%40s: %.3lf ms\n&quot;, key.data(), compileTimeStats.get(key));
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx">     return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (200530 => 200531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h        2016-05-06 22:47:16 UTC (rev 200530)
+++ trunk/Source/JavaScriptCore/runtime/Options.h        2016-05-06 22:57:32 UTC (rev 200531)
</span><span class="lines">@@ -168,7 +168,9 @@
</span><span class="cx">     v(bool, verboseFTLOSRExit, false, Normal, nullptr) \
</span><span class="cx">     v(bool, verboseCallLink, false, Normal, nullptr) \
</span><span class="cx">     v(bool, verboseCompilationQueue, false, Normal, nullptr) \
</span><del>-    v(bool, reportCompileTimes, false, Normal, &quot;dumps JS function signature and the time it took to compile&quot;) \
</del><ins>+    v(bool, reportCompileTimes, false, Normal, &quot;dumps JS function signature and the time it took to compile in all tiers&quot;) \
+    v(bool, reportBaselineCompileTimes, false, Normal, &quot;dumps JS function signature and the time it took to BaselineJIT compile&quot;) \
+    v(bool, reportDFGCompileTimes, false, Normal, &quot;dumps JS function signature and the time it took to DFG and FTL compile&quot;) \
</ins><span class="cx">     v(bool, reportFTLCompileTimes, false, Normal, &quot;dumps JS function signature and the time it took to FTL compile&quot;) \
</span><span class="cx">     v(bool, reportTotalCompileTimes, false, Normal, nullptr) \
</span><span class="cx">     v(bool, verboseCFA, false, Normal, nullptr) \
</span></span></pre>
</div>
</div>

</body>
</html>