Ignore:
Timestamp:
Jan 18, 2019, 4:17:12 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
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:
692be4e
Parents:
c3e1c9e
Message:

Fix printing in all the different modes of the benchmarks

File:
1 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.in

    rc3e1c9e r528ccc8  
    375375AM_CFAFLAGS = -quiet -in-tree -nodebug
    376376AM_UPPFLAGS = -quiet -nodebug -multi
     377BENCH_V_CC = $(__bench_v_CC_$(__quiet))
     378BENCH_V_CFA = $(__bench_v_CFA_$(__quiet))
     379BENCH_V_CXX = $(__bench_v_CXX_$(__quiet))
     380BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
     381BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
     382BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
     383__quiet = verbose
     384__bench_v_CC_quiet = @
     385__bench_v_CFA_quiet = @
     386__bench_v_CXX_quiet = @
     387__bench_v_GOC_quiet = @
     388__bench_v_JAVAC_quiet = @
     389__bench_v_UPP_quiet = @
     390__bench_v_CC_verbose = $(AM_V_CC)
     391__bench_v_CFA_verbose = $(AM_V_CFA)
     392__bench_v_CXX_verbose = $(AM_V_CXX)
     393__bench_v_GOC_verbose = $(AM_V_GOC)
     394__bench_v_JAVAC_verbose = $(AM_V_JAVAC)
     395__bench_v_UPP_verbose = $(AM_V_UPP)
    377396TOOLSDIR = ${abs_top_builddir}/tools/
    378397REPEAT = ${abs_top_builddir}/tools/repeat
     
    726745
    727746%.runquiet :
    728         @+make $(basename $@) CFLAGS="-w"
     747        @+make $(basename $@) CFLAGS="-w" __quiet=quiet
    729748        @taskset -c 1 ./a.out
    730749        @rm -f a.out
     
    773792
    774793loop$(EXEEXT):
    775         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     794        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    776795
    777796function$(EXEEXT):
    778         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     797        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    779798
    780799fetch_add$(EXEEXT):
    781         $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     800        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    782801
    783802@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
    784 @WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     803@WITH_LIBFIBRE_TRUE@    $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    785804
    786805@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre2$(EXEEXT):
    787 @WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     806@WITH_LIBFIBRE_TRUE@    $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    788807
    789808ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
    790809
    791810ctxswitch-pthread$(EXEEXT):
    792         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     811        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    793812
    794813ctxswitch-cfa_coroutine$(EXEEXT):
    795         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     814        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    796815
    797816ctxswitch-cfa_thread$(EXEEXT):
    798         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     817        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    799818
    800819ctxswitch-cfa_thread2$(EXEEXT):
    801         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     820        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    802821
    803822ctxswitch-upp_coroutine$(EXEEXT):
    804         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     823        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    805824
    806825ctxswitch-upp_thread$(EXEEXT):
    807         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     826        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    808827
    809828ctxswitch-goroutine$(EXEEXT):
    810         $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     829        $(BENCH_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    811830
    812831ctxswitch-java_thread$(EXEEXT):
    813         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     832        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    814833        @echo "#!/bin/sh" > a.out
    815834        @echo "java JavaThread" >> a.out
     
    828847
    829848mutex-pthread_lock$(EXEEXT):
    830         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     849        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    831850
    832851mutex-upp$(EXEEXT):
    833         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     852        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    834853
    835854mutex-cfa1$(EXEEXT):
    836         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     855        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    837856
    838857mutex-cfa2$(EXEEXT):
    839         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     858        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    840859
    841860mutex-cfa4$(EXEEXT):
    842         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     861        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    843862
    844863mutex-java_thread$(EXEEXT):
    845         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     864        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    846865        @echo "#!/bin/sh" > a.out
    847866        @echo "java JavaThread" >> a.out
     
    857876
    858877signal-pthread_cond$(EXEEXT):
    859         $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     878        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    860879
    861880signal-upp$(EXEEXT):
    862         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     881        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    863882
    864883signal-cfa1$(EXEEXT):
    865         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     884        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    866885
    867886signal-cfa2$(EXEEXT):
    868         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     887        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    869888
    870889signal-cfa4$(EXEEXT):
    871         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     890        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    872891
    873892signal-java_thread$(EXEEXT):
    874         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     893        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    875894        @echo "#!/bin/sh" > a.out
    876895        @echo "java JavaThread" >> a.out
     
    884903
    885904waitfor-upp$(EXEEXT):
    886         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     905        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    887906
    888907waitfor-cfa1$(EXEEXT):
    889         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     908        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    890909
    891910waitfor-cfa2$(EXEEXT):
    892         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     911        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    893912
    894913waitfor-cfa4$(EXEEXT):
    895         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     914        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    896915
    897916creation$(EXEEXT) :\
     
    906925
    907926creation-cfa_coroutine$(EXEEXT):
    908         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     927        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    909928
    910929creation-cfa_coroutine_eager$(EXEEXT):
    911         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
     930        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
    912931
    913932creation-cfa_thread$(EXEEXT):
    914         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     933        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    915934
    916935creation-upp_coroutine$(EXEEXT):
    917         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     936        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    918937
    919938creation-upp_thread$(EXEEXT):
    920         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     939        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    921940
    922941creation-pthread$(EXEEXT):
    923         $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     942        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    924943
    925944creation-goroutine$(EXEEXT):
    926         $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     945        $(BENCH_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    927946
    928947creation-java_thread$(EXEEXT):
    929         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     948        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    930949        @echo "#!/bin/sh" > a.out
    931950        @echo "java JavaThread" >> a.out
     
    943962
    944963compile-array$(EXEEXT):
    945         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     964        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    946965
    947966compile-attributes$(EXEEXT):
    948         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     967        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    949968
    950969compile-empty$(EXEEXT):
    951         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     970        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    952971
    953972compile-expression$(EXEEXT):
    954         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     973        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    955974
    956975compile-io$(EXEEXT):
    957         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     976        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    958977
    959978compile-monitor$(EXEEXT):
    960         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     979        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    961980
    962981compile-operators$(EXEEXT):
    963         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     982        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    964983
    965984compile-thread$(EXEEXT):
    966         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     985        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    967986
    968987compile-typeof$(EXEEXT):
    969         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     988        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    970989
    971990# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.