Ignore:
Timestamp:
Feb 10, 2019, 10:13:03 AM (3 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, persistent-indexer
Children:
3e491fd, d9f0ed4
Parents:
1f86d5e (diff), 1e7e44f (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.am

    r1f86d5e r015dc50  
    2121include $(top_srcdir)/src/cfa.make
    2222
    23 
    24 
    2523AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    2624AM_CFAFLAGS = -quiet -in-tree -nodebug
    2725AM_UPPFLAGS = -quiet -nodebug -multi
     26
     27BENCH_V_CC = $(__bench_v_CC_$(__quiet))
     28BENCH_V_CFA = $(__bench_v_CFA_$(__quiet))
     29BENCH_V_CXX = $(__bench_v_CXX_$(__quiet))
     30BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
     31BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
     32BENCH_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
    2849
    2950TOOLSDIR = ${abs_top_builddir}/tools/
     
    6081
    6182%.runquiet :
    62         @+make $(basename $@) CFLAGS="-w"
     83        @+make $(basename $@) CFLAGS="-w" __quiet=quiet
    6384        @taskset -c 1 ./a.out
    6485        @rm -f a.out
     
    110131## =========================================================================================================
    111132loop$(EXEEXT):
    112         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     133        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    113134
    114135function$(EXEEXT):
    115         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     136        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    116137
    117138fetch_add$(EXEEXT):
    118         $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     139        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    119140
    120141## =========================================================================================================
     
    139160
    140161ctxswitch-kos_fibre$(EXEEXT):
    141         $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     162        $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    142163
    143164ctxswitch-kos_fibre2$(EXEEXT):
    144         $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     165        $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    145166endif
    146167
     
    148169
    149170ctxswitch-pthread$(EXEEXT):
    150         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     171        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    151172
    152173ctxswitch-cfa_coroutine$(EXEEXT):
    153         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     174        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    154175
    155176ctxswitch-cfa_thread$(EXEEXT):
    156         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     177        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    157178
    158179ctxswitch-cfa_thread2$(EXEEXT):
    159         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     180        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    160181
    161182ctxswitch-upp_coroutine$(EXEEXT):
    162         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     183        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    163184
    164185ctxswitch-upp_thread$(EXEEXT):
    165         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     186        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    166187
    167188ctxswitch-goroutine$(EXEEXT):
    168         $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     189        $(BENCH_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    169190
    170191ctxswitch-java_thread$(EXEEXT):
    171         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     192        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    172193        @echo "#!/bin/sh" > a.out
    173194        @echo "java JavaThread" >> a.out
     
    187208
    188209mutex-pthread_lock$(EXEEXT):
    189         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     210        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    190211
    191212mutex-upp$(EXEEXT):
    192         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     213        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    193214
    194215mutex-cfa1$(EXEEXT):
    195         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     216        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    196217
    197218mutex-cfa2$(EXEEXT):
    198         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     219        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    199220
    200221mutex-cfa4$(EXEEXT):
    201         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     222        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    202223
    203224mutex-java_thread$(EXEEXT):
    204         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     225        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    205226        @echo "#!/bin/sh" > a.out
    206227        @echo "java JavaThread" >> a.out
     
    217238
    218239signal-pthread_cond$(EXEEXT):
    219         $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     240        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    220241
    221242signal-upp$(EXEEXT):
    222         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     243        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    223244
    224245signal-cfa1$(EXEEXT):
    225         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     246        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    226247
    227248signal-cfa2$(EXEEXT):
    228         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     249        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    229250
    230251signal-cfa4$(EXEEXT):
    231         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     252        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    232253
    233254signal-java_thread$(EXEEXT):
    234         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     255        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    235256        @echo "#!/bin/sh" > a.out
    236257        @echo "java JavaThread" >> a.out
     
    246267
    247268waitfor-upp$(EXEEXT):
    248         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     269        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    249270
    250271waitfor-cfa1$(EXEEXT):
    251         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     272        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    252273
    253274waitfor-cfa2$(EXEEXT):
    254         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     275        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    255276
    256277waitfor-cfa4$(EXEEXT):
    257         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     278        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    258279
    259280## =========================================================================================================
     
    269290
    270291creation-cfa_coroutine$(EXEEXT):
    271         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     292        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    272293
    273294creation-cfa_coroutine_eager$(EXEEXT):
    274         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
     295        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
    275296
    276297creation-cfa_thread$(EXEEXT):
    277         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     298        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    278299
    279300creation-upp_coroutine$(EXEEXT):
    280         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     301        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    281302
    282303creation-upp_thread$(EXEEXT):
    283         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     304        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    284305
    285306creation-pthread$(EXEEXT):
    286         $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     307        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    287308
    288309creation-goroutine$(EXEEXT):
    289         $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     310        $(BENCH_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    290311
    291312creation-java_thread$(EXEEXT):
    292         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     313        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    293314        @echo "#!/bin/sh" > a.out
    294315        @echo "java JavaThread" >> a.out
     
    311332
    312333compile-array$(EXEEXT):
    313         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     334        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    314335
    315336compile-attributes$(EXEEXT):
    316         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     337        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    317338
    318339compile-empty$(EXEEXT):
    319         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     340        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    320341
    321342compile-expression$(EXEEXT):
    322         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     343        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    323344
    324345compile-io$(EXEEXT):
    325         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     346        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    326347
    327348compile-monitor$(EXEEXT):
    328         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     349        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    329350
    330351compile-operators$(EXEEXT):
    331         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     352        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    332353
    333354compile-thread$(EXEEXT):
    334         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     355        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    335356
    336357compile-typeof$(EXEEXT):
    337         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    338 
     358        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     359
Note: See TracChangeset for help on using the changeset viewer.