Ignore:
Timestamp:
Feb 10, 2020, 11:17:38 AM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
3966d9a, 41efd33
Parents:
807a632 (diff), d231700 (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

  • benchmark/Makefile.in

    r807a632 r3b56166  
    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
    … …  
    352352LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
    353353        $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
    354         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
    355         $(AM_CFLAGS) $(CFLAGS)
     354        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(AM_CFLAGS) $(CFAFLAGS) $(CFLAGS)
    356355
    357356AM_V_CFA = $(am__v_CFA_@AM_V@)
    … …  
    359358am__v_CFA_0 = @echo "  CFA     " $@;
    360359am__v_CFA_1 =
    361 AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
    362 am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
    363 am__v_JAVAC_0 = @echo "  JAVAC   " $@;
    364 am__v_JAVAC_1 =
    365 AM_V_GOC = $(am__v_GOC_@AM_V@)
    366 am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
    367 am__v_GOC_0 = @echo "  GOC     " $@;
    368 am__v_GOC_1 =
    369360UPPCC = u++
    370361UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    … …  
    373364am__v_UPP_0 = @echo "  UPP     " $@;
    374365am__v_UPP_1 =
     366AM_V_GOC = $(am__v_GOC_@AM_V@)
     367am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
     368am__v_GOC_0 = @echo "  GOC     " $@;
     369am__v_GOC_1 =
     370AM_V_RUST = $(am__v_RUST_@AM_V@)
     371am__v_RUST_ = $(am__v_RUST_@AM_DEFAULT_V@)
     372am__v_RUST_0 = @echo "  RUST     " $@;
     373am__v_RUST_1 =
     374AM_V_NODEJS = $(am__v_NODEJS_@AM_V@)
     375am__v_NODEJS_ = $(am__v_NODEJS_@AM_DEFAULT_V@)
     376am__v_NODEJS_0 = @echo "  NODEJS     " $@;
     377am__v_NODEJS_1 =
     378AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
     379am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
     380am__v_JAVAC_0 = @echo "  JAVAC   " $@;
     381am__v_JAVAC_1 =
    375382
    376383# applies to both programs
    … …  
    381388BENCH_V_CFA = $(__bench_v_CFA_$(__quiet))
    382389BENCH_V_CXX = $(__bench_v_CXX_$(__quiet))
     390BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
    383391BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
     392BENCH_V_RUSTC = $(__bench_v_RUSTC_$(__quiet))
     393BENCH_V_NODEJS = $(__bench_v_NODEJS_$(__quiet))
    384394BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
    385 BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
    386395__quiet = verbose
    387396__bench_v_CC_quiet = @
    388397__bench_v_CFA_quiet = @
    389398__bench_v_CXX_quiet = @
     399__bench_v_UPP_quiet = @
    390400__bench_v_GOC_quiet = @
     401__bench_v_RUSTC_quiet = @
    391402__bench_v_JAVAC_quiet = @
    392 __bench_v_UPP_quiet = @
    393403__bench_v_CC_verbose = $(AM_V_CC)
    394404__bench_v_CFA_verbose = $(AM_V_CFA)
    395405__bench_v_CXX_verbose = $(AM_V_CXX)
     406__bench_v_UPP_verbose = $(AM_V_UPP)
    396407__bench_v_GOC_verbose = $(AM_V_GOC)
     408__bench_v_RUSTC_verbose = $(AM_V_RUSTC)
     409__bench_v_NODEJS_verbose = $(AM_V_NODEJS)
    397410__bench_v_JAVAC_verbose = $(AM_V_JAVAC)
    398 __bench_v_UPP_verbose = $(AM_V_UPP)
    399411TOOLSDIR = ${abs_top_builddir}/tools/
    400412REPEAT = ${abs_top_builddir}/tools/repeat
    401413STATS = ${abs_top_srcdir}/tools/stat.py
    402414# NEED AT LEAST 4 DATA VALUES FOR BENCHMARKS BECAUSE THE MAX AND MIN VALUES ARE REMOVED
    403 repeats = 5 # 31 for benchmarks
     415repeats = 13 # 31 for benchmarks
    404416arch = x64
    405417skipcompile = no
    … …  
    407419PRINT_FORMAT = %20s: #Comments needed for spacing
    408420dummy_SOURCES = dummyC.c dummyCXX.cpp
     421basic_loop_DURATION = 15000000000
     422basic_function_DURATION = 10000000000
     423basic_tls_fetch_add_DURATION = 10000000000
     424basic_DURATION = 250000000
     425ctxswitch_pthread_DURATION = 25000000
     426ctxswitch_rust_thread_DURATION = $(ctxswitch_pthread_DURATION)
     427ctxswitch_cfa_generator_DURATION = 5000000000
     428ctxswitch_nodejs_await_DURATION = 5000000
     429ctxswitch_DURATION = 100000000
     430
     431#mutex_java_DURATION = 10000000
     432mutex_DURATION = 50000000
     433schedint_pthread_DURATION = 1000000
     434schedint_java_DURATION = $(schedint_pthread_DURATION)
     435schedint_rust_DURATION = $(schedint_pthread_DURATION)
     436schedint_DURATION = 10000000
     437schedext_DURATION = 10000000
     438creation_pthread_DURATION = 250000
     439creation_rust_thread_DURATION = ${creation_pthread_DURATION}
     440creation_java_thread_DURATION = ${creation_pthread_DURATION}
     441creation_cfa_coroutine_DURATION = 100000000
     442creation_cfa_coroutine_eager_DURATION = 10000000
     443creation_upp_coroutine_DURATION = ${creation_cfa_coroutine_eager_DURATION}
     444creation_cfa_thread_DURATION = 10000000
     445creation_upp_thread_DURATION = ${creation_cfa_thread_DURATION}
     446creation_DURATION = 10000000
    409447FIX_NEW_LINES = cat $@ | tr "\n" "\t" | sed -r 's/\t,/,/' | tr "\t" "\n" > $@
    410 CTXSWITCH_DEPEND = loop.run function.run fetch_add.run ttst_lock.run \
    411         tls-fetch_add.run ctxswitch-pthread.run \
    412         ctxswitch-cfa_generator.run ctxswitch-cfa_coroutine.run \
    413         ctxswitch-cfa_thread.run ctxswitch-cfa_thread2.run \
    414         ctxswitch-upp_coroutine.run ctxswitch-upp_thread.run \
    415         ctxswitch-goroutine.run ctxswitch-java_thread.run \
    416         $(am__append_1)
     448BASIC_DEPEND = \
     449        basic-loop.run                          \
     450        basic-function.run                      \
     451        basic-fetch_add.run                     \
     452        basic-ttst_lock.run                     \
     453        basic-tls-fetch_add.run
     454
     455CTXSWITCH_DEPEND = ctxswitch-cfa_generator.run \
     456        ctxswitch-cfa_coroutine.run ctxswitch-cfa_thread.run \
     457        ctxswitch-cfa_thread2.run ctxswitch-upp_coroutine.run \
     458        ctxswitch-upp_thread.run ctxswitch-python_coroutine.run \
     459        ctxswitch-nodejs_coroutine.run ctxswitch-nodejs_await.run \
     460        ctxswitch-goroutine_thread.run ctxswitch-rust_thread.run \
     461        ctxswitch-nodejs_coroutine.run ctxswitch-java_thread.run \
     462        ctxswitch-pthread.run $(am__append_1)
    417463testdir = $(top_srcdir)/tests
    418464all: all-am
    … …  
    733779
    734780dummyC.c:
    735         @echo "int main() { return 0; }" > ${@}
     781        echo "int main() { return 0; }" > ${@}
    736782
    737783dummyCXX.cpp:
    738         @echo "int main() { return 0; }" > ${@}
    739 
     784        echo "int main() { return 0; }" > ${@}
     785
     786#.SILENT:               # do not print recipe
     787.ONESHELL:              # use one shell to execute recipe
    740788.NOTPARALLEL:
    741 .PHONY: compile.csv ctxswitch.csv mutex.csv signal.csv
    742 
    743 all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
     789.PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
     790
     791all : basic$(EXEEXT) ctxswitch$(EXEEXT) mutex$(EXEEXT) schedint$(EXEEXT) schedext$(EXEEXT) creation$(EXEEXT)
    744792
    745793%.run : %$(EXEEXT) ${REPEAT}
    746         @rm -f .result.log
    747         @echo "------------------------------------------------------"
    748         @echo $<
    749         @${REPEAT} ${repeats} ./a.out | tee -a .result.log
    750         @${STATS} .result.log
    751         @echo "------------------------------------------------------"
    752         @rm -f a.out .result.log *.class
     794        rm -f .result.log
     795        echo "------------------------------------------------------"
     796        echo $<
     797        ${REPEAT} ${repeats} -- ./a.out\
     798                $(if ${$(subst -,_,$(basename $@))_DURATION},\
     799                        ${$(subst -,_,$(basename $@))_DURATION},\
     800                        ${$(firstword $(subst -, ,$(basename $@)))_DURATION}) | tee -a .result.log
     801        ${STATS} .result.log
     802        echo "------------------------------------------------------"
     803        rm -f a.out .result.log *.class
     804
     805#       ${REPEAT} ${repeats} -- /usr/bin/time -f "%Uu %Ss %Er %Mkb" ./a.out
    753806
    754807%.runquiet :
    755         @+make $(basename $@) CFLAGS="-w" __quiet=quiet
    756         @taskset -c 1 ./a.out
    757         @rm -f a.out
     808        +make $(basename $@) CFLAGS="-w" __quiet=quiet
     809        taskset -c 1 ./a.out
     810        rm -f a.out
    758811
    759812%.make :
    760         @printf "${PRINT_FORMAT}" $(basename $(subst compile-,,$@))
    761         @+/usr/bin/time -f ${TIME_FORMAT} make $(basename $@) 2>&1
     813        printf "${PRINT_FORMAT}" $(basename $(subst compile-,,$@))
     814        +/usr/bin/time -f ${TIME_FORMAT} make $(basename $@) 2>&1
    762815
    763816${REPEAT} :
    764         @+make -C ${abs_top_builddir}/tools repeat
     817        +make -C ${abs_top_builddir}/tools repeat
    765818
    766819jenkins$(EXEEXT):
    767820@DOifskipcompile@
    768         @+make compile.csv
    769         @-+make compile.diff.csv
     821        +make compile.csv
     822        -+make compile.diff.csv
    770823@DOendif@
    771         @+make ctxswitch.csv
    772         @-+make ctxswitch.diff.csv
    773         @+make mutex.csv
    774         @-+make mutex.diff.csv
    775         @+make signal.csv
    776         @-+make signal.diff.csv
     824        +make basic.csv
     825        -+make basic.diff.csv
     826        +make ctxswitch.csv
     827        -+make ctxswitch.diff.csv
     828        +make mutex.csv
     829        -+make mutex.diff.csv
     830        +make schedint.csv
     831        -+make schedint.diff.csv
    777832@DOifskipcompile@
    778833        cat compile.csv
    779834        -cat compile.diff.csv
    780835@DOendif@
     836        cat basic.csv
     837        -cat basic.diff.csv
    781838        cat ctxswitch.csv
    782839        -cat ctxswitch.diff.csv
    783840        cat mutex.csv
    784841        -cat mutex.diff.csv
    785         cat signal.csv
    786         -cat signal.diff.csv
     842        cat schedint.csv
     843        -cat schedint.diff.csv
    787844
    788845compile.csv:
    789         @echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
    790         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
    791         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-attributes.make >> $@
    792         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-empty.make >> $@
    793         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-expression.make >> $@
    794         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-io.make >> $@
    795         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-monitor.make >> $@
    796         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-operators.make >> $@
    797         @+make TIME_FORMAT='%e' PRINT_FORMAT='' compile-typeof.make >> $@
    798         @$(srcdir)/fixcsv.sh $@
     846        echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
     847        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
     848        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-attributes.make >> $@
     849        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-empty.make >> $@
     850        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-expression.make >> $@
     851        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-io.make >> $@
     852        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-monitor.make >> $@
     853        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-operators.make >> $@
     854        +make TIME_FORMAT='%e' PRINT_FORMAT='' compile-typeof.make >> $@
     855        $(srcdir)/fixcsv.sh $@
     856
     857basic.csv:
     858        echo "generator,coroutine,thread" > $@
     859        +make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
     860        +make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
     861        +make basic-cfa_thread.runquiet >> $@
     862        $(srcdir)/fixcsv.sh $@
    799863
    800864ctxswitch.csv:
    801         @echo "generator,coroutine,thread" > $@
    802         @+make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
    803         @+make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
    804         @+make ctxswitch-cfa_thread.runquiet >> $@
    805         @$(srcdir)/fixcsv.sh $@
     865        echo "generator,coroutine,thread" > $@
     866        +make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
     867        +make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
     868        +make ctxswitch-cfa_thread.runquiet >> $@
     869        $(srcdir)/fixcsv.sh $@
    806870
    807871mutex.csv:
    808         @echo "1-monitor,2-monitor" > $@
    809         @+make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
    810         @+make mutex-cfa2.runquiet >> $@
    811         @$(srcdir)/fixcsv.sh $@
    812 
    813 signal.csv:
    814         @echo "signal-1,signal-2,waitfor-1,waitfor-2" > $@
    815         @+make signal-cfa1.runquiet >> $@ && echo -n ',' >> $@
    816         @+make signal-cfa2.runquiet >> $@ && echo -n ',' >> $@
    817         @+make waitfor-cfa1.runquiet >> $@ && echo -n ',' >> $@
    818         @+make waitfor-cfa2.runquiet >> $@
    819         @$(srcdir)/fixcsv.sh $@
     872        echo "1-monitor,2-monitor" > $@
     873        +make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
     874        +make mutex-cfa2.runquiet >> $@
     875        $(srcdir)/fixcsv.sh $@
     876
     877schedint.csv:
     878        echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
     879        +make schedint-cfa1.runquiet >> $@ && echo -n ',' >> $@
     880        +make schedint-cfa2.runquiet >> $@ && echo -n ',' >> $@
     881        +make schedext-cfa1.runquiet >> $@ && echo -n ',' >> $@
     882        +make schedext-cfa2.runquiet >> $@
     883        $(srcdir)/fixcsv.sh $@
    820884
    821885%.diff.csv: %.csv
    822         @test -e $(srcdir)/baselines/$(arch)/$< || (echo "Error : Missing baseline for ${<}" && false)
    823         @$(srcdir)/baselines/calc.py $(srcdir)/baselines/$(arch)/$(<) $(<) > $@
    824 
    825 loop$(EXEEXT):
    826         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    827 
    828 function$(EXEEXT):
    829         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    830 
    831 fetch_add$(EXEEXT):
    832         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    833 
    834 ttst_lock$(EXEEXT):
    835         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/ttst_lock.c
    836 
    837 tls-fetch_add$(EXEEXT):
    838         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/tls-fetch_add.c
     886        test -e $(srcdir)/baselines/$(arch)/$< || (echo "Error : Missing baseline for ${<}" && false)
     887        $(srcdir)/baselines/calc.py $(srcdir)/baselines/$(arch)/$(<) $(<) > $@
     888
     889basic-loop$(EXEEXT):
     890        $(BENCH_V_CC)$(COMPILE) $(srcdir)/basic/loop.c
     891
     892basic-function$(EXEEXT):
     893        $(BENCH_V_CC)$(COMPILE) $(srcdir)/basic/function.c
     894
     895basic-fetch_add$(EXEEXT):
     896        $(BENCH_V_CC)$(COMPILE) $(srcdir)/basic/fetch_add.c
     897
     898basic-ttst_lock$(EXEEXT):
     899        $(BENCH_V_CC)$(COMPILE) $(srcdir)/basic/ttst_lock.c
     900
     901basic-tls-fetch_add$(EXEEXT):
     902        $(BENCH_V_CC)$(COMPILE) $(srcdir)/basic/tls_fetch_add.c
     903
     904basic$(EXEEXT): $(BASIC_DEPEND)
    839905
    840906@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
    … …  
    846912ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
    847913
    848 ctxswitch-pthread$(EXEEXT):
    849         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    850 
    851914ctxswitch-cfa_generator$(EXEEXT):
    852         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_gen.cfa
     915        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/ctxswitch/cfa_gen.cfa
    853916
    854917ctxswitch-cfa_coroutine$(EXEEXT):
    855         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     918        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/ctxswitch/cfa_cor.cfa
    856919
    857920ctxswitch-cfa_thread$(EXEEXT):
    858         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     921        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/ctxswitch/cfa_thrd.cfa
    859922
    860923ctxswitch-cfa_thread2$(EXEEXT):
    861         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     924        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/ctxswitch/cfa_thrd2.cfa
    862925
    863926ctxswitch-upp_coroutine$(EXEEXT):
    864         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     927        $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/ctxswitch/upp_cor.cc
    865928
    866929ctxswitch-upp_thread$(EXEEXT):
    867         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    868 
    869 ctxswitch-goroutine$(EXEEXT):
     930        $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/ctxswitch/upp_thrd.cc
     931
     932ctxswitch-python_coroutine$(EXEEXT):
     933        echo "#!/bin/sh" > a.out
     934        echo "python3.7 $(srcdir)/ctxswitch/python_cor.py" >> a.out
     935        chmod a+x a.out
     936
     937ctxswitch-nodejs_coroutine$(EXEEXT):
     938        echo "#!/bin/sh" > a.out
     939        echo "nodejs $(srcdir)/ctxswitch/node_cor.js" >> a.out
     940        chmod a+x a.out
     941
     942ctxswitch-nodejs_await$(EXEEXT):
     943        echo "#!/bin/sh" > a.out
     944        echo "nodejs $(srcdir)/ctxswitch/node_await.js" >> a.out
     945        chmod a+x a.out
     946
     947ctxswitch-goroutine_thread$(EXEEXT):
    870948        $(BENCH_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     949
     950ctxswitch-rust_thread$(EXEEXT):
     951        $(BENCH_V_RUSTC)rustc -C opt-level=3 -o a.out $(srcdir)/ctxswitch/rust_thrd.rs
    871952
    872953ctxswitch-java_thread$(EXEEXT):
    873954        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    874         @echo "#!/bin/sh" > a.out
    875         @echo "java JavaThread" >> a.out
    876         @chmod a+x a.out
    877 
    878 mutex$(EXEEXT) :\
    879         loop.run                        \
    880         function.run            \
    881         fetch_add.run           \
    882         mutex-pthread_lock.run  \
    883         mutex-upp.run           \
     955        echo "#!/bin/sh" > a.out
     956        echo "java JavaThread" >> a.out
     957        chmod a+x a.out
     958
     959ctxswitch-pthread$(EXEEXT):
     960        $(BENCH_V_CC)$(COMPILE) $(srcdir)/ctxswitch/pthreads.c
     961
     962mutex$(EXEEXT) :                \
    884963        mutex-cfa1.run          \
    885964        mutex-cfa2.run          \
    886965        mutex-cfa4.run          \
    887         mutex-java_thread.run
    888 
    889 mutex-pthread_lock$(EXEEXT):
    890         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     966        mutex-upp.run           \
     967        mutex-go.run            \
     968        mutex-rust.run          \
     969        mutex-java.run          \
     970        mutex-pthread.run
     971
     972mutex-pthread$(EXEEXT):
     973        $(BENCH_V_CC)$(COMPILE) $(srcdir)/mutex/pthreads.c
     974
     975mutex-cfa1$(EXEEXT):
     976        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutex/cfa1.cfa
     977
     978mutex-cfa2$(EXEEXT):
     979        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutex/cfa2.cfa
     980
     981mutex-cfa4$(EXEEXT):
     982        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutex/cfa4.cfa
    891983
    892984mutex-upp$(EXEEXT):
    893         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    894 
    895 mutex-cfa1$(EXEEXT):
    896         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    897 
    898 mutex-cfa2$(EXEEXT):
    899         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    900 
    901 mutex-cfa4$(EXEEXT):
    902         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    903 
    904 mutex-java_thread$(EXEEXT):
     985        $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/mutex/upp.cc
     986
     987mutex-go$(EXEEXT):
     988        $(BENCH_V_GOC)go build -o a.out $(srcdir)/mutex/goroutine.go
     989
     990mutex-rust$(EXEEXT):
     991        $(BENCH_V_RUSTC)rustc -C opt-level=3 -o a.out $(srcdir)/mutex/rust.rs
     992
     993mutex-java$(EXEEXT):
    905994        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    906         @echo "#!/bin/sh" > a.out
    907         @echo "java JavaThread" >> a.out
    908         @chmod a+x a.out
    909 
    910 signal$(EXEEXT) :\
    911         signal-pthread_cond.run \
    912         signal-upp.run          \
    913         signal-cfa1.run         \
    914         signal-cfa2.run         \
    915         signal-cfa4.run         \
    916         signal-java_thread.run
    917 
    918 signal-pthread_cond$(EXEEXT):
    919         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    920 
    921 signal-upp$(EXEEXT):
    922         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    923 
    924 signal-cfa1$(EXEEXT):
    925         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    926 
    927 signal-cfa2$(EXEEXT):
    928         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    929 
    930 signal-cfa4$(EXEEXT):
    931         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    932 
    933 signal-java_thread$(EXEEXT):
     995        echo "#!/bin/sh" > a.out
     996        echo "java JavaThread" >> a.out
     997        chmod a+x a.out
     998
     999schedint$(EXEEXT) :             \
     1000        schedint-cfa1.run       \
     1001        schedint-cfa2.run       \
     1002        schedint-cfa4.run       \
     1003        schedint-upp.run        \
     1004        schedint-rust.run       \
     1005        schedint-java.run       \
     1006        schedint-pthread.run
     1007
     1008schedint-cfa1$(EXEEXT):
     1009        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa1.cfa
     1010
     1011schedint-cfa2$(EXEEXT):
     1012        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa2.cfa
     1013
     1014schedint-cfa4$(EXEEXT):
     1015        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa4.cfa
     1016
     1017schedint-upp$(EXEEXT):
     1018        $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/schedint/upp.cc
     1019
     1020schedint-rust$(EXEEXT):
     1021        $(BENCH_V_RUSTC)rustc -C opt-level=3 -o a.out $(srcdir)/schedint/rust.rs
     1022
     1023schedint-java$(EXEEXT):
    9341024        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    935         @echo "#!/bin/sh" > a.out
    936         @echo "java JavaThread" >> a.out
    937         @chmod a+x a.out
    938 
    939 waitfor$(EXEEXT) :\
    940         waitfor-upp.run         \
    941         waitfor-cfa1.run                \
    942         waitfor-cfa2.run                \
    943         waitfor-cfa4.run
    944 
    945 waitfor-upp$(EXEEXT):
    946         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    947 
    948 waitfor-cfa1$(EXEEXT):
    949         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    950 
    951 waitfor-cfa2$(EXEEXT):
    952         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    953 
    954 waitfor-cfa4$(EXEEXT):
    955         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    956 
    957 creation$(EXEEXT) :\
    958         creation-pthread.run                    \
     1025        echo "#!/bin/sh" > a.out
     1026        echo "java JavaThread" >> a.out
     1027        chmod a+x a.out
     1028
     1029schedint-pthread$(EXEEXT):
     1030        $(BENCH_V_CC)$(COMPILE) $(srcdir)/schedint/pthreads.c
     1031
     1032schedext$(EXEEXT) :             \
     1033        schedext-cfa1.run       \
     1034        schedext-cfa2.run       \
     1035        schedext-cfa4.run       \
     1036        schedext-upp.run        \
     1037        schedext-goroutine.run
     1038
     1039schedext-cfa1$(EXEEXT):
     1040        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa1.cfa
     1041
     1042schedext-cfa2$(EXEEXT):
     1043        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa2.cfa
     1044
     1045schedext-cfa4$(EXEEXT):
     1046        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa4.cfa
     1047
     1048schedext-upp$(EXEEXT):
     1049        $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/schedext/upp.cc
     1050
     1051schedext-goroutine$(EXEEXT):
     1052        $(BENCH_V_GOC)go build -o a.out $(srcdir)/schedext/goroutine.go
     1053
     1054creation$(EXEEXT) :                             \
     1055        creation-cfa_generator.run              \
    9591056        creation-cfa_coroutine.run              \
    9601057        creation-cfa_coroutine_eager.run        \
    … …  
    9621059        creation-upp_coroutine.run              \
    9631060        creation-upp_thread.run                 \
    964         creation-goroutine.run                  \
    965         creation-java_thread.run
     1061        creation-python_coroutine.run           \
     1062        creation-nodejs_coroutine.run           \
     1063        creation-goroutine_thread.run           \
     1064        creation-rust_thread.run                \
     1065        creation-java_thread.run                \
     1066        creation-pthread.run
     1067
     1068creation-cfa_generator$(EXEEXT):
     1069        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/creation/cfa_gen.cfa
    9661070
    9671071creation-cfa_coroutine$(EXEEXT):
    968         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     1072        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/creation/cfa_cor.cfa
    9691073
    9701074creation-cfa_coroutine_eager$(EXEEXT):
    971         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
     1075        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/creation/cfa_cor.cfa  -DEAGER
    9721076
    9731077creation-cfa_thread$(EXEEXT):
    974         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     1078        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/creation/cfa_thrd.cfa
    9751079
    9761080creation-upp_coroutine$(EXEEXT):
    977         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     1081        $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/creation/upp_cor.cc
    9781082
    9791083creation-upp_thread$(EXEEXT):
    980         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    981 
    982 creation-pthread$(EXEEXT):
    983         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    984 
    985 creation-goroutine$(EXEEXT):
     1084        $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/creation/upp_thrd.cc
     1085
     1086creation-python_coroutine$(EXEEXT):
     1087        echo "#!/bin/sh" > a.out
     1088        echo "python3.7 $(srcdir)/creation/python_cor.py" >> a.out
     1089        chmod a+x a.out
     1090
     1091creation-nodejs_coroutine$(EXEEXT):
     1092        echo "#!/bin/sh" > a.out
     1093        echo "nodejs $(srcdir)/creation/node_cor.js" >> a.out
     1094        chmod a+x a.out
     1095
     1096creation-goroutine_thread$(EXEEXT):
    9861097        $(BENCH_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     1098
     1099creation-rust_thread$(EXEEXT):
     1100        $(BENCH_V_RUSTC)rustc -C opt-level=3 -o a.out $(srcdir)/creation/rust_thrd.rs
    9871101
    9881102creation-java_thread$(EXEEXT):
    9891103        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    990         @echo "#!/bin/sh" > a.out
    991         @echo "java JavaThread" >> a.out
    992         @chmod a+x a.out
    993 
    994 compile$(EXEEXT) :\
     1104        echo "#!/bin/sh" > a.out
     1105        echo "java JavaThread" >> a.out
     1106        chmod a+x a.out
     1107
     1108creation-pthread$(EXEEXT):
     1109        $(BENCH_V_CC)$(COMPILE) $(srcdir)/creation/pthreads.c
     1110
     1111compile$(EXEEXT) :              \
    9951112        compile-array.make      \
    9961113        compile-attributes.make \
    … …  
    10031120
    10041121compile-array$(EXEEXT):
    1005         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     1122        $(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    10061123
    10071124compile-attributes$(EXEEXT):
    1008         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     1125        $(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    10091126
    10101127compile-empty$(EXEEXT):
    1011         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     1128        $(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    10121129
    10131130compile-expression$(EXEEXT):
    1014         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     1131        $(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    10151132
    10161133compile-io$(EXEEXT):
    1017         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     1134        $(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    10181135
    10191136compile-monitor$(EXEEXT):
    1020         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     1137        $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    10211138
    10221139compile-operators$(EXEEXT):
    1023         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     1140        $(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    10241141
    10251142compile-thread$(EXEEXT):
    1026         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     1143        $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    10271144
    10281145compile-typeof$(EXEEXT):
    1029         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     1146        $(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    10301147
    10311148# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.