Changeset a505021 for benchmark


Ignore:
Timestamp:
Feb 21, 2020, 3:36:36 PM (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:
c7a900a
Parents:
8c50aed (diff), c744563a (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' into park_unpark

Location:
benchmark
Files:
2 edited
2 moved

Legend:

Unmodified
Added
Removed

  • benchmark/Makefile.am

    r8c50aed ra505021  
    3030BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
    3131BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
     32BENCH_V_PY = $(__bench_v_PY_$(__quiet))
    3233BENCH_V_RUSTC = $(__bench_v_RUSTC_$(__quiet))
    3334BENCH_V_NODEJS = $(__bench_v_NODEJS_$(__quiet))
    … …  
    4748__bench_v_UPP_verbose = $(AM_V_UPP)
    4849__bench_v_GOC_verbose = $(AM_V_GOC)
    49 __bench_v_RUSTC_verbose = $(AM_V_RUSTC)
     50__bench_v_PY_verbose = $(AM_V_PY)
     51__bench_v_RUSTC_verbose = $(AM_V_RUST)
    5052__bench_v_NODEJS_verbose = $(AM_V_NODEJS)
    5153__bench_v_JAVAC_verbose = $(AM_V_JAVAC)
    … …  
    7274        echo "int main() { return 0; }" > ${@}
    7375
    74 #.SILENT:               # do not print recipe
    75 .ONESHELL:              # use one shell to execute recipe
     76.SILENT:                # do not print recipe
    7677.NOTPARALLEL:
    77 .PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
     78.PHONY: jenkins cleancsv
    7879
    7980## =========================================================================================================
    … …  
    142143FIX_NEW_LINES = cat $@ | tr "\n" "\t" | sed -r 's/\t,/,/' | tr "\t" "\n" > $@
    143144
    144 jenkins$(EXEEXT):
     145cleancsv:
     146        rm -f compile.csv basic.csv ctxswitch.csv mutex.csv scheduling.csv
     147
     148jenkins$(EXEEXT): cleancsv
    145149@DOifskipcompile@
    146150        +make compile.csv
    147151        -+make compile.diff.csv
    148152@DOendif@
    149         +make basic.csv
    150         -+make basic.diff.csv
    151153        +make ctxswitch.csv
    152154        -+make ctxswitch.diff.csv
    153155        +make mutex.csv
    154156        -+make mutex.diff.csv
    155         +make schedint.csv
    156         -+make schedint.diff.csv
     157        +make scheduling.csv
     158        -+make scheduling.diff.csv
    157159@DOifskipcompile@
    158160        cat compile.csv
    159161        -cat compile.diff.csv
    160162@DOendif@
    161         cat basic.csv
    162         -cat basic.diff.csv
    163163        cat ctxswitch.csv
    164164        -cat ctxswitch.diff.csv
    165165        cat mutex.csv
    166166        -cat mutex.diff.csv
    167         cat schedint.csv
    168         -cat schedint.diff.csv
     167        cat scheduling.csv
     168        -cat scheduling.diff.csv
    169169
    170170compile.csv:
     171        echo "building $@"
    171172        echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
    172173        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
    … …  
    180181        $(srcdir)/fixcsv.sh $@
    181182
    182 basic.csv:
    183         echo "generator,coroutine,thread" > $@
    184         +make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
    185         +make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
    186         +make basic-cfa_thread.runquiet >> $@
    187         $(srcdir)/fixcsv.sh $@
    188 
    189183ctxswitch.csv:
     184        echo "building $@"
    190185        echo "generator,coroutine,thread" > $@
    191186        +make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
    … …  
    195190
    196191mutex.csv:
     192        echo "building $@"
    197193        echo "1-monitor,2-monitor" > $@
    198194        +make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
    … …  
    200196        $(srcdir)/fixcsv.sh $@
    201197
    202 schedint.csv:
     198scheduling.csv:
     199        echo "building $@"
    203200        echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
    204201        +make schedint-cfa1.runquiet >> $@ && echo -n ',' >> $@
    … …  
    289286
    290287ctxswitch-python_coroutine$(EXEEXT):
    291         echo "#!/bin/sh" > a.out
     288        $(BENCH_V_PY)echo "#!/bin/sh" > a.out
    292289        echo "python3.7 $(srcdir)/ctxswitch/python_cor.py" >> a.out
    293290        chmod a+x a.out
    294291
    295292ctxswitch-nodejs_coroutine$(EXEEXT):
    296         echo "#!/bin/sh" > a.out
     293        $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
    297294        echo "nodejs $(srcdir)/ctxswitch/node_cor.js" >> a.out
    298295        chmod a+x a.out
    299296
    300297ctxswitch-nodejs_await$(EXEEXT):
    301         echo "#!/bin/sh" > a.out
     298        $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
    302299        echo "nodejs $(srcdir)/ctxswitch/node_await.js" >> a.out
    303300        chmod a+x a.out
    … …  
    452449
    453450creation-python_coroutine$(EXEEXT):
    454         echo "#!/bin/sh" > a.out
     451        $(BENCH_V_PY)echo "#!/bin/sh" > a.out
    455452        echo "python3.7 $(srcdir)/creation/python_cor.py" >> a.out
    456453        chmod a+x a.out
    457454
    458455creation-nodejs_coroutine$(EXEEXT):
    459         echo "#!/bin/sh" > a.out
     456        $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
    460457        echo "nodejs $(srcdir)/creation/node_cor.js" >> a.out
    461458        chmod a+x a.out

  • benchmark/Makefile.in

    r8c50aed ra505021  
    368368am__v_GOC_0 = @echo "  GOC     " $@;
    369369am__v_GOC_1 =
     370AM_V_PY = $(am__v_PY_@AM_V@)
     371am__v_PY_ = $(am__v_PY_@AM_DEFAULT_V@)
     372am__v_PY_0 = @echo "  PYTHON  " $@;
     373am__v_PY_1 =
    370374AM_V_RUST = $(am__v_RUST_@AM_V@)
    371375am__v_RUST_ = $(am__v_RUST_@AM_DEFAULT_V@)
    372 am__v_RUST_0 = @echo "  RUST     " $@;
     376am__v_RUST_0 = @echo "  RUST    " $@;
    373377am__v_RUST_1 =
    374378AM_V_NODEJS = $(am__v_NODEJS_@AM_V@)
    375379am__v_NODEJS_ = $(am__v_NODEJS_@AM_DEFAULT_V@)
    376 am__v_NODEJS_0 = @echo "  NODEJS     " $@;
     380am__v_NODEJS_0 = @echo "  NODEJS  " $@;
    377381am__v_NODEJS_1 =
    378382AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
    … …  
    390394BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
    391395BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
     396BENCH_V_PY = $(__bench_v_PY_$(__quiet))
    392397BENCH_V_RUSTC = $(__bench_v_RUSTC_$(__quiet))
    393398BENCH_V_NODEJS = $(__bench_v_NODEJS_$(__quiet))
    … …  
    406411__bench_v_UPP_verbose = $(AM_V_UPP)
    407412__bench_v_GOC_verbose = $(AM_V_GOC)
    408 __bench_v_RUSTC_verbose = $(AM_V_RUSTC)
     413__bench_v_PY_verbose = $(AM_V_PY)
     414__bench_v_RUSTC_verbose = $(AM_V_RUST)
    409415__bench_v_NODEJS_verbose = $(AM_V_NODEJS)
    410416__bench_v_JAVAC_verbose = $(AM_V_JAVAC)
    … …  
    784790        echo "int main() { return 0; }" > ${@}
    785791
    786 #.SILENT:               # do not print recipe
    787 .ONESHELL:              # use one shell to execute recipe
     792.SILENT:                # do not print recipe
    788793.NOTPARALLEL:
    789 .PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
     794.PHONY: jenkins cleancsv
    790795
    791796all : basic$(EXEEXT) ctxswitch$(EXEEXT) mutex$(EXEEXT) schedint$(EXEEXT) schedext$(EXEEXT) creation$(EXEEXT)
    … …  
    817822        +make -C ${abs_top_builddir}/tools repeat
    818823
    819 jenkins$(EXEEXT):
     824cleancsv:
     825        rm -f compile.csv basic.csv ctxswitch.csv mutex.csv scheduling.csv
     826
     827jenkins$(EXEEXT): cleancsv
    820828@DOifskipcompile@
    821829        +make compile.csv
    822830        -+make compile.diff.csv
    823831@DOendif@
    824         +make basic.csv
    825         -+make basic.diff.csv
    826832        +make ctxswitch.csv
    827833        -+make ctxswitch.diff.csv
    828834        +make mutex.csv
    829835        -+make mutex.diff.csv
    830         +make schedint.csv
    831         -+make schedint.diff.csv
     836        +make scheduling.csv
     837        -+make scheduling.diff.csv
    832838@DOifskipcompile@
    833839        cat compile.csv
    834840        -cat compile.diff.csv
    835841@DOendif@
    836         cat basic.csv
    837         -cat basic.diff.csv
    838842        cat ctxswitch.csv
    839843        -cat ctxswitch.diff.csv
    840844        cat mutex.csv
    841845        -cat mutex.diff.csv
    842         cat schedint.csv
    843         -cat schedint.diff.csv
     846        cat scheduling.csv
     847        -cat scheduling.diff.csv
    844848
    845849compile.csv:
     850        echo "building $@"
    846851        echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
    847852        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
    … …  
    855860        $(srcdir)/fixcsv.sh $@
    856861
    857 basic.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 $@
    863 
    864862ctxswitch.csv:
     863        echo "building $@"
    865864        echo "generator,coroutine,thread" > $@
    866865        +make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
    … …  
    870869
    871870mutex.csv:
     871        echo "building $@"
    872872        echo "1-monitor,2-monitor" > $@
    873873        +make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
    … …  
    875875        $(srcdir)/fixcsv.sh $@
    876876
    877 schedint.csv:
     877scheduling.csv:
     878        echo "building $@"
    878879        echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
    879880        +make schedint-cfa1.runquiet >> $@ && echo -n ',' >> $@
    … …  
    931932
    932933ctxswitch-python_coroutine$(EXEEXT):
    933         echo "#!/bin/sh" > a.out
     934        $(BENCH_V_PY)echo "#!/bin/sh" > a.out
    934935        echo "python3.7 $(srcdir)/ctxswitch/python_cor.py" >> a.out
    935936        chmod a+x a.out
    936937
    937938ctxswitch-nodejs_coroutine$(EXEEXT):
    938         echo "#!/bin/sh" > a.out
     939        $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
    939940        echo "nodejs $(srcdir)/ctxswitch/node_cor.js" >> a.out
    940941        chmod a+x a.out
    941942
    942943ctxswitch-nodejs_await$(EXEEXT):
    943         echo "#!/bin/sh" > a.out
     944        $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
    944945        echo "nodejs $(srcdir)/ctxswitch/node_await.js" >> a.out
    945946        chmod a+x a.out
    … …  
    10851086
    10861087creation-python_coroutine$(EXEEXT):
    1087         echo "#!/bin/sh" > a.out
     1088        $(BENCH_V_PY)echo "#!/bin/sh" > a.out
    10881089        echo "python3.7 $(srcdir)/creation/python_cor.py" >> a.out
    10891090        chmod a+x a.out
    10901091
    10911092creation-nodejs_coroutine$(EXEEXT):
    1092         echo "#!/bin/sh" > a.out
     1093        $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
    10931094        echo "nodejs $(srcdir)/creation/node_cor.js" >> a.out
    10941095        chmod a+x a.out

  • benchmark/baselines/x64/schedint.csv

    r8c50aed ra505021  
    1 waitfor-2,signal-1,signal-2,waitfor-1
     1schedext-2,schedint-1,schedint-2,schedext-1
    22393.69606249999987,325.99158333333327,409.01025000000004,319.90975000000003

  • benchmark/baselines/x86/schedint.csv

    r8c50aed ra505021  
    1 signal-2,waitfor-1,waitfor-2,signal-1
     1schedint-2,schedext-1,schedext-2,schedint-1
    22532.5297959183672,413.3084897959184,506.7579591836735,423.78826530612247
Note: See TracChangeset for help on using the changeset viewer.