Ignore:
Timestamp:
Jan 7, 2021, 2:55:57 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
58fe85a
Parents:
bdfc032 (diff), 44e37ef (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 dkobets-vector

File:
1 edited

Legend:

Unmodified
Added
Removed

  • benchmark/Makefile.am

    rbdfc032 reef8dfb  
    1111## Created On       : Sun May 31 09:08:15 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Sat Jan 25 09:20:44 2020
    14 ## Update Count     : 255
     13## Last Modified On : Tue Mar 10 11:41:18 2020
     14## Update Count     : 258
    1515###############################################################################
    1616
    … …  
    1919
    2020# applies to both programs
    21 include $(top_srcdir)/src/cfa.make
     21include $(top_srcdir)/tools/build/cfa.make
    2222
    2323AM_CFLAGS = -O2 -Wall -Wextra -I$(srcdir) -lrt -pthread # -Werror
    … …  
    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)
    … …  
    6466# Dummy hack tricks
    6567EXTRA_PROGRAMS = dummy # build but do not install
    66 dummy_SOURCES = dummyC.c dummyCXX.cpp
     68nodist_dummy_SOURCES = dummyC.c dummyCXX.cpp
    6769
    6870dummyC.c:
    … …  
    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 
    79 ## =========================================================================================================
    80 
    81 all : basic$(EXEEXT) ctxswitch$(EXEEXT) mutex$(EXEEXT) schedint$(EXEEXT) schedext$(EXEEXT) creation$(EXEEXT)
     78.PHONY: jenkins cleancsv
     79
     80## =========================================================================================================
     81
     82# all is used by make dist so ignore it
     83all:
     84
     85all-bench : basic$(EXEEXT) ctxswitch$(EXEEXT) mutex$(EXEEXT) schedint$(EXEEXT) schedext$(EXEEXT) creation$(EXEEXT)
    8286
    8387basic_loop_DURATION = 15000000000
    … …  
    107111creation_cfa_coroutine_DURATION = 100000000
    108112creation_cfa_coroutine_eager_DURATION = 10000000
     113creation_cfa_generator_DURATION = 1000000000
    109114creation_upp_coroutine_DURATION = ${creation_cfa_coroutine_eager_DURATION}
    110 creation_cfa_thread_DURATION = 10000000
    111 creation_upp_thread_DURATION = ${creation_cfa_thread_DURATION}
    112115creation_DURATION = 10000000
    113116
    … …  
    142145FIX_NEW_LINES = cat $@ | tr "\n" "\t" | sed -r 's/\t,/,/' | tr "\t" "\n" > $@
    143146
    144 jenkins$(EXEEXT):
     147cleancsv:
     148        rm -f compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
     149
     150jenkins$(EXEEXT): cleancsv
    145151@DOifskipcompile@
    146152        +make compile.csv
    147153        -+make compile.diff.csv
    148154@DOendif@
    149         +make basic.csv
    150         -+make basic.diff.csv
    151155        +make ctxswitch.csv
    152156        -+make ctxswitch.diff.csv
    … …  
    159163        -cat compile.diff.csv
    160164@DOendif@
    161         cat basic.csv
    162         -cat basic.diff.csv
    163165        cat ctxswitch.csv
    164166        -cat ctxswitch.diff.csv
    … …  
    169171
    170172compile.csv:
     173        echo "building $@"
    171174        echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
    172175        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
    … …  
    180183        $(srcdir)/fixcsv.sh $@
    181184
    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 
    189185ctxswitch.csv:
     186        echo "building $@"
    190187        echo "generator,coroutine,thread" > $@
    191188        +make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
    … …  
    195192
    196193mutex.csv:
     194        echo "building $@"
    197195        echo "1-monitor,2-monitor" > $@
    198196        +make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
    … …  
    201199
    202200schedint.csv:
     201        echo "building $@"
    203202        echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
    204203        +make schedint-cfa1.runquiet >> $@ && echo -n ',' >> $@
    … …  
    289288
    290289ctxswitch-python_coroutine$(EXEEXT):
    291         echo "#!/bin/sh" > a.out
    292         echo "python3.7 $(srcdir)/ctxswitch/python_cor.py" >> a.out
     290        $(BENCH_V_PY)echo "#!/bin/sh" > a.out
     291        echo "python3 $(srcdir)/ctxswitch/python_cor.py \"$$""@\"" >> a.out
    293292        chmod a+x a.out
    294293
    295294ctxswitch-nodejs_coroutine$(EXEEXT):
    296         echo "#!/bin/sh" > a.out
    297         echo "nodejs $(srcdir)/ctxswitch/node_cor.js" >> a.out
     295        $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
     296        echo "nodejs $(srcdir)/ctxswitch/node_cor.js \"$$""@\"" >> a.out
    298297        chmod a+x a.out
    299298
    300299ctxswitch-nodejs_await$(EXEEXT):
    301         echo "#!/bin/sh" > a.out
    302         echo "nodejs $(srcdir)/ctxswitch/node_await.js" >> a.out
     300        $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
     301        echo "nodejs $(srcdir)/ctxswitch/node_await.js \"$$""@\"" >> a.out
    303302        chmod a+x a.out
    304303
    … …  
    312311        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    313312        echo "#!/bin/sh" > a.out
    314         echo "java JavaThread" >> a.out
     313        echo "java JavaThread \"$$""@\"" >> a.out
    315314        chmod a+x a.out
    316315
    … …  
    354353        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    355354        echo "#!/bin/sh" > a.out
    356         echo "java JavaThread" >> a.out
     355        echo "java JavaThread \"$$""@\"" >> a.out
    357356        chmod a+x a.out
    358357
    … …  
    386385        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    387386        echo "#!/bin/sh" > a.out
    388         echo "java JavaThread" >> a.out
     387        echo "java JavaThread \"$$""@\"" >> a.out
    389388        chmod a+x a.out
    390389
    … …  
    452451
    453452creation-python_coroutine$(EXEEXT):
    454         echo "#!/bin/sh" > a.out
    455         echo "python3.7 $(srcdir)/creation/python_cor.py" >> a.out
     453        $(BENCH_V_PY)echo "#!/bin/sh" > a.out
     454        echo "python3 $(srcdir)/creation/python_cor.py \"$$""@\"" >> a.out
    456455        chmod a+x a.out
    457456
    458457creation-nodejs_coroutine$(EXEEXT):
    459         echo "#!/bin/sh" > a.out
    460         echo "nodejs $(srcdir)/creation/node_cor.js" >> a.out
     458        $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
     459        echo "nodejs $(srcdir)/creation/node_cor.js \"$$""@\"" >> a.out
    461460        chmod a+x a.out
    462461
    … …  
    470469        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    471470        echo "#!/bin/sh" > a.out
    472         echo "java JavaThread" >> a.out
     471        echo "java JavaThread \"$$""@\"" >> a.out
    473472        chmod a+x a.out
    474473
    … …  
    478477## =========================================================================================================
    479478
    480 compile$(EXEEXT) :              \
     479bcompile$(EXEEXT) :             \
    481480        compile-array.make      \
    482481        compile-attributes.make \
    … …  
    491490
    492491compile-array$(EXEEXT):
    493         $(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     492        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/array.cfa
    494493
    495494compile-attributes$(EXEEXT):
    496         $(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     495        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/attributes.cfa
    497496
    498497compile-empty$(EXEEXT):
    499         $(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     498        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(srcdir)/compile/empty.cfa
    500499
    501500compile-expression$(EXEEXT):
    502         $(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     501        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/expression.cfa
    503502
    504503compile-io$(EXEEXT):
    505         $(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     504        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/io1.cfa
    506505
    507506compile-monitor$(EXEEXT):
    508         $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     507        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    509508
    510509compile-operators$(EXEEXT):
    511         $(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     510        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/operators.cfa
    512511
    513512compile-thread$(EXEEXT):
    514         $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     513        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    515514
    516515compile-typeof$(EXEEXT):
    517         $(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     516        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/typeof.cfa
     517
     518## =========================================================================================================
     519
     520size$(EXEEXT) : size-cfa.runquiet
     521
     522size-cfa$(EXEEXT):
     523        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/size/size.cfa
     524
     525## =========================================================================================================
     526
     527%-tokio$(EXEEXT): $(srcdir)/readyQ/%.rs $(srcdir)/bench.rs
     528        cd $(builddir) && cargo build --release
     529        cp $(builddir)/target/release/$(basename $@) $@
Note: See TracChangeset for help on using the changeset viewer.