Changeset 580c11b


Ignore:
Timestamp:
Jan 7, 2020, 5:04:47 PM (22 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
6e540ea
Parents:
b4107c8
Message:

fix nodejs build

Location:
benchmark
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.am

    rb4107c8 r580c11b  
    1111## Created On       : Sun May 31 09:08:15 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Tue Jan  7 15:37:42 2020
    14 ## Update Count     : 70
     13## Last Modified On : Tue Jan  7 17:01:01 2020
     14## Update Count     : 103
    1515###############################################################################
    1616
     
    6565
    6666dummyC.c:
    67         @echo "int main() { return 0; }" > ${@}
     67        echo "int main() { return 0; }" > ${@}
    6868
    6969dummyCXX.cpp:
    70         @echo "int main() { return 0; }" > ${@}
    71 
     70        echo "int main() { return 0; }" > ${@}
     71
     72.SILENT:
     73.ONESHELL:
    7274.NOTPARALLEL:
    7375.PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv signal.csv
     
    7880
    7981%.run : %$(EXEEXT) ${REPEAT}
    80         @rm -f .result.log
    81         @echo "------------------------------------------------------"
    82         @echo $<
    83         @${REPEAT} ${repeats} ./a.out | tee -a .result.log
    84         @${STATS} .result.log
    85         @echo "------------------------------------------------------"
    86         @rm -f a.out .result.log *.class
     82        rm -f .result.log
     83        echo "------------------------------------------------------"
     84        echo $<
     85        ${REPEAT} ${repeats} ./a.out | tee -a .result.log
     86        ${STATS} .result.log
     87        echo "------------------------------------------------------"
     88        rm -f a.out .result.log *.class
    8789
    8890%.runquiet :
    89         @+make $(basename $@) CFLAGS="-w" __quiet=quiet
    90         @taskset -c 1 ./a.out
    91         @rm -f a.out
     91        +make $(basename $@) CFLAGS="-w" __quiet=quiet
     92        taskset -c 1 ./a.out
     93        rm -f a.out
    9294
    9395%.make :
    94         @printf "${PRINT_FORMAT}" $(basename $(subst compile-,,$@))
    95         @+/usr/bin/time -f ${TIME_FORMAT} make $(basename $@) 2>&1
     96        printf "${PRINT_FORMAT}" $(basename $(subst compile-,,$@))
     97        +/usr/bin/time -f ${TIME_FORMAT} make $(basename $@) 2>&1
    9698
    9799${REPEAT} :
    98         @+make -C ${abs_top_builddir}/tools repeat
     100        +make -C ${abs_top_builddir}/tools repeat
    99101
    100102## =========================================================================================================
     
    104106jenkins$(EXEEXT):
    105107@DOifskipcompile@
    106         @+make compile.csv
    107         @-+make compile.diff.csv
     108        +make compile.csv
     109        -+make compile.diff.csv
    108110@DOendif@
    109         @+make basic.csv
    110         @-+make basic.diff.csv
    111         @+make ctxswitch.csv
    112         @-+make ctxswitch.diff.csv
    113         @+make mutex.csv
    114         @-+make mutex.diff.csv
    115         @+make signal.csv
    116         @-+make signal.diff.csv
     111        +make basic.csv
     112        -+make basic.diff.csv
     113        +make ctxswitch.csv
     114        -+make ctxswitch.diff.csv
     115        +make mutex.csv
     116        -+make mutex.diff.csv
     117        +make signal.csv
     118        -+make signal.diff.csv
    117119@DOifskipcompile@
    118120        cat compile.csv
     
    129131
    130132compile.csv:
    131         @echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
    132         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
    133         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-attributes.make >> $@
    134         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-empty.make >> $@
    135         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-expression.make >> $@
    136         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-io.make >> $@
    137         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-monitor.make >> $@
    138         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-operators.make >> $@
    139         @+make TIME_FORMAT='%e' PRINT_FORMAT='' compile-typeof.make >> $@
    140         @$(srcdir)/fixcsv.sh $@
     133        echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
     134        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
     135        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-attributes.make >> $@
     136        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-empty.make >> $@
     137        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-expression.make >> $@
     138        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-io.make >> $@
     139        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-monitor.make >> $@
     140        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-operators.make >> $@
     141        +make TIME_FORMAT='%e' PRINT_FORMAT='' compile-typeof.make >> $@
     142        $(srcdir)/fixcsv.sh $@
    141143
    142144basic.csv:
    143         @echo "generator,coroutine,thread" > $@
    144         @+make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
    145         @+make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
    146         @+make basic-cfa_thread.runquiet >> $@
    147         @$(srcdir)/fixcsv.sh $@
     145        echo "generator,coroutine,thread" > $@
     146        +make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
     147        +make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
     148        +make basic-cfa_thread.runquiet >> $@
     149        $(srcdir)/fixcsv.sh $@
    148150
    149151ctxswitch.csv:
    150         @echo "generator,coroutine,thread" > $@
    151         @+make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
    152         @+make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
    153         @+make ctxswitch-cfa_thread.runquiet >> $@
    154         @$(srcdir)/fixcsv.sh $@
     152        echo "generator,coroutine,thread" > $@
     153        +make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
     154        +make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
     155        +make ctxswitch-cfa_thread.runquiet >> $@
     156        $(srcdir)/fixcsv.sh $@
    155157
    156158mutex.csv:
    157         @echo "1-monitor,2-monitor" > $@
    158         @+make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
    159         @+make mutex-cfa2.runquiet >> $@
    160         @$(srcdir)/fixcsv.sh $@
     159        echo "1-monitor,2-monitor" > $@
     160        +make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
     161        +make mutex-cfa2.runquiet >> $@
     162        $(srcdir)/fixcsv.sh $@
    161163
    162164signal.csv:
    163         @echo "signal-1,signal-2,waitfor-1,waitfor-2" > $@
    164         @+make signal-cfa1.runquiet >> $@ && echo -n ',' >> $@
    165         @+make signal-cfa2.runquiet >> $@ && echo -n ',' >> $@
    166         @+make waitfor-cfa1.runquiet >> $@ && echo -n ',' >> $@
    167         @+make waitfor-cfa2.runquiet >> $@
    168         @$(srcdir)/fixcsv.sh $@
     165        echo "signal-1,signal-2,waitfor-1,waitfor-2" > $@
     166        +make signal-cfa1.runquiet >> $@ && echo -n ',' >> $@
     167        +make signal-cfa2.runquiet >> $@ && echo -n ',' >> $@
     168        +make waitfor-cfa1.runquiet >> $@ && echo -n ',' >> $@
     169        +make waitfor-cfa2.runquiet >> $@
     170        $(srcdir)/fixcsv.sh $@
    169171
    170172%.diff.csv: %.csv
    171         @test -e $(srcdir)/baselines/$(arch)/$< || (echo "Error : Missing baseline for ${<}" && false)
    172         @$(srcdir)/baselines/calc.py $(srcdir)/baselines/$(arch)/$(<) $(<) > $@
     173        test -e $(srcdir)/baselines/$(arch)/$< || (echo "Error : Missing baseline for ${<}" && false)
     174        $(srcdir)/baselines/calc.py $(srcdir)/baselines/$(arch)/$(<) $(<) > $@
    173175
    174176## =========================================================================================================
     
    199201
    200202basic-loop.run : basic-loop$(EXEEXT) ${REPEAT}
    201         @rm -f .result.log
    202         @echo "------------------------------------------------------"
    203         @echo $<
    204         @${REPEAT} ${repeats} ./a.out 10000000000 | tee -a .result.log
    205         @${STATS} .result.log
    206         @echo "------------------------------------------------------"
    207         @rm -f a.out .result.log *.class
     203        rm -f .result.log
     204        echo "------------------------------------------------------"
     205        echo $<
     206        ${REPEAT} ${repeats} ./a.out 10000000000 | tee -a .result.log
     207        ${STATS} .result.log
     208        echo "------------------------------------------------------"
     209        rm -f a.out .result.log *.class
    208210
    209211basic-function.run : basic-function$(EXEEXT) ${REPEAT}
    210         @rm -f .result.log
    211         @echo "------------------------------------------------------"
    212         @echo $<
    213         @${REPEAT} ${repeats} ./a.out 5000000000 | tee -a .result.log
    214         @${STATS} .result.log
    215         @echo "------------------------------------------------------"
    216         @rm -f a.out .result.log *.class
     212        rm -f .result.log
     213        echo "------------------------------------------------------"
     214        echo $<
     215        ${REPEAT} ${repeats} ./a.out 5000000000 | tee -a .result.log
     216        ${STATS} .result.log
     217        echo "------------------------------------------------------"
     218        rm -f a.out .result.log *.class
    217219
    218220basic-%.run : basic-%$(EXEEXT) ${REPEAT}
    219         @rm -f .result.log
    220         @echo "------------------------------------------------------"
    221         @echo $<
    222         @${REPEAT} ${repeats} ./a.out 500000000 | tee -a .result.log
    223         @${STATS} .result.log
    224         @echo "------------------------------------------------------"
    225         @rm -f a.out .result.log *.class
     221        rm -f .result.log
     222        echo "------------------------------------------------------"
     223        echo $<
     224        ${REPEAT} ${repeats} ./a.out 500000000 | tee -a .result.log
     225        ${STATS} .result.log
     226        echo "------------------------------------------------------"
     227        rm -f a.out .result.log *.class
    226228
    227229## =========================================================================================================
     
    237239        ctxswitch-goroutine.run         \
    238240        ctxswitch-rust_thread.run       \
    239         ctxswitch-nodejs_thread.run     \
     241        ctxswitch-nodejs_coroutine.run  \
    240242        ctxswitch-java_thread.run
    241243
     
    281283        $(BENCH_V_RUSTC)rustc -C opt-level=3 -o a.out $(srcdir)/ctxswitch/rust_thrd.rs
    282284
     285ctxswitch-nodejs_coroutine$(EXEEXT):
     286
    283287ctxswitch-java_thread$(EXEEXT):
    284288        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    285         @echo "#!/bin/sh" > a.out
    286         @echo "java JavaThread" >> a.out
    287         @chmod a+x a.out
    288 
    289 ctxswitch-nodejs.run : ctxswitch-nodejs$(EXEEXT) ${REPEAT}
    290         @rm -f .result.log
    291         @echo "------------------------------------------------------"
    292         @echo $<
    293         @${REPEAT} ${repeats} node node_cor.js 50000000 | tee -a .result.log
    294         @${STATS} .result.log
    295         @echo "------------------------------------------------------"
    296         @rm -f a.out .result.log *.class
     289        echo "#!/bin/sh" > a.out
     290        echo "java JavaThread" >> a.out
     291        chmod a+x a.out
     292
     293ctxswitch-nodejs_coroutine.run : ctxswitch-nodejs_coroutine$(EXEEXT) ${REPEAT}
     294        rm -f .result.log
     295        echo "------------------------------------------------------"
     296        echo $<
     297        for (( i = 1; i <= ${repeats}; i += 1 )) ; do
     298                node $(srcdir)/ctxswitch/node_cor.js 50000000 | tee -a .result.log
     299        done
     300        ${STATS} .result.log
     301        echo "------------------------------------------------------"
     302        rm -f a.out .result.log *.class
    297303
    298304ctxswitch-%.run : ctxswitch-%$(EXEEXT) ${REPEAT}
    299         @rm -f .result.log
    300         @echo "------------------------------------------------------"
    301         @echo $<
    302         @${REPEAT} ${repeats} ./a.out 50000000 | tee -a .result.log
    303         @${STATS} .result.log
    304         @echo "------------------------------------------------------"
    305         @rm -f a.out .result.log *.class
     305        rm -f .result.log
     306        echo "------------------------------------------------------"
     307        echo $<
     308        ${REPEAT} ${repeats} ./a.out 50000000 | tee -a .result.log
     309        ${STATS} .result.log
     310        echo "------------------------------------------------------"
     311        rm -f a.out .result.log *.class
    306312
    307313## =========================================================================================================
     
    340346mutex-java$(EXEEXT):
    341347        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    342         @echo "#!/bin/sh" > a.out
    343         @echo "java JavaThread" >> a.out
    344         @chmod a+x a.out
     348        echo "#!/bin/sh" > a.out
     349        echo "java JavaThread" >> a.out
     350        chmod a+x a.out
    345351
    346352## =========================================================================================================
     
    375381signal-java$(EXEEXT):
    376382        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    377         @echo "#!/bin/sh" > a.out
    378         @echo "java JavaThread" >> a.out
    379         @chmod a+x a.out
     383        echo "#!/bin/sh" > a.out
     384        echo "java JavaThread" >> a.out
     385        chmod a+x a.out
    380386
    381387## =========================================================================================================
     
    438444creation-java$(EXEEXT):
    439445        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    440         @echo "#!/bin/sh" > a.out
    441         @echo "java JavaThread" >> a.out
    442         @chmod a+x a.out
     446        echo "#!/bin/sh" > a.out
     447        echo "java JavaThread" >> a.out
     448        chmod a+x a.out
    443449
    444450## =========================================================================================================
     
    457463
    458464compile-array$(EXEEXT):
    459         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     465        $(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    460466
    461467compile-attributes$(EXEEXT):
    462         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     468        $(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    463469
    464470compile-empty$(EXEEXT):
    465         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     471        $(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    466472
    467473compile-expression$(EXEEXT):
    468         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     474        $(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    469475
    470476compile-io$(EXEEXT):
    471         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     477        $(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    472478
    473479compile-monitor$(EXEEXT):
    474         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     480        $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    475481
    476482compile-operators$(EXEEXT):
    477         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     483        $(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    478484
    479485compile-thread$(EXEEXT):
    480         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     486        $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    481487
    482488compile-typeof$(EXEEXT):
    483         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     489        $(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
  • benchmark/Makefile.in

    rb4107c8 r580c11b  
    421421        ctxswitch-cfa_thread2.run ctxswitch-upp_coroutine.run \
    422422        ctxswitch-upp_thread.run ctxswitch-goroutine.run \
    423         ctxswitch-rust_thread.run ctxswitch-nodejs_thread.run \
     423        ctxswitch-rust_thread.run ctxswitch-nodejs_coroutine.run \
    424424        ctxswitch-java_thread.run $(am__append_1)
    425425testdir = $(top_srcdir)/tests
     
    741741
    742742dummyC.c:
    743         @echo "int main() { return 0; }" > ${@}
     743        echo "int main() { return 0; }" > ${@}
    744744
    745745dummyCXX.cpp:
    746         @echo "int main() { return 0; }" > ${@}
    747 
     746        echo "int main() { return 0; }" > ${@}
     747
     748.SILENT:
     749.ONESHELL:
    748750.NOTPARALLEL:
    749751.PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv signal.csv
     
    752754
    753755%.run : %$(EXEEXT) ${REPEAT}
    754         @rm -f .result.log
    755         @echo "------------------------------------------------------"
    756         @echo $<
    757         @${REPEAT} ${repeats} ./a.out | tee -a .result.log
    758         @${STATS} .result.log
    759         @echo "------------------------------------------------------"
    760         @rm -f a.out .result.log *.class
     756        rm -f .result.log
     757        echo "------------------------------------------------------"
     758        echo $<
     759        ${REPEAT} ${repeats} ./a.out | tee -a .result.log
     760        ${STATS} .result.log
     761        echo "------------------------------------------------------"
     762        rm -f a.out .result.log *.class
    761763
    762764%.runquiet :
    763         @+make $(basename $@) CFLAGS="-w" __quiet=quiet
    764         @taskset -c 1 ./a.out
    765         @rm -f a.out
     765        +make $(basename $@) CFLAGS="-w" __quiet=quiet
     766        taskset -c 1 ./a.out
     767        rm -f a.out
    766768
    767769%.make :
    768         @printf "${PRINT_FORMAT}" $(basename $(subst compile-,,$@))
    769         @+/usr/bin/time -f ${TIME_FORMAT} make $(basename $@) 2>&1
     770        printf "${PRINT_FORMAT}" $(basename $(subst compile-,,$@))
     771        +/usr/bin/time -f ${TIME_FORMAT} make $(basename $@) 2>&1
    770772
    771773${REPEAT} :
    772         @+make -C ${abs_top_builddir}/tools repeat
     774        +make -C ${abs_top_builddir}/tools repeat
    773775
    774776jenkins$(EXEEXT):
    775777@DOifskipcompile@
    776         @+make compile.csv
    777         @-+make compile.diff.csv
     778        +make compile.csv
     779        -+make compile.diff.csv
    778780@DOendif@
    779         @+make basic.csv
    780         @-+make basic.diff.csv
    781         @+make ctxswitch.csv
    782         @-+make ctxswitch.diff.csv
    783         @+make mutex.csv
    784         @-+make mutex.diff.csv
    785         @+make signal.csv
    786         @-+make signal.diff.csv
     781        +make basic.csv
     782        -+make basic.diff.csv
     783        +make ctxswitch.csv
     784        -+make ctxswitch.diff.csv
     785        +make mutex.csv
     786        -+make mutex.diff.csv
     787        +make signal.csv
     788        -+make signal.diff.csv
    787789@DOifskipcompile@
    788790        cat compile.csv
     
    799801
    800802compile.csv:
    801         @echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
    802         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
    803         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-attributes.make >> $@
    804         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-empty.make >> $@
    805         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-expression.make >> $@
    806         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-io.make >> $@
    807         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-monitor.make >> $@
    808         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-operators.make >> $@
    809         @+make TIME_FORMAT='%e' PRINT_FORMAT='' compile-typeof.make >> $@
    810         @$(srcdir)/fixcsv.sh $@
     803        echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
     804        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
     805        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-attributes.make >> $@
     806        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-empty.make >> $@
     807        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-expression.make >> $@
     808        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-io.make >> $@
     809        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-monitor.make >> $@
     810        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-operators.make >> $@
     811        +make TIME_FORMAT='%e' PRINT_FORMAT='' compile-typeof.make >> $@
     812        $(srcdir)/fixcsv.sh $@
    811813
    812814basic.csv:
    813         @echo "generator,coroutine,thread" > $@
    814         @+make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
    815         @+make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
    816         @+make basic-cfa_thread.runquiet >> $@
    817         @$(srcdir)/fixcsv.sh $@
     815        echo "generator,coroutine,thread" > $@
     816        +make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
     817        +make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
     818        +make basic-cfa_thread.runquiet >> $@
     819        $(srcdir)/fixcsv.sh $@
    818820
    819821ctxswitch.csv:
    820         @echo "generator,coroutine,thread" > $@
    821         @+make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
    822         @+make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
    823         @+make ctxswitch-cfa_thread.runquiet >> $@
    824         @$(srcdir)/fixcsv.sh $@
     822        echo "generator,coroutine,thread" > $@
     823        +make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
     824        +make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
     825        +make ctxswitch-cfa_thread.runquiet >> $@
     826        $(srcdir)/fixcsv.sh $@
    825827
    826828mutex.csv:
    827         @echo "1-monitor,2-monitor" > $@
    828         @+make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
    829         @+make mutex-cfa2.runquiet >> $@
    830         @$(srcdir)/fixcsv.sh $@
     829        echo "1-monitor,2-monitor" > $@
     830        +make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
     831        +make mutex-cfa2.runquiet >> $@
     832        $(srcdir)/fixcsv.sh $@
    831833
    832834signal.csv:
    833         @echo "signal-1,signal-2,waitfor-1,waitfor-2" > $@
    834         @+make signal-cfa1.runquiet >> $@ && echo -n ',' >> $@
    835         @+make signal-cfa2.runquiet >> $@ && echo -n ',' >> $@
    836         @+make waitfor-cfa1.runquiet >> $@ && echo -n ',' >> $@
    837         @+make waitfor-cfa2.runquiet >> $@
    838         @$(srcdir)/fixcsv.sh $@
     835        echo "signal-1,signal-2,waitfor-1,waitfor-2" > $@
     836        +make signal-cfa1.runquiet >> $@ && echo -n ',' >> $@
     837        +make signal-cfa2.runquiet >> $@ && echo -n ',' >> $@
     838        +make waitfor-cfa1.runquiet >> $@ && echo -n ',' >> $@
     839        +make waitfor-cfa2.runquiet >> $@
     840        $(srcdir)/fixcsv.sh $@
    839841
    840842%.diff.csv: %.csv
    841         @test -e $(srcdir)/baselines/$(arch)/$< || (echo "Error : Missing baseline for ${<}" && false)
    842         @$(srcdir)/baselines/calc.py $(srcdir)/baselines/$(arch)/$(<) $(<) > $@
     843        test -e $(srcdir)/baselines/$(arch)/$< || (echo "Error : Missing baseline for ${<}" && false)
     844        $(srcdir)/baselines/calc.py $(srcdir)/baselines/$(arch)/$(<) $(<) > $@
    843845
    844846basic-loop$(EXEEXT):
     
    860862
    861863basic-loop.run : basic-loop$(EXEEXT) ${REPEAT}
    862         @rm -f .result.log
    863         @echo "------------------------------------------------------"
    864         @echo $<
    865         @${REPEAT} ${repeats} ./a.out 10000000000 | tee -a .result.log
    866         @${STATS} .result.log
    867         @echo "------------------------------------------------------"
    868         @rm -f a.out .result.log *.class
     864        rm -f .result.log
     865        echo "------------------------------------------------------"
     866        echo $<
     867        ${REPEAT} ${repeats} ./a.out 10000000000 | tee -a .result.log
     868        ${STATS} .result.log
     869        echo "------------------------------------------------------"
     870        rm -f a.out .result.log *.class
    869871
    870872basic-function.run : basic-function$(EXEEXT) ${REPEAT}
    871         @rm -f .result.log
    872         @echo "------------------------------------------------------"
    873         @echo $<
    874         @${REPEAT} ${repeats} ./a.out 5000000000 | tee -a .result.log
    875         @${STATS} .result.log
    876         @echo "------------------------------------------------------"
    877         @rm -f a.out .result.log *.class
     873        rm -f .result.log
     874        echo "------------------------------------------------------"
     875        echo $<
     876        ${REPEAT} ${repeats} ./a.out 5000000000 | tee -a .result.log
     877        ${STATS} .result.log
     878        echo "------------------------------------------------------"
     879        rm -f a.out .result.log *.class
    878880
    879881basic-%.run : basic-%$(EXEEXT) ${REPEAT}
    880         @rm -f .result.log
    881         @echo "------------------------------------------------------"
    882         @echo $<
    883         @${REPEAT} ${repeats} ./a.out 500000000 | tee -a .result.log
    884         @${STATS} .result.log
    885         @echo "------------------------------------------------------"
    886         @rm -f a.out .result.log *.class
     882        rm -f .result.log
     883        echo "------------------------------------------------------"
     884        echo $<
     885        ${REPEAT} ${repeats} ./a.out 500000000 | tee -a .result.log
     886        ${STATS} .result.log
     887        echo "------------------------------------------------------"
     888        rm -f a.out .result.log *.class
    887889
    888890@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
     
    921923        $(BENCH_V_RUSTC)rustc -C opt-level=3 -o a.out $(srcdir)/ctxswitch/rust_thrd.rs
    922924
     925ctxswitch-nodejs_coroutine$(EXEEXT):
     926
    923927ctxswitch-java_thread$(EXEEXT):
    924928        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    925         @echo "#!/bin/sh" > a.out
    926         @echo "java JavaThread" >> a.out
    927         @chmod a+x a.out
    928 
    929 ctxswitch-nodejs.run : ctxswitch-nodejs$(EXEEXT) ${REPEAT}
    930         @rm -f .result.log
    931         @echo "------------------------------------------------------"
    932         @echo $<
    933         @${REPEAT} ${repeats} node node_cor.js 50000000 | tee -a .result.log
    934         @${STATS} .result.log
    935         @echo "------------------------------------------------------"
    936         @rm -f a.out .result.log *.class
     929        echo "#!/bin/sh" > a.out
     930        echo "java JavaThread" >> a.out
     931        chmod a+x a.out
     932
     933ctxswitch-nodejs_coroutine.run : ctxswitch-nodejs_coroutine$(EXEEXT) ${REPEAT}
     934        rm -f .result.log
     935        echo "------------------------------------------------------"
     936        echo $<
     937        for (( i = 1; i <= ${repeats}; i += 1 )) ; do
     938                node $(srcdir)/ctxswitch/node_cor.js 50000000 | tee -a .result.log
     939        done
     940        ${STATS} .result.log
     941        echo "------------------------------------------------------"
     942        rm -f a.out .result.log *.class
    937943
    938944ctxswitch-%.run : ctxswitch-%$(EXEEXT) ${REPEAT}
    939         @rm -f .result.log
    940         @echo "------------------------------------------------------"
    941         @echo $<
    942         @${REPEAT} ${repeats} ./a.out 50000000 | tee -a .result.log
    943         @${STATS} .result.log
    944         @echo "------------------------------------------------------"
    945         @rm -f a.out .result.log *.class
     945        rm -f .result.log
     946        echo "------------------------------------------------------"
     947        echo $<
     948        ${REPEAT} ${repeats} ./a.out 50000000 | tee -a .result.log
     949        ${STATS} .result.log
     950        echo "------------------------------------------------------"
     951        rm -f a.out .result.log *.class
    946952
    947953mutex$(EXEEXT) :                \
     
    978984mutex-java$(EXEEXT):
    979985        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    980         @echo "#!/bin/sh" > a.out
    981         @echo "java JavaThread" >> a.out
    982         @chmod a+x a.out
     986        echo "#!/bin/sh" > a.out
     987        echo "java JavaThread" >> a.out
     988        chmod a+x a.out
    983989
    984990signal$(EXEEXT) :               \
     
    10111017signal-java$(EXEEXT):
    10121018        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    1013         @echo "#!/bin/sh" > a.out
    1014         @echo "java JavaThread" >> a.out
    1015         @chmod a+x a.out
     1019        echo "#!/bin/sh" > a.out
     1020        echo "java JavaThread" >> a.out
     1021        chmod a+x a.out
    10161022
    10171023waitfor$(EXEEXT) :              \
     
    10701076creation-java$(EXEEXT):
    10711077        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    1072         @echo "#!/bin/sh" > a.out
    1073         @echo "java JavaThread" >> a.out
    1074         @chmod a+x a.out
     1078        echo "#!/bin/sh" > a.out
     1079        echo "java JavaThread" >> a.out
     1080        chmod a+x a.out
    10751081
    10761082compile$(EXEEXT) :              \
     
    10851091
    10861092compile-array$(EXEEXT):
    1087         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     1093        $(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    10881094
    10891095compile-attributes$(EXEEXT):
    1090         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     1096        $(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    10911097
    10921098compile-empty$(EXEEXT):
    1093         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     1099        $(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    10941100
    10951101compile-expression$(EXEEXT):
    1096         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     1102        $(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    10971103
    10981104compile-io$(EXEEXT):
    1099         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     1105        $(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    11001106
    11011107compile-monitor$(EXEEXT):
    1102         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     1108        $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    11031109
    11041110compile-operators$(EXEEXT):
    1105         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     1111        $(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    11061112
    11071113compile-thread$(EXEEXT):
    1108         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     1114        $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    11091115
    11101116compile-typeof$(EXEEXT):
    1111         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     1117        $(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    11121118
    11131119# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.