<!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>[277346] 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/277346">277346</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2021-05-11 17:52:09 -0700 (Tue, 11 May 2021)</dd>
</dl>
<h3>Log Message</h3>
<pre>ConservativeRoots triggers page demand on Speedometer
https://bugs.webkit.org/show_bug.cgi?id=225676
Reviewed by Saam Barati.
Use a Vector instead of OSAllocator to avoid mmap() and page fault --
and, like, come on.
Bump default inlineCapacity up to 1024 because we seem to overflow
frequently.
* heap/ConservativeRoots.cpp:
(JSC::ConservativeRoots::ConservativeRoots):
(JSC::ConservativeRoots::~ConservativeRoots):
(JSC::ConservativeRoots::genericAddPointer):
(JSC::ConservativeRoots::grow): Deleted.
* heap/ConservativeRoots.h:
(JSC::ConservativeRoots::roots const):
(JSC::ConservativeRoots::size const): Deleted.
* heap/SlotVisitor.cpp:
(JSC::SlotVisitor::append):
* heap/VerifierSlotVisitor.cpp:
(JSC::VerifierSlotVisitor::append):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapConservativeRootscpp">trunk/Source/JavaScriptCore/heap/ConservativeRoots.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapConservativeRootsh">trunk/Source/JavaScriptCore/heap/ConservativeRoots.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapSlotVisitorcpp">trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapVerifierSlotVisitorcpp">trunk/Source/JavaScriptCore/heap/VerifierSlotVisitor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (277345 => 277346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2021-05-12 00:46:17 UTC (rev 277345)
+++ trunk/Source/JavaScriptCore/ChangeLog 2021-05-12 00:52:09 UTC (rev 277346)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2021-05-11 Geoffrey Garen <ggaren@apple.com>
+
+ ConservativeRoots triggers page demand on Speedometer
+ https://bugs.webkit.org/show_bug.cgi?id=225676
+
+ Reviewed by Saam Barati.
+
+ Use a Vector instead of OSAllocator to avoid mmap() and page fault --
+ and, like, come on.
+
+ Bump default inlineCapacity up to 1024 because we seem to overflow
+ frequently.
+
+ * heap/ConservativeRoots.cpp:
+ (JSC::ConservativeRoots::ConservativeRoots):
+ (JSC::ConservativeRoots::~ConservativeRoots):
+ (JSC::ConservativeRoots::genericAddPointer):
+ (JSC::ConservativeRoots::grow): Deleted.
+ * heap/ConservativeRoots.h:
+ (JSC::ConservativeRoots::roots const):
+ (JSC::ConservativeRoots::size const): Deleted.
+ * heap/SlotVisitor.cpp:
+ (JSC::SlotVisitor::append):
+ * heap/VerifierSlotVisitor.cpp:
+ (JSC::VerifierSlotVisitor::append):
+
</ins><span class="cx"> 2021-05-10 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Tune number of threads for AS
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapConservativeRootscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/ConservativeRoots.cpp (277345 => 277346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/ConservativeRoots.cpp 2021-05-12 00:46:17 UTC (rev 277345)
+++ trunk/Source/JavaScriptCore/heap/ConservativeRoots.cpp 2021-05-12 00:52:09 UTC (rev 277346)
</span><span class="lines">@@ -38,30 +38,14 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> ConservativeRoots::ConservativeRoots(Heap& heap)
</span><del>- : m_roots(m_inlineRoots)
- , m_size(0)
- , m_capacity(inlineCapacity)
- , m_heap(heap)
</del><ins>+ : m_heap(heap)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ConservativeRoots::~ConservativeRoots()
</span><span class="cx"> {
</span><del>- if (m_roots != m_inlineRoots)
- OSAllocator::decommitAndRelease(m_roots, m_capacity * sizeof(HeapCell*));
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void ConservativeRoots::grow()
-{
- size_t newCapacity = m_capacity == inlineCapacity ? nonInlineCapacity : m_capacity * 2;
- HeapCell** newRoots = static_cast<HeapCell**>(OSAllocator::reserveAndCommit(newCapacity * sizeof(HeapCell*)));
- memcpy(newRoots, m_roots, m_size * sizeof(HeapCell*));
- if (m_roots != m_inlineRoots)
- OSAllocator::decommitAndRelease(m_roots, m_capacity * sizeof(HeapCell*));
- m_capacity = newCapacity;
- m_roots = newRoots;
-}
-
</del><span class="cx"> template<typename MarkHook>
</span><span class="cx"> inline void ConservativeRoots::genericAddPointer(void* p, HeapVersion markingVersion, HeapVersion newlyAllocatedVersion, TinyBloomFilter filter, MarkHook& markHook)
</span><span class="cx"> {
</span><span class="lines">@@ -74,10 +58,7 @@
</span><span class="cx"> if (isJSCellKind(cellKind))
</span><span class="cx"> markHook.markKnownJSCell(static_cast<JSCell*>(p));
</span><span class="cx">
</span><del>- if (m_size == m_capacity)
- grow();
-
- m_roots[m_size++] = bitwise_cast<HeapCell*>(p);
</del><ins>+ m_roots.append(bitwise_cast<HeapCell*>(p));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapConservativeRootsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/ConservativeRoots.h (277345 => 277346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/ConservativeRoots.h 2021-05-12 00:46:17 UTC (rev 277345)
+++ trunk/Source/JavaScriptCore/heap/ConservativeRoots.h 2021-05-12 00:52:09 UTC (rev 277346)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> class JITStubRoutineSet;
</span><span class="cx">
</span><span class="cx"> class ConservativeRoots {
</span><ins>+ static constexpr size_t inlineCapacity = 1024;
+
</ins><span class="cx"> public:
</span><span class="cx"> ConservativeRoots(Heap&);
</span><span class="cx"> ~ConservativeRoots();
</span><span class="lines">@@ -41,13 +43,9 @@
</span><span class="cx"> void add(void* begin, void* end);
</span><span class="cx"> void add(void* begin, void* end, JITStubRoutineSet&, CodeBlockSet&);
</span><span class="cx">
</span><del>- size_t size() const;
- HeapCell** roots() const;
</del><ins>+ const Vector<HeapCell*, inlineCapacity>& roots() const { return m_roots; };
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- static constexpr size_t inlineCapacity = 128;
- static constexpr size_t nonInlineCapacity = 8192 / sizeof(HeapCell*);
-
</del><span class="cx"> template<typename MarkHook>
</span><span class="cx"> void genericAddPointer(void*, HeapVersion markingVersion, HeapVersion newlyAllocatedVersion, TinyBloomFilter, MarkHook&);
</span><span class="cx">
</span><span class="lines">@@ -54,23 +52,8 @@
</span><span class="cx"> template<typename MarkHook>
</span><span class="cx"> void genericAddSpan(void*, void* end, MarkHook&);
</span><span class="cx">
</span><del>- void grow();
-
- HeapCell** m_roots;
- size_t m_size;
- size_t m_capacity;
</del><span class="cx"> Heap& m_heap;
</span><del>- HeapCell* m_inlineRoots[inlineCapacity];
</del><ins>+ Vector<HeapCell*, inlineCapacity> m_roots;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-inline size_t ConservativeRoots::size() const
-{
- return m_size;
-}
-
-inline HeapCell** ConservativeRoots::roots() const
-{
- return m_roots;
-}
-
</del><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapSlotVisitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp (277345 => 277346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp 2021-05-12 00:46:17 UTC (rev 277345)
+++ trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp 2021-05-12 00:52:09 UTC (rev 277346)
</span><span class="lines">@@ -129,10 +129,8 @@
</span><span class="cx">
</span><span class="cx"> void SlotVisitor::append(const ConservativeRoots& conservativeRoots)
</span><span class="cx"> {
</span><del>- HeapCell** roots = conservativeRoots.roots();
- size_t size = conservativeRoots.size();
- for (size_t i = 0; i < size; ++i)
- appendJSCellOrAuxiliary(roots[i]);
</del><ins>+ for (auto root : conservativeRoots.roots())
+ appendJSCellOrAuxiliary(root);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SlotVisitor::appendJSCellOrAuxiliary(HeapCell* heapCell)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapVerifierSlotVisitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/VerifierSlotVisitor.cpp (277345 => 277346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/VerifierSlotVisitor.cpp 2021-05-12 00:46:17 UTC (rev 277345)
+++ trunk/Source/JavaScriptCore/heap/VerifierSlotVisitor.cpp 2021-05-12 00:52:09 UTC (rev 277346)
</span><span class="lines">@@ -148,10 +148,8 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>- HeapCell** roots = conservativeRoots.roots();
- size_t size = conservativeRoots.size();
- for (size_t i = 0; i < size; ++i)
- appendJSCellOrAuxiliary(roots[i]);
</del><ins>+ for (auto root : conservativeRoots.roots())
+ appendJSCellOrAuxiliary(root);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void VerifierSlotVisitor::appendToMarkStack(JSCell* cell)
</span></span></pre>
</div>
</div>
</body>
</html>