Changeset f15fe0a


Ignore:
Timestamp:
Apr 18, 2019, 11:52:27 AM (2 years ago)
Author:
tdelisle <tdelisle@…>
Branches:
arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
d4510ea
Parents:
b0ccd1c
Message:

Jenkins benchmarks updated to use plot plugin

Files:
1 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    rb0ccd1c rf15fe0a  
    153153                dir (BuildDir) {
    154154                        //Append bench results
    155                         sh "${SrcDir}/benchmark/jenkins.sh ${Settings.GitNewRef} ${Settings.Architecture} ${BuildDir}/bench.json"
     155                        sh "make --no-print-directory -C benchmark jenkins"
    156156                }
    157157        }
     
    177177
    178178                if( !Settings.Publish ) return
     179                if( !Settings.RunBenchmark ) {
     180                        echo 'No results to publish!!!'
     181                        return
     182                }
    179183
    180184                //Then publish the results
    181                 sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @${BuildDir}/bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
     185                plot csvFileName: "cforall-${env.BRANCH_NAME}-compilation.csv",
     186                        csvSeries: [[file: "${BuildDir}/benchmark/compile.csv"]],
     187                        group: 'Compilation',
     188                        title: 'Compilation',
     189                        style: 'line'
     190
     191                plot csvFileName: 'cforall-${env.BRANCH_NAME}-ctxswitch.csv',
     192                        csvSeries: [[file: "${BuildDir}/benchmark/ctxswitch.csv"]],
     193                        group: 'Concurrency',
     194                        title: 'Context Switching',
     195                        style: 'line'
     196
     197                plot csvFileName: 'cforall-${env.BRANCH_NAME}-mutex.csv',
     198                        csvSeries: [[file: "${BuildDir}/benchmark/mutex.csv"]],
     199                        group: 'Concurrency',
     200                        title: 'Mutual Exclusion',
     201                        style: 'line'
     202
     203                plot csvFileName: 'cforall-${env.BRANCH_NAME}-signal.csv',
     204                        csvSeries: [[file: "${BuildDir}/benchmark/signal.csv"]],
     205                        group: 'Concurrency',
     206                        title: 'Internal and External Scheduling',
     207                        style: 'line'
    182208        }
    183209}
  • benchmark/Makefile.am

    rb0ccd1c rf15fe0a  
    6767
    6868.NOTPARALLEL:
     69.PHONY: compile.csv ctxswitch.csv mutex.csv signal.csv
    6970
    7071## =========================================================================================================
     
    9495## =========================================================================================================
    9596
     97FIX_NEW_LINES = cat $@ | tr "\n" "\t" | sed -r 's/\t,/,/' | tr "\t" "\n" > $@
     98
    9699jenkins$(EXEEXT):
    97         @echo "{"
    98         @echo -e '\t"githash": "'${githash}'",'
    99         @echo -e '\t"arch": "'   ${arch}   '",'
    100100@DOifskipcompile@
    101         @echo -e '\t"compile": {'
    102         @+make compile TIME_FORMAT='%e,' PRINT_FORMAT='\t\t\"%s\" :'
    103         @echo -e '\t\t"dummy" : {}'
    104         @echo -e '\t},'
     101        @+make compile.csv
    105102@DOendif@
    106         @echo -e '\t"ctxswitch": {'
    107         @echo -en '\t\t"coroutine":'
    108         @+make ctxswitch-cfa_coroutine.runquiet
    109         @echo -en '\t\t,"thread":'
    110         @+make ctxswitch-cfa_thread.runquiet
    111         @echo -e '\t},'
    112         @echo -e '\t"mutex": ['
    113         @echo -en '\t\t'
    114         @+make mutex-cfa1.runquiet
    115         @echo -en '\t\t,'
    116         @+make mutex-cfa2.runquiet
    117         @echo -e '\t],'
    118         @echo -e '\t"scheduling": ['
    119         @echo -en '\t\t'
    120         @+make signal-cfa1.runquiet
    121         @echo -en '\t\t,'
    122         @+make signal-cfa2.runquiet
    123         @echo -en '\t\t,'
    124         @+make waitfor-cfa1.runquiet
    125         @echo -en '\t\t,'
    126         @+make waitfor-cfa2.runquiet
    127         @echo -e '\n\t],'
    128         @echo -e '\t"epoch": ' $(shell date +%s)
    129         @echo "}"
     103        @+make ctxswitch.csv
     104        @+make mutex.csv
     105        @+make signal.csv
     106
     107compile.csv:
     108        @echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
     109        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
     110        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-attributes.make >> $@
     111        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-empty.make >> $@
     112        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-expression.make >> $@
     113        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-io.make >> $@
     114        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-monitor.make >> $@
     115        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-operators.make >> $@
     116        @+make TIME_FORMAT='%e' PRINT_FORMAT='' compile-typeof.make >> $@
     117        @$(srcdir)/fixcsv.sh $@
     118
     119ctxswitch.csv:
     120        @echo "coroutine,thread" > $@
     121        @+make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
     122        @+make ctxswitch-cfa_thread.runquiet >> $@
     123        @$(srcdir)/fixcsv.sh $@
     124
     125mutex.csv:
     126        @echo "1-monitor,2-monitor" > $@
     127        @+make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
     128        @+make mutex-cfa2.runquiet >> $@
     129        @$(srcdir)/fixcsv.sh $@
     130
     131signal.csv:
     132        @echo "signal-1,signal-2,waitfor-1,waitfor-2" > $@
     133        @+make signal-cfa1.runquiet >> $@ && echo -n ',' >> $@
     134        @+make signal-cfa2.runquiet >> $@ && echo -n ',' >> $@
     135        @+make waitfor-cfa1.runquiet >> $@ && echo -n ',' >> $@
     136        @+make waitfor-cfa2.runquiet >> $@
     137        @$(srcdir)/fixcsv.sh $@
    130138
    131139## =========================================================================================================
  • benchmark/Makefile.in

    rb0ccd1c rf15fe0a  
    401401PRINT_FORMAT = %20s: #Comments needed for spacing
    402402dummy_SOURCES = dummyC.c dummyCXX.cpp
     403FIX_NEW_LINES = cat $@ | tr "\n" "\t" | sed -r 's/\t,/,/' | tr "\t" "\n" > $@
    403404CTXSWITCH_DEPEND = loop.run function.run fetch_add.run \
    404405        tls-fetch_add.run ctxswitch-pthread.run \
     
    731732
    732733.NOTPARALLEL:
     734.PHONY: compile.csv ctxswitch.csv mutex.csv signal.csv
    733735
    734736all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
     
    756758
    757759jenkins$(EXEEXT):
    758         @echo "{"
    759         @echo -e '\t"githash": "'${githash}'",'
    760         @echo -e '\t"arch": "'   ${arch}   '",'
    761760@DOifskipcompile@
    762         @echo -e '\t"compile": {'
    763         @+make compile TIME_FORMAT='%e,' PRINT_FORMAT='\t\t\"%s\" :'
    764         @echo -e '\t\t"dummy" : {}'
    765         @echo -e '\t},'
     761        @+make compile.csv
    766762@DOendif@
    767         @echo -e '\t"ctxswitch": {'
    768         @echo -en '\t\t"coroutine":'
    769         @+make ctxswitch-cfa_coroutine.runquiet
    770         @echo -en '\t\t,"thread":'
    771         @+make ctxswitch-cfa_thread.runquiet
    772         @echo -e '\t},'
    773         @echo -e '\t"mutex": ['
    774         @echo -en '\t\t'
    775         @+make mutex-cfa1.runquiet
    776         @echo -en '\t\t,'
    777         @+make mutex-cfa2.runquiet
    778         @echo -e '\t],'
    779         @echo -e '\t"scheduling": ['
    780         @echo -en '\t\t'
    781         @+make signal-cfa1.runquiet
    782         @echo -en '\t\t,'
    783         @+make signal-cfa2.runquiet
    784         @echo -en '\t\t,'
    785         @+make waitfor-cfa1.runquiet
    786         @echo -en '\t\t,'
    787         @+make waitfor-cfa2.runquiet
    788         @echo -e '\n\t],'
    789         @echo -e '\t"epoch": ' $(shell date +%s)
    790         @echo "}"
     763        @+make ctxswitch.csv
     764        @+make mutex.csv
     765        @+make signal.csv
     766
     767compile.csv:
     768        @echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
     769        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
     770        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-attributes.make >> $@
     771        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-empty.make >> $@
     772        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-expression.make >> $@
     773        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-io.make >> $@
     774        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-monitor.make >> $@
     775        @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-operators.make >> $@
     776        @+make TIME_FORMAT='%e' PRINT_FORMAT='' compile-typeof.make >> $@
     777        @$(srcdir)/fixcsv.sh $@
     778
     779ctxswitch.csv:
     780        @echo "coroutine,thread" > $@
     781        @+make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
     782        @+make ctxswitch-cfa_thread.runquiet >> $@
     783        @$(srcdir)/fixcsv.sh $@
     784
     785mutex.csv:
     786        @echo "1-monitor,2-monitor" > $@
     787        @+make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
     788        @+make mutex-cfa2.runquiet >> $@
     789        @$(srcdir)/fixcsv.sh $@
     790
     791signal.csv:
     792        @echo "signal-1,signal-2,waitfor-1,waitfor-2" > $@
     793        @+make signal-cfa1.runquiet >> $@ && echo -n ',' >> $@
     794        @+make signal-cfa2.runquiet >> $@ && echo -n ',' >> $@
     795        @+make waitfor-cfa1.runquiet >> $@ && echo -n ',' >> $@
     796        @+make waitfor-cfa2.runquiet >> $@
     797        @$(srcdir)/fixcsv.sh $@
    791798
    792799loop$(EXEEXT):
Note: See TracChangeset for help on using the changeset viewer.