Changeset 54dd994 for benchmark/Makefile.am

Timestamp:

Jun 24, 2019, 10:30:47 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

84917e2

Parents:

3c6e417 (diff), 9e0a360 (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:

• benchmark/Makefile.am (modified) (14 diffs)

benchmark/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Tue Nov  6 09:01:23 2018
-## Update Count     : 26
+## Last Modified On : Sun Jun 23 12:34:29 2019
+## Update Count     : 52
 ###############################################################################
 
@@ -21 +21 @@
 include $(top_srcdir)/src/cfa.make
 
-AM_CFLAGS = -O2 -Wall -Wextra -Werror -I$(srcdir) -lrt -pthread
+AM_CFLAGS = -O2 -Wall -Wextra -I$(srcdir) -lrt -pthread # -Werror
 AM_CFAFLAGS = -quiet -nodebug -in-tree
 AM_UPPFLAGS = -quiet -nodebug -multi -std=c++14
@@ -31 +31 @@
 BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
 BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
+BENCH_V_QTHREAD = $(__bench_v_QTHREAD_$(__quiet))
 
 __quiet = verbose
@@ -45 +46 @@
 __bench_v_JAVAC_verbose = $(AM_V_JAVAC)
 __bench_v_UPP_verbose = $(AM_V_UPP)
-
+__bench_v_QTHREAD_verbose = $(AM_V_CC)
 
 
@@ -51 +52 @@
 REPEAT   = ${abs_top_builddir}/tools/repeat
 STATS    = ${abs_top_srcdir}/tools/stat.py
-repeats  = 30
+repeats  = 3 # 30
 skipcompile = no
 TIME_FORMAT = "%E"
@@ -124 +125 @@
 
 ctxswitch.csv:
-        @echo "coroutine,thread" > $@
+        @echo "generator,coroutine,thread" > $@
+        @+make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
         @+make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
         @+make ctxswitch-cfa_thread.runquiet >> $@
@@ -153 +155 @@
         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
 
+ttst_lock$(EXEEXT):
+        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/ttst_lock.c
+
 tls-fetch_add$(EXEEXT):
         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/tls-fetch_add.c
@@ -161 +166 @@
         function.run                    \
         fetch_add.run                   \
+        ttst_lock.run                   \
         tls-fetch_add.run                       \
         ctxswitch-pthread.run           \
+        ctxswitch-cfa_generator.run     \
         ctxswitch-cfa_coroutine.run     \
         ctxswitch-cfa_thread.run        \
@@ -169 +176 @@
         ctxswitch-upp_thread.run        \
         ctxswitch-goroutine.run         \
-        ctxswitch-java_thread.run
+        ctxswitch-java_thread.run       \
+        ctxswitch-qthreads.run
+
 
 if WITH_LIBFIBRE
@@ -188 +197 @@
 ctxswitch-pthread$(EXEEXT):
         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
+
+ctxswitch-cfa_generator$(EXEEXT):
+        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_gen.cfa
 
 ctxswitch-cfa_coroutine$(EXEEXT):
@@ -212 +224 @@
         @echo "java JavaThread" >> a.out
         @chmod a+x a.out
+
+ctxswitch-qthreads$(EXEEXT):
+        $(BENCH_V_QTHREADS)$(COMPILE) -DBENCH_N=50000000 -I/u/pabuhr/software/qthreads/include -L/u/pabuhr/software/qthreads/lib -Xlinker -R/u/pabuhr/software/qthreads/lib $(srcdir)/ctxswitch/qthreads.c -lqthread
 
 ## =========================================================================================================
@@ -305 +320 @@
         creation-upp_thread.run                 \
         creation-goroutine.run                  \
-        creation-java_thread.run
+        creation-java_thread.run                \
+        creation-qthreads.run
 
 creation-cfa_coroutine$(EXEEXT):
@@ -333 +349 @@
         @echo "java JavaThread" >> a.out
         @chmod a+x a.out
+
+creation-qthreads$(EXEEXT):
+        $(BENCH_V_QTHREADS)$(COMPILE) -DBENCH_N=50000000 -I/u/pabuhr/software/qthreads/include -L/u/pabuhr/software/qthreads/lib -Xlinker -R/u/pabuhr/software/qthreads/lib $(srcdir)/ctxswitch/qthreads.c -lqthread
 
 ## =========================================================================================================
@@ -375 +394 @@
 compile-typeof$(EXEEXT):
         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
-