<!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>[208317] 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/208317">208317</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2016-11-02 17:44:42 -0700 (Wed, 02 Nov 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>MarkedSpace should have specialized size classes for popular engine objects.
&lt;https://webkit.org/b/164345&gt;

Reviewed by Filip Pizlo.

The MarkedSpace size classes were recently reworked to minimize wasted space
at the end of MarkedBlocks.

However, we know that some specific objects will be allocated in very high volume.
Adding specialized size classes for those object sizes achieves greater utilization
since we're basically guaranteed to allocate them all the time.

Inject specialized size classes for these four objects:

    - FunctionCodeBlock
        560 bytes instead of 624
        28 per block instead of 26 (+2)

    - FunctionExecutable
        176 bytes instead of 224
        92 per block instead of 72 (+20)

    - UnlinkedFunctionCodeBlock
        256 bytes instead of 320
        63 per block instead of 50 (+13)

    - UnlinkedFunctionExecutable
        192 bytes instead of 224
        84 per block instead of 72 (+12)

* heap/MarkedSpace.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedSpacecpp">trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208316 => 208317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-11-03 00:37:19 UTC (rev 208316)
+++ trunk/Source/JavaScriptCore/ChangeLog        2016-11-03 00:44:42 UTC (rev 208317)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2016-11-02  Andreas Kling  &lt;akling@apple.com&gt;
+
+        MarkedSpace should have specialized size classes for popular engine objects.
+        &lt;https://webkit.org/b/164345&gt;
+
+        Reviewed by Filip Pizlo.
+
+        The MarkedSpace size classes were recently reworked to minimize wasted space
+        at the end of MarkedBlocks.
+
+        However, we know that some specific objects will be allocated in very high volume.
+        Adding specialized size classes for those object sizes achieves greater utilization
+        since we're basically guaranteed to allocate them all the time.
+
+        Inject specialized size classes for these four objects:
+
+            - FunctionCodeBlock
+                560 bytes instead of 624
+                28 per block instead of 26 (+2)
+
+            - FunctionExecutable
+                176 bytes instead of 224
+                92 per block instead of 72 (+20)
+
+            - UnlinkedFunctionCodeBlock
+                256 bytes instead of 320
+                63 per block instead of 50 (+13)
+
+            - UnlinkedFunctionExecutable
+                192 bytes instead of 224
+                84 per block instead of 72 (+12)
+
+        * heap/MarkedSpace.cpp:
+
</ins><span class="cx"> 2016-11-02  Geoffrey Garen  &lt;ggaren@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         One file per class for UnlinkedCodeBlock.h/.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedSpacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp (208316 => 208317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp        2016-11-03 00:37:19 UTC (rev 208316)
+++ trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp        2016-11-03 00:44:42 UTC (rev 208317)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;MarkedSpace.h&quot;
</span><span class="cx"> 
</span><ins>+#include &quot;FunctionCodeBlock.h&quot;
</ins><span class="cx"> #include &quot;IncrementalSweeper.h&quot;
</span><span class="cx"> #include &quot;JSObject.h&quot;
</span><span class="cx"> #include &quot;JSCInlines.h&quot;
</span><span class="lines">@@ -43,6 +44,7 @@
</span><span class="cx">             result = new Vector&lt;size_t&gt;();
</span><span class="cx">             
</span><span class="cx">             auto add = [&amp;] (size_t sizeClass) {
</span><ins>+                sizeClass = WTF::roundUpToMultipleOf&lt;MarkedBlock::atomSize&gt;(sizeClass);
</ins><span class="cx">                 if (Options::dumpSizeClasses())
</span><span class="cx">                     dataLog(&quot;Adding JSC MarkedSpace size class: &quot;, sizeClass, &quot;\n&quot;);
</span><span class="cx">                 // Perform some validation as we go.
</span><span class="lines">@@ -49,8 +51,6 @@
</span><span class="cx">                 RELEASE_ASSERT(!(sizeClass % MarkedSpace::sizeStep));
</span><span class="cx">                 if (result-&gt;isEmpty())
</span><span class="cx">                     RELEASE_ASSERT(sizeClass == MarkedSpace::sizeStep);
</span><del>-                else
-                    RELEASE_ASSERT(sizeClass &gt; result-&gt;last());
</del><span class="cx">                 result-&gt;append(sizeClass);
</span><span class="cx">             };
</span><span class="cx">             
</span><span class="lines">@@ -129,7 +129,19 @@
</span><span class="cx">                 
</span><span class="cx">                 add(betterSizeClass);
</span><span class="cx">             }
</span><del>-            
</del><ins>+
+            add(sizeof(UnlinkedFunctionExecutable));
+            add(sizeof(UnlinkedFunctionCodeBlock));
+            add(sizeof(FunctionExecutable));
+            add(sizeof(FunctionCodeBlock));
+
+            {
+                // Sort and deduplicate.
+                std::sort(result-&gt;begin(), result-&gt;end());
+                auto it = std::unique(result-&gt;begin(), result-&gt;end());
+                result-&gt;shrinkCapacity(it - result-&gt;begin());
+            }
+
</ins><span class="cx">             if (Options::dumpSizeClasses())
</span><span class="cx">                 dataLog(&quot;JSC Heap MarkedSpace size class dump: &quot;, listDump(*result), &quot;\n&quot;);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>