Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • benchmark/Makefile.in

    rdd9e1ca rdf8b87cd  
    9393EXTRA_PROGRAMS = dummy$(EXEEXT)
    9494@WITH_LIBFIBRE_TRUE@am__append_1 = \
    95 @WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre.run         \
     95@WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre.run  \
    9696@WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre2.run
    9797
    … …  
    214214CCDEPMODE = @CCDEPMODE@
    215215CFACC = @CFACC@
    216 CFACC_INSTALL = @CFACC_INSTALL@
    217216CFACPP = @CFACPP@
    218217CFA_BACKEND_CC = @CFA_BACKEND_CC@
    … …  
    245244FGREP = @FGREP@
    246245GREP = @GREP@
    247 HAS_DISTCC = @HAS_DISTCC@
    248246HOST_FLAGS = @HOST_FLAGS@
    249247INSTALL = @INSTALL@
    … …  
    352350LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
    353351        $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
    354         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(AM_CFLAGS) $(CFAFLAGS) $(CFLAGS)
     352        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
     353        $(AM_CFLAGS) $(CFLAGS)
    355354
    356355AM_V_CFA = $(am__v_CFA_@AM_V@)
    … …  
    358357am__v_CFA_0 = @echo "  CFA     " $@;
    359358am__v_CFA_1 =
     359AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
     360am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
     361am__v_JAVAC_0 = @echo "  JAVAC   " $@;
     362am__v_JAVAC_1 =
     363AM_V_GOC = $(am__v_GOC_@AM_V@)
     364am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
     365am__v_GOC_0 = @echo "  GOC     " $@;
     366am__v_GOC_1 =
    360367UPPCC = u++
    361368UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    … …  
    364371am__v_UPP_0 = @echo "  UPP     " $@;
    365372am__v_UPP_1 =
    366 AM_V_GOC = $(am__v_GOC_@AM_V@)
    367 am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
    368 am__v_GOC_0 = @echo "  GOC     " $@;
    369 am__v_GOC_1 =
    370 AM_V_PY = $(am__v_PY_@AM_V@)
    371 am__v_PY_ = $(am__v_PY_@AM_DEFAULT_V@)
    372 am__v_PY_0 = @echo "  PYTHON  " $@;
    373 am__v_PY_1 =
    374 AM_V_RUST = $(am__v_RUST_@AM_V@)
    375 am__v_RUST_ = $(am__v_RUST_@AM_DEFAULT_V@)
    376 am__v_RUST_0 = @echo "  RUST    " $@;
    377 am__v_RUST_1 =
    378 AM_V_NODEJS = $(am__v_NODEJS_@AM_V@)
    379 am__v_NODEJS_ = $(am__v_NODEJS_@AM_DEFAULT_V@)
    380 am__v_NODEJS_0 = @echo "  NODEJS  " $@;
    381 am__v_NODEJS_1 =
    382 AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
    383 am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
    384 am__v_JAVAC_0 = @echo "  JAVAC   " $@;
    385 am__v_JAVAC_1 =
    386373
    387374# applies to both programs
    388375AM_CFLAGS = -O2 -Wall -Wextra -I$(srcdir) -lrt -pthread # -Werror
    389 AM_CFAFLAGS = -quiet -nodebug
     376AM_CFAFLAGS = -quiet -nodebug -in-tree
    390377AM_UPPFLAGS = -quiet -nodebug -multi -std=c++14
    391378BENCH_V_CC = $(__bench_v_CC_$(__quiet))
    392379BENCH_V_CFA = $(__bench_v_CFA_$(__quiet))
    393380BENCH_V_CXX = $(__bench_v_CXX_$(__quiet))
     381BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
     382BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
    394383BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
    395 BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
    396 BENCH_V_PY = $(__bench_v_PY_$(__quiet))
    397 BENCH_V_RUSTC = $(__bench_v_RUSTC_$(__quiet))
    398 BENCH_V_NODEJS = $(__bench_v_NODEJS_$(__quiet))
    399 BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
    400384__quiet = verbose
    401385__bench_v_CC_quiet = @
    402386__bench_v_CFA_quiet = @
    403387__bench_v_CXX_quiet = @
     388__bench_v_GOC_quiet = @
     389__bench_v_JAVAC_quiet = @
    404390__bench_v_UPP_quiet = @
    405 __bench_v_GOC_quiet = @
    406 __bench_v_RUSTC_quiet = @
    407 __bench_v_JAVAC_quiet = @
    408391__bench_v_CC_verbose = $(AM_V_CC)
    409392__bench_v_CFA_verbose = $(AM_V_CFA)
    410393__bench_v_CXX_verbose = $(AM_V_CXX)
     394__bench_v_GOC_verbose = $(AM_V_GOC)
     395__bench_v_JAVAC_verbose = $(AM_V_JAVAC)
    411396__bench_v_UPP_verbose = $(AM_V_UPP)
    412 __bench_v_GOC_verbose = $(AM_V_GOC)
    413 __bench_v_PY_verbose = $(AM_V_PY)
    414 __bench_v_RUSTC_verbose = $(AM_V_RUST)
    415 __bench_v_NODEJS_verbose = $(AM_V_NODEJS)
    416 __bench_v_JAVAC_verbose = $(AM_V_JAVAC)
    417397TOOLSDIR = ${abs_top_builddir}/tools/
    418398REPEAT = ${abs_top_builddir}/tools/repeat
    419399STATS = ${abs_top_srcdir}/tools/stat.py
    420400# NEED AT LEAST 4 DATA VALUES FOR BENCHMARKS BECAUSE THE MAX AND MIN VALUES ARE REMOVED
    421 repeats = 13 # 31 for benchmarks
     401repeats = 5 # 31 for benchmarks
    422402arch = x64
    423403skipcompile = no
    … …  
    425405PRINT_FORMAT = %20s: #Comments needed for spacing
    426406dummy_SOURCES = dummyC.c dummyCXX.cpp
    427 basic_loop_DURATION = 15000000000
    428 basic_function_DURATION = 10000000000
    429 basic_tls_fetch_add_DURATION = 10000000000
    430 basic_DURATION = 250000000
    431 ctxswitch_pthread_DURATION = 25000000
    432 ctxswitch_rust_thread_DURATION = $(ctxswitch_pthread_DURATION)
    433 ctxswitch_cfa_generator_DURATION = 5000000000
    434 ctxswitch_nodejs_await_DURATION = 5000000
    435 ctxswitch_DURATION = 100000000
    436 
    437 #mutex_java_DURATION = 10000000
    438 mutex_DURATION = 50000000
    439 schedint_pthread_DURATION = 1000000
    440 schedint_java_DURATION = $(schedint_pthread_DURATION)
    441 schedint_rust_DURATION = $(schedint_pthread_DURATION)
    442 schedint_DURATION = 10000000
    443 schedext_DURATION = 10000000
    444 creation_pthread_DURATION = 250000
    445 creation_rust_thread_DURATION = ${creation_pthread_DURATION}
    446 creation_java_thread_DURATION = ${creation_pthread_DURATION}
    447 creation_cfa_coroutine_DURATION = 100000000
    448 creation_cfa_coroutine_eager_DURATION = 10000000
    449 creation_upp_coroutine_DURATION = ${creation_cfa_coroutine_eager_DURATION}
    450 creation_cfa_thread_DURATION = 10000000
    451 creation_upp_thread_DURATION = ${creation_cfa_thread_DURATION}
    452 creation_DURATION = 10000000
    453407FIX_NEW_LINES = cat $@ | tr "\n" "\t" | sed -r 's/\t,/,/' | tr "\t" "\n" > $@
    454 BASIC_DEPEND = \
    455         basic-loop.run                          \
    456         basic-function.run                      \
    457         basic-fetch_add.run                     \
    458         basic-ttst_lock.run                     \
    459         basic-tls-fetch_add.run
    460 
    461 CTXSWITCH_DEPEND = ctxswitch-cfa_generator.run \
    462         ctxswitch-cfa_coroutine.run ctxswitch-cfa_thread.run \
    463         ctxswitch-cfa_thread2.run ctxswitch-upp_coroutine.run \
    464         ctxswitch-upp_thread.run ctxswitch-python_coroutine.run \
    465         ctxswitch-nodejs_coroutine.run ctxswitch-nodejs_await.run \
    466         ctxswitch-goroutine_thread.run ctxswitch-rust_thread.run \
    467         ctxswitch-nodejs_coroutine.run ctxswitch-java_thread.run \
    468         ctxswitch-pthread.run $(am__append_1)
     408CTXSWITCH_DEPEND = loop.run function.run fetch_add.run ttst_lock.run \
     409        tls-fetch_add.run ctxswitch-pthread.run \
     410        ctxswitch-cfa_generator.run ctxswitch-cfa_coroutine.run \
     411        ctxswitch-cfa_thread.run ctxswitch-cfa_thread2.run \
     412        ctxswitch-upp_coroutine.run ctxswitch-upp_thread.run \
     413        ctxswitch-goroutine.run ctxswitch-java_thread.run \
     414        $(am__append_1)
    469415testdir = $(top_srcdir)/tests
    470416all: all-am
    … …  
    785731
    786732dummyC.c:
    787         echo "int main() { return 0; }" > ${@}
     733        @echo "int main() { return 0; }" > ${@}
    788734
    789735dummyCXX.cpp:
    790         echo "int main() { return 0; }" > ${@}
    791 
    792 .SILENT:                # do not print recipe
     736        @echo "int main() { return 0; }" > ${@}
     737
    793738.NOTPARALLEL:
    794 .PHONY: jenkins cleancsv
    795 
    796 all : basic$(EXEEXT) ctxswitch$(EXEEXT) mutex$(EXEEXT) schedint$(EXEEXT) schedext$(EXEEXT) creation$(EXEEXT)
     739.PHONY: compile.csv ctxswitch.csv mutex.csv signal.csv
     740
     741all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
    797742
    798743%.run : %$(EXEEXT) ${REPEAT}
    799         rm -f .result.log
    800         echo "------------------------------------------------------"
    801         echo $<
    802         ${REPEAT} ${repeats} -- ./a.out\
    803                 $(if ${$(subst -,_,$(basename $@))_DURATION},\
    804                         ${$(subst -,_,$(basename $@))_DURATION},\
    805                         ${$(firstword $(subst -, ,$(basename $@)))_DURATION}) | tee -a .result.log
    806         ${STATS} .result.log
    807         echo "------------------------------------------------------"
    808         rm -f a.out .result.log *.class
    809 
    810 #       ${REPEAT} ${repeats} -- /usr/bin/time -f "%Uu %Ss %Er %Mkb" ./a.out
     744        @rm -f .result.log
     745        @echo "------------------------------------------------------"
     746        @echo $<
     747        @${REPEAT} ${repeats} ./a.out | tee -a .result.log
     748        @${STATS} .result.log
     749        @echo "------------------------------------------------------"
     750        @rm -f a.out .result.log *.class
    811751
    812752%.runquiet :
    813         +make $(basename $@) CFLAGS="-w" __quiet=quiet
    814         taskset -c 1 ./a.out
    815         rm -f a.out
     753        @+make $(basename $@) CFLAGS="-w" __quiet=quiet
     754        @taskset -c 1 ./a.out
     755        @rm -f a.out
    816756
    817757%.make :
    818         printf "${PRINT_FORMAT}" $(basename $(subst compile-,,$@))
    819         +/usr/bin/time -f ${TIME_FORMAT} make $(basename $@) 2>&1
     758        @printf "${PRINT_FORMAT}" $(basename $(subst compile-,,$@))
     759        @+/usr/bin/time -f ${TIME_FORMAT} make $(basename $@) 2>&1
    820760
    821761${REPEAT} :
    822         +make -C ${abs_top_builddir}/tools repeat
    823 
    824 cleancsv:
    825         rm -f compile.csv basic.csv ctxswitch.csv mutex.csv scheduling.csv
    826 
    827 jenkins$(EXEEXT): cleancsv
     762        @+make -C ${abs_top_builddir}/tools repeat
     763
     764jenkins$(EXEEXT):
    828765@DOifskipcompile@
    829         +make compile.csv
    830         -+make compile.diff.csv
     766        @+make compile.csv
     767        @-+make compile.diff.csv
    831768@DOendif@
    832         +make ctxswitch.csv
    833         -+make ctxswitch.diff.csv
    834         +make mutex.csv
    835         -+make mutex.diff.csv
    836         +make scheduling.csv
    837         -+make scheduling.diff.csv
     769        @+make ctxswitch.csv
     770        @-+make ctxswitch.diff.csv
     771        @+make mutex.csv
     772        @-+make mutex.diff.csv
     773        @+make signal.csv
     774        @-+make signal.diff.csv
    838775@DOifskipcompile@
    839776        cat compile.csv
    … …  
    844781        cat mutex.csv
    845782        -cat mutex.diff.csv
    846         cat scheduling.csv
    847         -cat scheduling.diff.csv
     783        cat signal.csv
     784        -cat signal.diff.csv
    848785
    849786compile.csv:
    850         echo "building $@"
    851         echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
    852         +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
    853         +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-attributes.make >> $@
    854         +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-empty.make >> $@
    855         +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-expression.make >> $@
    856         +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-io.make >> $@
    857         +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-monitor.make >> $@
    858         +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-operators.make >> $@
    859         +make TIME_FORMAT='%e' PRINT_FORMAT='' compile-typeof.make >> $@
    860         $(srcdir)/fixcsv.sh $@
     787        @echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
     788        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
     789        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-attributes.make >> $@
     790        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-empty.make >> $@
     791        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-expression.make >> $@
     792        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-io.make >> $@
     793        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-monitor.make >> $@
     794        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-operators.make >> $@
     795        @+make TIME_FORMAT='%e' PRINT_FORMAT='' compile-typeof.make >> $@
     796        @$(srcdir)/fixcsv.sh $@
    861797
    862798ctxswitch.csv:
    863         echo "building $@"
    864         echo "generator,coroutine,thread" > $@
    865         +make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
    866         +make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
    867         +make ctxswitch-cfa_thread.runquiet >> $@
    868         $(srcdir)/fixcsv.sh $@
     799        @echo "generator,coroutine,thread" > $@
     800        @+make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
     801        @+make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
     802        @+make ctxswitch-cfa_thread.runquiet >> $@
     803        @$(srcdir)/fixcsv.sh $@
    869804
    870805mutex.csv:
    871         echo "building $@"
    872         echo "1-monitor,2-monitor" > $@
    873         +make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
    874         +make mutex-cfa2.runquiet >> $@
    875         $(srcdir)/fixcsv.sh $@
    876 
    877 scheduling.csv:
    878         echo "building $@"
    879         echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
    880         +make schedint-cfa1.runquiet >> $@ && echo -n ',' >> $@
    881         +make schedint-cfa2.runquiet >> $@ && echo -n ',' >> $@
    882         +make schedext-cfa1.runquiet >> $@ && echo -n ',' >> $@
    883         +make schedext-cfa2.runquiet >> $@
    884         $(srcdir)/fixcsv.sh $@
     806        @echo "1-monitor,2-monitor" > $@
     807        @+make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
     808        @+make mutex-cfa2.runquiet >> $@
     809        @$(srcdir)/fixcsv.sh $@
     810
     811signal.csv:
     812        @echo "signal-1,signal-2,waitfor-1,waitfor-2" > $@
     813        @+make signal-cfa1.runquiet >> $@ && echo -n ',' >> $@
     814        @+make signal-cfa2.runquiet >> $@ && echo -n ',' >> $@
     815        @+make waitfor-cfa1.runquiet >> $@ && echo -n ',' >> $@
     816        @+make waitfor-cfa2.runquiet >> $@
     817        @$(srcdir)/fixcsv.sh $@
    885818
    886819%.diff.csv: %.csv
    887         test -e $(srcdir)/baselines/$(arch)/$< || (echo "Error : Missing baseline for ${<}" && false)
    888         $(srcdir)/baselines/calc.py $(srcdir)/baselines/$(arch)/$(<) $(<) > $@
    889 
    890 basic-loop$(EXEEXT):
    891         $(BENCH_V_CC)$(COMPILE) $(srcdir)/basic/loop.c
    892 
    893 basic-function$(EXEEXT):
    894         $(BENCH_V_CC)$(COMPILE) $(srcdir)/basic/function.c
    895 
    896 basic-fetch_add$(EXEEXT):
    897         $(BENCH_V_CC)$(COMPILE) $(srcdir)/basic/fetch_add.c
    898 
    899 basic-ttst_lock$(EXEEXT):
    900         $(BENCH_V_CC)$(COMPILE) $(srcdir)/basic/ttst_lock.c
    901 
    902 basic-tls-fetch_add$(EXEEXT):
    903         $(BENCH_V_CC)$(COMPILE) $(srcdir)/basic/tls_fetch_add.c
    904 
    905 basic$(EXEEXT): $(BASIC_DEPEND)
     820        @test -e $(srcdir)/baselines/$(arch)/$< || (echo "Error : Missing baseline for ${<}" && false)
     821        @$(srcdir)/baselines/calc.py $(srcdir)/baselines/$(arch)/$(<) $(<) > $@
     822
     823loop$(EXEEXT):
     824        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     825
     826function$(EXEEXT):
     827        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     828
     829fetch_add$(EXEEXT):
     830        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     831
     832ttst_lock$(EXEEXT):
     833        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/ttst_lock.c
     834
     835tls-fetch_add$(EXEEXT):
     836        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/tls-fetch_add.c
    906837
    907838@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
    … …  
    913844ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
    914845
     846ctxswitch-pthread$(EXEEXT):
     847        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     848
    915849ctxswitch-cfa_generator$(EXEEXT):
    916         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/ctxswitch/cfa_gen.cfa
     850        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_gen.cfa
    917851
    918852ctxswitch-cfa_coroutine$(EXEEXT):
    919         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/ctxswitch/cfa_cor.cfa
     853        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    920854
    921855ctxswitch-cfa_thread$(EXEEXT):
    922         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/ctxswitch/cfa_thrd.cfa
     856        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    923857
    924858ctxswitch-cfa_thread2$(EXEEXT):
    925         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/ctxswitch/cfa_thrd2.cfa
     859        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    926860
    927861ctxswitch-upp_coroutine$(EXEEXT):
    928         $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/ctxswitch/upp_cor.cc
     862        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    929863
    930864ctxswitch-upp_thread$(EXEEXT):
    931         $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/ctxswitch/upp_thrd.cc
    932 
    933 ctxswitch-python_coroutine$(EXEEXT):
    934         $(BENCH_V_PY)echo "#!/bin/sh" > a.out
    935         echo "python3.7 $(srcdir)/ctxswitch/python_cor.py" >> a.out
    936         chmod a+x a.out
    937 
    938 ctxswitch-nodejs_coroutine$(EXEEXT):
    939         $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
    940         echo "nodejs $(srcdir)/ctxswitch/node_cor.js" >> a.out
    941         chmod a+x a.out
    942 
    943 ctxswitch-nodejs_await$(EXEEXT):
    944         $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
    945         echo "nodejs $(srcdir)/ctxswitch/node_await.js" >> a.out
    946         chmod a+x a.out
    947 
    948 ctxswitch-goroutine_thread$(EXEEXT):
     865        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     866
     867ctxswitch-goroutine$(EXEEXT):
    949868        $(BENCH_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    950 
    951 ctxswitch-rust_thread$(EXEEXT):
    952         $(BENCH_V_RUSTC)rustc -C opt-level=3 -o a.out $(srcdir)/ctxswitch/rust_thrd.rs
    953869
    954870ctxswitch-java_thread$(EXEEXT):
    955871        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    956         echo "#!/bin/sh" > a.out
    957         echo "java JavaThread" >> a.out
    958         chmod a+x a.out
    959 
    960 ctxswitch-pthread$(EXEEXT):
    961         $(BENCH_V_CC)$(COMPILE) $(srcdir)/ctxswitch/pthreads.c
    962 
    963 mutex$(EXEEXT) :                \
     872        @echo "#!/bin/sh" > a.out
     873        @echo "java JavaThread" >> a.out
     874        @chmod a+x a.out
     875
     876mutex$(EXEEXT) :\
     877        loop.run                        \
     878        function.run            \
     879        fetch_add.run           \
     880        mutex-pthread_lock.run  \
     881        mutex-upp.run           \
    964882        mutex-cfa1.run          \
    965883        mutex-cfa2.run          \
    966884        mutex-cfa4.run          \
    967         mutex-upp.run           \
    968         mutex-go.run            \
    969         mutex-rust.run          \
    970         mutex-java.run          \
    971         mutex-pthread.run
    972 
    973 mutex-pthread$(EXEEXT):
    974         $(BENCH_V_CC)$(COMPILE) $(srcdir)/mutex/pthreads.c
     885        mutex-java_thread.run
     886
     887mutex-pthread_lock$(EXEEXT):
     888        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     889
     890mutex-upp$(EXEEXT):
     891        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    975892
    976893mutex-cfa1$(EXEEXT):
    977         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutex/cfa1.cfa
     894        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    978895
    979896mutex-cfa2$(EXEEXT):
    980         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutex/cfa2.cfa
     897        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    981898
    982899mutex-cfa4$(EXEEXT):
    983         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutex/cfa4.cfa
    984 
    985 mutex-upp$(EXEEXT):
    986         $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/mutex/upp.cc
    987 
    988 mutex-go$(EXEEXT):
    989         $(BENCH_V_GOC)go build -o a.out $(srcdir)/mutex/goroutine.go
    990 
    991 mutex-rust$(EXEEXT):
    992         $(BENCH_V_RUSTC)rustc -C opt-level=3 -o a.out $(srcdir)/mutex/rust.rs
    993 
    994 mutex-java$(EXEEXT):
     900        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     901
     902mutex-java_thread$(EXEEXT):
    995903        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    996         echo "#!/bin/sh" > a.out
    997         echo "java JavaThread" >> a.out
    998         chmod a+x a.out
    999 
    1000 schedint$(EXEEXT) :             \
    1001         schedint-cfa1.run       \
    1002         schedint-cfa2.run       \
    1003         schedint-cfa4.run       \
    1004         schedint-upp.run        \
    1005         schedint-rust.run       \
    1006         schedint-java.run       \
    1007         schedint-pthread.run
    1008 
    1009 schedint-cfa1$(EXEEXT):
    1010         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa1.cfa
    1011 
    1012 schedint-cfa2$(EXEEXT):
    1013         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa2.cfa
    1014 
    1015 schedint-cfa4$(EXEEXT):
    1016         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa4.cfa
    1017 
    1018 schedint-upp$(EXEEXT):
    1019         $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/schedint/upp.cc
    1020 
    1021 schedint-rust$(EXEEXT):
    1022         $(BENCH_V_RUSTC)rustc -C opt-level=3 -o a.out $(srcdir)/schedint/rust.rs
    1023 
    1024 schedint-java$(EXEEXT):
     904        @echo "#!/bin/sh" > a.out
     905        @echo "java JavaThread" >> a.out
     906        @chmod a+x a.out
     907
     908signal$(EXEEXT) :\
     909        signal-pthread_cond.run \
     910        signal-upp.run          \
     911        signal-cfa1.run         \
     912        signal-cfa2.run         \
     913        signal-cfa4.run         \
     914        signal-java_thread.run
     915
     916signal-pthread_cond$(EXEEXT):
     917        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     918
     919signal-upp$(EXEEXT):
     920        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     921
     922signal-cfa1$(EXEEXT):
     923        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     924
     925signal-cfa2$(EXEEXT):
     926        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     927
     928signal-cfa4$(EXEEXT):
     929        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     930
     931signal-java_thread$(EXEEXT):
    1025932        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    1026         echo "#!/bin/sh" > a.out
    1027         echo "java JavaThread" >> a.out
    1028         chmod a+x a.out
    1029 
    1030 schedint-pthread$(EXEEXT):
    1031         $(BENCH_V_CC)$(COMPILE) $(srcdir)/schedint/pthreads.c
    1032 
    1033 schedext$(EXEEXT) :             \
    1034         schedext-cfa1.run       \
    1035         schedext-cfa2.run       \
    1036         schedext-cfa4.run       \
    1037         schedext-upp.run        \
    1038         schedext-goroutine.run
    1039 
    1040 schedext-cfa1$(EXEEXT):
    1041         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa1.cfa
    1042 
    1043 schedext-cfa2$(EXEEXT):
    1044         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa2.cfa
    1045 
    1046 schedext-cfa4$(EXEEXT):
    1047         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa4.cfa
    1048 
    1049 schedext-upp$(EXEEXT):
    1050         $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/schedext/upp.cc
    1051 
    1052 schedext-goroutine$(EXEEXT):
    1053         $(BENCH_V_GOC)go build -o a.out $(srcdir)/schedext/goroutine.go
    1054 
    1055 creation$(EXEEXT) :                             \
    1056         creation-cfa_generator.run              \
     933        @echo "#!/bin/sh" > a.out
     934        @echo "java JavaThread" >> a.out
     935        @chmod a+x a.out
     936
     937waitfor$(EXEEXT) :\
     938        waitfor-upp.run         \
     939        waitfor-cfa1.run                \
     940        waitfor-cfa2.run                \
     941        waitfor-cfa4.run
     942
     943waitfor-upp$(EXEEXT):
     944        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     945
     946waitfor-cfa1$(EXEEXT):
     947        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     948
     949waitfor-cfa2$(EXEEXT):
     950        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     951
     952waitfor-cfa4$(EXEEXT):
     953        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     954
     955creation$(EXEEXT) :\
     956        creation-pthread.run                    \
    1057957        creation-cfa_coroutine.run              \
    1058958        creation-cfa_coroutine_eager.run        \
    … …  
    1060960        creation-upp_coroutine.run              \
    1061961        creation-upp_thread.run                 \
    1062         creation-python_coroutine.run           \
    1063         creation-nodejs_coroutine.run           \
    1064         creation-goroutine_thread.run           \
    1065         creation-rust_thread.run                \
    1066         creation-java_thread.run                \
    1067         creation-pthread.run
    1068 
    1069 creation-cfa_generator$(EXEEXT):
    1070         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/creation/cfa_gen.cfa
     962        creation-goroutine.run                  \
     963        creation-java_thread.run
    1071964
    1072965creation-cfa_coroutine$(EXEEXT):
    1073         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/creation/cfa_cor.cfa
     966        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    1074967
    1075968creation-cfa_coroutine_eager$(EXEEXT):
    1076         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/creation/cfa_cor.cfa  -DEAGER
     969        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
    1077970
    1078971creation-cfa_thread$(EXEEXT):
    1079         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/creation/cfa_thrd.cfa
     972        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    1080973
    1081974creation-upp_coroutine$(EXEEXT):
    1082         $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/creation/upp_cor.cc
     975        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    1083976
    1084977creation-upp_thread$(EXEEXT):
    1085         $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/creation/upp_thrd.cc
    1086 
    1087 creation-python_coroutine$(EXEEXT):
    1088         $(BENCH_V_PY)echo "#!/bin/sh" > a.out
    1089         echo "python3.7 $(srcdir)/creation/python_cor.py" >> a.out
    1090         chmod a+x a.out
    1091 
    1092 creation-nodejs_coroutine$(EXEEXT):
    1093         $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
    1094         echo "nodejs $(srcdir)/creation/node_cor.js" >> a.out
    1095         chmod a+x a.out
    1096 
    1097 creation-goroutine_thread$(EXEEXT):
     978        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     979
     980creation-pthread$(EXEEXT):
     981        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     982
     983creation-goroutine$(EXEEXT):
    1098984        $(BENCH_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    1099 
    1100 creation-rust_thread$(EXEEXT):
    1101         $(BENCH_V_RUSTC)rustc -C opt-level=3 -o a.out $(srcdir)/creation/rust_thrd.rs
    1102985
    1103986creation-java_thread$(EXEEXT):
    1104987        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    1105         echo "#!/bin/sh" > a.out
    1106         echo "java JavaThread" >> a.out
    1107         chmod a+x a.out
    1108 
    1109 creation-pthread$(EXEEXT):
    1110         $(BENCH_V_CC)$(COMPILE) $(srcdir)/creation/pthreads.c
    1111 
    1112 compile$(EXEEXT) :              \
     988        @echo "#!/bin/sh" > a.out
     989        @echo "java JavaThread" >> a.out
     990        @chmod a+x a.out
     991
     992compile$(EXEEXT) :\
    1113993        compile-array.make      \
    1114994        compile-attributes.make \
    … …  
    11211001
    11221002compile-array$(EXEEXT):
    1123         $(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     1003        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    11241004
    11251005compile-attributes$(EXEEXT):
    1126         $(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     1006        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    11271007
    11281008compile-empty$(EXEEXT):
    1129         $(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     1009        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    11301010
    11311011compile-expression$(EXEEXT):
    1132         $(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     1012        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    11331013
    11341014compile-io$(EXEEXT):
    1135         $(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     1015        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    11361016
    11371017compile-monitor$(EXEEXT):
    1138         $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     1018        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    11391019
    11401020compile-operators$(EXEEXT):
    1141         $(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     1021        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    11421022
    11431023compile-thread$(EXEEXT):
    1144         $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     1024        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    11451025
    11461026compile-typeof$(EXEEXT):
    1147         $(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    1148 
    1149 size$(EXEEXT) : size-cfa.runquiet
    1150 
    1151 size-cfa$(EXEEXT):
    1152         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/size/size.cfa
     1027        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    11531028
    11541029# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.