Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.am

    r528ccc8 r107b01a  
    2121include $(top_srcdir)/src/cfa.make
    2222
     23UPPCC = u++
     24
    2325AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    2426AM_CFAFLAGS = -quiet -in-tree -nodebug
    2527AM_UPPFLAGS = -quiet -nodebug -multi
    2628
    27 BENCH_V_CC = $(__bench_v_CC_$(__quiet))
    28 BENCH_V_CFA = $(__bench_v_CFA_$(__quiet))
    29 BENCH_V_CXX = $(__bench_v_CXX_$(__quiet))
    30 BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
    31 BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
    32 BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
    33 
    34 __quiet = verbose
    35 __bench_v_CC_quiet = @
    36 __bench_v_CFA_quiet = @
    37 __bench_v_CXX_quiet = @
    38 __bench_v_GOC_quiet = @
    39 __bench_v_JAVAC_quiet = @
    40 __bench_v_UPP_quiet = @
    41 __bench_v_CC_verbose = $(AM_V_CC)
    42 __bench_v_CFA_verbose = $(AM_V_CFA)
    43 __bench_v_CXX_verbose = $(AM_V_CXX)
    44 __bench_v_GOC_verbose = $(AM_V_GOC)
    45 __bench_v_JAVAC_verbose = $(AM_V_JAVAC)
    46 __bench_v_UPP_verbose = $(AM_V_UPP)
    47 
    48 
    49 
    50 TOOLSDIR = ${abs_top_builddir}/tools/
    51 REPEAT   = ${abs_top_builddir}/tools/repeat
    52 STATS    = ${abs_top_srcdir}/tools/stat.py
     29TOOLSDIR = ${abs_top_srcdir}/tools/
     30REPEAT   = ${TOOLSDIR}repeat
     31STATS    = ${TOOLSDIR}stat.py
    5332repeats  = 30
    5433skipcompile = no
     
    5635PRINT_FORMAT = %20s: #Comments needed for spacing
    5736
    58 # Dummy hack tricks
    59 EXTRA_PROGRAMS = dummy # build but do not install
    60 dummy_SOURCES = dummyC.c dummyCXX.cpp
    61 
    62 dummyC.c:
    63         @echo "int main() { return 0; }" > ${@}
    64 
    65 dummyCXX.cpp:
    66         @echo "int main() { return 0; }" > ${@}
    67 
     37#prevent any tests in parallel
    6838.NOTPARALLEL:
     39
     40#make sure automake includes the compile rules for C and C++
     41EXTRA_PROGRAMS = dummy
     42dummy_SOURCES = c.c cxx.cpp
    6943
    7044## =========================================================================================================
     
    8155
    8256%.runquiet :
    83         @+make $(basename $@) CFLAGS="-w" __quiet=quiet
     57        @+make $(basename $@) CFLAGS="-w"
    8458        @taskset -c 1 ./a.out
    8559        @rm -f a.out
     
    9064
    9165${REPEAT} :
    92         @+make -C ${abs_top_builddir}/tools repeat
     66        @+make -C ${TOOLSDIR} repeat
    9367
    9468## =========================================================================================================
     
    131105## =========================================================================================================
    132106loop$(EXEEXT):
    133         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     107        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    134108
    135109function$(EXEEXT):
    136         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     110        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    137111
    138112fetch_add$(EXEEXT):
    139         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     113        $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    140114
    141115## =========================================================================================================
     
    160134
    161135ctxswitch-kos_fibre$(EXEEXT):
    162         $(BENCH_V_CXX)$(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
    163137
    164138ctxswitch-kos_fibre2$(EXEEXT):
    165         $(BENCH_V_CXX)$(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
    166140endif
    167141
     
    169143
    170144ctxswitch-pthread$(EXEEXT):
    171         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     145        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    172146
    173147ctxswitch-cfa_coroutine$(EXEEXT):
    174         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     148        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
    175149
    176150ctxswitch-cfa_thread$(EXEEXT):
    177         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     151        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
    178152
    179153ctxswitch-cfa_thread2$(EXEEXT):
    180         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     154        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
    181155
    182156ctxswitch-upp_coroutine$(EXEEXT):
    183         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     157        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    184158
    185159ctxswitch-upp_thread$(EXEEXT):
    186         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     160        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    187161
    188162ctxswitch-goroutine$(EXEEXT):
    189         $(BENCH_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     163        $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    190164
    191165ctxswitch-java_thread$(EXEEXT):
    192         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     166        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    193167        @echo "#!/bin/sh" > a.out
    194168        @echo "java JavaThread" >> a.out
     
    208182
    209183mutex-pthread_lock$(EXEEXT):
    210         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     184        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    211185
    212186mutex-upp$(EXEEXT):
    213         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     187        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    214188
    215189mutex-cfa1$(EXEEXT):
    216         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     190        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
    217191
    218192mutex-cfa2$(EXEEXT):
    219         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     193        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
    220194
    221195mutex-cfa4$(EXEEXT):
    222         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     196        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
    223197
    224198mutex-java_thread$(EXEEXT):
    225         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     199        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    226200        @echo "#!/bin/sh" > a.out
    227201        @echo "java JavaThread" >> a.out
     
    238212
    239213signal-pthread_cond$(EXEEXT):
    240         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     214        $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    241215
    242216signal-upp$(EXEEXT):
    243         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     217        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    244218
    245219signal-cfa1$(EXEEXT):
    246         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     220        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
    247221
    248222signal-cfa2$(EXEEXT):
    249         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     223        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
    250224
    251225signal-cfa4$(EXEEXT):
    252         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     226        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
    253227
    254228signal-java_thread$(EXEEXT):
    255         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     229        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    256230        @echo "#!/bin/sh" > a.out
    257231        @echo "java JavaThread" >> a.out
     
    267241
    268242waitfor-upp$(EXEEXT):
    269         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     243        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    270244
    271245waitfor-cfa1$(EXEEXT):
    272         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     246        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
    273247
    274248waitfor-cfa2$(EXEEXT):
    275         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     249        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
    276250
    277251waitfor-cfa4$(EXEEXT):
    278         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     252        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
    279253
    280254## =========================================================================================================
     
    290264
    291265creation-cfa_coroutine$(EXEEXT):
    292         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     266        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    293267
    294268creation-cfa_coroutine_eager$(EXEEXT):
    295         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
     269        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    296270
    297271creation-cfa_thread$(EXEEXT):
    298         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     272        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
    299273
    300274creation-upp_coroutine$(EXEEXT):
    301         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     275        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    302276
    303277creation-upp_thread$(EXEEXT):
    304         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     278        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    305279
    306280creation-pthread$(EXEEXT):
    307         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     281        $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    308282
    309283creation-goroutine$(EXEEXT):
    310         $(BENCH_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     284        $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    311285
    312286creation-java_thread$(EXEEXT):
    313         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     287        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    314288        @echo "#!/bin/sh" > a.out
    315289        @echo "java JavaThread" >> a.out
     
    332306
    333307compile-array$(EXEEXT):
    334         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     308        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    335309
    336310compile-attributes$(EXEEXT):
    337         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     311        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    338312
    339313compile-empty$(EXEEXT):
    340         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     314        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    341315
    342316compile-expression$(EXEEXT):
    343         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     317        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    344318
    345319compile-io$(EXEEXT):
    346         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     320        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    347321
    348322compile-monitor$(EXEEXT):
    349         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     323        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    350324
    351325compile-operators$(EXEEXT):
    352         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     326        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    353327
    354328compile-thread$(EXEEXT):
    355         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     329        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    356330
    357331compile-typeof$(EXEEXT):
    358         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    359 
     332        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     333
Note: See TracChangeset for help on using the changeset viewer.