<!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>[173529] trunk/PerformanceTests</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/173529">173529</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2014-09-11 12:33:47 -0700 (Thu, 11 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some MallocBench refinements
https://bugs.webkit.org/show_bug.cgi?id=136750
Reviewed by Sam Weinig.
* MallocBench/MallocBench/Interpreter.cpp:
(Interpreter::run): Allow for null entries in the object list so that
we can test in modes that exclude large or small allocations.
* MallocBench/MallocBench/churn.cpp:
(benchmark_churn):
* MallocBench/MallocBench/flickr.cpp:
(benchmark_flickr):
* MallocBench/MallocBench/fragment.cpp:
(benchmark_fragment_iterate):
* MallocBench/MallocBench/list.cpp:
(benchmark_list_allocate):
* MallocBench/MallocBench/reddit.cpp:
(benchmark_reddit): Updated test runtimes to weight them more equally,
for the sake of arithmetic mean.
* MallocBench/MallocBench/stress.cpp:
(Object::Object):
(allocate):
(deallocate):
(benchmark_stress): Verify the contents of memory as we go. Also,
force scavenging each time through the loop to test the scavenging path.
* MallocBench/MallocBench/theverge.cpp:
(benchmark_theverge):
* MallocBench/MallocBench/tree.cpp:
(benchmark_tree_churn): Re-weighted, as above.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchInterpretercpp">trunk/PerformanceTests/MallocBench/MallocBench/Interpreter.cpp</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchchurncpp">trunk/PerformanceTests/MallocBench/MallocBench/churn.cpp</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchflickrcpp">trunk/PerformanceTests/MallocBench/MallocBench/flickr.cpp</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchfragmentcpp">trunk/PerformanceTests/MallocBench/MallocBench/fragment.cpp</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchlistcpp">trunk/PerformanceTests/MallocBench/MallocBench/list.cpp</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchredditcpp">trunk/PerformanceTests/MallocBench/MallocBench/reddit.cpp</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchstresscpp">trunk/PerformanceTests/MallocBench/MallocBench/stress.cpp</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchthevergecpp">trunk/PerformanceTests/MallocBench/MallocBench/theverge.cpp</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchtreecpp">trunk/PerformanceTests/MallocBench/MallocBench/tree.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (173528 => 173529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2014-09-11 19:26:16 UTC (rev 173528)
+++ trunk/PerformanceTests/ChangeLog 2014-09-11 19:33:47 UTC (rev 173529)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-09-11 Geoffrey Garen <ggaren@apple.com>
+
+ Some MallocBench refinements
+ https://bugs.webkit.org/show_bug.cgi?id=136750
+
+ Reviewed by Sam Weinig.
+
+ * MallocBench/MallocBench/Interpreter.cpp:
+ (Interpreter::run): Allow for null entries in the object list so that
+ we can test in modes that exclude large or small allocations.
+
+ * MallocBench/MallocBench/churn.cpp:
+ (benchmark_churn):
+ * MallocBench/MallocBench/flickr.cpp:
+ (benchmark_flickr):
+ * MallocBench/MallocBench/fragment.cpp:
+ (benchmark_fragment_iterate):
+ * MallocBench/MallocBench/list.cpp:
+ (benchmark_list_allocate):
+ * MallocBench/MallocBench/reddit.cpp:
+ (benchmark_reddit): Updated test runtimes to weight them more equally,
+ for the sake of arithmetic mean.
+
+ * MallocBench/MallocBench/stress.cpp:
+ (Object::Object):
+ (allocate):
+ (deallocate):
+ (benchmark_stress): Verify the contents of memory as we go. Also,
+ force scavenging each time through the loop to test the scavenging path.
+
+ * MallocBench/MallocBench/theverge.cpp:
+ (benchmark_theverge):
+ * MallocBench/MallocBench/tree.cpp:
+ (benchmark_tree_churn): Re-weighted, as above.
+
</ins><span class="cx"> 2014-09-08 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> PerformanceTests/SVG/SVG-Text.html has unparsable output
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/Interpreter.cpp (173528 => 173529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/Interpreter.cpp 2014-09-11 19:26:16 UTC (rev 173528)
+++ trunk/PerformanceTests/MallocBench/MallocBench/Interpreter.cpp 2014-09-11 19:33:47 UTC (rev 173529)
</span><span class="lines">@@ -101,13 +101,15 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_free: {
</span><del>- assert(m_objects[op.slot].object);
</del><ins>+ if (!m_objects[op.slot].object)
+ continue;
</ins><span class="cx"> mbfree(m_objects[op.slot].object, m_objects[op.slot].size);
</span><span class="cx"> m_objects[op.slot] = { 0, 0 };
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_realloc: {
</span><del>- assert(m_objects[op.slot].object);
</del><ins>+ if (!m_objects[op.slot].object)
+ continue;
</ins><span class="cx"> m_objects[op.slot] = { mbrealloc(m_objects[op.slot].object, m_objects[op.slot].size, op.size), op.size };
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchchurncpp"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/churn.cpp (173528 => 173529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/churn.cpp 2014-09-11 19:26:16 UTC (rev 173528)
+++ trunk/PerformanceTests/MallocBench/MallocBench/churn.cpp 2014-09-11 19:33:47 UTC (rev 173529)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> void benchmark_churn(bool isParallel)
</span><span class="cx"> {
</span><del>- size_t times = 10000000;
</del><ins>+ size_t times = 7000000;
</ins><span class="cx"> if (isParallel)
</span><span class="cx"> times /= cpuCount();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchflickrcpp"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/flickr.cpp (173528 => 173529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/flickr.cpp 2014-09-11 19:26:16 UTC (rev 173528)
+++ trunk/PerformanceTests/MallocBench/MallocBench/flickr.cpp 2014-09-11 19:33:47 UTC (rev 173529)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> void benchmark_flickr(bool isParallel)
</span><span class="cx"> {
</span><del>- size_t times = 1;
</del><ins>+ size_t times = 3;
</ins><span class="cx">
</span><span class="cx"> Interpreter interpreter("flickr.ops");
</span><span class="cx"> for (size_t i = 0; i < times; ++i)
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchfragmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/fragment.cpp (173528 => 173529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/fragment.cpp 2014-09-11 19:26:16 UTC (rev 173528)
+++ trunk/PerformanceTests/MallocBench/MallocBench/fragment.cpp 2014-09-11 19:33:47 UTC (rev 173529)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> void benchmark_fragment_iterate(bool isParallel)
</span><span class="cx"> {
</span><span class="cx"> size_t nodeCount = 512 * 1024;
</span><del>- size_t times = 32;
</del><ins>+ size_t times = 20;
</ins><span class="cx"> if (isParallel)
</span><span class="cx"> nodeCount /= cpuCount();
</span><span class="cx"> size_t replaceCount = nodeCount / 4;
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchlistcpp"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/list.cpp (173528 => 173529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/list.cpp 2014-09-11 19:26:16 UTC (rev 173528)
+++ trunk/PerformanceTests/MallocBench/MallocBench/list.cpp 2014-09-11 19:33:47 UTC (rev 173529)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> void benchmark_list_allocate(bool isParallel)
</span><span class="cx"> {
</span><span class="cx"> Node* head = 0;
</span><del>- size_t times = 96;
</del><ins>+ size_t times = 70;
</ins><span class="cx"> size_t nodes = 32 * 1024;
</span><span class="cx"> if (isParallel) {
</span><span class="cx"> nodes /= cpuCount();
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchredditcpp"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/reddit.cpp (173528 => 173529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/reddit.cpp 2014-09-11 19:26:16 UTC (rev 173528)
+++ trunk/PerformanceTests/MallocBench/MallocBench/reddit.cpp 2014-09-11 19:33:47 UTC (rev 173529)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> void benchmark_reddit(bool isParallel)
</span><span class="cx"> {
</span><del>- size_t times = 1;
</del><ins>+ size_t times = 6;
</ins><span class="cx">
</span><span class="cx"> Interpreter interpreter("reddit.ops");
</span><span class="cx"> for (size_t i = 0; i < times; ++i)
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchstresscpp"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/stress.cpp (173528 => 173529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/stress.cpp 2014-09-11 19:26:16 UTC (rev 173528)
+++ trunk/PerformanceTests/MallocBench/MallocBench/stress.cpp 2014-09-11 19:33:47 UTC (rev 173529)
</span><span class="lines">@@ -39,14 +39,16 @@
</span><span class="cx"> static const size_t MB = kB * kB;
</span><span class="cx">
</span><span class="cx"> struct Object {
</span><del>- Object(void* pointer, size_t size)
</del><ins>+ Object(void* pointer, size_t size, long uuid)
</ins><span class="cx"> : pointer(pointer)
</span><span class="cx"> , size(size)
</span><ins>+ , uuid(uuid)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void* pointer;
</span><span class="cx"> size_t size;
</span><ins>+ long uuid;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class SizeStream {
</span><span class="lines">@@ -100,6 +102,24 @@
</span><span class="cx"> size_t m_count;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+Object allocate(size_t size)
+{
+ Object object(mbmalloc(size), size, random());
+ for (size_t i = 0; i < size / sizeof(long); ++i)
+ (static_cast<long*>(object.pointer))[i] = object.uuid;
+ return object;
+}
+
+void deallocate(const Object& object)
+{
+ for (size_t i = 0; i < object.size / sizeof(long); ++i) {
+ if ((static_cast<long*>(object.pointer))[i] != object.uuid)
+ abort();
+ }
+
+ mbfree(object.pointer, object.size);
+}
+
</ins><span class="cx"> void benchmark_stress(bool isParallel)
</span><span class="cx"> {
</span><span class="cx"> const size_t heapSize = 100 * MB;
</span><span class="lines">@@ -112,18 +132,17 @@
</span><span class="cx">
</span><span class="cx"> SizeStream sizeStream;
</span><span class="cx">
</span><del>- size_t lastSize = 0;
- for (size_t remaining = heapSize; remaining; remaining -= std::min(remaining, lastSize)) {
- lastSize = sizeStream.next();
- Object object(mbmalloc(lastSize), lastSize);
- objects.push_back(object);
</del><ins>+ size_t size = 0;
+ for (size_t remaining = heapSize; remaining; remaining -= std::min(remaining, size)) {
+ size = sizeStream.next();
+ objects.push_back(allocate(size));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < churnCount; ++i) {
</span><span class="cx"> std::vector<Object> objectsToFree;
</span><del>- for (size_t remaining = churnSize; remaining; remaining -= std::min(remaining, lastSize)) {
- lastSize = sizeStream.next();
- Object object(mbmalloc(lastSize), lastSize);
</del><ins>+ for (size_t remaining = churnSize; remaining; remaining -= std::min(remaining, size)) {
+ size = sizeStream.next();
+ Object object = allocate(size);
</ins><span class="cx">
</span><span class="cx"> size_t index = random() % objects.size();
</span><span class="cx"> objectsToFree.push_back(objects[index]);
</span><span class="lines">@@ -131,7 +150,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (auto& object : objectsToFree)
</span><del>- mbfree(object.pointer, object.size);
</del><ins>+ deallocate(object);
+
+ mbscavenge();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (auto& object : objects)
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchthevergecpp"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/theverge.cpp (173528 => 173529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/theverge.cpp 2014-09-11 19:26:16 UTC (rev 173528)
+++ trunk/PerformanceTests/MallocBench/MallocBench/theverge.cpp 2014-09-11 19:33:47 UTC (rev 173529)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> void benchmark_theverge(bool isParallel)
</span><span class="cx"> {
</span><del>- size_t times = 1;
</del><ins>+ size_t times = 3;
</ins><span class="cx">
</span><span class="cx"> Interpreter interpreter("theverge.ops");
</span><span class="cx"> for (size_t i = 0; i < times; ++i)
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchtreecpp"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/tree.cpp (173528 => 173529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/tree.cpp 2014-09-11 19:26:16 UTC (rev 173528)
+++ trunk/PerformanceTests/MallocBench/MallocBench/tree.cpp 2014-09-11 19:33:47 UTC (rev 173529)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx">
</span><span class="cx"> void benchmark_tree_churn(bool isParallel)
</span><span class="cx"> {
</span><del>- size_t times = 160;
</del><ins>+ size_t times = 130;
</ins><span class="cx"> size_t depth = 15;
</span><span class="cx"> if (isParallel) {
</span><span class="cx"> times *= 4;
</span></span></pre>
</div>
</div>
</body>
</html>