Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.am

    r5e49e47 r107b01a  
    1616
    1717AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     18ACLOCAL_AMFLAGS  = -I automake
    1819
    1920# applies to both programs
     
    2122
    2223UPPCC = u++
    23 UPPCOMPILE = $(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_builddir}/tools/
    30 REPEAT   = ${abs_top_builddir}/tools/repeat
    31 STATS    = ${abs_top_srcdir}/tools/stat.py
     29TOOLSDIR = ${abs_top_srcdir}/tools/
     30REPEAT   = ${TOOLSDIR}repeat
     31STATS    = ${TOOLSDIR}stat.py
    3232repeats  = 30
    3333skipcompile = no
     
    3535PRINT_FORMAT = %20s: #Comments needed for spacing
    3636
    37 EXTRA_PROGRAMS = dummy # build but do not install
    38 
    39 dummy_SOURCES = dummyC.c dummyCXX.cpp
    40 
    41 dummyC.c:
    42         @echo "int main() { return 0; }" > ${@}
    43 
    44 dummyCXX.cpp:
    45         @echo "int main() { return 0; }" > ${@}
    46 
     37#prevent any tests in parallel
    4738.NOTPARALLEL:
    4839
    49 noinst_PROGRAMS =
    50 
     40#make sure automake includes the compile rules for C and C++
     41EXTRA_PROGRAMS = dummy
     42dummy_SOURCES = c.c cxx.cpp
     43
     44## =========================================================================================================
    5145all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
    5246
     
    5852        @${STATS} .result.log
    5953        @echo "------------------------------------------------------"
    60         @rm -f a.out .result.log
     54        @rm -f a.out .result.log *.class
    6155
    6256%.runquiet :
     
    7064
    7165${REPEAT} :
    72         @+make -C ${abs_top_builddir}/tools repeat
     66        @+make -C ${TOOLSDIR} repeat
    7367
    7468## =========================================================================================================
     
    111105## =========================================================================================================
    112106loop$(EXEEXT):
    113         $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     107        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    114108
    115109function$(EXEEXT):
    116         $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     110        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    117111
    118112fetch_add$(EXEEXT):
    119         $(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     113        $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    120114
    121115## =========================================================================================================
     
    140134
    141135ctxswitch-kos_fibre$(EXEEXT):
    142         @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     136        $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    143137
    144138ctxswitch-kos_fibre2$(EXEEXT):
    145         @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     139        $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    146140endif
    147141
     
    149143
    150144ctxswitch-pthread$(EXEEXT):
    151         @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     145        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    152146
    153147ctxswitch-cfa_coroutine$(EXEEXT):
    154         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     148        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
    155149
    156150ctxswitch-cfa_thread$(EXEEXT):
    157         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     151        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
    158152
    159153ctxswitch-cfa_thread2$(EXEEXT):
    160         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     154        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
    161155
    162156ctxswitch-upp_coroutine$(EXEEXT):
    163         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     157        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    164158
    165159ctxswitch-upp_thread$(EXEEXT):
    166         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     160        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    167161
    168162ctxswitch-goroutine$(EXEEXT):
    169         @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     163        $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    170164
    171165ctxswitch-java_thread$(EXEEXT):
    172         @javac -d . $(srcdir)/ctxswitch/JavaThread.java
     166        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    173167        @echo "#!/bin/sh" > a.out
    174168        @echo "java JavaThread" >> a.out
     
    188182
    189183mutex-pthread_lock$(EXEEXT):
    190         @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     184        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    191185
    192186mutex-upp$(EXEEXT):
    193         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     187        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    194188
    195189mutex-cfa1$(EXEEXT):
    196         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     190        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
    197191
    198192mutex-cfa2$(EXEEXT):
    199         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     193        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
    200194
    201195mutex-cfa4$(EXEEXT):
    202         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     196        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
    203197
    204198mutex-java_thread$(EXEEXT):
    205         @javac -d . $(srcdir)/mutex/JavaThread.java
     199        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    206200        @echo "#!/bin/sh" > a.out
    207201        @echo "java JavaThread" >> a.out
     
    218212
    219213signal-pthread_cond$(EXEEXT):
    220         @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     214        $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    221215
    222216signal-upp$(EXEEXT):
    223         @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     217        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    224218
    225219signal-cfa1$(EXEEXT):
    226         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     220        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
    227221
    228222signal-cfa2$(EXEEXT):
    229         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     223        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
    230224
    231225signal-cfa4$(EXEEXT):
    232         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     226        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
    233227
    234228signal-java_thread$(EXEEXT):
    235         @javac -d . $(srcdir)/schedint/JavaThread.java
     229        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    236230        @echo "#!/bin/sh" > a.out
    237231        @echo "java JavaThread" >> a.out
     
    247241
    248242waitfor-upp$(EXEEXT):
    249         @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     243        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    250244
    251245waitfor-cfa1$(EXEEXT):
    252         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     246        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
    253247
    254248waitfor-cfa2$(EXEEXT):
    255         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     249        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
    256250
    257251waitfor-cfa4$(EXEEXT):
    258         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     252        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
    259253
    260254## =========================================================================================================
     
    270264
    271265creation-cfa_coroutine$(EXEEXT):
    272         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     266        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    273267
    274268creation-cfa_coroutine_eager$(EXEEXT):
    275         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa -DEAGER
     269        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    276270
    277271creation-cfa_thread$(EXEEXT):
    278         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     272        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
    279273
    280274creation-upp_coroutine$(EXEEXT):
    281         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     275        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    282276
    283277creation-upp_thread$(EXEEXT):
    284         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     278        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    285279
    286280creation-pthread$(EXEEXT):
    287         @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     281        $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    288282
    289283creation-goroutine$(EXEEXT):
    290         @go build -o a.out $(srcdir)/creation/goroutine.go
     284        $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    291285
    292286creation-java_thread$(EXEEXT):
    293         @javac -d . $(srcdir)/creation/JavaThread.java
     287        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    294288        @echo "#!/bin/sh" > a.out
    295289        @echo "java JavaThread" >> a.out
     
    312306
    313307compile-array$(EXEEXT):
    314         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     308        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    315309
    316310compile-attributes$(EXEEXT):
    317         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     311        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    318312
    319313compile-empty$(EXEEXT):
    320         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     314        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    321315
    322316compile-expression$(EXEEXT):
    323         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     317        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    324318
    325319compile-io$(EXEEXT):
    326         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     320        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    327321
    328322compile-monitor$(EXEEXT):
    329         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     323        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    330324
    331325compile-operators$(EXEEXT):
    332         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     326        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    333327
    334328compile-thread$(EXEEXT):
    335         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     329        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    336330
    337331compile-typeof$(EXEEXT):
    338         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    339 
     332        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     333
Note: See TracChangeset for help on using the changeset viewer.