Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • benchmark/Makefile.am

    rd9f2874 r5e49e47  
    1616
    1717AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
    18 ACLOCAL_AMFLAGS  = -I automake
    1918
    2019# applies to both programs
    2120include $(top_srcdir)/src/cfa.make
    2221
    23 AM_CFLAGS = -O2 -Wall -Wextra -Werror -I$(srcdir) -lrt -pthread
    24 AM_CFAFLAGS = -quiet -nodebug -in-tree
    25 AM_UPPFLAGS = -quiet -nodebug -multi -std=c++14
    26 
    27 BENCH_V_CC = $(__bench_v_CC_$(__quiet))
    28 BENCH_V_CFA = $(__bench_v_CFA_$(__quiet))
    29 BENCH_V_CXX = $(__bench_v_CXX_$(__quiet))
    30 BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
    31 BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
    32 BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
    33 
    34 __quiet = verbose
    35 __bench_v_CC_quiet = @
    36 __bench_v_CFA_quiet = @
    37 __bench_v_CXX_quiet = @
    38 __bench_v_GOC_quiet = @
    39 __bench_v_JAVAC_quiet = @
    40 __bench_v_UPP_quiet = @
    41 __bench_v_CC_verbose = $(AM_V_CC)
    42 __bench_v_CFA_verbose = $(AM_V_CFA)
    43 __bench_v_CXX_verbose = $(AM_V_CXX)
    44 __bench_v_GOC_verbose = $(AM_V_GOC)
    45 __bench_v_JAVAC_verbose = $(AM_V_JAVAC)
    46 __bench_v_UPP_verbose = $(AM_V_UPP)
    47 
    48 
     22UPPCC = u++
     23UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
     24
     25AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
     26AM_CFAFLAGS = -quiet -in-tree -nodebug
     27AM_UPPFLAGS = -quiet -nodebug -multi
    4928
    5029TOOLSDIR = ${abs_top_builddir}/tools/
    … …  
    5635PRINT_FORMAT = %20s: #Comments needed for spacing
    5736
    58 # Dummy hack tricks
    5937EXTRA_PROGRAMS = dummy # build but do not install
     38
    6039dummy_SOURCES = dummyC.c dummyCXX.cpp
    6140
    … …  
    6746
    6847.NOTPARALLEL:
    69 .PHONY: compile.csv ctxswitch.csv mutex.csv signal.csv
    70 
    71 ## =========================================================================================================
     48
     49noinst_PROGRAMS =
     50
    7251all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
    7352
    … …  
    7958        @${STATS} .result.log
    8059        @echo "------------------------------------------------------"
    81         @rm -f a.out .result.log *.class
     60        @rm -f a.out .result.log
    8261
    8362%.runquiet :
    84         @+make $(basename $@) CFLAGS="-w" __quiet=quiet
     63        @+make $(basename $@) CFLAGS="-w"
    8564        @taskset -c 1 ./a.out
    8665        @rm -f a.out
    … …  
    9574## =========================================================================================================
    9675
    97 FIX_NEW_LINES = cat $@ | tr "\n" "\t" | sed -r 's/\t,/,/' | tr "\t" "\n" > $@
    98 
    9976jenkins$(EXEEXT):
     77        @echo "{"
     78        @echo -e '\t"githash": "'${githash}'",'
     79        @echo -e '\t"arch": "'   ${arch}   '",'
    10080@DOifskipcompile@
    101         @+make compile.csv
     81        @echo -e '\t"compile": {'
     82        @+make compile TIME_FORMAT='%e,' PRINT_FORMAT='\t\t\"%s\" :'
     83        @echo -e '\t\t"dummy" : {}'
     84        @echo -e '\t},'
    10285@DOendif@
    103         @+make ctxswitch.csv
    104         @+make mutex.csv
    105         @+make signal.csv
    106 @DOifskipcompile@
    107         @cat compile.csv
    108 @DOendif@
    109         @cat ctxswitch.csv
    110         @cat mutex.csv
    111         @cat signal.csv
    112 
    113 compile.csv:
    114         @echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
    115         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
    116         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-attributes.make >> $@
    117         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-empty.make >> $@
    118         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-expression.make >> $@
    119         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-io.make >> $@
    120         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-monitor.make >> $@
    121         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-operators.make >> $@
    122         @+make TIME_FORMAT='%e' PRINT_FORMAT='' compile-typeof.make >> $@
    123         @$(srcdir)/fixcsv.sh $@
    124 
    125 ctxswitch.csv:
    126         @echo "coroutine,thread" > $@
    127         @+make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
    128         @+make ctxswitch-cfa_thread.runquiet >> $@
    129         @$(srcdir)/fixcsv.sh $@
    130 
    131 mutex.csv:
    132         @echo "1-monitor,2-monitor" > $@
    133         @+make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
    134         @+make mutex-cfa2.runquiet >> $@
    135         @$(srcdir)/fixcsv.sh $@
    136 
    137 signal.csv:
    138         @echo "signal-1,signal-2,waitfor-1,waitfor-2" > $@
    139         @+make signal-cfa1.runquiet >> $@ && echo -n ',' >> $@
    140         @+make signal-cfa2.runquiet >> $@ && echo -n ',' >> $@
    141         @+make waitfor-cfa1.runquiet >> $@ && echo -n ',' >> $@
    142         @+make waitfor-cfa2.runquiet >> $@
    143         @$(srcdir)/fixcsv.sh $@
     86        @echo -e '\t"ctxswitch": {'
     87        @echo -en '\t\t"coroutine":'
     88        @+make ctxswitch-cfa_coroutine.runquiet
     89        @echo -en '\t\t,"thread":'
     90        @+make ctxswitch-cfa_thread.runquiet
     91        @echo -e '\t},'
     92        @echo -e '\t"mutex": ['
     93        @echo -en '\t\t'
     94        @+make mutex-cfa1.runquiet
     95        @echo -en '\t\t,'
     96        @+make mutex-cfa2.runquiet
     97        @echo -e '\t],'
     98        @echo -e '\t"scheduling": ['
     99        @echo -en '\t\t'
     100        @+make signal-cfa1.runquiet
     101        @echo -en '\t\t,'
     102        @+make signal-cfa2.runquiet
     103        @echo -en '\t\t,'
     104        @+make waitfor-cfa1.runquiet
     105        @echo -en '\t\t,'
     106        @+make waitfor-cfa2.runquiet
     107        @echo -e '\n\t],'
     108        @echo -e '\t"epoch": ' $(shell date +%s)
     109        @echo "}"
    144110
    145111## =========================================================================================================
    146112loop$(EXEEXT):
    147         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     113        $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    148114
    149115function$(EXEEXT):
    150         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     116        $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    151117
    152118fetch_add$(EXEEXT):
    153         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    154 
    155 tls-fetch_add$(EXEEXT):
    156         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/tls-fetch_add.c
     119        $(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    157120
    158121## =========================================================================================================
    … …  
    161124        function.run                    \
    162125        fetch_add.run                   \
    163         tls-fetch_add.run                       \
    164126        ctxswitch-pthread.run           \
    165127        ctxswitch-cfa_coroutine.run     \
    … …  
    178140
    179141ctxswitch-kos_fibre$(EXEEXT):
    180         $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     142        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    181143
    182144ctxswitch-kos_fibre2$(EXEEXT):
    183         $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     145        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    184146endif
    185147
    … …  
    187149
    188150ctxswitch-pthread$(EXEEXT):
    189         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     151        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    190152
    191153ctxswitch-cfa_coroutine$(EXEEXT):
    192         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     154        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    193155
    194156ctxswitch-cfa_thread$(EXEEXT):
    195         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     157        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    196158
    197159ctxswitch-cfa_thread2$(EXEEXT):
    198         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     160        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    199161
    200162ctxswitch-upp_coroutine$(EXEEXT):
    201         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     163        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    202164
    203165ctxswitch-upp_thread$(EXEEXT):
    204         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     166        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    205167
    206168ctxswitch-goroutine$(EXEEXT):
    207         $(BENCH_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     169        @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    208170
    209171ctxswitch-java_thread$(EXEEXT):
    210         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     172        @javac -d . $(srcdir)/ctxswitch/JavaThread.java
    211173        @echo "#!/bin/sh" > a.out
    212174        @echo "java JavaThread" >> a.out
    … …  
    226188
    227189mutex-pthread_lock$(EXEEXT):
    228         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     190        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    229191
    230192mutex-upp$(EXEEXT):
    231         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     193        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    232194
    233195mutex-cfa1$(EXEEXT):
    234         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     196        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    235197
    236198mutex-cfa2$(EXEEXT):
    237         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     199        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    238200
    239201mutex-cfa4$(EXEEXT):
    240         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     202        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    241203
    242204mutex-java_thread$(EXEEXT):
    243         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     205        @javac -d . $(srcdir)/mutex/JavaThread.java
    244206        @echo "#!/bin/sh" > a.out
    245207        @echo "java JavaThread" >> a.out
    … …  
    256218
    257219signal-pthread_cond$(EXEEXT):
    258         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     220        @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    259221
    260222signal-upp$(EXEEXT):
    261         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     223        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    262224
    263225signal-cfa1$(EXEEXT):
    264         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     226        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    265227
    266228signal-cfa2$(EXEEXT):
    267         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     229        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    268230
    269231signal-cfa4$(EXEEXT):
    270         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     232        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    271233
    272234signal-java_thread$(EXEEXT):
    273         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     235        @javac -d . $(srcdir)/schedint/JavaThread.java
    274236        @echo "#!/bin/sh" > a.out
    275237        @echo "java JavaThread" >> a.out
    … …  
    285247
    286248waitfor-upp$(EXEEXT):
    287         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     249        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    288250
    289251waitfor-cfa1$(EXEEXT):
    290         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     252        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    291253
    292254waitfor-cfa2$(EXEEXT):
    293         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     255        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    294256
    295257waitfor-cfa4$(EXEEXT):
    296         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     258        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    297259
    298260## =========================================================================================================
    … …  
    308270
    309271creation-cfa_coroutine$(EXEEXT):
    310         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     272        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    311273
    312274creation-cfa_coroutine_eager$(EXEEXT):
    313         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa -DEAGER
     275        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa -DEAGER
    314276
    315277creation-cfa_thread$(EXEEXT):
    316         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     278        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    317279
    318280creation-upp_coroutine$(EXEEXT):
    319         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     281        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    320282
    321283creation-upp_thread$(EXEEXT):
    322         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     284        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    323285
    324286creation-pthread$(EXEEXT):
    325         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     287        @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    326288
    327289creation-goroutine$(EXEEXT):
    328         $(BENCH_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     290        @go build -o a.out $(srcdir)/creation/goroutine.go
    329291
    330292creation-java_thread$(EXEEXT):
    331         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     293        @javac -d . $(srcdir)/creation/JavaThread.java
    332294        @echo "#!/bin/sh" > a.out
    333295        @echo "java JavaThread" >> a.out
Note: See TracChangeset for help on using the changeset viewer.