Changeset 154fdc8 for doc/generic_types/evaluation/Makefile

Timestamp:

Apr 19, 2017, 10:15:45 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

cd348e7

Parents:

221c2de7 (diff), de4ce0e (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:software/cfa/cfa-cc

File:

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

doc/generic_types/evaluation/Makefile

@@ -1 @@
-CFA = my-cfa
+CFA = cfa
 DEPFLAGS = -MMD -MP
+CFLAGS = -O2
+ifdef N
+CFLAGS += -DN=$(N)
+endif
+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 c2-bench cpp2-bench cfa2-bench
+all: c-bench cpp-bench cfa-bench cpp-vbench
 
 # rewrite object generation to auto-determine deps
@@ -13 +18 @@
 c-%.o : c-%.c
 c-%.o : c-%.c c-%.d
-        $(COMPILE.c) -O0 $(OUTPUT_OPTION) -c $<
+        $(COMPILE.c) $(OUTPUT_OPTION) -c $<
 
 cpp-%.o : cpp-%.cpp
 cpp-%.o : cpp-%.cpp cpp-%.d
-        $(COMPILE.cpp) -O0 $(OUTPUT_OPTION) -c $<
+        $(COMPILE.cpp) $(OUTPUT_OPTION) -c $<
 
 cfa-%.o : cfa-%.c
 cfa-%.o : cfa-%.c cfa-%.d
-        $(COMPILE.cfa) -O0 $(OUTPUT_OPTION) -c $<
+        $(COMPILE.cfa) $(OUTPUT_OPTION) -c $<
 
-c2-%.o : c-%.c
-c2-%.o : c-%.c c-%.d
-        $(COMPILE.c) -O2 $(OUTPUT_OPTION) -c $<
+COBJS = c-stack.o c-pair.o c-print.o
+CPPOBJS = 
+CPPVOBJS = cpp-vstack.o
+CFAOBJS = cfa-stack.o cfa-pair.o cfa-print.o
 
-cpp2-%.o : cpp-%.cpp
-cpp2-%.o : cpp-%.cpp cpp-%.d
-        $(COMPILE.cpp) -O2 $(OUTPUT_OPTION) -c $<
-
-cfa2-%.o : cfa-%.c
-cfa2-%.o : cfa-%.c cfa-%.d
-        $(COMPILE.cfa) -O2 $(OUTPUT_OPTION) -c $<
-
-COBJS = c-stack.o
-CPPOBJS = 
-CFAOBJS = cfa-stack.o
-C2OBJS = $(patsubst c-%,c2-%, $(COBJS))
-CPP2OBJS = $(patsubst cpp-%,cpp2-%, $(CPPOBJS))
-CFA2OBJS = $(patsubst cfa-%,cfa2-%, $(CFAOBJS))
+CFILES = c-bench.c bench.h $(COBJS:.o=.h) $(COBJS:.o=.c)
+CPPFILES = cpp-bench.cpp bench.hpp cpp-stack.hpp cpp-pair.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 $(CFAOBJS:.o=.h) $(CFAOBJS:.o=.c)
 
 c-bench: c-bench.c c-bench.d $(COBJS)
-        $(COMPILE.c) -O0 -o $@ $< $(COBJS) $(LDFLAGS)
+        $(COMPILE.c) -o $@ $< $(COBJS) $(LDFLAGS)
 
 cpp-bench: cpp-bench.cpp cpp-bench.d $(CPPOBJS)
-        $(COMPILE.cpp) -O0 -o $@ $< $(CPPOBJS) $(LDFLAGS)
+        $(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) -O0 -o $@ $< $(CFAOBJS) $(LDFLAGS)
-
-c2-bench: c-bench.c c-bench.d $(C2OBJS)
-        $(COMPILE.c) -O2 -o $@ $< $(C2OBJS) $(LDFLAGS)
-
-cpp2-bench: cpp-bench.cpp cpp-bench.d $(CPP2OBJS)
-        $(COMPILE.cpp) -O2 -o $@ $< $(CPP2OBJS) $(LDFLAGS)
-
-cfa2-bench: cfa-bench.c cfa-bench.d $(CFA2OBJS)
-        $(COMPILE.cfa) -O2 -o $@ $< $(CFA2OBJS) $(LDFLAGS)
+        $(COMPILE.cfa) -o $@ $< $(CFAOBJS) $(LDFLAGS)
 
 clean:
         -rm $(COBJS) c-bench
         -rm $(CPPOBJS) cpp-bench
+        -rm $(CPPVOBJS) cpp-vbench
         -rm $(CFAOBJS) cfa-bench
-        -rm $(C2OBJS) c2-bench
-        -rm $(CPP2OBJS) cpp2-bench
-        -rm $(CFA2OBJS) cfa2-bench
 
 distclean: clean
         -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 c2-bench cpp2-bench cfa2-bench
+run-c: c-bench
+        @echo
         @echo '## C ##'
-        @./c-bench
+        @/usr/bin/time -f 'max_memory:\t%M kilobytes' ./c-bench
+        @printf 'source_size:\t%8d lines\n' `cat $(CFILES) | wc -l`
+        @printf 'redundant_type_annotations:%8d lines\n' `cat $(CFILES) | fgrep '/***/' -c`
+        @printf 'binary_size:\t%8d bytes\n' `stat -c %s c-bench`
+
+run-cfa: cfa-bench
+        @echo
+        @echo '## Cforall ##'
+        @/usr/bin/time -f 'max_memory:\t %M kilobytes' ./cfa-bench
+        @printf 'source_size:\t%8d lines\n' `cat $(CFAFILES) | wc -l`
+        @printf 'redundant_type_annotations:%8d lines\n' `cat $(CFAFILES) | fgrep '/***/' -c`
+        @printf 'binary_size:\t%8d bytes\n' `stat -c %s cfa-bench`
+
+run-cpp: cpp-bench
+        @echo
         @echo '## C++ ##'
-        @./cpp-bench
-        @echo '## Cforall ##'
-        @./cfa-bench
-        @echo '## C -O2 ##'
-        @./c2-bench
-        @echo '## C++ -O2 ##'
-        @./cpp2-bench
-        @echo '## Cforall -O2 ##'
-        @./cfa2-bench
+        @/usr/bin/time -f 'max_memory:\t %M kilobytes' ./cpp-bench
+        @printf 'source_size:\t%8d lines\n' `cat $(CPPFILES) | wc -l`
+        @printf 'redundant_type_annotations:%8d lines\n' `cat $(CPPFILES) | fgrep '/***/' -c`
+        @printf 'binary_size:\t%8d bytes\n' `stat -c %s cpp-bench`
+
+run-cppv: cpp-vbench
+        @echo
+        @echo '## C++obj ##'
+        @/usr/bin/time -f 'max_memory:\t%M kilobytes' ./cpp-vbench
+        @printf 'source_size:\t%8d lines\n' `cat $(CPPVFILES) | wc -l`
+        @printf 'redundant_type_annotations:%8d lines\n' `cat $(CPPVFILES) | fgrep '/***/' -c`
+        @printf 'binary_size:\t%8d bytes\n' `stat -c %s cpp-vbench`
+
+run: run-c run-cfa run-cpp run-cppv
 
 # so make doesn't fail without dependency files