Changeset 2ccb93c for doc

Timestamp:

Apr 10, 2017, 9:58:02 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

5a48d79

Parents:

f92aa32 (diff), b276be5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Location:

doc/generic_types/evaluation

Files:

• .gitignore (modified) (1 diff)
• Makefile (modified) (5 diffs)
• bench.h (modified) (2 diffs)
• bench.hpp (added)
• cpp-bench.cpp (modified) (1 diff)
• cpp-stack.hpp (moved) (moved from doc/generic_types/evaluation/cpp-stack.h) (1 diff)
• cpp-vbench.cpp (added)
• cpp-vstack.cpp (added)
• cpp-vstack.hpp (added)
• object.hpp (added)

doc/generic_types/evaluation/.gitignore

@@ -1 +1 @@
 c-bench
 cpp-bench
+cpp-vbench
 cfa-bench
-c2-bench
-cpp2-bench
-cfa2-bench
 *.o
 *.d

doc/generic_types/evaluation/Makefile

@@ -1 +1 @@
 CFA = my-cfa
 DEPFLAGS = -MMD -MP
-OPT = -O2
-CFLAGS = $(OPT)
-CXXFLAGS = $(OPT)
+CFLAGS = -O2 -flto
+CXXFLAGS = $(CFLAGS) --std=c++14
 
-.PHONY: all clean distclean bench
+.PHONY: all clean distclean run-c run-cpp run-cfa run
 
 all: c-bench cpp-bench cfa-bench
@@ -28 +27 @@
 COBJS = c-stack.o
 CPPOBJS = 
+CPPVOBJS = cpp-vstack.o
 CFAOBJS = cfa-stack.o
 
@@ -36 +36 @@
         $(COMPILE.cpp) -o $@ $< $(CPPOBJS) $(LDFLAGS)
 
+cpp-vbench: cpp-vbench.cpp cpp-vbench.d $(CPPVOBJS)
+        $(COMPILE.cpp) -o $@ $< $(CPPVOBJS) $(LDFLAGS)
+
 cfa-bench: cfa-bench.c cfa-bench.d $(CFAOBJS)
         $(COMPILE.cfa) -o $@ $< $(CFAOBJS) $(LDFLAGS)
@@ -42 +45 @@
         -rm $(COBJS) c-bench
         -rm $(CPPOBJS) cpp-bench
+        -rm $(CPPVOBJS) cpp-vbench
         -rm $(CFAOBJS) cfa-bench
 
@@ -47 +51 @@
         -rm $(COBJS:.o=.d) c-bench.d
         -rm $(CPPOBJS:.o=.d) cpp-bench.d
+        -rm $(CPPVOBJS:.o=.d) cpp-vbench.d
         -rm $(CFAOBJS:.o=.d) cfa-bench.d
 
-bench: c-bench cpp-bench cfa-bench
+run-c: c-bench
         @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`
+
+run-cfa: cfa-bench
+        @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`
+
+run-cpp: cpp-bench
         @echo '## C++ ##'
         @./cpp-bench
-        @echo '## Cforall ##'
-        @./cfa-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`
+
+run-cppv: cpp-vbench
+        @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`
+
+run: run-c run-cfa run-cpp run-cppv
 
 # so make doesn't fail without dependency files

doc/generic_types/evaluation/bench.h

@@ -4 +4 @@
 #include <time.h>
 
- #define N 50000000
+ #define N 100000000
  
 
@@ -12 +12 @@
 
 #define TIMED(name, code) { \
-        clock_t _start, _end; \
+        volatile clock_t _start, _end; \
         _start = clock(); \
         code \

doc/generic_types/evaluation/cpp-bench.cpp

@@ -1 +1 @@
 #include <stdlib.h>
-#include "bench.h"
-#include "cpp-stack.h"
+#include "bench.hpp"
+#include "cpp-stack.hpp"
 
 int main(int argc, char** argv) {

doc/generic_types/evaluation/cpp-stack.hpp

@@ -47 +47 @@
                 clear();
                 copy(o);
-                return *this;if ( this == &o ) return *this;
+                return *this;
         }