Changeset b3976bf for Jenkinsfile

Timestamp:

Aug 12, 2019, 11:05:36 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

dee1f89

Parents:

cc4218f (diff), 4f5a8a2 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• Jenkinsfile (modified) (3 diffs)

Jenkinsfile

@@ -106 +106 @@
 
 def build() {
-        // build_stage('Build', true) {
-        //      // Build outside of the src tree to ease cleaning
-        //      dir (BuildDir) {
-        //              //Configure the conpilation (Output is not relevant)
-        //              //Use the current directory as the installation target so nothing escapes the sandbox
-        //              //Also specify the compiler by hand
-        //              targets=""
-        //              if( Settings.RunAllTests || Settings.RunBenchmark ) {
-        //                      targets="--with-target-hosts='host:debug,host:nodebug'"
-        //              } else {
-        //                      targets="--with-target-hosts='host:debug'"
-        //              }
-
-        //              sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
-
-        //              //Compile the project
-        //              sh 'make -j 8 --no-print-directory'
-        //      }
-        // }
-
         debug = true
         release = Settings.RunAllTests || Settings.RunBenchmark
@@ -195 +175 @@
                 dir (BuildDir) {
                         //Append bench results
-                        sh "make --no-print-directory -C benchmark jenkins"
+                        sh "make --no-print-directory -C benchmark jenkins arch=${Settings.Architecture.name}"
                 }
         }
@@ -221 +201 @@
 
                 //Then publish the results
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'  , groupCompile    , 'Compilation')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch', groupConcurrency, 'Context Switching')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'    , groupConcurrency, 'Mutual Exclusion')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal'   , groupConcurrency, 'Internal and External Scheduling')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'       , groupCompile    , 'Compilation')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile.diff'  , groupCompile    , 'Compilation Speed-Up')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch'     , groupConcurrency, 'Context Switching')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch.diff', groupConcurrency, 'Context Switching Speed-Up')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'         , groupConcurrency, 'Mutual Exclusion')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex.diff'    , groupConcurrency, 'Mutual Exclusion Speed-Up')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal'        , groupConcurrency, 'Internal and External Scheduling')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal.diff'   , groupConcurrency, 'Internal and External Scheduling Speed-Up')
         }
 }