Changeset 47535a0d for doc

Timestamp:

Apr 10, 2017, 5:26:04 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

65cb413

Parents:

2f0fc56

Message:

Update benchmarks to report peak memory usage

Location:

doc/generic_types/evaluation

Files:

• Makefile (modified) (1 diff)
• bench.h (modified) (2 diffs)
• bench.hpp (modified) (2 diffs)

doc/generic_types/evaluation/Makefile

@@ -55 +55 @@
 
 run-c: c-bench
+        @echo
         @echo '## C ##'
-        @./c-bench
-        @printf 'source_size:\t%7d lines\n' `cat c-bench.c bench.h c-stack.h c-stack.c | wc -l`
-        @printf 'binary_size:\t%7d bytes\n' `wc -c < c-bench`
+        @/usr/bin/time -f 'max_memory:\t%M kilobytes' ./c-bench
+        @printf 'source_size:\t%8d lines\n' `cat c-bench.c bench.h c-stack.h c-stack.c | wc -l`
+        @printf 'binary_size:\t%8d bytes\n' `stat -c %s c-bench`
 
 run-cfa: cfa-bench
+        @echo
         @echo '## Cforall ##'
-        @./cfa-bench
-        @printf 'source_size:\t%7d lines\n' `cat cfa-bench.c bench.h cfa-stack.h cfa-stack.c | wc -l`
-        @printf 'binary_size:\t%7d bytes\n' `wc -c < cfa-bench`
+        @/usr/bin/time -f 'max_memory:\t %M kilobytes' ./cfa-bench
+        @printf 'source_size:\t%8d lines\n' `cat cfa-bench.c bench.h cfa-stack.h cfa-stack.c | wc -l`
+        @printf 'binary_size:\t%8d bytes\n' `stat -c %s cfa-bench`
 
 run-cpp: cpp-bench
+        @echo
         @echo '## C++ ##'
-        @./cpp-bench
-        @printf 'source_size:\t%7d lines\n' `cat cpp-bench.cpp bench.hpp cpp-stack.hpp | wc -l`
-        @printf 'binary_size:\t%7d bytes\n' `wc -c < cpp-bench`
+        @/usr/bin/time -f 'max_memory:\t %M kilobytes' ./cpp-bench
+        @printf 'source_size:\t%8d lines\n' `cat cpp-bench.cpp bench.hpp cpp-stack.hpp | wc -l`
+        @printf 'binary_size:\t%8d bytes\n' `stat -c %s cpp-bench`
 
 run-cppv: cpp-vbench
+        @echo
         @echo '## C++ virtual ##'
-        @./cpp-vbench
-        @printf 'source_size:\t%7d lines\n' `cat cpp-vbench.cpp bench.hpp object.hpp cpp-vstack.hpp cpp-vstack.cpp | wc -l`
-        @printf 'binary_size:\t%7d bytes\n' `wc -c < cpp-vbench`
+        @/usr/bin/time -f 'max_memory:\t%M kilobytes' ./cpp-vbench
+        @printf 'source_size:\t%8d lines\n' `cat cpp-vbench.cpp bench.hpp object.hpp cpp-vstack.hpp cpp-vstack.cpp | wc -l`
+        @printf 'binary_size:\t%8d bytes\n' `stat -c %s cpp-vbench`
 
 run: run-c run-cfa run-cpp run-cppv

doc/generic_types/evaluation/bench.h

@@ -4 +4 @@
 #include <time.h>
 
- #define N 100000000
- 
+#define N 100000000
 
 long ms_between(clock_t start, clock_t end) {
@@ -16 +15 @@
         code \
         _end = clock(); \
-        printf("%s:\t%7ld ms\n", name, ms_between(_start, _end)); \
+        printf("%s:\t%8ld ms\n", name, ms_between(_start, _end)); \
 }
 

doc/generic_types/evaluation/bench.hpp

@@ -5 +5 @@
 #include <time.h>
 
- #define N 100000000
- 
+static const int N = 100000000;
 
 long ms_between(clock_t start, clock_t end) {
@@ -17 +16 @@
         code \
         _end = clock(); \
-        std::cout << name << ":\t" << std::setw(7) << ms_between(_start, _end) << std::setw(0) << " ms" << std::endl; \
+        std::cout << name << ":\t" << std::setw(8) << ms_between(_start, _end) << std::setw(0) << " ms" << std::endl; \
 }