Ignore:
Timestamp:
Jan 23, 2019, 4:52:16 PM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct
Children:
a200795
Parents:
9b086ca (diff), 1d832f4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into cleanup-dtors

File:
1 edited

Legend:

Unmodified
Added
Removed

  • benchmark/Makefile.am

    r9b086ca rcde3891  
    1111## Created On       : Sun May 31 09:08:15 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Mon Jan 25 22:31:42 2016
    14 ## Update Count     : 25
     13## Last Modified On : Tue Nov  6 09:01:23 2018
     14## Update Count     : 26
    1515###############################################################################
    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)
     23
    2324
    2425AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    … …  
    2627AM_UPPFLAGS = -quiet -nodebug -multi
    2728
    28 TOOLSDIR = ${abs_top_srcdir}/tools/
    29 REPEAT   = ${TOOLSDIR}repeat
    30 STATS    = ${TOOLSDIR}stat.py
     29TOOLSDIR = ${abs_top_builddir}/tools/
     30REPEAT   = ${abs_top_builddir}/tools/repeat
     31STATS    = ${abs_top_srcdir}/tools/stat.py
    3132repeats  = 30
    3233skipcompile = no
    … …  
    3435PRINT_FORMAT = %20s: #Comments needed for spacing
    3536
    36 LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
     37# Dummy hack tricks
     38EXTRA_PROGRAMS = dummy # build but do not install
     39dummy_SOURCES = dummyC.c dummyCXX.cpp
     40
     41dummyC.c:
     42        @echo "int main() { return 0; }" > ${@}
     43
     44dummyCXX.cpp:
     45        @echo "int main() { return 0; }" > ${@}
    3746
    3847.NOTPARALLEL:
    3948
    40 noinst_PROGRAMS =
    41 
     49## =========================================================================================================
    4250all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
    4351
    … …  
    4957        @${STATS} .result.log
    5058        @echo "------------------------------------------------------"
    51         @rm -f a.out .result.log
     59        @rm -f a.out .result.log *.class
    5260
    5361%.runquiet :
    … …  
    6169
    6270${REPEAT} :
    63         @+make -C ${TOOLSDIR} repeat
     71        @+make -C ${abs_top_builddir}/tools repeat
    6472
    6573## =========================================================================================================
    … …  
    102110## =========================================================================================================
    103111loop$(EXEEXT):
    104         $(COMPILE) -DBENCH_N=5000000000 loop.c
     112        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    105113
    106114function$(EXEEXT):
    107         $(COMPILE) -DBENCH_N=5000000000 function.c
     115        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    108116
    109117fetch_add$(EXEEXT):
    110         $(COMPILE) -DBENCH_N=500000000  fetch_add.c
    111 
    112 ## =========================================================================================================
    113 ctxswitch$(EXEEXT): \
     118        $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     119
     120## =========================================================================================================
     121CTXSWITCH_DEPEND  =                \
    114122        loop.run                                \
    115123        function.run                    \
    … …  
    121129        ctxswitch-upp_coroutine.run     \
    122130        ctxswitch-upp_thread.run        \
    123         -ctxswitch-kos_fibre.run        \
    124         -ctxswitch-kos_fibre2.run       \
    125131        ctxswitch-goroutine.run         \
    126132        ctxswitch-java_thread.run
    127133
     134if WITH_LIBFIBRE
     135CTXSWITCH_DEPEND  +=           \
     136        ctxswitch-kos_fibre.run  \
     137        ctxswitch-kos_fibre2.run
     138
     139
     140ctxswitch-kos_fibre$(EXEEXT):
     141        $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     142
     143ctxswitch-kos_fibre2$(EXEEXT):
     144        $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     145endif
     146
     147ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
     148
    128149ctxswitch-pthread$(EXEEXT):
    129         @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     150        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    130151
    131152ctxswitch-cfa_coroutine$(EXEEXT):
    132         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
     153        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    133154
    134155ctxswitch-cfa_thread$(EXEEXT):
    135         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     156        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    136157
    137158ctxswitch-cfa_thread2$(EXEEXT):
    138         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
     159        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    139160
    140161ctxswitch-upp_coroutine$(EXEEXT):
    141         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     162        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    142163
    143164ctxswitch-upp_thread$(EXEEXT):
    144         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    145 
    146 ctxswitch-kos_fibre$(EXEEXT):
    147         @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    148 
    149 ctxswitch-kos_fibre2$(EXEEXT):
    150         @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     165        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    151166
    152167ctxswitch-goroutine$(EXEEXT):
    153         @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     168        $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    154169
    155170ctxswitch-java_thread$(EXEEXT):
    156         @javac $(srcdir)/ctxswitch/JavaThread.java
     171        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    157172        @echo "#!/bin/sh" > a.out
    158         @echo "cd ctxswitch && java JavaThread" >> a.out
     173        @echo "java JavaThread" >> a.out
    159174        @chmod a+x a.out
    160175
    … …  
    172187
    173188mutex-pthread_lock$(EXEEXT):
    174         @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     189        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    175190
    176191mutex-upp$(EXEEXT):
    177         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     192        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    178193
    179194mutex-cfa1$(EXEEXT):
    180         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
     195        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    181196
    182197mutex-cfa2$(EXEEXT):
    183         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
     198        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    184199
    185200mutex-cfa4$(EXEEXT):
    186         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
     201        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    187202
    188203mutex-java_thread$(EXEEXT):
    189         @javac $(srcdir)/mutex/JavaThread.java
     204        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    190205        @echo "#!/bin/sh" > a.out
    191         @echo "cd mutex && java JavaThread" >> a.out
     206        @echo "java JavaThread" >> a.out
    192207        @chmod a+x a.out
    193208
    … …  
    202217
    203218signal-pthread_cond$(EXEEXT):
    204         @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     219        $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    205220
    206221signal-upp$(EXEEXT):
    207         @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     222        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    208223
    209224signal-cfa1$(EXEEXT):
    210         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
     225        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    211226
    212227signal-cfa2$(EXEEXT):
    213         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
     228        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    214229
    215230signal-cfa4$(EXEEXT):
    216         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
     231        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    217232
    218233signal-java_thread$(EXEEXT):
    219         @javac $(srcdir)/schedint/JavaThread.java
     234        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    220235        @echo "#!/bin/sh" > a.out
    221         @echo "cd schedint && java JavaThread" >> a.out
     236        @echo "java JavaThread" >> a.out
    222237        @chmod a+x a.out
    223238
    … …  
    231246
    232247waitfor-upp$(EXEEXT):
    233         @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     248        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    234249
    235250waitfor-cfa1$(EXEEXT):
    236         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
     251        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    237252
    238253waitfor-cfa2$(EXEEXT):
    239         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
     254        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    240255
    241256waitfor-cfa4$(EXEEXT):
    242         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
     257        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    243258
    244259## =========================================================================================================
    … …  
    254269
    255270creation-cfa_coroutine$(EXEEXT):
    256         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     271        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    257272
    258273creation-cfa_coroutine_eager$(EXEEXT):
    259         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     274        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
    260275
    261276creation-cfa_thread$(EXEEXT):
    262         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
     277        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    263278
    264279creation-upp_coroutine$(EXEEXT):
    265         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     280        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    266281
    267282creation-upp_thread$(EXEEXT):
    268         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     283        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    269284
    270285creation-pthread$(EXEEXT):
    271         @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     286        $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    272287
    273288creation-goroutine$(EXEEXT):
    274         @go build -o a.out $(srcdir)/creation/goroutine.go
     289        $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    275290
    276291creation-java_thread$(EXEEXT):
    277         @javac $(srcdir)/creation/JavaThread.java
     292        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    278293        @echo "#!/bin/sh" > a.out
    279         @echo "cd creation && java JavaThread" >> a.out
     294        @echo "java JavaThread" >> a.out
    280295        @chmod a+x a.out
    281296
    … …  
    296311
    297312compile-array$(EXEEXT):
    298         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
     313        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    299314
    300315compile-attributes$(EXEEXT):
    301         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
     316        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    302317
    303318compile-empty$(EXEEXT):
    304         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
     319        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    305320
    306321compile-expression$(EXEEXT):
    307         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
     322        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    308323
    309324compile-io$(EXEEXT):
    310         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
     325        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    311326
    312327compile-monitor$(EXEEXT):
    313         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
     328        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    314329
    315330compile-operators$(EXEEXT):
    316         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
     331        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    317332
    318333compile-thread$(EXEEXT):
    319         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
     334        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    320335
    321336compile-typeof$(EXEEXT):
    322         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
    323 
     337        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     338
Note: See TracChangeset for help on using the changeset viewer.