Changes in benchmark/Makefile.in [e764ee1:d9f2874]

File:

• benchmark/Makefile.in (modified) (10 diffs)

benchmark/Makefile.in

@@ -371 +371 @@
 
 # applies to both programs
-AM_CFLAGS = -O2 -Wall -Wextra -I$(srcdir) -lrt -pthread # -Werror
+AM_CFLAGS = -O2 -Wall -Wextra -Werror -I$(srcdir) -lrt -pthread
 AM_CFAFLAGS = -quiet -nodebug -in-tree
 AM_UPPFLAGS = -quiet -nodebug -multi -std=c++14
@@ -380 +380 @@
 BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
 BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
-BENCH_V_QTHREAD = $(__bench_v_QTHREAD_$(__quiet))
 __quiet = verbose
 __bench_v_CC_quiet = @
@@ -394 +393 @@
 __bench_v_JAVAC_verbose = $(AM_V_JAVAC)
 __bench_v_UPP_verbose = $(AM_V_UPP)
-__bench_v_QTHREAD_verbose = $(AM_V_CC)
 TOOLSDIR = ${abs_top_builddir}/tools/
 REPEAT = ${abs_top_builddir}/tools/repeat
 STATS = ${abs_top_srcdir}/tools/stat.py
-repeats = 3 # 30
+repeats = 30
 skipcompile = no
 TIME_FORMAT = "%E"
@@ -404 +402 @@
 dummy_SOURCES = dummyC.c dummyCXX.cpp
 FIX_NEW_LINES = cat $@ | tr "\n" "\t" | sed -r 's/\t,/,/' | tr "\t" "\n" > $@
-CTXSWITCH_DEPEND = loop.run function.run fetch_add.run ttst_lock.run \
+CTXSWITCH_DEPEND = loop.run function.run fetch_add.run \
         tls-fetch_add.run ctxswitch-pthread.run \
-        ctxswitch-cfa_generator.run ctxswitch-cfa_coroutine.run \
-        ctxswitch-cfa_thread.run ctxswitch-cfa_thread2.run \
-        ctxswitch-upp_coroutine.run ctxswitch-upp_thread.run \
-        ctxswitch-goroutine.run ctxswitch-java_thread.run \
-        ctxswitch-qthreads.run $(am__append_1)
+        ctxswitch-cfa_coroutine.run ctxswitch-cfa_thread.run \
+        ctxswitch-cfa_thread2.run ctxswitch-upp_coroutine.run \
+        ctxswitch-upp_thread.run ctxswitch-goroutine.run \
+        ctxswitch-java_thread.run $(am__append_1)
 testdir = $(top_srcdir)/tests
 all: all-am
@@ -787 +784 @@
 
 ctxswitch.csv:
-        @echo "generator,coroutine,thread" > $@
-        @+make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
+        @echo "coroutine,thread" > $@
         @+make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
         @+make ctxswitch-cfa_thread.runquiet >> $@
@@ -816 +812 @@
         $(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
@@ -832 +825 @@
 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):
@@ -859 +849 @@
         @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
 
 mutex$(EXEEXT) :\
@@ -950 +937 @@
         creation-upp_thread.run                 \
         creation-goroutine.run                  \
-        creation-java_thread.run                \
-        creation-qthreads.run
+        creation-java_thread.run
 
 creation-cfa_coroutine$(EXEEXT):
@@ -979 +965 @@
         @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
 
 compile$(EXEEXT) :\