Changeset ae28ee2

Timestamp:

Feb 16, 2017, 2:33:21 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8a7db7c

Parents:

0ef06b6

Message:

New try at benchmark data sent to server

Files:

• Jenkins/FullBuild (modified) (2 diffs)
• Jenkinsfile (modified) (3 diffs)
• src/benchmark/csv-data.c (modified) (1 diff)

Jenkins/FullBuild

@@ -1 +1 @@
 #!groovy
 
+//===========================================================================================================
+// Main loop of the compilation
+//===========================================================================================================
+
+node ('master') {
+        def err = null
+
+        try {
+                //Prevent the build from exceeding 30 minutes
+                timeout(60) {
+
+                        //Wrap build to add timestamp to command line
+                        wrap([$class: 'TimestamperBuildWrapper']) {
+
+                                stage 'Build'
+
+                                        results = [null, null]
+
+                                        parallel (
+                                                x64: {
+                                                        trigger_build('64-bit')
+                                                },
+                                                x32: {
+                                                        trigger_build('32-bit')
+                                                }
+                                        )
+
+                                //Push latest changes to do-lang repo
+                                push_build()
+                        }
+                }
+        }
+
+        //If an exception is caught we need to change the status and remember to
+        //attach the build log to the email
+        catch (Exception caughtError) {
+                echo('error caught')
+
+                //rethrow error later
+                err = caughtError
+
+                //Store the result of the build log
+                currentBuild.result = 'FAILURE'
+
+                //Send email to notify the failure
+                promote_failure_email()
+        }
+
+        finally {
+                //Must re-throw exception to propagate error
+                if (err) {
+                        throw err
+                }
+        }
+}
 //===========================================================================================================
 // Main compilation routines
@@ -69 +124 @@
 
 //===========================================================================================================
-// Main loop of the compilation
-//===========================================================================================================
-
-node ('master') {
-        def err = null
-
-        try {
-                //Prevent the build from exceeding 30 minutes
-                timeout(60) {
-
-                        //Wrap build to add timestamp to command line
-                        wrap([$class: 'TimestamperBuildWrapper']) {
-
-                                stage 'Build'
-
-                                        results = [null, null]
-
-                                        parallel (
-                                                x64: {
-                                                        trigger_build('64-bit')
-                                                },
-                                                x32: {
-                                                        trigger_build('32-bit')
-                                                }
-                                        )
-
-                                //Push latest changes to do-lang repo
-                                push_build()
-                        }
-                }
-        }
-
-        //If an exception is caught we need to change the status and remember to
-        //attach the build log to the email
-        catch (Exception caughtError) {
-                echo('error caught')
-
-                //rethrow error later
-                err = caughtError
-
-                //Store the result of the build log
-                currentBuild.result = 'FAILURE'
-
-                //Send email to notify the failure
-                promote_failure_email()
-        }
-
-        finally {
-                //Must re-throw exception to propagate error
-                if (err) {
-                        throw err
-                }
-        }
-}
-//===========================================================================================================
 //Routine responsible of sending the email notification once the build is completed
 //===========================================================================================================

Jenkinsfile

@@ -31 +31 @@
                                 //Compile latex documentation
                                 doc_build()
-
-                                //Run benchmark and save result
-                                benchmark()
 
                                 if( bIsFullBuild ) {
@@ -194 +191 @@
                 }
 
+        build_stage 'Benchmark'
+
+                //Write the commit id to Benchmark
+                writeFile( 'bench.csv', 'data=' + env.CHANGE_ID + ',' )
+ 
+                //Append bench results
+                sh 'make -C src/benchmark csv-data >> bench.csv'
+
+                //Then publish the results
+                sh 'curl --data @bench.csv http://plg2/~cforall/cgi-bin/publish.cgi'
+
         build_stage 'Cleanup'
 
@@ -235 +243 @@
                         make_doc()
                 }
-}
-
-def benchmark() {
-        stage 'Benchmark'
-
-                status_prefix = 'Documentation'
-
-                // //We can't just write to a file outside our repo
-                // //Copy the file locally using ssh
-                // sh 'scp plg2.cs.uwaterloo.ca:/u/cforall/public_html/perf-history/concurrency.csv bench.csv'
-
-                // //Then append to the local file
-                // sh 'make -C src/benchmark csv-data >> bench.csv'
-
-                // //Then publish the file again
-                // sh 'scp bench.csv plg2.cs.uwaterloo.ca:/u/cforall/public_html/perf-history/concurrency.csv'          
 }
 

src/benchmark/csv-data.c

@@ -84 +84 @@
 int main()
 {
-        sout | time(NULL) | "," | measure_coroutine() | "," | measure_thread() | endl;
+        sout | measure_coroutine() | "," | measure_thread() | endl;
 }