Changes in benchmark/Makefile.am [c2bc6d5:6ca0dab]

File:

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

benchmark/Makefile.am

@@ -113 +113 @@
 creation_cfa_generator_DURATION = 1000000000
 creation_upp_coroutine_DURATION = ${creation_cfa_coroutine_eager_DURATION}
-creation_cfa_thread_DURATION = 10000000
-creation_upp_thread_DURATION = ${creation_cfa_thread_DURATION}
 creation_DURATION = 10000000
 
@@ -148 +146 @@
 
 cleancsv:
-        rm -f compile.csv basic.csv ctxswitch.csv mutex.csv scheduling.csv
+        rm -f compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
 
 jenkins$(EXEEXT): cleancsv
@@ -159 +157 @@
         +make mutex.csv
         -+make mutex.diff.csv
-        +make scheduling.csv
-        -+make scheduling.diff.csv
+        +make schedint.csv
+        -+make schedint.diff.csv
 @DOifskipcompile@
         cat compile.csv
@@ -169 +167 @@
         cat mutex.csv
         -cat mutex.diff.csv
-        cat scheduling.csv
-        -cat scheduling.diff.csv
+        cat schedint.csv
+        -cat schedint.diff.csv
 
 compile.csv:
@@ -200 +198 @@
         $(srcdir)/fixcsv.sh $@
 
-scheduling.csv:
+schedint.csv:
         echo "building $@"
         echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
@@ -291 +289 @@
 ctxswitch-python_coroutine$(EXEEXT):
         $(BENCH_V_PY)echo "#!/bin/sh" > a.out
-        echo "python3.7 $(srcdir)/ctxswitch/python_cor.py" >> a.out
+        echo "python3 $(srcdir)/ctxswitch/python_cor.py \"$$""@\"" >> a.out
         chmod a+x a.out
 
 ctxswitch-nodejs_coroutine$(EXEEXT):
         $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
-        echo "nodejs $(srcdir)/ctxswitch/node_cor.js" >> a.out
+        echo "nodejs $(srcdir)/ctxswitch/node_cor.js \"$$""@\"" >> a.out
         chmod a+x a.out
 
 ctxswitch-nodejs_await$(EXEEXT):
         $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
-        echo "nodejs $(srcdir)/ctxswitch/node_await.js" >> a.out
+        echo "nodejs $(srcdir)/ctxswitch/node_await.js \"$$""@\"" >> a.out
         chmod a+x a.out
 
@@ -313 +311 @@
         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
         echo "#!/bin/sh" > a.out
-        echo "java JavaThread" >> a.out
+        echo "java JavaThread \"$$""@\"" >> a.out
         chmod a+x a.out
 
@@ -355 +353 @@
         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
         echo "#!/bin/sh" > a.out
-        echo "java JavaThread" >> a.out
+        echo "java JavaThread \"$$""@\"" >> a.out
         chmod a+x a.out
 
@@ -387 +385 @@
         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
         echo "#!/bin/sh" > a.out
-        echo "java JavaThread" >> a.out
+        echo "java JavaThread \"$$""@\"" >> a.out
         chmod a+x a.out
 
@@ -454 +452 @@
 creation-python_coroutine$(EXEEXT):
         $(BENCH_V_PY)echo "#!/bin/sh" > a.out
-        echo "python3.7 $(srcdir)/creation/python_cor.py" >> a.out
+        echo "python3 $(srcdir)/creation/python_cor.py \"$$""@\"" >> a.out
         chmod a+x a.out
 
 creation-nodejs_coroutine$(EXEEXT):
         $(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
-        echo "nodejs $(srcdir)/creation/node_cor.js" >> a.out
+        echo "nodejs $(srcdir)/creation/node_cor.js \"$$""@\"" >> a.out
         chmod a+x a.out
 
@@ -471 +469 @@
         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
         echo "#!/bin/sh" > a.out
-        echo "java JavaThread" >> a.out
+        echo "java JavaThread \"$$""@\"" >> a.out
         chmod a+x a.out
 
@@ -492 +490 @@
 
 compile-array$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/array.cfa
 
 compile-attributes$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/attributes.cfa
 
 compile-empty$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(srcdir)/compile/empty.cfa
 
 compile-expression$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/expression.cfa
 
 compile-io$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/io1.cfa
 
 compile-monitor$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
 
 compile-operators$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/operators.cfa
 
 compile-thread$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/concurrent/thread.cfa
 
 compile-typeof$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/typeof.cfa
 
 ## =========================================================================================================