Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.in

    r1f86d5e r5a8037a7  
    371371
    372372# applies to both programs
    373 AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    374 AM_CFAFLAGS = -quiet -in-tree -nodebug
    375 AM_UPPFLAGS = -quiet -nodebug -multi
     373AM_CFLAGS = -O2 -Wall -Wextra -Werror -I$(srcdir) -lrt -pthread
     374AM_CFAFLAGS = -quiet -nodebug -in-tree
     375AM_UPPFLAGS = -quiet -nodebug -multi -std=c++14
     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)
    376395TOOLSDIR = ${abs_top_builddir}/tools/
    377396REPEAT = ${abs_top_builddir}/tools/repeat
     
    383402dummy_SOURCES = dummyC.c dummyCXX.cpp
    384403CTXSWITCH_DEPEND = loop.run function.run fetch_add.run \
    385         ctxswitch-pthread.run ctxswitch-cfa_coroutine.run \
    386         ctxswitch-cfa_thread.run ctxswitch-cfa_thread2.run \
    387         ctxswitch-upp_coroutine.run ctxswitch-upp_thread.run \
    388         ctxswitch-goroutine.run ctxswitch-java_thread.run \
    389         $(am__append_1)
     404        tls-fetch_add.run ctxswitch-pthread.run \
     405        ctxswitch-cfa_coroutine.run ctxswitch-cfa_thread.run \
     406        ctxswitch-cfa_thread2.run ctxswitch-upp_coroutine.run \
     407        ctxswitch-upp_thread.run ctxswitch-goroutine.run \
     408        ctxswitch-java_thread.run $(am__append_1)
    390409testdir = $(top_srcdir)/tests
    391410all: all-am
     
    725744
    726745%.runquiet :
    727         @+make $(basename $@) CFLAGS="-w"
     746        @+make $(basename $@) CFLAGS="-w" __quiet=quiet
    728747        @taskset -c 1 ./a.out
    729748        @rm -f a.out
     
    772791
    773792loop$(EXEEXT):
    774         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     793        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    775794
    776795function$(EXEEXT):
    777         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     796        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    778797
    779798fetch_add$(EXEEXT):
    780         $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     799        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     800
     801tls-fetch_add$(EXEEXT):
     802        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/tls-fetch_add.c
    781803
    782804@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
    783 @WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     805@WITH_LIBFIBRE_TRUE@    $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    784806
    785807@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre2$(EXEEXT):
    786 @WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     808@WITH_LIBFIBRE_TRUE@    $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    787809
    788810ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
    789811
    790812ctxswitch-pthread$(EXEEXT):
    791         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     813        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    792814
    793815ctxswitch-cfa_coroutine$(EXEEXT):
    794         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     816        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    795817
    796818ctxswitch-cfa_thread$(EXEEXT):
    797         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     819        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    798820
    799821ctxswitch-cfa_thread2$(EXEEXT):
    800         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     822        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    801823
    802824ctxswitch-upp_coroutine$(EXEEXT):
    803         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     825        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    804826
    805827ctxswitch-upp_thread$(EXEEXT):
    806         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     828        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    807829
    808830ctxswitch-goroutine$(EXEEXT):
    809         $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     831        $(BENCH_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    810832
    811833ctxswitch-java_thread$(EXEEXT):
    812         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     834        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    813835        @echo "#!/bin/sh" > a.out
    814836        @echo "java JavaThread" >> a.out
     
    827849
    828850mutex-pthread_lock$(EXEEXT):
    829         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     851        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    830852
    831853mutex-upp$(EXEEXT):
    832         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     854        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    833855
    834856mutex-cfa1$(EXEEXT):
    835         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     857        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    836858
    837859mutex-cfa2$(EXEEXT):
    838         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     860        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    839861
    840862mutex-cfa4$(EXEEXT):
    841         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     863        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    842864
    843865mutex-java_thread$(EXEEXT):
    844         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     866        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    845867        @echo "#!/bin/sh" > a.out
    846868        @echo "java JavaThread" >> a.out
     
    856878
    857879signal-pthread_cond$(EXEEXT):
    858         $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     880        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    859881
    860882signal-upp$(EXEEXT):
    861         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     883        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    862884
    863885signal-cfa1$(EXEEXT):
    864         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     886        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    865887
    866888signal-cfa2$(EXEEXT):
    867         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     889        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    868890
    869891signal-cfa4$(EXEEXT):
    870         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     892        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    871893
    872894signal-java_thread$(EXEEXT):
    873         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     895        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    874896        @echo "#!/bin/sh" > a.out
    875897        @echo "java JavaThread" >> a.out
     
    883905
    884906waitfor-upp$(EXEEXT):
    885         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     907        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    886908
    887909waitfor-cfa1$(EXEEXT):
    888         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     910        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    889911
    890912waitfor-cfa2$(EXEEXT):
    891         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     913        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    892914
    893915waitfor-cfa4$(EXEEXT):
    894         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     916        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    895917
    896918creation$(EXEEXT) :\
     
    905927
    906928creation-cfa_coroutine$(EXEEXT):
    907         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     929        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    908930
    909931creation-cfa_coroutine_eager$(EXEEXT):
    910         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
     932        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
    911933
    912934creation-cfa_thread$(EXEEXT):
    913         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     935        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    914936
    915937creation-upp_coroutine$(EXEEXT):
    916         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     938        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    917939
    918940creation-upp_thread$(EXEEXT):
    919         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     941        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    920942
    921943creation-pthread$(EXEEXT):
    922         $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     944        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    923945
    924946creation-goroutine$(EXEEXT):
    925         $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     947        $(BENCH_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    926948
    927949creation-java_thread$(EXEEXT):
    928         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     950        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    929951        @echo "#!/bin/sh" > a.out
    930952        @echo "java JavaThread" >> a.out
     
    942964
    943965compile-array$(EXEEXT):
    944         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     966        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    945967
    946968compile-attributes$(EXEEXT):
    947         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     969        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    948970
    949971compile-empty$(EXEEXT):
    950         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     972        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    951973
    952974compile-expression$(EXEEXT):
    953         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     975        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    954976
    955977compile-io$(EXEEXT):
    956         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     978        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    957979
    958980compile-monitor$(EXEEXT):
    959         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     981        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    960982
    961983compile-operators$(EXEEXT):
    962         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     984        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    963985
    964986compile-thread$(EXEEXT):
    965         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     987        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    966988
    967989compile-typeof$(EXEEXT):
    968         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     990        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    969991
    970992# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.