Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.am

    rdc8511c r107b01a  
    1616
    1717AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     18ACLOCAL_AMFLAGS  = -I automake
    1819
    1920# applies to both programs
    2021include $(top_srcdir)/src/cfa.make
    2122
    22 UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
     23UPPCC = u++
    2324
    2425AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
     
    3435PRINT_FORMAT = %20s: #Comments needed for spacing
    3536
     37#prevent any tests in parallel
    3638.NOTPARALLEL:
    3739
    38 noinst_PROGRAMS =
    39 
     40#make sure automake includes the compile rules for C and C++
     41EXTRA_PROGRAMS = dummy
     42dummy_SOURCES = c.c cxx.cpp
     43
     44## =========================================================================================================
    4045all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
    4146
     
    4752        @${STATS} .result.log
    4853        @echo "------------------------------------------------------"
    49         @rm -f a.out .result.log
     54        @rm -f a.out .result.log *.class
    5055
    5156%.runquiet :
     
    100105## =========================================================================================================
    101106loop$(EXEEXT):
    102         $(COMPILE) -DBENCH_N=5000000000 loop.c
     107        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    103108
    104109function$(EXEEXT):
    105         $(COMPILE) -DBENCH_N=5000000000 function.c
     110        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    106111
    107112fetch_add$(EXEEXT):
    108         $(COMPILE) -DBENCH_N=500000000  fetch_add.c
     113        $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    109114
    110115## =========================================================================================================
     
    129134
    130135ctxswitch-kos_fibre$(EXEEXT):
    131         @$(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
    132137
    133138ctxswitch-kos_fibre2$(EXEEXT):
    134         @$(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
    135140endif
    136141
     
    138143
    139144ctxswitch-pthread$(EXEEXT):
    140         @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     145        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    141146
    142147ctxswitch-cfa_coroutine$(EXEEXT):
    143         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
     148        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
    144149
    145150ctxswitch-cfa_thread$(EXEEXT):
    146         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     151        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
    147152
    148153ctxswitch-cfa_thread2$(EXEEXT):
    149         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
     154        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
    150155
    151156ctxswitch-upp_coroutine$(EXEEXT):
    152         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     157        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    153158
    154159ctxswitch-upp_thread$(EXEEXT):
    155         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     160        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    156161
    157162ctxswitch-goroutine$(EXEEXT):
    158         @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     163        $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    159164
    160165ctxswitch-java_thread$(EXEEXT):
    161         @javac $(srcdir)/ctxswitch/JavaThread.java
     166        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    162167        @echo "#!/bin/sh" > a.out
    163         @echo "cd ctxswitch && java JavaThread" >> a.out
     168        @echo "java JavaThread" >> a.out
    164169        @chmod a+x a.out
    165170
     
    177182
    178183mutex-pthread_lock$(EXEEXT):
    179         @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     184        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    180185
    181186mutex-upp$(EXEEXT):
    182         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     187        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    183188
    184189mutex-cfa1$(EXEEXT):
    185         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
     190        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
    186191
    187192mutex-cfa2$(EXEEXT):
    188         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
     193        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
    189194
    190195mutex-cfa4$(EXEEXT):
    191         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
     196        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
    192197
    193198mutex-java_thread$(EXEEXT):
    194         @javac $(srcdir)/mutex/JavaThread.java
     199        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    195200        @echo "#!/bin/sh" > a.out
    196         @echo "cd mutex && java JavaThread" >> a.out
     201        @echo "java JavaThread" >> a.out
    197202        @chmod a+x a.out
    198203
     
    207212
    208213signal-pthread_cond$(EXEEXT):
    209         @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     214        $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    210215
    211216signal-upp$(EXEEXT):
    212         @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     217        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    213218
    214219signal-cfa1$(EXEEXT):
    215         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
     220        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
    216221
    217222signal-cfa2$(EXEEXT):
    218         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
     223        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
    219224
    220225signal-cfa4$(EXEEXT):
    221         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
     226        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
    222227
    223228signal-java_thread$(EXEEXT):
    224         @javac $(srcdir)/schedint/JavaThread.java
     229        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    225230        @echo "#!/bin/sh" > a.out
    226         @echo "cd schedint && java JavaThread" >> a.out
     231        @echo "java JavaThread" >> a.out
    227232        @chmod a+x a.out
    228233
     
    236241
    237242waitfor-upp$(EXEEXT):
    238         @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     243        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    239244
    240245waitfor-cfa1$(EXEEXT):
    241         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
     246        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
    242247
    243248waitfor-cfa2$(EXEEXT):
    244         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
     249        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
    245250
    246251waitfor-cfa4$(EXEEXT):
    247         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
     252        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
    248253
    249254## =========================================================================================================
     
    259264
    260265creation-cfa_coroutine$(EXEEXT):
    261         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     266        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    262267
    263268creation-cfa_coroutine_eager$(EXEEXT):
    264         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     269        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    265270
    266271creation-cfa_thread$(EXEEXT):
    267         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
     272        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
    268273
    269274creation-upp_coroutine$(EXEEXT):
    270         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     275        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    271276
    272277creation-upp_thread$(EXEEXT):
    273         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     278        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    274279
    275280creation-pthread$(EXEEXT):
    276         @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     281        $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    277282
    278283creation-goroutine$(EXEEXT):
    279         @go build -o a.out $(srcdir)/creation/goroutine.go
     284        $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    280285
    281286creation-java_thread$(EXEEXT):
    282         @javac $(srcdir)/creation/JavaThread.java
     287        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    283288        @echo "#!/bin/sh" > a.out
    284         @echo "cd creation && java JavaThread" >> a.out
     289        @echo "java JavaThread" >> a.out
    285290        @chmod a+x a.out
    286291
     
    301306
    302307compile-array$(EXEEXT):
    303         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
     308        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    304309
    305310compile-attributes$(EXEEXT):
    306         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     311        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    307312
    308313compile-empty$(EXEEXT):
    309         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
     314        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    310315
    311316compile-expression$(EXEEXT):
    312         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
     317        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    313318
    314319compile-io$(EXEEXT):
    315         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
     320        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    316321
    317322compile-monitor$(EXEEXT):
    318         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
     323        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    319324
    320325compile-operators$(EXEEXT):
    321         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
     326        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    322327
    323328compile-thread$(EXEEXT):
    324         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
     329        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    325330
    326331compile-typeof$(EXEEXT):
    327         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
    328 
     332        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     333
Note: See TracChangeset for help on using the changeset viewer.