Changeset 490cb3c for Jenkinsfile

Timestamp:

Apr 26, 2019, 2:33:04 PM (6 years ago)

Author:

Thierry Delisle <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:

38c0fe5

Parents:

e2862d3

Message:

Some improvements on plots to be correct for both fine grain concurrency and compilation

File:

• Jenkinsfile (modified) (8 diffs)

Jenkinsfile

@@ -165 +165 @@
 }
 
+CompileGroup = new PlotGroup('Compilation', 'seconds', true)
+ConcurrencyGroup = new PlotGroup('Concurrency', 'nanoseconds', false)
+
 def publish() {
         build_stage('Publish') {
@@ -175 +178 @@
 
                 //Then publish the results
-                do_plot('compile', 'Compilation', 'Compilation')
-
-                do_plot('ctxswitch', 'Concurrency', 'Context Switching')
-
-                do_plot('mutex', 'Concurrency', 'Mutual Exclusion')
-
-                do_plot('signal', 'Concurrency', 'Internal and External Scheduling')
+                do_plot('compile', CompilationGroup, 'Compilation')
+
+                do_plot('ctxswitch', ConcurrencyGroup, 'Context Switching')
+
+                do_plot('mutex', ConcurrencyGroup, 'Mutual Exclusion')
+
+                do_plot('signal', ConcurrencyGroup, 'Internal and External Scheduling')
         }
 }
@@ -292 +295 @@
         public String GitOldRef
 
-        BuildSettings(java.util.Collections$UnmodifiableMap param, String branch, String number) {
+        BuildSettings(java.util.Collections$UnmodifiableMap param, String branch) {
                 switch( param.Compiler ) {
                         case 'gcc-6':
@@ -329 +332 @@
 
                 def full = param.RunAllTests ? " (Full)" : ""
-                this.DescShort = "${number} - ${ this.Compiler.name }:${ this.Architecture.name }${full}"
+                this.DescShort = "${ this.Compiler.name }:${ this.Architecture.name }${full}"
 
                 this.DescLong = """Compiler              : ${ this.Compiler.name } (${ this.Compiler.CXX }/${ this.Compiler.CC })
@@ -343 +346 @@
                 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
         }
 }
@@ -394 +409 @@
         checkout scm
 
-        final settings = new BuildSettings(params, env.BRANCH_NAME, env.BUILD_NUMBER)
+        final settings = new BuildSettings(params, env.BRANCH_NAME)
 
         currentBuild.description = settings.DescShort
@@ -423 +438 @@
 }
 
-def do_plot(String file, String group, String title) {
+def do_plot(String file, PlotGroup group, String title) {
         echo "file is ${BuildDir}/benchmark/${file}.csv, group ${group}, title ${title}"
         dir("${BuildDir}/benchmark/") {
@@ -434 +449 @@
                                 url: ''
                         ]],
-                        group: "${group}",
+                        group: "${group.name}",
                         title: "${title}",
                         style: 'lineSimple',
                         exclZero: false,
                         keepRecords: false,
-                        logarithmic: true,
+                        logarithmic: group.log,
                         numBuilds: '120',
                         useDescr: true,
-                        yaxis: '',
+                        yaxis: group.unit,
                         yaxisMaximum: '',
                         yaxisMinimum: ''