Ignore:
Timestamp:
Apr 10, 2017, 3:17:29 PM (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:
b715c9a
Parents:
b0fedd4 (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:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed

  • doc/generic_types/evaluation/Makefile

    rb0fedd4 r7a054e82  
    11CFA = my-cfa
    22DEPFLAGS = -MMD -MP
     3CFLAGS = -O2 -flto
     4CXXFLAGS = $(CFLAGS) --std=c++14
    35
    4 .PHONY: all clean distclean bench
     6.PHONY: all clean distclean run-c run-cpp run-cfa run
    57
    6 all: c-bench cpp-bench cfa-bench c2-bench cpp2-bench cfa2-bench
     8all: c-bench cpp-bench cfa-bench
    79
    810# rewrite object generation to auto-determine deps
    … …  
    1315c-%.o : c-%.c
    1416c-%.o : c-%.c c-%.d
    15         $(COMPILE.c) -O0 $(OUTPUT_OPTION) -c $<
     17        $(COMPILE.c) $(OUTPUT_OPTION) -c $<
    1618
    1719cpp-%.o : cpp-%.cpp
    1820cpp-%.o : cpp-%.cpp cpp-%.d
    19         $(COMPILE.cpp) -O0 $(OUTPUT_OPTION) -c $<
     21        $(COMPILE.cpp) $(OUTPUT_OPTION) -c $<
    2022
    2123cfa-%.o : cfa-%.c
    2224cfa-%.o : cfa-%.c cfa-%.d
    23         $(COMPILE.cfa) -O0 $(OUTPUT_OPTION) -c $<
    24 
    25 c2-%.o : c-%.c
    26 c2-%.o : c-%.c c-%.d
    27         $(COMPILE.c) -O2 $(OUTPUT_OPTION) -c $<
    28 
    29 cpp2-%.o : cpp-%.cpp
    30 cpp2-%.o : cpp-%.cpp cpp-%.d
    31         $(COMPILE.cpp) -O2 $(OUTPUT_OPTION) -c $<
    32 
    33 cfa2-%.o : cfa-%.c
    34 cfa2-%.o : cfa-%.c cfa-%.d
    35         $(COMPILE.cfa) -O2 $(OUTPUT_OPTION) -c $<
     25        $(COMPILE.cfa) $(OUTPUT_OPTION) -c $<
    3626
    3727COBJS = c-stack.o
    3828CPPOBJS =
     29CPPVOBJS = cpp-vstack.o
    3930CFAOBJS = cfa-stack.o
    40 C2OBJS = $(patsubst c-%,c2-%, $(COBJS))
    41 CPP2OBJS = $(patsubst cpp-%,cpp2-%, $(CPPOBJS))
    42 CFA2OBJS = $(patsubst cfa-%,cfa2-%, $(CFAOBJS))
    4331
    4432c-bench: c-bench.c c-bench.d $(COBJS)
    45         $(COMPILE.c) -O0 -o $@ $< $(COBJS) $(LDFLAGS)
     33        $(COMPILE.c) -o $@ $< $(COBJS) $(LDFLAGS)
    4634
    4735cpp-bench: cpp-bench.cpp cpp-bench.d $(CPPOBJS)
    48         $(COMPILE.cpp) -O0 -o $@ $< $(CPPOBJS) $(LDFLAGS)
     36        $(COMPILE.cpp) -o $@ $< $(CPPOBJS) $(LDFLAGS)
     37
     38cpp-vbench: cpp-vbench.cpp cpp-vbench.d $(CPPVOBJS)
     39        $(COMPILE.cpp) -o $@ $< $(CPPVOBJS) $(LDFLAGS)
    4940
    5041cfa-bench: cfa-bench.c cfa-bench.d $(CFAOBJS)
    51         $(COMPILE.cfa) -O0 -o $@ $< $(CFAOBJS) $(LDFLAGS)
    52 
    53 c2-bench: c-bench.c c-bench.d $(C2OBJS)
    54         $(COMPILE.c) -O2 -o $@ $< $(C2OBJS) $(LDFLAGS)
    55 
    56 cpp2-bench: cpp-bench.cpp cpp-bench.d $(CPP2OBJS)
    57         $(COMPILE.cpp) -O2 -o $@ $< $(CPP2OBJS) $(LDFLAGS)
    58 
    59 cfa2-bench: cfa-bench.c cfa-bench.d $(CFA2OBJS)
    60         $(COMPILE.cfa) -O2 -o $@ $< $(CFA2OBJS) $(LDFLAGS)
     42        $(COMPILE.cfa) -o $@ $< $(CFAOBJS) $(LDFLAGS)
    6143
    6244clean:
    6345        -rm $(COBJS) c-bench
    6446        -rm $(CPPOBJS) cpp-bench
     47        -rm $(CPPVOBJS) cpp-vbench
    6548        -rm $(CFAOBJS) cfa-bench
    66         -rm $(C2OBJS) c2-bench
    67         -rm $(CPP2OBJS) cpp2-bench
    68         -rm $(CFA2OBJS) cfa2-bench
    6949
    7050distclean: clean
    7151        -rm $(COBJS:.o=.d) c-bench.d
    7252        -rm $(CPPOBJS:.o=.d) cpp-bench.d
     53        -rm $(CPPVOBJS:.o=.d) cpp-vbench.d
    7354        -rm $(CFAOBJS:.o=.d) cfa-bench.d
    7455
    75 bench: c-bench cpp-bench cfa-bench c2-bench cpp2-bench cfa2-bench
     56run-c: c-bench
    7657        @echo '## C ##'
    7758        @./c-bench
     59        @printf 'source_size:\t%7d lines\n' `cat c-bench.c bench.h c-stack.h c-stack.c | wc -l`
     60        @printf 'binary_size:\t%7d bytes\n' `wc -c < c-bench`
     61
     62run-cfa: cfa-bench
     63        @echo '## Cforall ##'
     64        @./cfa-bench
     65        @printf 'source_size:\t%7d lines\n' `cat cfa-bench.c bench.h cfa-stack.h cfa-stack.c | wc -l`
     66        @printf 'binary_size:\t%7d bytes\n' `wc -c < cfa-bench`
     67
     68run-cpp: cpp-bench
    7869        @echo '## C++ ##'
    7970        @./cpp-bench
    80         @echo '## Cforall ##'
    81         @./cfa-bench
    82         @echo '## C -O2 ##'
    83         @./c2-bench
    84         @echo '## C++ -O2 ##'
    85         @./cpp2-bench
    86         @echo '## Cforall -O2 ##'
    87         @./cfa2-bench
     71        @printf 'source_size:\t%7d lines\n' `cat cpp-bench.cpp bench.hpp cpp-stack.hpp | wc -l`
     72        @printf 'binary_size:\t%7d bytes\n' `wc -c < cpp-bench`
     73
     74run-cppv: cpp-vbench
     75        @echo '## C++ virtual ##'
     76        @./cpp-vbench
     77        @printf 'source_size:\t%7d lines\n' `cat cpp-vbench.cpp bench.hpp object.hpp cpp-vstack.hpp cpp-vstack.cpp | wc -l`
     78        @printf 'binary_size:\t%7d bytes\n' `wc -c < cpp-vbench`
     79
     80run: run-c run-cfa run-cpp run-cppv
    8881
    8982# so make doesn't fail without dependency files
Note: See TracChangeset for help on using the changeset viewer.