Changeset def751f for Jenkinsfile

Timestamp:

Jul 25, 2022, 3:17:25 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

b0d9ff7

Parents:

4e2befe3 (diff), ffec1bf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into qualifiedEnum

File:

• Jenkinsfile (modified) (3 diffs)

Jenkinsfile

@@ -209 +209 @@
 
                 if( Settings.Publish && !Settings.RunBenchmark ) { echo 'No results to publish!!!' }
-
-                def groupCompile = new PlotGroup('Compilation', 'duration (s) - lower is better', true)
-                def groupConcurrency = new PlotGroup('Concurrency', 'duration (n) - lower is better', false)
-
-                //Then publish the results
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'        , groupCompile    , false, 'Compilation')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile.diff'   , groupCompile    , true , 'Compilation (relative)')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch'      , groupConcurrency, false, 'Context Switching')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch.diff' , groupConcurrency, true , 'Context Switching (relative)')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'          , groupConcurrency, false, 'Mutual Exclusion')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex.diff'     , groupConcurrency, true , 'Mutual Exclusion (relative)')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'scheduling'     , groupConcurrency, false, 'Internal and External Scheduling')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'scheduling.diff', groupConcurrency, true , 'Internal and External Scheduling (relative)')
         }
 }
@@ -376 +363 @@
                 this.GitNewRef = ''
                 this.GitOldRef = ''
-        }
-}
-
-class PlotGroup implements Serializable {
-        public String name
-        public String unit
-        public boolean log
-
-        PlotGroup(String name, String unit, boolean log) {
-                this.name = name
-                this.unit = unit
-                this.log = log
         }
 }
@@ -476 +451 @@
         }
 }
-
-def do_plot(boolean new_data, String file, PlotGroup group, boolean relative, String title) {
-
-        if(new_data) {
-                echo "Publishing new data"
-        }
-
-        def series = new_data ? [[
-                                file: "${file}.csv",
-                                exclusionValues: '',
-                                displayTableFlag: false,
-                                inclusionFlag: 'OFF',
-                                url: ''
-                        ]] : [];
-
-        echo "file is ${BuildDir}/benchmark/${file}.csv, group ${group}, title ${title}"
-        dir("${BuildDir}/benchmark/") {
-                plot csvFileName: "cforall-${env.BRANCH_NAME}-${file}.csv",
-                        csvSeries: series,
-                        group: "${group.name}",
-                        title: "${title}",
-                        style: 'lineSimple',
-                        exclZero: false,
-                        keepRecords: false,
-                        logarithmic: !relative && group.log,
-                        numBuilds: '120',
-                        useDescr: true,
-                        yaxis: group.unit,
-                        yaxisMaximum: '',
-                        yaxisMinimum: ''
-        }
-}