Ignore:
Timestamp:
Mar 12, 2019, 3:00:54 PM (7 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
30e32b2, a2545593
Parents:
9d9a451 (diff), 91d6584 (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 second draft of Aaron's thesis

File:
1 edited

Legend:

Unmodified
Added
Removed

  • benchmark/Makefile.in

    r9d9a451 r53bb8f1  
    111111CONFIG_CLEAN_FILES =
    112112CONFIG_CLEAN_VPATH_FILES =
    113 am_dummy_OBJECTS = c.$(OBJEXT) cxx.$(OBJEXT)
     113am_dummy_OBJECTS = dummyC.$(OBJEXT) dummyCXX.$(OBJEXT)
    114114dummy_OBJECTS = $(am_dummy_OBJECTS)
    115115dummy_LDADD = $(LDADD)
    … …  
    200200DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    201201ACLOCAL = @ACLOCAL@
    202 ALLOCA = @ALLOCA@
    203202AMTAR = @AMTAR@
    204203AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
    … …  
    364363am__v_GOC_0 = @echo "  GOC     " $@;
    365364am__v_GOC_1 =
     365UPPCC = u++
    366366UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    367367AM_V_UPP = $(am__v_UPP_@AM_V@)
    … …  
    371371
    372372# applies to both programs
    373 UPPCC = u++
    374373AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    375374AM_CFAFLAGS = -quiet -in-tree -nodebug
    376375AM_UPPFLAGS = -quiet -nodebug -multi
    377 TOOLSDIR = ${abs_top_srcdir}/tools/
    378 REPEAT = ${TOOLSDIR}repeat
    379 STATS = ${TOOLSDIR}stat.py
     376BENCH_V_CC = $(__bench_v_CC_$(__quiet))
     377BENCH_V_CFA = $(__bench_v_CFA_$(__quiet))
     378BENCH_V_CXX = $(__bench_v_CXX_$(__quiet))
     379BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
     380BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
     381BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
     382__quiet = verbose
     383__bench_v_CC_quiet = @
     384__bench_v_CFA_quiet = @
     385__bench_v_CXX_quiet = @
     386__bench_v_GOC_quiet = @
     387__bench_v_JAVAC_quiet = @
     388__bench_v_UPP_quiet = @
     389__bench_v_CC_verbose = $(AM_V_CC)
     390__bench_v_CFA_verbose = $(AM_V_CFA)
     391__bench_v_CXX_verbose = $(AM_V_CXX)
     392__bench_v_GOC_verbose = $(AM_V_GOC)
     393__bench_v_JAVAC_verbose = $(AM_V_JAVAC)
     394__bench_v_UPP_verbose = $(AM_V_UPP)
     395TOOLSDIR = ${abs_top_builddir}/tools/
     396REPEAT = ${abs_top_builddir}/tools/repeat
     397STATS = ${abs_top_srcdir}/tools/stat.py
    380398repeats = 30
    381399skipcompile = no
    382400TIME_FORMAT = "%E"
    383401PRINT_FORMAT = %20s: #Comments needed for spacing
    384 dummy_SOURCES = c.c cxx.cpp
     402dummy_SOURCES = dummyC.c dummyCXX.cpp
    385403CTXSWITCH_DEPEND = loop.run function.run fetch_add.run \
    386404        ctxswitch-pthread.run ctxswitch-cfa_coroutine.run \
    … …  
    435453        -rm -f *.tab.c
    436454
    437 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c.Po@am__quote@
    438 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx.Po@am__quote@
     455@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummyC.Po@am__quote@
     456@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummyCXX.Po@am__quote@
    439457
    440458.c.o:
    … …  
    706724        $(am__mv) $$depbase.Tpo $$depbase.Plo
    707725
    708 #prevent any tests in parallel
     726dummyC.c:
     727        @echo "int main() { return 0; }" > ${@}
     728
     729dummyCXX.cpp:
     730        @echo "int main() { return 0; }" > ${@}
     731
    709732.NOTPARALLEL:
    710733
    … …  
    721744
    722745%.runquiet :
    723         @+make $(basename $@) CFLAGS="-w"
     746        @+make $(basename $@) CFLAGS="-w" __quiet=quiet
    724747        @taskset -c 1 ./a.out
    725748        @rm -f a.out
    … …  
    730753
    731754${REPEAT} :
    732         @+make -C ${TOOLSDIR} repeat
     755        @+make -C ${abs_top_builddir}/tools repeat
    733756
    734757jenkins$(EXEEXT):
    … …  
    768791
    769792loop$(EXEEXT):
    770         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     793        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    771794
    772795function$(EXEEXT):
    773         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     796        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    774797
    775798fetch_add$(EXEEXT):
    776         $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     799        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    777800
    778801@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
    779 @WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     802@WITH_LIBFIBRE_TRUE@    $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    780803
    781804@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre2$(EXEEXT):
    782 @WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     805@WITH_LIBFIBRE_TRUE@    $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    783806
    784807ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
    785808
    786809ctxswitch-pthread$(EXEEXT):
    787         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     810        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    788811
    789812ctxswitch-cfa_coroutine$(EXEEXT):
    790         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
     813        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    791814
    792815ctxswitch-cfa_thread$(EXEEXT):
    793         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     816        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    794817
    795818ctxswitch-cfa_thread2$(EXEEXT):
    796         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
     819        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    797820
    798821ctxswitch-upp_coroutine$(EXEEXT):
    799         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     822        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    800823
    801824ctxswitch-upp_thread$(EXEEXT):
    802         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     825        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    803826
    804827ctxswitch-goroutine$(EXEEXT):
    805         $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     828        $(BENCH_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    806829
    807830ctxswitch-java_thread$(EXEEXT):
    808         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     831        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    809832        @echo "#!/bin/sh" > a.out
    810833        @echo "java JavaThread" >> a.out
    … …  
    823846
    824847mutex-pthread_lock$(EXEEXT):
    825         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     848        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    826849
    827850mutex-upp$(EXEEXT):
    828         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     851        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    829852
    830853mutex-cfa1$(EXEEXT):
    831         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
     854        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    832855
    833856mutex-cfa2$(EXEEXT):
    834         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
     857        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    835858
    836859mutex-cfa4$(EXEEXT):
    837         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
     860        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    838861
    839862mutex-java_thread$(EXEEXT):
    840         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     863        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    841864        @echo "#!/bin/sh" > a.out
    842865        @echo "java JavaThread" >> a.out
    … …  
    852875
    853876signal-pthread_cond$(EXEEXT):
    854         $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     877        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    855878
    856879signal-upp$(EXEEXT):
    857         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     880        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    858881
    859882signal-cfa1$(EXEEXT):
    860         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
     883        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    861884
    862885signal-cfa2$(EXEEXT):
    863         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
     886        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    864887
    865888signal-cfa4$(EXEEXT):
    866         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
     889        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    867890
    868891signal-java_thread$(EXEEXT):
    869         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     892        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    870893        @echo "#!/bin/sh" > a.out
    871894        @echo "java JavaThread" >> a.out
    … …  
    879902
    880903waitfor-upp$(EXEEXT):
    881         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     904        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    882905
    883906waitfor-cfa1$(EXEEXT):
    884         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
     907        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    885908
    886909waitfor-cfa2$(EXEEXT):
    887         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
     910        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    888911
    889912waitfor-cfa4$(EXEEXT):
    890         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
     913        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    891914
    892915creation$(EXEEXT) :\
    … …  
    901924
    902925creation-cfa_coroutine$(EXEEXT):
    903         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     926        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    904927
    905928creation-cfa_coroutine_eager$(EXEEXT):
    906         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     929        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
    907930
    908931creation-cfa_thread$(EXEEXT):
    909         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
     932        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    910933
    911934creation-upp_coroutine$(EXEEXT):
    912         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     935        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    913936
    914937creation-upp_thread$(EXEEXT):
    915         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     938        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    916939
    917940creation-pthread$(EXEEXT):
    918         $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     941        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    919942
    920943creation-goroutine$(EXEEXT):
    921         $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     944        $(BENCH_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    922945
    923946creation-java_thread$(EXEEXT):
    924         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     947        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    925948        @echo "#!/bin/sh" > a.out
    926949        @echo "java JavaThread" >> a.out
    … …  
    938961
    939962compile-array$(EXEEXT):
    940         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
     963        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    941964
    942965compile-attributes$(EXEEXT):
    943         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     966        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    944967
    945968compile-empty$(EXEEXT):
    946         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
     969        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    947970
    948971compile-expression$(EXEEXT):
    949         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
     972        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    950973
    951974compile-io$(EXEEXT):
    952         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
     975        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    953976
    954977compile-monitor$(EXEEXT):
    955         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
     978        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    956979
    957980compile-operators$(EXEEXT):
    958         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
     981        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    959982
    960983compile-thread$(EXEEXT):
    961         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
     984        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    962985
    963986compile-typeof$(EXEEXT):
    964         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     987        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    965988
    966989# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.