<!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>[208811] 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/208811">208811</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-11-16 14:24:45 -0800 (Wed, 16 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Slight Octane regression from concurrent GC's eager object zero-fill
https://bugs.webkit.org/show_bug.cgi?id=164823
Reviewed by Geoffrey Garen.
During concurrent GC, we need to eagerly zero-fill objects we allocate prior to
executing the end-of-allocation fence. This causes some regressions. This is an attempt
to fix those regressions by making them conditional on whether the mutator is fenced.
This is a slight speed-up on raytrace and boyer, and hopefully it will fix the
regression.
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileMaterializeNewObject):
(JSC::FTL::DFG::LowerDFGToB3::splatWordsIfMutatorIsFenced):
(JSC::FTL::DFG::LowerDFGToB3::allocatePropertyStorage):
(JSC::FTL::DFG::LowerDFGToB3::reallocatePropertyStorage):
(JSC::FTL::DFG::LowerDFGToB3::allocateObject):
(JSC::FTL::DFG::LowerDFGToB3::mutatorFence):
(JSC::FTL::DFG::LowerDFGToB3::setButterfly):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208810 => 208811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-16 22:12:48 UTC (rev 208810)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-16 22:24:45 UTC (rev 208811)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-11-16 Filip Pizlo <fpizlo@apple.com>
+
+ Slight Octane regression from concurrent GC's eager object zero-fill
+ https://bugs.webkit.org/show_bug.cgi?id=164823
+
+ Reviewed by Geoffrey Garen.
+
+ During concurrent GC, we need to eagerly zero-fill objects we allocate prior to
+ executing the end-of-allocation fence. This causes some regressions. This is an attempt
+ to fix those regressions by making them conditional on whether the mutator is fenced.
+
+ This is a slight speed-up on raytrace and boyer, and hopefully it will fix the
+ regression.
+
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::compileMaterializeNewObject):
+ (JSC::FTL::DFG::LowerDFGToB3::splatWordsIfMutatorIsFenced):
+ (JSC::FTL::DFG::LowerDFGToB3::allocatePropertyStorage):
+ (JSC::FTL::DFG::LowerDFGToB3::reallocatePropertyStorage):
+ (JSC::FTL::DFG::LowerDFGToB3::allocateObject):
+ (JSC::FTL::DFG::LowerDFGToB3::mutatorFence):
+ (JSC::FTL::DFG::LowerDFGToB3::setButterfly):
+
</ins><span class="cx"> 2016-11-16 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix exception scope checking in JSGlobalObject.cpp.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp (208810 => 208811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2016-11-16 22:12:48 UTC (rev 208810)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2016-11-16 22:24:45 UTC (rev 208811)
</span><span class="lines">@@ -8134,7 +8134,7 @@
</span><span class="cx">
</span><span class="cx"> ValueFromBlock haveButterfly = m_out.anchor(fastButterflyValue);
</span><span class="cx">
</span><del>- splatWords(
</del><ins>+ splatWordsIfMutatorIsFenced(
</ins><span class="cx"> fastButterflyValue,
</span><span class="cx"> m_out.constInt32(-structure->outOfLineCapacity() - 1),
</span><span class="cx"> m_out.constInt32(-1),
</span><span class="lines">@@ -8960,6 +8960,25 @@
</span><span class="cx"> splatWords(butterfly, begin, end, hole, heap->atAnyIndex());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void splatWordsIfMutatorIsFenced(LValue base, LValue begin, LValue end, LValue value, const AbstractHeap& heap)
+ {
+ LBasicBlock slowPath = m_out.newBlock();
+ LBasicBlock continuation = m_out.newBlock();
+
+ LBasicBlock lastNext = m_out.insertNewBlocksBefore(slowPath);
+
+ m_out.branch(
+ m_out.load8ZeroExt32(m_out.absolute(vm().heap.addressOfMutatorShouldBeFenced())),
+ rarely(slowPath), usually(continuation));
+
+ m_out.appendTo(slowPath, continuation);
+
+ splatWords(base, begin, end, value, heap);
+ m_out.jump(continuation);
+
+ m_out.appendTo(continuation, lastNext);
+ }
+
</ins><span class="cx"> void splatWords(LValue base, LValue begin, LValue end, LValue value, const AbstractHeap& heap)
</span><span class="cx"> {
</span><span class="cx"> const uint64_t unrollingLimit = 10;
</span><span class="lines">@@ -9013,7 +9032,7 @@
</span><span class="cx">
</span><span class="cx"> LValue result = allocatePropertyStorageWithSizeImpl(initialOutOfLineCapacity);
</span><span class="cx">
</span><del>- splatWords(
</del><ins>+ splatWordsIfMutatorIsFenced(
</ins><span class="cx"> result,
</span><span class="cx"> m_out.constInt32(-initialOutOfLineCapacity - 1), m_out.constInt32(-1),
</span><span class="cx"> m_out.int64Zero, m_heaps.properties.atAnyNumber());
</span><span class="lines">@@ -9046,7 +9065,7 @@
</span><span class="cx"> m_out.storePtr(loaded, m_out.address(m_heaps.properties.atAnyNumber(), result, offset));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- splatWords(
</del><ins>+ splatWordsIfMutatorIsFenced(
</ins><span class="cx"> result,
</span><span class="cx"> m_out.constInt32(-newSize - 1), m_out.constInt32(-oldSize - 1),
</span><span class="cx"> m_out.int64Zero, m_heaps.properties.atAnyNumber());
</span><span class="lines">@@ -9926,7 +9945,7 @@
</span><span class="cx"> LValue allocator, Structure* structure, LValue butterfly, LBasicBlock slowPath)
</span><span class="cx"> {
</span><span class="cx"> LValue result = allocateCell(allocator, structure, slowPath);
</span><del>- splatWords(
</del><ins>+ splatWordsIfMutatorIsFenced(
</ins><span class="cx"> result,
</span><span class="cx"> m_out.constInt32(JSFinalObject::offsetOfInlineStorage() / 8),
</span><span class="cx"> m_out.constInt32(JSFinalObject::offsetOfInlineStorage() / 8 + structure->inlineCapacity()),
</span><span class="lines">@@ -12585,7 +12604,7 @@
</span><span class="cx"> m_out.load8ZeroExt32(m_out.absolute(vm().heap.addressOfMutatorShouldBeFenced())),
</span><span class="cx"> rarely(slowPath), usually(continuation));
</span><span class="cx">
</span><del>- m_out.appendTo(slowPath);
</del><ins>+ m_out.appendTo(slowPath, continuation);
</ins><span class="cx">
</span><span class="cx"> m_out.fence(&m_heaps.root, nullptr);
</span><span class="cx"> m_out.jump(continuation);
</span><span class="lines">@@ -12612,12 +12631,12 @@
</span><span class="cx"> m_out.load8ZeroExt32(m_out.absolute(vm().heap.addressOfMutatorShouldBeFenced())),
</span><span class="cx"> rarely(slowPath), usually(fastPath));
</span><span class="cx">
</span><del>- m_out.appendTo(fastPath);
</del><ins>+ m_out.appendTo(fastPath, slowPath);
</ins><span class="cx">
</span><span class="cx"> m_out.storePtr(butterfly, object, m_heaps.JSObject_butterfly);
</span><span class="cx"> m_out.jump(continuation);
</span><span class="cx">
</span><del>- m_out.appendTo(slowPath);
</del><ins>+ m_out.appendTo(slowPath, continuation);
</ins><span class="cx">
</span><span class="cx"> m_out.fence(&m_heaps.root, nullptr);
</span><span class="cx"> m_out.storePtr(butterfly, object, m_heaps.JSObject_butterfly);
</span></span></pre>
</div>
</div>
</body>
</html>