Changes in benchmark/Makefile.in [8633485b:13d2dac]

File:

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

benchmark/Makefile.in

@@ -368 +368 @@
 am__v_GOC_0 = @echo "  GOC     " $@;
 am__v_GOC_1 = 
+AM_V_PY = $(am__v_PY_@AM_V@)
+am__v_PY_ = $(am__v_PY_@AM_DEFAULT_V@)
+am__v_PY_0 = @echo "  PYTHON  " $@;
+am__v_PY_1 = 
 AM_V_RUST = $(am__v_RUST_@AM_V@)
 am__v_RUST_ = $(am__v_RUST_@AM_DEFAULT_V@)
-am__v_RUST_0 = @echo "  RUST     " $@;
+am__v_RUST_0 = @echo "  RUST    " $@;
 am__v_RUST_1 = 
 AM_V_NODEJS = $(am__v_NODEJS_@AM_V@)
 am__v_NODEJS_ = $(am__v_NODEJS_@AM_DEFAULT_V@)
-am__v_NODEJS_0 = @echo "  NODEJS     " $@;
+am__v_NODEJS_0 = @echo "  NODEJS  " $@;
 am__v_NODEJS_1 = 
 AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
@@ -390 +394 @@
 BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
 BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
+BENCH_V_PY = $(__bench_v_PY_$(__quiet))
 BENCH_V_RUSTC = $(__bench_v_RUSTC_$(__quiet))
 BENCH_V_NODEJS = $(__bench_v_NODEJS_$(__quiet))
@@ -406 +411 @@
 __bench_v_UPP_verbose = $(AM_V_UPP)
 __bench_v_GOC_verbose = $(AM_V_GOC)
-__bench_v_RUSTC_verbose = $(AM_V_RUSTC)
+__bench_v_PY_verbose = $(AM_V_PY)
+__bench_v_RUSTC_verbose = $(AM_V_RUST)
 __bench_v_NODEJS_verbose = $(AM_V_NODEJS)
 __bench_v_JAVAC_verbose = $(AM_V_JAVAC)
@@ -784 +790 @@
         echo "int main() { return 0; }" > ${@}
 
-#.SILENT:               # do not print recipe
-.ONESHELL:              # use one shell to execute recipe
+.SILENT:                # do not print recipe
 .NOTPARALLEL:
-.PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
+.PHONY: jenkins cleancsv
 
 all : basic$(EXEEXT) ctxswitch$(EXEEXT) mutex$(EXEEXT) schedint$(EXEEXT) schedext$(EXEEXT) creation$(EXEEXT)
@@ -817 +822 @@
         +make -C ${abs_top_builddir}/tools repeat
 
-jenkins$(EXEEXT):
+cleancsv:
+        rm -f compile.csv basic.csv ctxswitch.csv mutex.csv scheduling.csv
+
+jenkins$(EXEEXT): cleancsv
 @DOifskipcompile@
         +make compile.csv
         -+make compile.diff.csv
 @DOendif@
-        +make basic.csv
-        -+make basic.diff.csv
         +make ctxswitch.csv
         -+make ctxswitch.diff.csv
         +make mutex.csv
         -+make mutex.diff.csv
-        +make schedint.csv
-        -+make schedint.diff.csv
+        +make scheduling.csv
+        -+make scheduling.diff.csv
 @DOifskipcompile@
         cat compile.csv
         -cat compile.diff.csv
 @DOendif@
-        cat basic.csv
-        -cat basic.diff.csv
         cat ctxswitch.csv
         -cat ctxswitch.diff.csv
         cat mutex.csv
         -cat mutex.diff.csv
-        cat schedint.csv
-        -cat schedint.diff.csv
+        cat scheduling.csv
+        -cat scheduling.diff.csv
 
 compile.csv:
+        echo "building $@"
         echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
         +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
@@ -855 +860 @@
         $(srcdir)/fixcsv.sh $@
 
-basic.csv:
-        echo "generator,coroutine,thread" > $@
-        +make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
-        +make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
-        +make basic-cfa_thread.runquiet >> $@
-        $(srcdir)/fixcsv.sh $@
-
 ctxswitch.csv:
+        echo "building $@"
         echo "generator,coroutine,thread" > $@
         +make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
@@ -870 +869 @@
 
 mutex.csv:
+        echo "building $@"
         echo "1-monitor,2-monitor" > $@
         +make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
@@ -875 +875 @@
         $(srcdir)/fixcsv.sh $@
 
-schedint.csv:
+scheduling.csv:
+        echo "building $@"
         echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
         +make schedint-cfa1.runquiet >> $@ && echo -n ',' >> $@
@@ -931 +932 @@
 
 ctxswitch-python_coroutine$(EXEEXT):
-        echo "#!/bin/sh" > a.out
+        $(BENCH_V_PY)echo "#!/bin/sh" > a.out
         echo "python3.7 $(srcdir)/ctxswitch/python_cor.py" >> a.out
         chmod a+x a.out
 
 ctxswitch-nodejs_coroutine$(EXEEXT):
-        echo "#!/bin/sh" > a.out
+        $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
         echo "nodejs $(srcdir)/ctxswitch/node_cor.js" >> a.out
         chmod a+x a.out
 
 ctxswitch-nodejs_await$(EXEEXT):
-        echo "#!/bin/sh" > a.out
+        $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
         echo "nodejs $(srcdir)/ctxswitch/node_await.js" >> a.out
         chmod a+x a.out
@@ -1085 +1086 @@
 
 creation-python_coroutine$(EXEEXT):
-        echo "#!/bin/sh" > a.out
+        $(BENCH_V_PY)echo "#!/bin/sh" > a.out
         echo "python3.7 $(srcdir)/creation/python_cor.py" >> a.out
         chmod a+x a.out
 
 creation-nodejs_coroutine$(EXEEXT):
-        echo "#!/bin/sh" > a.out
+        $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
         echo "nodejs $(srcdir)/creation/node_cor.js" >> a.out
         chmod a+x a.out