Changeset f15fe0a for benchmark/Makefile.in

Timestamp:

Apr 18, 2019, 11:52:27 AM (5 years ago)

Author:

tdelisle <tdelisle@…>

Branches:

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

Children:

d4510ea

Parents:

b0ccd1c

Message:

Jenkins benchmarks updated to use plot plugin

File:

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

benchmark/Makefile.in

@@ -401 +401 @@
 PRINT_FORMAT = %20s: #Comments needed for spacing
 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 \
         tls-fetch_add.run ctxswitch-pthread.run \
@@ -731 +732 @@
 
 .NOTPARALLEL:
+.PHONY: compile.csv ctxswitch.csv mutex.csv signal.csv
 
 all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
@@ -756 +758 @@
 
 jenkins$(EXEEXT):
-        @echo "{"
-        @echo -e '\t"githash": "'${githash}'",'
-        @echo -e '\t"arch": "'   ${arch}   '",'
 @DOifskipcompile@
-        @echo -e '\t"compile": {'
-        @+make compile TIME_FORMAT='%e,' PRINT_FORMAT='\t\t\"%s\" :'
-        @echo -e '\t\t"dummy" : {}'
-        @echo -e '\t},'
+        @+make compile.csv
 @DOendif@
-        @echo -e '\t"ctxswitch": {'
-        @echo -en '\t\t"coroutine":'
-        @+make ctxswitch-cfa_coroutine.runquiet
-        @echo -en '\t\t,"thread":'
-        @+make ctxswitch-cfa_thread.runquiet
-        @echo -e '\t},'
-        @echo -e '\t"mutex": ['
-        @echo -en '\t\t'
-        @+make mutex-cfa1.runquiet
-        @echo -en '\t\t,'
-        @+make mutex-cfa2.runquiet
-        @echo -e '\t],'
-        @echo -e '\t"scheduling": ['
-        @echo -en '\t\t'
-        @+make signal-cfa1.runquiet
-        @echo -en '\t\t,'
-        @+make signal-cfa2.runquiet
-        @echo -en '\t\t,'
-        @+make waitfor-cfa1.runquiet
-        @echo -en '\t\t,'
-        @+make waitfor-cfa2.runquiet
-        @echo -e '\n\t],'
-        @echo -e '\t"epoch": ' $(shell date +%s)
-        @echo "}"
+        @+make ctxswitch.csv
+        @+make mutex.csv
+        @+make signal.csv
+
+compile.csv:
+        @echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
+        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
+        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-attributes.make >> $@
+        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-empty.make >> $@
+        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-expression.make >> $@
+        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-io.make >> $@
+        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-monitor.make >> $@
+        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-operators.make >> $@
+        @+make TIME_FORMAT='%e' PRINT_FORMAT='' compile-typeof.make >> $@
+        @$(srcdir)/fixcsv.sh $@
+
+ctxswitch.csv:
+        @echo "coroutine,thread" > $@
+        @+make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
+        @+make ctxswitch-cfa_thread.runquiet >> $@
+        @$(srcdir)/fixcsv.sh $@
+
+mutex.csv:
+        @echo "1-monitor,2-monitor" > $@
+        @+make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
+        @+make mutex-cfa2.runquiet >> $@
+        @$(srcdir)/fixcsv.sh $@
+
+signal.csv:
+        @echo "signal-1,signal-2,waitfor-1,waitfor-2" > $@
+        @+make signal-cfa1.runquiet >> $@ && echo -n ',' >> $@
+        @+make signal-cfa2.runquiet >> $@ && echo -n ',' >> $@
+        @+make waitfor-cfa1.runquiet >> $@ && echo -n ',' >> $@
+        @+make waitfor-cfa2.runquiet >> $@
+        @$(srcdir)/fixcsv.sh $@
 
 loop$(EXEEXT):