Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.am

    r88e139e r41cca44  
    2020include $(top_srcdir)/src/cfa.make
    2121
    22 UPPCC = u++
     22UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    2323
    2424AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
     
    3434PRINT_FORMAT = %20s: #Comments needed for spacing
    3535
    36 #prevent any tests in parallel
    3736.NOTPARALLEL:
    3837
    39 #make sure automake includes the compile rules for C and C++
    40 EXTRA_PROGRAMS = dummy
    41 dummy_SOURCES = c.c cxx.cpp
    42 
    43 ## =========================================================================================================
     38noinst_PROGRAMS =
     39
    4440all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
    4541
     
    5147        @${STATS} .result.log
    5248        @echo "------------------------------------------------------"
    53         @rm -f a.out .result.log *.class
     49        @rm -f a.out .result.log
    5450
    5551%.runquiet :
     
    104100## =========================================================================================================
    105101loop$(EXEEXT):
    106         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     102        $(COMPILE) -DBENCH_N=5000000000 loop.c
    107103
    108104function$(EXEEXT):
    109         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     105        $(COMPILE) -DBENCH_N=5000000000 function.c
    110106
    111107fetch_add$(EXEEXT):
    112         $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     108        $(COMPILE) -DBENCH_N=500000000  fetch_add.c
    113109
    114110## =========================================================================================================
     
    133129
    134130ctxswitch-kos_fibre$(EXEEXT):
    135         $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     131        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    136132
    137133ctxswitch-kos_fibre2$(EXEEXT):
    138         $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     134        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    139135endif
    140136
     
    142138
    143139ctxswitch-pthread$(EXEEXT):
    144         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     140        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    145141
    146142ctxswitch-cfa_coroutine$(EXEEXT):
    147         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
     143        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
    148144
    149145ctxswitch-cfa_thread$(EXEEXT):
    150         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     146        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
    151147
    152148ctxswitch-cfa_thread2$(EXEEXT):
    153         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
     149        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
    154150
    155151ctxswitch-upp_coroutine$(EXEEXT):
    156         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     152        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    157153
    158154ctxswitch-upp_thread$(EXEEXT):
    159         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     155        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    160156
    161157ctxswitch-goroutine$(EXEEXT):
    162         $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     158        @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    163159
    164160ctxswitch-java_thread$(EXEEXT):
    165         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     161        @javac $(srcdir)/ctxswitch/JavaThread.java
    166162        @echo "#!/bin/sh" > a.out
    167         @echo "java JavaThread" >> a.out
     163        @echo "cd ctxswitch && java JavaThread" >> a.out
    168164        @chmod a+x a.out
    169165
     
    181177
    182178mutex-pthread_lock$(EXEEXT):
    183         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     179        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    184180
    185181mutex-upp$(EXEEXT):
    186         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     182        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    187183
    188184mutex-cfa1$(EXEEXT):
    189         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
     185        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
    190186
    191187mutex-cfa2$(EXEEXT):
    192         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
     188        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
    193189
    194190mutex-cfa4$(EXEEXT):
    195         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
     191        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
    196192
    197193mutex-java_thread$(EXEEXT):
    198         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     194        @javac $(srcdir)/mutex/JavaThread.java
    199195        @echo "#!/bin/sh" > a.out
    200         @echo "java JavaThread" >> a.out
     196        @echo "cd mutex && java JavaThread" >> a.out
    201197        @chmod a+x a.out
    202198
     
    211207
    212208signal-pthread_cond$(EXEEXT):
    213         $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     209        @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    214210
    215211signal-upp$(EXEEXT):
    216         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     212        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    217213
    218214signal-cfa1$(EXEEXT):
    219         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
     215        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
    220216
    221217signal-cfa2$(EXEEXT):
    222         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
     218        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
    223219
    224220signal-cfa4$(EXEEXT):
    225         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
     221        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
    226222
    227223signal-java_thread$(EXEEXT):
    228         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     224        @javac $(srcdir)/schedint/JavaThread.java
    229225        @echo "#!/bin/sh" > a.out
    230         @echo "java JavaThread" >> a.out
     226        @echo "cd schedint && java JavaThread" >> a.out
    231227        @chmod a+x a.out
    232228
     
    240236
    241237waitfor-upp$(EXEEXT):
    242         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     238        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    243239
    244240waitfor-cfa1$(EXEEXT):
    245         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
     241        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
    246242
    247243waitfor-cfa2$(EXEEXT):
    248         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
     244        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
    249245
    250246waitfor-cfa4$(EXEEXT):
    251         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
     247        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
    252248
    253249## =========================================================================================================
     
    263259
    264260creation-cfa_coroutine$(EXEEXT):
    265         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     261        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    266262
    267263creation-cfa_coroutine_eager$(EXEEXT):
    268         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     264        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    269265
    270266creation-cfa_thread$(EXEEXT):
    271         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
     267        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
    272268
    273269creation-upp_coroutine$(EXEEXT):
    274         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     270        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    275271
    276272creation-upp_thread$(EXEEXT):
    277         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     273        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    278274
    279275creation-pthread$(EXEEXT):
    280         $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     276        @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    281277
    282278creation-goroutine$(EXEEXT):
    283         $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     279        @go build -o a.out $(srcdir)/creation/goroutine.go
    284280
    285281creation-java_thread$(EXEEXT):
    286         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     282        @javac $(srcdir)/creation/JavaThread.java
    287283        @echo "#!/bin/sh" > a.out
    288         @echo "java JavaThread" >> a.out
     284        @echo "cd creation && java JavaThread" >> a.out
    289285        @chmod a+x a.out
    290286
     
    305301
    306302compile-array$(EXEEXT):
    307         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
     303        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    308304
    309305compile-attributes$(EXEEXT):
    310         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
     306        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
    311307
    312308compile-empty$(EXEEXT):
    313         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
     309        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    314310
    315311compile-expression$(EXEEXT):
    316         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
     312        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    317313
    318314compile-io$(EXEEXT):
    319         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
     315        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    320316
    321317compile-monitor$(EXEEXT):
    322         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
     318        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    323319
    324320compile-operators$(EXEEXT):
    325         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
     321        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    326322
    327323compile-thread$(EXEEXT):
    328         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
     324        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    329325
    330326compile-typeof$(EXEEXT):
    331         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
    332 
     327        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     328
Note: See TracChangeset for help on using the changeset viewer.