Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.am

    r107b01a r5e49e47  
    1616
    1717AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
    18 ACLOCAL_AMFLAGS  = -I automake
    1918
    2019# applies to both programs
     
    2221
    2322UPPCC = u++
     23UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    2424
    2525AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
     
    2727AM_UPPFLAGS = -quiet -nodebug -multi
    2828
    29 TOOLSDIR = ${abs_top_srcdir}/tools/
    30 REPEAT   = ${TOOLSDIR}repeat
    31 STATS    = ${TOOLSDIR}stat.py
     29TOOLSDIR = ${abs_top_builddir}/tools/
     30REPEAT   = ${abs_top_builddir}/tools/repeat
     31STATS    = ${abs_top_srcdir}/tools/stat.py
    3232repeats  = 30
    3333skipcompile = no
     
    3535PRINT_FORMAT = %20s: #Comments needed for spacing
    3636
    37 #prevent any tests in parallel
     37EXTRA_PROGRAMS = dummy # build but do not install
     38
     39dummy_SOURCES = dummyC.c dummyCXX.cpp
     40
     41dummyC.c:
     42        @echo "int main() { return 0; }" > ${@}
     43
     44dummyCXX.cpp:
     45        @echo "int main() { return 0; }" > ${@}
     46
    3847.NOTPARALLEL:
    3948
    40 #make sure automake includes the compile rules for C and C++
    41 EXTRA_PROGRAMS = dummy
    42 dummy_SOURCES = c.c cxx.cpp
    43 
    44 ## =========================================================================================================
     49noinst_PROGRAMS =
     50
    4551all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
    4652
     
    5258        @${STATS} .result.log
    5359        @echo "------------------------------------------------------"
    54         @rm -f a.out .result.log *.class
     60        @rm -f a.out .result.log
    5561
    5662%.runquiet :
     
    6470
    6571${REPEAT} :
    66         @+make -C ${TOOLSDIR} repeat
     72        @+make -C ${abs_top_builddir}/tools repeat
    6773
    6874## =========================================================================================================
     
    105111## =========================================================================================================
    106112loop$(EXEEXT):
    107         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     113        $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    108114
    109115function$(EXEEXT):
    110         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     116        $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    111117
    112118fetch_add$(EXEEXT):
    113         $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     119        $(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    114120
    115121## =========================================================================================================
     
    134140
    135141ctxswitch-kos_fibre$(EXEEXT):
    136         $(AM_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
    137143
    138144ctxswitch-kos_fibre2$(EXEEXT):
    139         $(AM_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
    140146endif
    141147
     
    143149
    144150ctxswitch-pthread$(EXEEXT):
    145         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     151        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    146152
    147153ctxswitch-cfa_coroutine$(EXEEXT):
    148         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
     154        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    149155
    150156ctxswitch-cfa_thread$(EXEEXT):
    151         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     157        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    152158
    153159ctxswitch-cfa_thread2$(EXEEXT):
    154         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
     160        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    155161
    156162ctxswitch-upp_coroutine$(EXEEXT):
    157         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     163        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    158164
    159165ctxswitch-upp_thread$(EXEEXT):
    160         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     166        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    161167
    162168ctxswitch-goroutine$(EXEEXT):
    163         $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     169        @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    164170
    165171ctxswitch-java_thread$(EXEEXT):
    166         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     172        @javac -d . $(srcdir)/ctxswitch/JavaThread.java
    167173        @echo "#!/bin/sh" > a.out
    168174        @echo "java JavaThread" >> a.out
     
    182188
    183189mutex-pthread_lock$(EXEEXT):
    184         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     190        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    185191
    186192mutex-upp$(EXEEXT):
    187         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     193        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    188194
    189195mutex-cfa1$(EXEEXT):
    190         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
     196        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    191197
    192198mutex-cfa2$(EXEEXT):
    193         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
     199        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    194200
    195201mutex-cfa4$(EXEEXT):
    196         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
     202        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    197203
    198204mutex-java_thread$(EXEEXT):
    199         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     205        @javac -d . $(srcdir)/mutex/JavaThread.java
    200206        @echo "#!/bin/sh" > a.out
    201207        @echo "java JavaThread" >> a.out
     
    212218
    213219signal-pthread_cond$(EXEEXT):
    214         $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     220        @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    215221
    216222signal-upp$(EXEEXT):
    217         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     223        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    218224
    219225signal-cfa1$(EXEEXT):
    220         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
     226        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    221227
    222228signal-cfa2$(EXEEXT):
    223         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
     229        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    224230
    225231signal-cfa4$(EXEEXT):
    226         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
     232        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    227233
    228234signal-java_thread$(EXEEXT):
    229         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     235        @javac -d . $(srcdir)/schedint/JavaThread.java
    230236        @echo "#!/bin/sh" > a.out
    231237        @echo "java JavaThread" >> a.out
     
    241247
    242248waitfor-upp$(EXEEXT):
    243         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     249        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    244250
    245251waitfor-cfa1$(EXEEXT):
    246         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
     252        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    247253
    248254waitfor-cfa2$(EXEEXT):
    249         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
     255        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    250256
    251257waitfor-cfa4$(EXEEXT):
    252         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
     258        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    253259
    254260## =========================================================================================================
     
    264270
    265271creation-cfa_coroutine$(EXEEXT):
    266         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     272        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    267273
    268274creation-cfa_coroutine_eager$(EXEEXT):
    269         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     275        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa -DEAGER
    270276
    271277creation-cfa_thread$(EXEEXT):
    272         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
     278        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    273279
    274280creation-upp_coroutine$(EXEEXT):
    275         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     281        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    276282
    277283creation-upp_thread$(EXEEXT):
    278         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     284        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    279285
    280286creation-pthread$(EXEEXT):
    281         $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     287        @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    282288
    283289creation-goroutine$(EXEEXT):
    284         $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     290        @go build -o a.out $(srcdir)/creation/goroutine.go
    285291
    286292creation-java_thread$(EXEEXT):
    287         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     293        @javac -d . $(srcdir)/creation/JavaThread.java
    288294        @echo "#!/bin/sh" > a.out
    289295        @echo "java JavaThread" >> a.out
     
    306312
    307313compile-array$(EXEEXT):
    308         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
     314        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    309315
    310316compile-attributes$(EXEEXT):
    311         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     317        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    312318
    313319compile-empty$(EXEEXT):
    314         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
     320        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    315321
    316322compile-expression$(EXEEXT):
    317         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
     323        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    318324
    319325compile-io$(EXEEXT):
    320         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
     326        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    321327
    322328compile-monitor$(EXEEXT):
    323         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
     329        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    324330
    325331compile-operators$(EXEEXT):
    326         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
     332        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    327333
    328334compile-thread$(EXEEXT):
    329         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
     335        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    330336
    331337compile-typeof$(EXEEXT):
    332         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
    333 
     338        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     339
Note: See TracChangeset for help on using the changeset viewer.