Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.am

    r107b01a r41cca44  
    1111## Created On       : Sun May 31 09:08:15 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Tue Nov  6 09:01:23 2018
    14 ## Update Count     : 26
     13## Last Modified On : Mon Jan 25 22:31:42 2016
     14## Update Count     : 25
    1515###############################################################################
    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 UPPCC = u++
     22UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    2423
    2524AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
     
    3534PRINT_FORMAT = %20s: #Comments needed for spacing
    3635
    37 #prevent any tests in parallel
    3836.NOTPARALLEL:
    3937
    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 ## =========================================================================================================
     38noinst_PROGRAMS =
     39
    4540all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
    4641
     
    5247        @${STATS} .result.log
    5348        @echo "------------------------------------------------------"
    54         @rm -f a.out .result.log *.class
     49        @rm -f a.out .result.log
    5550
    5651%.runquiet :
     
    105100## =========================================================================================================
    106101loop$(EXEEXT):
    107         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     102        $(COMPILE) -DBENCH_N=5000000000 loop.c
    108103
    109104function$(EXEEXT):
    110         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     105        $(COMPILE) -DBENCH_N=5000000000 function.c
    111106
    112107fetch_add$(EXEEXT):
    113         $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     108        $(COMPILE) -DBENCH_N=500000000  fetch_add.c
    114109
    115110## =========================================================================================================
     
    134129
    135130ctxswitch-kos_fibre$(EXEEXT):
    136         $(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
    137132
    138133ctxswitch-kos_fibre2$(EXEEXT):
    139         $(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
    140135endif
    141136
     
    143138
    144139ctxswitch-pthread$(EXEEXT):
    145         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     140        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    146141
    147142ctxswitch-cfa_coroutine$(EXEEXT):
    148         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
     143        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
    149144
    150145ctxswitch-cfa_thread$(EXEEXT):
    151         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     146        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
    152147
    153148ctxswitch-cfa_thread2$(EXEEXT):
    154         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
     149        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
    155150
    156151ctxswitch-upp_coroutine$(EXEEXT):
    157         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     152        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    158153
    159154ctxswitch-upp_thread$(EXEEXT):
    160         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     155        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    161156
    162157ctxswitch-goroutine$(EXEEXT):
    163         $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     158        @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    164159
    165160ctxswitch-java_thread$(EXEEXT):
    166         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     161        @javac $(srcdir)/ctxswitch/JavaThread.java
    167162        @echo "#!/bin/sh" > a.out
    168         @echo "java JavaThread" >> a.out
     163        @echo "cd ctxswitch && java JavaThread" >> a.out
    169164        @chmod a+x a.out
    170165
     
    182177
    183178mutex-pthread_lock$(EXEEXT):
    184         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     179        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    185180
    186181mutex-upp$(EXEEXT):
    187         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     182        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    188183
    189184mutex-cfa1$(EXEEXT):
    190         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
     185        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
    191186
    192187mutex-cfa2$(EXEEXT):
    193         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
     188        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
    194189
    195190mutex-cfa4$(EXEEXT):
    196         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
     191        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
    197192
    198193mutex-java_thread$(EXEEXT):
    199         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     194        @javac $(srcdir)/mutex/JavaThread.java
    200195        @echo "#!/bin/sh" > a.out
    201         @echo "java JavaThread" >> a.out
     196        @echo "cd mutex && java JavaThread" >> a.out
    202197        @chmod a+x a.out
    203198
     
    212207
    213208signal-pthread_cond$(EXEEXT):
    214         $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     209        @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    215210
    216211signal-upp$(EXEEXT):
    217         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     212        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    218213
    219214signal-cfa1$(EXEEXT):
    220         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
     215        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
    221216
    222217signal-cfa2$(EXEEXT):
    223         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
     218        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
    224219
    225220signal-cfa4$(EXEEXT):
    226         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
     221        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
    227222
    228223signal-java_thread$(EXEEXT):
    229         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     224        @javac $(srcdir)/schedint/JavaThread.java
    230225        @echo "#!/bin/sh" > a.out
    231         @echo "java JavaThread" >> a.out
     226        @echo "cd schedint && java JavaThread" >> a.out
    232227        @chmod a+x a.out
    233228
     
    241236
    242237waitfor-upp$(EXEEXT):
    243         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     238        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    244239
    245240waitfor-cfa1$(EXEEXT):
    246         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
     241        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
    247242
    248243waitfor-cfa2$(EXEEXT):
    249         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
     244        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
    250245
    251246waitfor-cfa4$(EXEEXT):
    252         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
     247        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
    253248
    254249## =========================================================================================================
     
    264259
    265260creation-cfa_coroutine$(EXEEXT):
    266         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     261        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    267262
    268263creation-cfa_coroutine_eager$(EXEEXT):
    269         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     264        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    270265
    271266creation-cfa_thread$(EXEEXT):
    272         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
     267        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
    273268
    274269creation-upp_coroutine$(EXEEXT):
    275         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     270        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    276271
    277272creation-upp_thread$(EXEEXT):
    278         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     273        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    279274
    280275creation-pthread$(EXEEXT):
    281         $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     276        @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    282277
    283278creation-goroutine$(EXEEXT):
    284         $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     279        @go build -o a.out $(srcdir)/creation/goroutine.go
    285280
    286281creation-java_thread$(EXEEXT):
    287         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     282        @javac $(srcdir)/creation/JavaThread.java
    288283        @echo "#!/bin/sh" > a.out
    289         @echo "java JavaThread" >> a.out
     284        @echo "cd creation && java JavaThread" >> a.out
    290285        @chmod a+x a.out
    291286
     
    306301
    307302compile-array$(EXEEXT):
    308         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
     303        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    309304
    310305compile-attributes$(EXEEXT):
    311         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     306        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
    312307
    313308compile-empty$(EXEEXT):
    314         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
     309        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    315310
    316311compile-expression$(EXEEXT):
    317         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
     312        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    318313
    319314compile-io$(EXEEXT):
    320         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
     315        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    321316
    322317compile-monitor$(EXEEXT):
    323         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
     318        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    324319
    325320compile-operators$(EXEEXT):
    326         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
     321        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    327322
    328323compile-thread$(EXEEXT):
    329         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
     324        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    330325
    331326compile-typeof$(EXEEXT):
    332         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
    333 
     327        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     328
Note: See TracChangeset for help on using the changeset viewer.