Changeset b7170a64 for src/benchmark/Makefile.am

Timestamp:

Oct 26, 2017, 12:16:10 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc

Children:

6395817

Parents:

4149d9d

Message:

Updated the creation and ctxswitch benchmark to all be consistent and flexible

File:

• src/benchmark/Makefile.am (modified) (3 diffs)

src/benchmark/Makefile.am

@@ -19 +19 @@
 AM_CFLAGS = -g -Wall -Wno-unused-function -O2
 CC = @CFA_BINDIR@/@CFA_NAME@
-REPEAT = ${abs_top_srcdir}/tools/a.out
-repeats = 30
+TOOLSDIR = ${abs_top_srcdir}/tools/
+REPEAT   = ${TOOLSDIR}repeat
+STATS    = ${TOOLSDIR}stat.py
+repeats  = 30
 
 .NOTPARALLEL:
 
-noinst_PROGRAMS = bench$(EXEEXT) ctxswitch-coroutine$(EXEEXT) ctxswitch-thread$(EXEEXT) sched-int$(EXEEXT) monitor$(EXEEXT) csv-data$(EXEEXT)
+noinst_PROGRAMS =
 
 bench$(EXEEXT) :
@@ -41 +43 @@
 ## =========================================================================================================
 ctxswitch$(EXEEXT): \
-        ctxswitch-cfa_coroutine.run     \
-        ctxswitch-cfa_thread.run        \
-        ctxswitch-upp_coroutine.run     \
-        ctxswitch-upp_thread.run        \
-        ctxswitch-pthread.run
+        ctxswitch-pthread.run           \
+        ctxswitch-cfa_coroutine.run     \
+        ctxswitch-cfa_thread.run        \
+        ctxswitch-upp_coroutine.run     \
+        ctxswitch-upp_thread.run
 
 ctxswitch-cfa_coroutine$(EXEEXT):
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -I. -nodebug -lrt -DN=50000000 ctxswitch/cfa_cor.c
+        ${AM_V_CC}${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -I. -nodebug -lrt -quiet -DBENCH_N=50000000 ctxswitch/cfa_cor.c
 
 ctxswitch-cfa_thread$(EXEEXT):
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -I. -nodebug -lrt -DN=50000000 ctxswitch/cfa_thrd.c
+        ${AM_V_CC}${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -I. -nodebug -lrt -quiet -DBENCH_N=50000000 ctxswitch/cfa_thrd.c
 
 ctxswitch-upp_coroutine$(EXEEXT):
-        u++ ${AM_CFLAGS} ${CFLAGS} ${ccflags} ${ccflags} -I. -nodebug -lrt -DN=50000000 ctxswitch/upp_cor.cc
+        ${AM_V_CC}u++ ${AM_CFLAGS} ${CFLAGS} ${ccflags} ${ccflags} -I. -nodebug -lrt -quiet -DBENCH_N=50000000 ctxswitch/upp_cor.cc
 
 ctxswitch-upp_thread$(EXEEXT):
-        u++ ${AM_CFLAGS} ${CFLAGS} ${ccflags} ${ccflags} -I. -nodebug -lrt -DN=50000000 ctxswitch/upp_cor.cc
+        ${AM_V_CC}u++ ${AM_CFLAGS} ${CFLAGS} ${ccflags} ${ccflags} -I. -nodebug -lrt -quiet -DBENCH_N=50000000 ctxswitch/upp_thrd.cc
 
 ctxswitch-pthread$(EXEEXT):
-        @BACKEND_CC@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -I. -lrt -pthread -DN=50000000 ctxswitch/pthreads.c
+        ${AM_V_CC}@BACKEND_CC@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -I. -lrt -pthread -DBENCH_N=50000000 ctxswitch/pthreads.c
 
 ## =========================================================================================================
 creation$(EXEEXT) :\
         creation-pthread.run            \
-        creation-cfa_coroutine.run      \
-        creation-cfa_thread.run         \
-        creation-upp_coroutine.run      \
+        creation-cfa_coroutine.run      \
+        creation-cfa_thread.run         \
+        creation-upp_coroutine.run      \
         creation-upp_thread.run
 
 creation-cfa_coroutine$(EXEEXT):
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -I. -nodebug -lrt -DBENCH_N=500000000 creation/cfa_cor.c
+        ${AM_V_CC}${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -I. -nodebug -lrt -quiet -DBENCH_N=500000000 creation/cfa_cor.c
 
 creation-cfa_thread$(EXEEXT):
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -I. -nodebug -lrt -DBENCH_N=10000000 creation/cfa_thrd.c
+        ${AM_V_CC}${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -I. -nodebug -lrt -quiet -DBENCH_N=10000000 creation/cfa_thrd.c
 
 creation-upp_coroutine$(EXEEXT):
-        u++ ${AM_CFLAGS} ${CFLAGS} ${ccflags} ${ccflags} -I. -nodebug -lrt -DBENCH_N=50000000 creation/upp_cor.cc
+        ${AM_V_CC}u++ ${AM_CFLAGS} ${CFLAGS} ${ccflags} ${ccflags} -I. -nodebug -lrt -quiet -DBENCH_N=50000000 creation/upp_cor.cc
 
 creation-upp_thread$(EXEEXT):
-        u++ ${AM_CFLAGS} ${CFLAGS} ${ccflags} ${ccflags} -I. -nodebug -lrt -DBENCH_N=50000000 creation/upp_cor.cc
+        ${AM_V_CC}u++ ${AM_CFLAGS} ${CFLAGS} ${ccflags} ${ccflags} -I. -nodebug -lrt -quiet -DBENCH_N=50000000 creation/upp_thrd.cc
 
 creation-pthread$(EXEEXT):
-        @BACKEND_CC@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -I. -lrt -pthread -DBENCH_N=2500000 creation/pthreads.c
+        ${AM_V_CC}@BACKEND_CC@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -I. -lrt -pthread -DBENCH_N=250000 creation/pthreads.c
 
 ## =========================================================================================================
@@ -92 +94 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=50000000 Monitor.c
 
-%.run : %$(EXEEXT)
+%.run : %$(EXEEXT) ${REPEAT}
         @rm -f .result.log
-        @./catchsig
+        @echo "------------------------------------------------------"
+        @echo $<
         @${REPEAT} ${repeats} ./a.out | tee -a .result.log
-        @./stat.py .result.log
+        @${STATS} .result.log
+        @echo "------------------------------------------------------"
         @rm -f a.out .result.log
+
+${REPEAT} :
+        @+make -C ${TOOLSDIR} repeat