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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@167505 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/PerformanceTests/ChangeLog b/PerformanceTests/ChangeLog
index a2fcd09be0ca9ee09a733eceeced79cf2967c5d0..9c4021eb677e474d88b3e15e2204e756cdc402b8 100644 (file)
--- a/PerformanceTests/ChangeLog
+++ b/PerformanceTests/ChangeLog
@@ -1,3 +1,26 @@
+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):
+
 2014-04-16  Alexandru Chiculita  <achicu@adobe.com>
 
         Improve performance of the RenderLayerCompositor::OverlapMap

diff --git a/PerformanceTests/MallocBench/MallocBench/Benchmark.cpp b/PerformanceTests/MallocBench/MallocBench/Benchmark.cpp
index a873611c65095aa90909fd3e9a782f1965beb774..55bef83301ae4e51821d007a9e16ee291dfa620c 100644 (file)
--- a/PerformanceTests/MallocBench/MallocBench/Benchmark.cpp
+++ b/PerformanceTests/MallocBench/MallocBench/Benchmark.cpp
@@ -119,12 +119,11 @@ static void deallocateHeap(void*** chunks, size_t heapSize, size_t chunkSize, si
     mbfree(chunks, chunkCount * sizeof(void**));
 }
 
-Benchmark::Benchmark(const string& benchmarkName, bool isParallel, bool measureHeap, size_t heapSize)
+Benchmark::Benchmark(const string& benchmarkName, bool isParallel, size_t heapSize)
     : m_benchmarkPair()
     , m_elapsedTime()
     , m_isParallel(isParallel)
     , m_heapSize(heapSize)
-    , m_measureHeap(measureHeap)
 {
     const BenchmarkPair* benchmarkPair = std::find(
         benchmarkPairs, benchmarkPairs + benchmarksPairsCount, benchmarkName);
@@ -182,9 +181,6 @@ void Benchmark::run()
 
     deallocateHeap(heap, m_heapSize, chunkSize, objectSize);
     
-    if (!m_measureHeap)
-        return;
-    
     mbscavenge();
     m_memory = currentMemoryBytes();
 }
@@ -194,9 +190,6 @@ void Benchmark::printReport()
     size_t kB = 1024;
 
     cout << "Time:       \t" << m_elapsedTime << "ms" << endl;
-    if (!m_measureHeap)
-        return;
-
     cout << "Memory:     \t" << m_memory.resident / kB << "kB" << endl;
     cout << "Peak Memory:\t" << m_memory.residentMax / kB << "kB" << endl;
 }

diff --git a/PerformanceTests/MallocBench/MallocBench/Benchmark.h b/PerformanceTests/MallocBench/MallocBench/Benchmark.h
index cf9781e32051d03e00643208e83a0c0e5dc151ac..b93a88b77bb4ae0cb8253f1988f3415db267fd65 100644 (file)
--- a/PerformanceTests/MallocBench/MallocBench/Benchmark.h
+++ b/PerformanceTests/MallocBench/MallocBench/Benchmark.h
@@ -59,7 +59,7 @@ public:
     static double currentTimeMS();
     static Memory currentMemoryBytes();
 
-    Benchmark(const std::string&, bool isParallel, bool measureHeap, size_t heapSize);
+    Benchmark(const std::string&, bool isParallel, size_t heapSize);
     
     bool isValid() { return m_benchmarkPair; }
     
@@ -76,7 +76,6 @@ private:
 
     const BenchmarkPair* m_benchmarkPair;
     bool m_isParallel;
-    bool m_measureHeap;
     size_t m_heapSize;
 
     Memory m_memory;

diff --git a/PerformanceTests/MallocBench/MallocBench/CommandLine.cpp b/PerformanceTests/MallocBench/MallocBench/CommandLine.cpp
index 9d3f8861f7f1eb1a169b35ca5cc42e40be1a080f..f832c2f0fc7400021a5f37cc474ddf044e5a931d 100644 (file)
--- a/PerformanceTests/MallocBench/MallocBench/CommandLine.cpp
+++ b/PerformanceTests/MallocBench/MallocBench/CommandLine.cpp
@@ -32,7 +32,6 @@ struct option CommandLine::longOptions[] =
     {"benchmark", required_argument, 0, 'b'},
     {"parallel", no_argument, 0, 'p'},
     {"heap", required_argument, 0, 'h'},
-    {"measure-heap", no_argument, 0, 'm'},
     {0, 0, 0, 0}
 };
 
@@ -41,7 +40,6 @@ CommandLine::CommandLine(int argc, char** argv)
     , m_argv(argv)
     , m_isParallel()
     , m_heapSize()
-    , m_measureHeap()
 {
     int optionIndex = 0;
     int ch;
@@ -60,10 +58,6 @@ CommandLine::CommandLine(int argc, char** argv)
                 m_heapSize = atoi(optarg) * 1024 * 1024;
                 break;
 
-            case 'm':
-                m_measureHeap = true;
-                break;
-
             default:
                 break;
         }
@@ -75,5 +69,5 @@ void CommandLine::printUsage()
     std::string fullPath(m_argv[0]);
     size_t pos = fullPath.find_last_of("/") + 1;
     std::string program = fullPath.substr(pos);
-    std::cout << "Usage: " << program << " --benchmark benchmark_name [ --parallel ] [ --measure-heap ] [ --heap MB ]" << std::endl;
+    std::cout << "Usage: " << program << " --benchmark benchmark_name [ --parallel ] [ --heap MB ]" << std::endl;
 }

diff --git a/PerformanceTests/MallocBench/MallocBench/CommandLine.h b/PerformanceTests/MallocBench/MallocBench/CommandLine.h
index 29242bdb986df72380ba371a111d2d6edca77829..14d7329f8f6c459c07cce4834c6ec3e650ea67f5 100644 (file)
--- a/PerformanceTests/MallocBench/MallocBench/CommandLine.h
+++ b/PerformanceTests/MallocBench/MallocBench/CommandLine.h
@@ -33,7 +33,6 @@ public:
     const std::string& benchmarkName() { return m_benchmarkName; }
     bool isParallel() { return m_isParallel; }
     size_t heapSize() { return m_heapSize; }
-    bool measureHeap() { return m_measureHeap; }
 
     void printUsage();
 
@@ -45,5 +44,4 @@ private:
     std::string m_benchmarkName;
     bool m_isParallel;
     size_t m_heapSize;
-    bool m_measureHeap;
 };

diff --git a/PerformanceTests/MallocBench/MallocBench/main.cpp b/PerformanceTests/MallocBench/MallocBench/main.cpp
index 53781e073e4810cfa266d30da9728f4170708ea7..db80d44e9e99995ccaf085fe7f46b76a9063aee5 100644 (file)
--- a/PerformanceTests/MallocBench/MallocBench/main.cpp
+++ b/PerformanceTests/MallocBench/MallocBench/main.cpp
@@ -40,7 +40,7 @@ int main(int argc, char** argv)
         exit(1);
     }
 
-    Benchmark benchmark(commandLine.benchmarkName(), commandLine.isParallel(), commandLine.measureHeap(), commandLine.heapSize());
+    Benchmark benchmark(commandLine.benchmarkName(), commandLine.isParallel(), commandLine.heapSize());
     if (!benchmark.isValid()) {
         cout << "Invalid benchmark: " << commandLine.benchmarkName() << endl << endl;
         benchmark.printBenchmarks();