Ignore:
Timestamp:
Feb 10, 2019, 10:13:03 AM (6 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
3e491fd0, 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.in

    r1f86d5e r015dc50  
    374374AM_CFAFLAGS = -quiet -in-tree -nodebug
    375375AM_UPPFLAGS = -quiet -nodebug -multi
     376BENCH_V_CC = $(__bench_v_CC_$(__quiet))
     377BENCH_V_CFA = $(__bench_v_CFA_$(__quiet))
     378BENCH_V_CXX = $(__bench_v_CXX_$(__quiet))
     379BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
     380BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
     381BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
     382__quiet = verbose
     383__bench_v_CC_quiet = @
     384__bench_v_CFA_quiet = @
     385__bench_v_CXX_quiet = @
     386__bench_v_GOC_quiet = @
     387__bench_v_JAVAC_quiet = @
     388__bench_v_UPP_quiet = @
     389__bench_v_CC_verbose = $(AM_V_CC)
     390__bench_v_CFA_verbose = $(AM_V_CFA)
     391__bench_v_CXX_verbose = $(AM_V_CXX)
     392__bench_v_GOC_verbose = $(AM_V_GOC)
     393__bench_v_JAVAC_verbose = $(AM_V_JAVAC)
     394__bench_v_UPP_verbose = $(AM_V_UPP)
    376395TOOLSDIR = ${abs_top_builddir}/tools/
    377396REPEAT = ${abs_top_builddir}/tools/repeat
    … …  
    725744
    726745%.runquiet :
    727         @+make $(basename $@) CFLAGS="-w"
     746        @+make $(basename $@) CFLAGS="-w" __quiet=quiet
    728747        @taskset -c 1 ./a.out
    729748        @rm -f a.out
    … …  
    772791
    773792loop$(EXEEXT):
    774         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     793        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    775794
    776795function$(EXEEXT):
    777         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     796        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    778797
    779798fetch_add$(EXEEXT):
    780         $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     799        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    781800
    782801@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
    783 @WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     802@WITH_LIBFIBRE_TRUE@    $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    784803
    785804@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre2$(EXEEXT):
    786 @WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     805@WITH_LIBFIBRE_TRUE@    $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    787806
    788807ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
    789808
    790809ctxswitch-pthread$(EXEEXT):
    791         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     810        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    792811
    793812ctxswitch-cfa_coroutine$(EXEEXT):
    794         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     813        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    795814
    796815ctxswitch-cfa_thread$(EXEEXT):
    797         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     816        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    798817
    799818ctxswitch-cfa_thread2$(EXEEXT):
    800         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     819        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    801820
    802821ctxswitch-upp_coroutine$(EXEEXT):
    803         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     822        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    804823
    805824ctxswitch-upp_thread$(EXEEXT):
    806         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     825        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    807826
    808827ctxswitch-goroutine$(EXEEXT):
    809         $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     828        $(BENCH_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    810829
    811830ctxswitch-java_thread$(EXEEXT):
    812         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     831        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    813832        @echo "#!/bin/sh" > a.out
    814833        @echo "java JavaThread" >> a.out
    … …  
    827846
    828847mutex-pthread_lock$(EXEEXT):
    829         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     848        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    830849
    831850mutex-upp$(EXEEXT):
    832         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     851        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    833852
    834853mutex-cfa1$(EXEEXT):
    835         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     854        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    836855
    837856mutex-cfa2$(EXEEXT):
    838         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     857        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    839858
    840859mutex-cfa4$(EXEEXT):
    841         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     860        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    842861
    843862mutex-java_thread$(EXEEXT):
    844         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     863        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    845864        @echo "#!/bin/sh" > a.out
    846865        @echo "java JavaThread" >> a.out
    … …  
    856875
    857876signal-pthread_cond$(EXEEXT):
    858         $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     877        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    859878
    860879signal-upp$(EXEEXT):
    861         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     880        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    862881
    863882signal-cfa1$(EXEEXT):
    864         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     883        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    865884
    866885signal-cfa2$(EXEEXT):
    867         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     886        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    868887
    869888signal-cfa4$(EXEEXT):
    870         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     889        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    871890
    872891signal-java_thread$(EXEEXT):
    873         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     892        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    874893        @echo "#!/bin/sh" > a.out
    875894        @echo "java JavaThread" >> a.out
    … …  
    883902
    884903waitfor-upp$(EXEEXT):
    885         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     904        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    886905
    887906waitfor-cfa1$(EXEEXT):
    888         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     907        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    889908
    890909waitfor-cfa2$(EXEEXT):
    891         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     910        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    892911
    893912waitfor-cfa4$(EXEEXT):
    894         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     913        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    895914
    896915creation$(EXEEXT) :\
    … …  
    905924
    906925creation-cfa_coroutine$(EXEEXT):
    907         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     926        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    908927
    909928creation-cfa_coroutine_eager$(EXEEXT):
    910         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
     929        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
    911930
    912931creation-cfa_thread$(EXEEXT):
    913         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     932        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    914933
    915934creation-upp_coroutine$(EXEEXT):
    916         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     935        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    917936
    918937creation-upp_thread$(EXEEXT):
    919         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     938        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    920939
    921940creation-pthread$(EXEEXT):
    922         $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     941        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    923942
    924943creation-goroutine$(EXEEXT):
    925         $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     944        $(BENCH_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    926945
    927946creation-java_thread$(EXEEXT):
    928         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     947        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    929948        @echo "#!/bin/sh" > a.out
    930949        @echo "java JavaThread" >> a.out
    … …  
    942961
    943962compile-array$(EXEEXT):
    944         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     963        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    945964
    946965compile-attributes$(EXEEXT):
    947         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     966        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    948967
    949968compile-empty$(EXEEXT):
    950         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     969        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    951970
    952971compile-expression$(EXEEXT):
    953         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     972        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    954973
    955974compile-io$(EXEEXT):
    956         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     975        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    957976
    958977compile-monitor$(EXEEXT):
    959         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     978        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    960979
    961980compile-operators$(EXEEXT):
    962         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     981        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    963982
    964983compile-thread$(EXEEXT):
    965         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     984        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    966985
    967986compile-typeof$(EXEEXT):
    968         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     987        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    969988
    970989# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.