Changes in / [5fb17f1:9795142]


Ignore:
Files:
1 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • Jenkins/FullBuild

    r5fb17f1 r9795142  
    2525                                )
    2626                        }
     27
     28                        //Push latest changes to do-lang repo
     29                        push_build()
    2730                }
    28 
    29                 promote_email(true)
    3031        }
    3132
    … …  
    4243
    4344                //Send email to notify the failure
    44                 promote_email(false)
     45                promote_failure_email()
    4546        }
    4647
    … …  
    9192}
    9293
     94def push_build() {
     95        //Don't use the build_stage function which outputs the compiler
     96        stage('Push') {
     97
     98                status_prefix = 'Push'
     99
     100                def out_dir = pwd tmp: true
     101                sh "mkdir -p ${out_dir}"
     102
     103                //checkout the code to make sure this is a valid git repo
     104                checkout scm
     105
     106                collect_git_info()
     107
     108                //parse git logs to find what changed
     109                sh "git remote > ${out_dir}/GIT_REMOTE"
     110                git_remote = readFile("${out_dir}/GIT_REMOTE")
     111                remoteDoLangExists = git_remote.contains("DoLang")
     112
     113                if( !remoteDoLangExists ) {
     114                        sh 'git remote add DoLang git@gitlab.do-lang.org:internal/cfa-cc.git'
     115                }
     116
     117                //sh "GIT_SSH_COMMAND=\"ssh -v\" git push DoLang ${gitRefNewValue}:master"
     118                echo('BUILD NOT PUSH SINCE DO-LANG SERVER WAS DOWN')
     119        }
     120}
     121
    93122//Helper routine to collect information about the git history
    94123def collect_git_info() {
    … …  
    112141
    113142//Email notification on a full build failure
    114 def promote_email(boolean success) {
     143def promote_failure_email() {
    115144        echo('notifying users')
    116 
    117         def result = success ? "PROMOTE - SUCCESS" : "PROMOTE - FAILURE"
    118145
    119146        //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
    120147        //Configurations for email format
    121         def email_subject = "[cforall git][${result}]"
    122         def email_body = """<p>This is an automated email from the Jenkins build machine. It was
    123 generated following the result of the Cāˆ€ nightly build.</p>
     148        def email_subject = "[cforall git][PROMOTE - FAILURE]"
     149        def email_body = """This is an automated email from the Jenkins build machine. It was
     150generated because of a git hooks/post-receive script following
     151a ref change was pushed to the repository containing
     152the project "UNNAMED PROJECT".
    124153
    125 <p>Check console output at ${env.BUILD_URL} to view the results.</p>
     154Check console output at ${env.BUILD_URL} to view the results.
    126155
    127 <p>- Status --------------------------------------------------------------</p>
     156- Status --------------------------------------------------------------
    128157
    129 <p>${result}</p>
    130 
    131 <p>- Performance ---------------------------------------------------------</p>
    132 
    133 <img src="https://cforall.uwaterloo.ca/jenkins/job/Cforall/job/master/plot/Compilation/getPlot?index=0" >
    134 
    135 <p>- Logs ----------------------------------------------------------------</p>
     158PROMOTE FAILURE
    136159"""
    137160
    … …  
    139162
    140163        //send email notification
    141         emailext body: email_body, subject: email_subject, to: email_to, attachLog: !success
     164        emailext body: email_body, subject: email_subject, to: email_to, attachLog: true
    142165}

  • Jenkinsfile

    r5fb17f1 r9795142  
    11#!groovy
    2 
    3 import groovy.transform.Field
    42
    53//===========================================================================================================
    … …  
    2422                wrap([$class: 'TimestamperBuildWrapper']) {
    2523
     24                        notify_server(0)
     25
    2626                        Settings = prepare_build()
    2727
    … …  
    3434                                checkout()
    3535
     36                                notify_server(0)
     37
    3638                                build()
    3739
    … …  
    4850                        BuildDir  = pwd tmp: true
    4951                        SrcDir    = pwd tmp: false
     52
     53                        notify_server(45)
    5054                }
    5155        }
    … …  
    6872        finally {
    6973                //Send email with final results if this is not a full build
    70                 email(log_needed)
     74                if( Settings && !Settings.Silent ) {
     75                        email(log_needed, Settings.IsSandbox)
     76                }
    7177
    7278                echo 'Build Completed'
    … …  
    110116                        //Also specify the compiler by hand
    111117                        targets=""
    112                         if( Settings.RunAllTests || Settings.RunBenchmark ) {
     118                        if( Settings.RunAllTests ) {
    113119                                targets="--with-target-hosts='host:debug,host:nodebug'"
    114120                        } else {
    … …  
    147153                dir (BuildDir) {
    148154                        //Append bench results
    149                         sh "make --no-print-directory -C benchmark jenkins"
     155                        sh "${SrcDir}/benchmark/jenkins.sh ${Settings.GitNewRef} ${Settings.Architecture} ${BuildDir}/bench.json"
    150156                }
    151157        }
    … …  
    170176        build_stage('Publish') {
    171177
    172                 if( !Settings.RunBenchmark ) { echo 'No results to publish!!!' }
    173 
    174                 def groupCompile = new PlotGroup('Compilation', 'seconds', true)
    175                 def groupConcurrency = new PlotGroup('Concurrency', 'nanoseconds', false)
     178                if( !Settings.Publish ) return
    176179
    177180                //Then publish the results
    178                 do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'  , groupCompile    , 'Compilation')
    179                 do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch', groupConcurrency, 'Context Switching')
    180                 do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'    , groupConcurrency, 'Mutual Exclusion')
    181                 do_plot(Settings.RunBenchmark && Settings.Publish, 'signal'   , groupConcurrency, 'Internal and External Scheduling')
     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'
    182182        }
    183183}
    … …  
    196196
    197197        return """
    198 <pre>
    199198The branch ${env.BRANCH_NAME} has been updated.
    200199${gitUpdate}
    201 </pre>
    202 
    203 <p>Check console output at ${env.BUILD_URL} to view the results.</p>
    204 
    205 <p>- Status --------------------------------------------------------------</p>
    206 
    207 <p>BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}</p>
    208 
    209 <p>- Log -----------------------------------------------------------------</p>
    210 
    211 <pre>
     200
     201Check console output at ${env.BUILD_URL} to view the results.
     202
     203- Status --------------------------------------------------------------
     204
     205BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}
     206
     207- Log -----------------------------------------------------------------
    212208${gitLog}
    213 </pre>
    214 
    215 <p>-----------------------------------------------------------------------</p>
    216 <pre>
     209-----------------------------------------------------------------------
    217210Summary of changes:
    218211${gitDiff}
    219 </pre>
    220212"""
    221213}
    222214
    223215//Standard build email notification
    224 def email(boolean log) {
     216def email(boolean log, boolean bIsSandbox) {
    225217        //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
    226218        //Configurations for email format
    … …  
    229221        def project_name = (env.JOB_NAME =~ /(.+)\/.+/)[0][1].toLowerCase()
    230222        def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}] - branch ${env.BRANCH_NAME}"
    231         def email_body = """<p>This is an automated email from the Jenkins build machine. It was
     223        def email_body = """This is an automated email from the Jenkins build machine. It was
    232224generated because of a git hooks/post-receive script following
    233 a ref change which was pushed to the Cāˆ€ repository.</p>
     225a ref change which was pushed to the Cforall repository.
    234226""" + GitLogMessage()
    235227
    236         def email_to = !Settings.IsSandbox ? "cforall@lists.uwaterloo.ca" : "tdelisle@uwaterloo.ca"
    237 
    238         if( Settings && !Settings.Silent ) {
     228        def email_to = "cforall@lists.uwaterloo.ca"
     229
     230        if( Settings && !Settings.IsSandbox ) {
    239231                //send email notification
    240232                emailext body: email_body, subject: email_subject, to: email_to, attachLog: log
    … …  
    319311                }
    320312
    321                 this.IsSandbox          = (branch == "jenkins-sandbox")
    322313                this.RunAllTests        = param.RunAllTests
    323314                this.RunBenchmark       = param.RunBenchmark
    … …  
    325316                this.Publish            = param.Publish
    326317                this.Silent             = param.Silent
     318                this.IsSandbox          = (branch == "jenkins-sandbox")
    327319
    328320                def full = param.RunAllTests ? " (Full)" : ""
    … …  
    341333                this.GitNewRef = ''
    342334                this.GitOldRef = ''
    343         }
    344 }
    345 
    346 class PlotGroup implements Serializable {
    347         public String name
    348         public String unit
    349         public boolean log
    350 
    351         PlotGroup(String name, String unit, boolean log) {
    352                 this.name = name
    353                 this.unit = unit
    354                 this.log = log
    355335        }
    356336}
    … …  
    418398}
    419399
     400def notify_server(int wait) {
     401        sh """curl --silent --show-error --data "wait=${wait}" -X POST https://cforall.uwaterloo.ca:8082/jenkins/notify > /dev/null || true"""
     402        return
     403}
     404
    420405def make_doc() {
    421406        def err = null
    … …  
    432417        }
    433418}
    434 
    435 def do_plot(boolean silent, String file, PlotGroup group, String title) {
    436 
    437         def series = silent ? [] : [[
    438                                 file: "${file}.csv",
    439                                 exclusionValues: '',
    440                                 displayTableFlag: false,
    441                                 inclusionFlag: 'OFF',
    442                                 url: ''
    443                         ]];
    444 
    445         echo "file is ${BuildDir}/benchmark/${file}.csv, group ${group}, title ${title}"
    446         dir("${BuildDir}/benchmark/") {
    447                 plot csvFileName: "cforall-${env.BRANCH_NAME}-${file}.csv",
    448                         csvSeries: series,
    449                         group: "${group.name}",
    450                         title: "${title}",
    451                         style: 'lineSimple',
    452                         exclZero: false,
    453                         keepRecords: false,
    454                         logarithmic: group.log,
    455                         numBuilds: '120',
    456                         useDescr: true,
    457                         yaxis: group.unit,
    458                         yaxisMaximum: '',
    459                         yaxisMinimum: ''
    460         }
    461 }

  • benchmark/Makefile.am

    r5fb17f1 r9795142  
    6767
    6868.NOTPARALLEL:
    69 .PHONY: compile.csv ctxswitch.csv mutex.csv signal.csv
    7069
    7170## =========================================================================================================
    … …  
    9594## =========================================================================================================
    9695
    97 FIX_NEW_LINES = cat $@ | tr "\n" "\t" | sed -r 's/\t,/,/' | tr "\t" "\n" > $@
    98 
    9996jenkins$(EXEEXT):
     97        @echo "{"
     98        @echo -e '\t"githash": "'${githash}'",'
     99        @echo -e '\t"arch": "'   ${arch}   '",'
    100100@DOifskipcompile@
    101         @+make compile.csv
     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},'
    102105@DOendif@
    103         @+make ctxswitch.csv
    104         @+make mutex.csv
    105         @+make signal.csv
    106 @DOifskipcompile@
    107         @cat compile.csv
    108 @DOendif@
    109         @cat ctxswitch.csv
    110         @cat mutex.csv
    111         @cat signal.csv
    112 
    113 compile.csv:
    114         @echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
    115         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
    116         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-attributes.make >> $@
    117         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-empty.make >> $@
    118         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-expression.make >> $@
    119         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-io.make >> $@
    120         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-monitor.make >> $@
    121         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-operators.make >> $@
    122         @+make TIME_FORMAT='%e' PRINT_FORMAT='' compile-typeof.make >> $@
    123         @$(srcdir)/fixcsv.sh $@
    124 
    125 ctxswitch.csv:
    126         @echo "coroutine,thread" > $@
    127         @+make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
    128         @+make ctxswitch-cfa_thread.runquiet >> $@
    129         @$(srcdir)/fixcsv.sh $@
    130 
    131 mutex.csv:
    132         @echo "1-monitor,2-monitor" > $@
    133         @+make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
    134         @+make mutex-cfa2.runquiet >> $@
    135         @$(srcdir)/fixcsv.sh $@
    136 
    137 signal.csv:
    138         @echo "signal-1,signal-2,waitfor-1,waitfor-2" > $@
    139         @+make signal-cfa1.runquiet >> $@ && echo -n ',' >> $@
    140         @+make signal-cfa2.runquiet >> $@ && echo -n ',' >> $@
    141         @+make waitfor-cfa1.runquiet >> $@ && echo -n ',' >> $@
    142         @+make waitfor-cfa2.runquiet >> $@
    143         @$(srcdir)/fixcsv.sh $@
     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 "}"
    144130
    145131## =========================================================================================================

  • benchmark/Makefile.in

    r5fb17f1 r9795142  
    401401PRINT_FORMAT = %20s: #Comments needed for spacing
    402402dummy_SOURCES = dummyC.c dummyCXX.cpp
    403 FIX_NEW_LINES = cat $@ | tr "\n" "\t" | sed -r 's/\t,/,/' | tr "\t" "\n" > $@
    404403CTXSWITCH_DEPEND = loop.run function.run fetch_add.run \
    405404        tls-fetch_add.run ctxswitch-pthread.run \
    … …  
    732731
    733732.NOTPARALLEL:
    734 .PHONY: compile.csv ctxswitch.csv mutex.csv signal.csv
    735733
    736734all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
    … …  
    758756
    759757jenkins$(EXEEXT):
     758        @echo "{"
     759        @echo -e '\t"githash": "'${githash}'",'
     760        @echo -e '\t"arch": "'   ${arch}   '",'
    760761@DOifskipcompile@
    761         @+make compile.csv
     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},'
    762766@DOendif@
    763         @+make ctxswitch.csv
    764         @+make mutex.csv
    765         @+make signal.csv
    766 @DOifskipcompile@
    767         @cat compile.csv
    768 @DOendif@
    769         @cat ctxswitch.csv
    770         @cat mutex.csv
    771         @cat signal.csv
    772 
    773 compile.csv:
    774         @echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
    775         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
    776         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-attributes.make >> $@
    777         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-empty.make >> $@
    778         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-expression.make >> $@
    779         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-io.make >> $@
    780         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-monitor.make >> $@
    781         @+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-operators.make >> $@
    782         @+make TIME_FORMAT='%e' PRINT_FORMAT='' compile-typeof.make >> $@
    783         @$(srcdir)/fixcsv.sh $@
    784 
    785 ctxswitch.csv:
    786         @echo "coroutine,thread" > $@
    787         @+make ctxswitch-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
    788         @+make ctxswitch-cfa_thread.runquiet >> $@
    789         @$(srcdir)/fixcsv.sh $@
    790 
    791 mutex.csv:
    792         @echo "1-monitor,2-monitor" > $@
    793         @+make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
    794         @+make mutex-cfa2.runquiet >> $@
    795         @$(srcdir)/fixcsv.sh $@
    796 
    797 signal.csv:
    798         @echo "signal-1,signal-2,waitfor-1,waitfor-2" > $@
    799         @+make signal-cfa1.runquiet >> $@ && echo -n ',' >> $@
    800         @+make signal-cfa2.runquiet >> $@ && echo -n ',' >> $@
    801         @+make waitfor-cfa1.runquiet >> $@ && echo -n ',' >> $@
    802         @+make waitfor-cfa2.runquiet >> $@
    803         @$(srcdir)/fixcsv.sh $@
     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 "}"
    804791
    805792loop$(EXEEXT):

  • tools/PrettyGitLogs.sh

    r5fb17f1 r9795142  
    2727git rev-list --format=short ${GitOldRef}...${GitNewRef} >  ${GIT_LOG}
    2828
    29 git diff --stat --color ${GitNewRef} ${GitOldRef} | sed -e 's/\[32m/<span style\=\"color\: \#00AA00\;\">/g' -e 's/\[31m/<span style\=\"color\: \#AA0000\;\">/g' -e 's/\[m/<\/span>/g' >  ${GIT_DIFF}
     29git diff --stat ${GitNewRef} ${GitOldRef} >  ${GIT_DIFF}
Note: See TracChangeset for help on using the changeset viewer.