Changeset 4aac9ff


Ignore:
Timestamp:
Feb 19, 2020, 3:37:13 PM (20 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
32ce9b7
Parents:
921cd82
Message:

Fixed jenkins benchmark

Location:
benchmark
Files:
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.am

    r921cd82 r4aac9ff  
    7272        echo "int main() { return 0; }" > ${@}
    7373
    74 #.SILENT:               # do not print recipe
    75 .ONESHELL:              # use one shell to execute recipe
     74.SILENT:                # do not print recipe
    7675.NOTPARALLEL:
    77 .PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
     76.PHONY: jenkins cleancsv
    7877
    7978## =========================================================================================================
     
    142141FIX_NEW_LINES = cat $@ | tr "\n" "\t" | sed -r 's/\t,/,/' | tr "\t" "\n" > $@
    143142
    144 jenkins$(EXEEXT):
     143cleancsv:
     144        rm -f compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
     145
     146jenkins$(EXEEXT): cleancsv
    145147@DOifskipcompile@
    146148        +make compile.csv
    147149        -+make compile.diff.csv
    148150@DOendif@
    149         +make basic.csv
    150         -+make basic.diff.csv
    151151        +make ctxswitch.csv
    152152        -+make ctxswitch.diff.csv
     
    159159        -cat compile.diff.csv
    160160@DOendif@
    161         cat basic.csv
    162         -cat basic.diff.csv
    163161        cat ctxswitch.csv
    164162        -cat ctxswitch.diff.csv
     
    169167
    170168compile.csv:
     169        echo "building $@"
    171170        echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
    172171        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
     
    180179        $(srcdir)/fixcsv.sh $@
    181180
    182 basic.csv:
    183         echo "generator,coroutine,thread" > $@
    184         +make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
    185         +make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
    186         +make basic-cfa_thread.runquiet >> $@
    187         $(srcdir)/fixcsv.sh $@
     181# basic.csv:
     182#       echo "$@"
     183#       echo "generator,coroutine,thread" > $@
     184#       +make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
     185#       +make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
     186#       +make basic-cfa_thread.runquiet >> $@
     187#       $(srcdir)/fixcsv.sh $@
    188188
    189189ctxswitch.csv:
     190        echo "building $@"
    190191        echo "generator,coroutine,thread" > $@
    191192        +make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
     
    195196
    196197mutex.csv:
     198        echo "building $@"
    197199        echo "1-monitor,2-monitor" > $@
    198200        +make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
     
    201203
    202204schedint.csv:
     205        echo "building $@"
    203206        echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
    204207        +make schedint-cfa1.runquiet >> $@ && echo -n ',' >> $@
  • benchmark/Makefile.in

    r921cd82 r4aac9ff  
    784784        echo "int main() { return 0; }" > ${@}
    785785
    786 #.SILENT:               # do not print recipe
    787 .ONESHELL:              # use one shell to execute recipe
     786.SILENT:                # do not print recipe
    788787.NOTPARALLEL:
    789 .PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
     788.PHONY: jenkins cleancsv
    790789
    791790all : basic$(EXEEXT) ctxswitch$(EXEEXT) mutex$(EXEEXT) schedint$(EXEEXT) schedext$(EXEEXT) creation$(EXEEXT)
     
    817816        +make -C ${abs_top_builddir}/tools repeat
    818817
    819 jenkins$(EXEEXT):
     818cleancsv:
     819        rm -f compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
     820
     821jenkins$(EXEEXT): cleancsv
    820822@DOifskipcompile@
    821823        +make compile.csv
    822824        -+make compile.diff.csv
    823825@DOendif@
    824         +make basic.csv
    825         -+make basic.diff.csv
    826826        +make ctxswitch.csv
    827827        -+make ctxswitch.diff.csv
     
    834834        -cat compile.diff.csv
    835835@DOendif@
    836         cat basic.csv
    837         -cat basic.diff.csv
    838836        cat ctxswitch.csv
    839837        -cat ctxswitch.diff.csv
     
    844842
    845843compile.csv:
     844        echo "building $@"
    846845        echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
    847846        +make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
     
    855854        $(srcdir)/fixcsv.sh $@
    856855
    857 basic.csv:
    858         echo "generator,coroutine,thread" > $@
    859         +make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
    860         +make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
    861         +make basic-cfa_thread.runquiet >> $@
    862         $(srcdir)/fixcsv.sh $@
     856# basic.csv:
     857#       echo "$@"
     858#       echo "generator,coroutine,thread" > $@
     859#       +make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
     860#       +make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
     861#       +make basic-cfa_thread.runquiet >> $@
     862#       $(srcdir)/fixcsv.sh $@
    863863
    864864ctxswitch.csv:
     865        echo "building $@"
    865866        echo "generator,coroutine,thread" > $@
    866867        +make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
     
    870871
    871872mutex.csv:
     873        echo "building $@"
    872874        echo "1-monitor,2-monitor" > $@
    873875        +make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
     
    876878
    877879schedint.csv:
     880        echo "building $@"
    878881        echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
    879882        +make schedint-cfa1.runquiet >> $@ && echo -n ',' >> $@
  • benchmark/baselines/x64/schedint.csv

    r921cd82 r4aac9ff  
    1 waitfor-2,signal-1,signal-2,waitfor-1
     1schedext-2,schedint-1,schedint-2,schedext-1
    22393.69606249999987,325.99158333333327,409.01025000000004,319.90975000000003
  • benchmark/baselines/x86/schedint.csv

    r921cd82 r4aac9ff  
    1 signal-2,waitfor-1,waitfor-2,signal-1
     1schedint-2,schedext-1,schedext-2,schedint-1
    22532.5297959183672,413.3084897959184,506.7579591836735,423.78826530612247
Note: See TracChangeset for help on using the changeset viewer.