Ignore:
Timestamp:
Jan 15, 2019, 3:37:36 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
d0c91a6
Parents:
3b6a87c
Message:

Fix code rot in benchmark (not jenkins)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • benchmark/Makefile.am

    r3b6a87c r5e49e47  
    2020include $(top_srcdir)/src/cfa.make
    2121
     22UPPCC = u++
    2223UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    2324
    … …  
    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
    3334TIME_FORMAT = "%E"
    3435PRINT_FORMAT = %20s: #Comments needed for spacing
     36
     37EXTRA_PROGRAMS = dummy # build but do not install
     38
     39dummy_SOURCES = dummyC.c dummyCXX.cpp
     40
     41dummyC.c:
     42        @echo "int main() { return 0; }" > ${@}
     43
     44dummyCXX.cpp:
     45        @echo "int main() { return 0; }" > ${@}
    3546
    3647.NOTPARALLEL:
    … …  
    5970
    6071${REPEAT} :
    61         @+make -C ${TOOLSDIR} repeat
     72        @+make -C ${abs_top_builddir}/tools repeat
    6273
    6374## =========================================================================================================
    … …  
    100111## =========================================================================================================
    101112loop$(EXEEXT):
    102         $(COMPILE) -DBENCH_N=5000000000 loop.c
     113        $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    103114
    104115function$(EXEEXT):
    105         $(COMPILE) -DBENCH_N=5000000000 function.c
     116        $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    106117
    107118fetch_add$(EXEEXT):
    108         $(COMPILE) -DBENCH_N=500000000  fetch_add.c
     119        $(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    109120
    110121## =========================================================================================================
    … …  
    141152
    142153ctxswitch-cfa_coroutine$(EXEEXT):
    143         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
     154        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    144155
    145156ctxswitch-cfa_thread$(EXEEXT):
    146         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     157        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    147158
    148159ctxswitch-cfa_thread2$(EXEEXT):
    149         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
     160        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    150161
    151162ctxswitch-upp_coroutine$(EXEEXT):
    … …  
    159170
    160171ctxswitch-java_thread$(EXEEXT):
    161         @javac $(srcdir)/ctxswitch/JavaThread.java
     172        @javac -d . $(srcdir)/ctxswitch/JavaThread.java
    162173        @echo "#!/bin/sh" > a.out
    163         @echo "cd ctxswitch && java JavaThread" >> a.out
     174        @echo "java JavaThread" >> a.out
    164175        @chmod a+x a.out
    165176
    … …  
    183194
    184195mutex-cfa1$(EXEEXT):
    185         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
     196        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    186197
    187198mutex-cfa2$(EXEEXT):
    188         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
     199        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    189200
    190201mutex-cfa4$(EXEEXT):
    191         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
     202        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    192203
    193204mutex-java_thread$(EXEEXT):
    194         @javac $(srcdir)/mutex/JavaThread.java
     205        @javac -d . $(srcdir)/mutex/JavaThread.java
    195206        @echo "#!/bin/sh" > a.out
    196         @echo "cd mutex && java JavaThread" >> a.out
     207        @echo "java JavaThread" >> a.out
    197208        @chmod a+x a.out
    198209
    … …  
    213224
    214225signal-cfa1$(EXEEXT):
    215         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
     226        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    216227
    217228signal-cfa2$(EXEEXT):
    218         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
     229        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    219230
    220231signal-cfa4$(EXEEXT):
    221         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
     232        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    222233
    223234signal-java_thread$(EXEEXT):
    224         @javac $(srcdir)/schedint/JavaThread.java
     235        @javac -d . $(srcdir)/schedint/JavaThread.java
    225236        @echo "#!/bin/sh" > a.out
    226         @echo "cd schedint && java JavaThread" >> a.out
     237        @echo "java JavaThread" >> a.out
    227238        @chmod a+x a.out
    228239
    … …  
    239250
    240251waitfor-cfa1$(EXEEXT):
    241         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
     252        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    242253
    243254waitfor-cfa2$(EXEEXT):
    244         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
     255        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    245256
    246257waitfor-cfa4$(EXEEXT):
    247         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
     258        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    248259
    249260## =========================================================================================================
    … …  
    259270
    260271creation-cfa_coroutine$(EXEEXT):
    261         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     272        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    262273
    263274creation-cfa_coroutine_eager$(EXEEXT):
    264         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     275        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa -DEAGER
    265276
    266277creation-cfa_thread$(EXEEXT):
    267         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
     278        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    268279
    269280creation-upp_coroutine$(EXEEXT):
    … …  
    280291
    281292creation-java_thread$(EXEEXT):
    282         @javac $(srcdir)/creation/JavaThread.java
     293        @javac -d . $(srcdir)/creation/JavaThread.java
    283294        @echo "#!/bin/sh" > a.out
    284         @echo "cd creation && java JavaThread" >> a.out
     295        @echo "java JavaThread" >> a.out
    285296        @chmod a+x a.out
    286297
    … …  
    301312
    302313compile-array$(EXEEXT):
    303         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
     314        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    304315
    305316compile-attributes$(EXEEXT):
    … …  
    307318
    308319compile-empty$(EXEEXT):
    309         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
     320        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    310321
    311322compile-expression$(EXEEXT):
    312         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
     323        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    313324
    314325compile-io$(EXEEXT):
    315         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
     326        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    316327
    317328compile-monitor$(EXEEXT):
    318         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
     329        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    319330
    320331compile-operators$(EXEEXT):
    321         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
     332        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    322333
    323334compile-thread$(EXEEXT):
    324         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
     335        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    325336
    326337compile-typeof$(EXEEXT):
    327         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
    328 
     338        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     339
Note: See TracChangeset for help on using the changeset viewer.