<!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>[167505] 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/167505">167505</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2014-04-18 13:46:18 -0700 (Fri, 18 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>MallocBench: removed the --measure-heap option
https://bugs.webkit.org/show_bug.cgi?id=131854
Reviewed by Sam Weinig.
As of <https://bugs.webkit.org/show_bug.cgi?id=131661>, measuring the
heap is fast, so there's no reason to disable it.
* MallocBench/MallocBench/Benchmark.cpp:
(Benchmark::Benchmark):
(Benchmark::run):
(Benchmark::printReport):
* MallocBench/MallocBench/Benchmark.h:
* MallocBench/MallocBench/CommandLine.cpp:
(CommandLine::printUsage):
* MallocBench/MallocBench/CommandLine.h:
(CommandLine::heapSize):
(CommandLine::measureHeap): Deleted.
* MallocBench/MallocBench/main.cpp:
(main):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchBenchmarkcpp">trunk/PerformanceTests/MallocBench/MallocBench/Benchmark.cpp</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchBenchmarkh">trunk/PerformanceTests/MallocBench/MallocBench/Benchmark.h</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchCommandLinecpp">trunk/PerformanceTests/MallocBench/MallocBench/CommandLine.cpp</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchCommandLineh">trunk/PerformanceTests/MallocBench/MallocBench/CommandLine.h</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchmaincpp">trunk/PerformanceTests/MallocBench/MallocBench/main.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (167504 => 167505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2014-04-18 20:43:05 UTC (rev 167504)
+++ trunk/PerformanceTests/ChangeLog 2014-04-18 20:46:18 UTC (rev 167505)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-04-18 Geoffrey Garen <ggaren@apple.com>
+
+ MallocBench: removed the --measure-heap option
+ https://bugs.webkit.org/show_bug.cgi?id=131854
+
+ Reviewed by Sam Weinig.
+
+ As of <https://bugs.webkit.org/show_bug.cgi?id=131661>, measuring the
+ heap is fast, so there's no reason to disable it.
+
+ * MallocBench/MallocBench/Benchmark.cpp:
+ (Benchmark::Benchmark):
+ (Benchmark::run):
+ (Benchmark::printReport):
+ * MallocBench/MallocBench/Benchmark.h:
+ * MallocBench/MallocBench/CommandLine.cpp:
+ (CommandLine::printUsage):
+ * MallocBench/MallocBench/CommandLine.h:
+ (CommandLine::heapSize):
+ (CommandLine::measureHeap): Deleted.
+ * MallocBench/MallocBench/main.cpp:
+ (main):
+
</ins><span class="cx"> 2014-04-16 Alexandru Chiculita <achicu@adobe.com>
</span><span class="cx">
</span><span class="cx"> Improve performance of the RenderLayerCompositor::OverlapMap
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchBenchmarkcpp"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/Benchmark.cpp (167504 => 167505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/Benchmark.cpp 2014-04-18 20:43:05 UTC (rev 167504)
+++ trunk/PerformanceTests/MallocBench/MallocBench/Benchmark.cpp 2014-04-18 20:46:18 UTC (rev 167505)
</span><span class="lines">@@ -119,12 +119,11 @@
</span><span class="cx"> mbfree(chunks, chunkCount * sizeof(void**));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Benchmark::Benchmark(const string& benchmarkName, bool isParallel, bool measureHeap, size_t heapSize)
</del><ins>+Benchmark::Benchmark(const string& benchmarkName, bool isParallel, size_t heapSize)
</ins><span class="cx"> : m_benchmarkPair()
</span><span class="cx"> , m_elapsedTime()
</span><span class="cx"> , m_isParallel(isParallel)
</span><span class="cx"> , m_heapSize(heapSize)
</span><del>- , m_measureHeap(measureHeap)
</del><span class="cx"> {
</span><span class="cx"> const BenchmarkPair* benchmarkPair = std::find(
</span><span class="cx"> benchmarkPairs, benchmarkPairs + benchmarksPairsCount, benchmarkName);
</span><span class="lines">@@ -182,9 +181,6 @@
</span><span class="cx">
</span><span class="cx"> deallocateHeap(heap, m_heapSize, chunkSize, objectSize);
</span><span class="cx">
</span><del>- if (!m_measureHeap)
- return;
-
</del><span class="cx"> mbscavenge();
</span><span class="cx"> m_memory = currentMemoryBytes();
</span><span class="cx"> }
</span><span class="lines">@@ -194,9 +190,6 @@
</span><span class="cx"> size_t kB = 1024;
</span><span class="cx">
</span><span class="cx"> cout << "Time: \t" << m_elapsedTime << "ms" << endl;
</span><del>- if (!m_measureHeap)
- return;
-
</del><span class="cx"> cout << "Memory: \t" << m_memory.resident / kB << "kB" << endl;
</span><span class="cx"> cout << "Peak Memory:\t" << m_memory.residentMax / kB << "kB" << endl;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchBenchmarkh"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/Benchmark.h (167504 => 167505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/Benchmark.h 2014-04-18 20:43:05 UTC (rev 167504)
+++ trunk/PerformanceTests/MallocBench/MallocBench/Benchmark.h 2014-04-18 20:46:18 UTC (rev 167505)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> static double currentTimeMS();
</span><span class="cx"> static Memory currentMemoryBytes();
</span><span class="cx">
</span><del>- Benchmark(const std::string&, bool isParallel, bool measureHeap, size_t heapSize);
</del><ins>+ Benchmark(const std::string&, bool isParallel, size_t heapSize);
</ins><span class="cx">
</span><span class="cx"> bool isValid() { return m_benchmarkPair; }
</span><span class="cx">
</span><span class="lines">@@ -76,7 +76,6 @@
</span><span class="cx">
</span><span class="cx"> const BenchmarkPair* m_benchmarkPair;
</span><span class="cx"> bool m_isParallel;
</span><del>- bool m_measureHeap;
</del><span class="cx"> size_t m_heapSize;
</span><span class="cx">
</span><span class="cx"> Memory m_memory;
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchCommandLinecpp"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/CommandLine.cpp (167504 => 167505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/CommandLine.cpp 2014-04-18 20:43:05 UTC (rev 167504)
+++ trunk/PerformanceTests/MallocBench/MallocBench/CommandLine.cpp 2014-04-18 20:46:18 UTC (rev 167505)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> {"benchmark", required_argument, 0, 'b'},
</span><span class="cx"> {"parallel", no_argument, 0, 'p'},
</span><span class="cx"> {"heap", required_argument, 0, 'h'},
</span><del>- {"measure-heap", no_argument, 0, 'm'},
</del><span class="cx"> {0, 0, 0, 0}
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -41,7 +40,6 @@
</span><span class="cx"> , m_argv(argv)
</span><span class="cx"> , m_isParallel()
</span><span class="cx"> , m_heapSize()
</span><del>- , m_measureHeap()
</del><span class="cx"> {
</span><span class="cx"> int optionIndex = 0;
</span><span class="cx"> int ch;
</span><span class="lines">@@ -60,10 +58,6 @@
</span><span class="cx"> m_heapSize = atoi(optarg) * 1024 * 1024;
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case 'm':
- m_measureHeap = true;
- break;
-
</del><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -75,5 +69,5 @@
</span><span class="cx"> std::string fullPath(m_argv[0]);
</span><span class="cx"> size_t pos = fullPath.find_last_of("/") + 1;
</span><span class="cx"> std::string program = fullPath.substr(pos);
</span><del>- std::cout << "Usage: " << program << " --benchmark benchmark_name [ --parallel ] [ --measure-heap ] [ --heap MB ]" << std::endl;
</del><ins>+ std::cout << "Usage: " << program << " --benchmark benchmark_name [ --parallel ] [ --heap MB ]" << std::endl;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchCommandLineh"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/CommandLine.h (167504 => 167505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/CommandLine.h 2014-04-18 20:43:05 UTC (rev 167504)
+++ trunk/PerformanceTests/MallocBench/MallocBench/CommandLine.h 2014-04-18 20:46:18 UTC (rev 167505)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> const std::string& benchmarkName() { return m_benchmarkName; }
</span><span class="cx"> bool isParallel() { return m_isParallel; }
</span><span class="cx"> size_t heapSize() { return m_heapSize; }
</span><del>- bool measureHeap() { return m_measureHeap; }
</del><span class="cx">
</span><span class="cx"> void printUsage();
</span><span class="cx">
</span><span class="lines">@@ -45,5 +44,4 @@
</span><span class="cx"> std::string m_benchmarkName;
</span><span class="cx"> bool m_isParallel;
</span><span class="cx"> size_t m_heapSize;
</span><del>- bool m_measureHeap;
</del><span class="cx"> };
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchmaincpp"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/main.cpp (167504 => 167505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/main.cpp 2014-04-18 20:43:05 UTC (rev 167504)
+++ trunk/PerformanceTests/MallocBench/MallocBench/main.cpp 2014-04-18 20:46:18 UTC (rev 167505)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> exit(1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Benchmark benchmark(commandLine.benchmarkName(), commandLine.isParallel(), commandLine.measureHeap(), commandLine.heapSize());
</del><ins>+ Benchmark benchmark(commandLine.benchmarkName(), commandLine.isParallel(), commandLine.heapSize());
</ins><span class="cx"> if (!benchmark.isValid()) {
</span><span class="cx"> cout << "Invalid benchmark: " << commandLine.benchmarkName() << endl << endl;
</span><span class="cx"> benchmark.printBenchmarks();
</span></span></pre>
</div>
</div>
</body>
</html>