Changeset 3fb7f5e for doc/generic_types/evaluation/Makefile

Timestamp:

Apr 14, 2017, 4:51:13 PM (7 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:

1504536, e3de500

Parents:

3895b8b5

Message:

Update benchmarks, cleanup edits to the evaluation section

File:

• doc/generic_types/evaluation/Makefile (modified) (5 diffs)

doc/generic_types/evaluation/Makefile

@@ -33 +33 @@
 CFAOBJS = cfa-stack.o cfa-pair.o cfa-print.o
 
+CFILES = c-bench.c bench.h $(COBJS:.o=.h) $(COBJS:.o=.c)
+CPPFILES = cpp-bench.cpp bench.hpp cpp-stack.hpp cpp-print.hpp
+CPPVFILES = cpp-vbench.cpp bench.hpp object.hpp $(CPPVOBJS:.o=.hpp) $(CPPVOBJS:.o=.cpp) cpp-vprint.hpp
+CFAFILES = cfa-bench.c bench.h cfa-stack.h cfa-print.h cfa-stack.c cfa-print.c
+
 c-bench: c-bench.c c-bench.d $(COBJS)
         $(COMPILE.c) -o $@ $< $(COBJS) $(LDFLAGS)
@@ -61 +66 @@
         @echo '## C ##'
         @/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} c-pair.{h,c} c-print.{h,c} | wc -l`
+        @printf 'source_size:\t%8d lines\n' `cat $(CFILES) | wc -l`
+        @printf 'redundant_type_annotations:%8d count\n' `cat $(CFILES) | fgrep '/***/' -c`
         @printf 'binary_size:\t%8d bytes\n' `stat -c %s c-bench`
 
@@ -68 +74 @@
         @echo '## Cforall ##'
         @/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 cfa-print.h cfa-print.c | wc -l`
+        @printf 'source_size:\t%8d lines\n' `cat $(CFAFILES) | wc -l`
+        @printf 'redundant_type_annotations:%8d count\n' `cat $(CFAFILES) | fgrep '/***/' -c`
         @printf 'binary_size:\t%8d bytes\n' `stat -c %s cfa-bench`
 
@@ -75 +82 @@
         @echo '## C++ ##'
         @/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 cpp-print.hpp | wc -l`
+        @printf 'source_size:\t%8d lines\n' `cat $(CPPFILES) | wc -l`
+        @printf 'redundant_type_annotations:%8d count\n' `cat $(CPPFILES) | fgrep '/***/' -c`
         @printf 'binary_size:\t%8d bytes\n' `stat -c %s cpp-bench`
 
@@ -82 +90 @@
         @echo '## C++ virtual ##'
         @/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} cpp-vprint.hpp | wc -l`
+        @printf 'source_size:\t%8d lines\n' `cat $(CPPVFILES) | wc -l`
+        @printf 'redundant_type_annotations:%8d count\n' `cat $(CPPVFILES) | fgrep '/***/' -c`
         @printf 'binary_size:\t%8d bytes\n' `stat -c %s cpp-vbench`