Changeset 298581c

Timestamp:

May 9, 2017, 1:56:38 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

6182039

Parents:

c10ee66 (diff), f408e1a (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:/u/cforall/software/cfa/cfa-cc

Files:

• Jenkins/FullBuild (modified) (3 diffs)
• Jenkinsfile (modified) (11 diffs)
• src/CodeGen/LineStream.cc (added)
• src/CodeGen/LineStream.h (added)
• src/Common/utility.h (modified) (2 diffs)
• src/benchmark/csv-data.c (modified) (2 diffs)

Jenkins/FullBuild

@@ -9 +9 @@
 
         try {
-                //Prevent the build from exceeding 30 minutes
-                timeout(60) {
+                //Wrap build to add timestamp to command line
+                wrap([$class: 'TimestamperBuildWrapper']) {
 
-                        //Wrap build to add timestamp to command line
-                        wrap([$class: 'TimestamperBuildWrapper']) {
+                        stage('Build') {
 
-                                stage 'Build'
+                                results = [null, null]
 
-                                        results = [null, null]
+                                parallel (
+                                        gcc_6_x64: { trigger_build( 'gcc-6',   'x64', true  ) },
+                                        gcc_6_x86: { trigger_build( 'gcc-6',   'x86', true  ) },
+                                        gcc_5_x64: { trigger_build( 'gcc-5',   'x64', false ) },
+                                        gcc_5_x86: { trigger_build( 'gcc-5',   'x86', false ) },
+                                        gcc_4_x64: { trigger_build( 'gcc-4.9', 'x64', false ) },
+                                        gcc_4_x86: { trigger_build( 'gcc-4.9', 'x86', false ) },
+                                        clang_x64: { trigger_build( 'clang',   'x64', false ) },
+                                        clang_x86: { trigger_build( 'clang',   'x86', false ) },
+                                )
+                        }
 
-                                        parallel (
-                                                gcc_6_x64: { trigger_build( 'gcc-6',   'x64', true  ) },
-                                                gcc_6_x86: { trigger_build( 'gcc-6',   'x86', true  ) },
-                                                gcc_5_x64: { trigger_build( 'gcc-5',   'x64', false ) },
-                                                gcc_5_x86: { trigger_build( 'gcc-5',   'x86', false ) },
-                                                gcc_4_x64: { trigger_build( 'gcc-4.9', 'x64', false ) },
-                                                gcc_4_x86: { trigger_build( 'gcc-4.9', 'x86', false ) },
-                                                clang_x64: { trigger_build( 'clang',   'x64', false ) },
-                                                clang_x86: { trigger_build( 'clang',   'x86', false ) },
-                                        )
-
-                                //Push latest changes to do-lang repo
-                                push_build()
-                        }
+                        //Push latest changes to do-lang repo
+                        push_build()
                 }
         }
@@ -99 +96 @@
 def push_build() {
         //Don't use the build_stage function which outputs the compiler
-        stage 'Push'
+        stage('Push') {
 
                 status_prefix = 'Push'
@@ -122 +119 @@
                 //sh "GIT_SSH_COMMAND=\"ssh -v\" git push DoLang ${gitRefNewValue}:master"
                 echo('BUILD NOT PUSH SINCE DO-LANG SERVER WAS DOWN')
+        }
 }
 

Jenkinsfile

@@ -28 +28 @@
                 wrap([$class: 'TimestamperBuildWrapper']) {
 
-                        //Prevent the build from exceeding 60 minutes
-                        timeout(60) {
-
-                                notify_server()
-
-                                prepare_build()
-
-                                checkout()
-
-                                build()
-
-                                test()
-
-                                benchmark()
-
-                                clean()
-
-                                build_doc()
-
-                                publish()
-
-                                notify_server()
-                        }
+                        notify_server()
+
+                        prepare_build()
+
+                        checkout()
+
+                        build()
+
+                        test()
+
+                        benchmark()
+
+                        clean()
+
+                        build_doc()
+
+                        publish()
+
+                        notify_server()
                 }
         }
@@ -89 +85 @@
 def collect_git_info() {
 
+        checkout scm
+
         //create the temporary output directory in case it doesn't already exist
         def out_dir = pwd tmp: true
@@ -95 +93 @@
         //parse git logs to find what changed
         gitRefName = env.BRANCH_NAME
-        dir("../${gitRefName}@script") {
-                sh "git reflog > ${out_dir}/GIT_COMMIT"
-        }
+        sh "git reflog > ${out_dir}/GIT_COMMIT"
         git_reflog = readFile("${out_dir}/GIT_COMMIT")
         gitRefOldValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][1]
@@ -170 +166 @@
 }
 
-def build_stage(String name) {
+def build_stage(String name, Closure block ) {
         stage_name = name
-        stage name
+        stage(name, block)
 }
 
@@ -245 +241 @@
 //Compilation script is done here but environnement set-up and error handling is done in main loop
 def checkout() {
-        build_stage'Checkout'
+        build_stage('Checkout') {
                 //checkout the source code and clean the repo
                 checkout scm
@@ -254 +250 @@
                 //Reset the git repo so no local changes persist
                 sh 'git reset --hard'
+        }
 }
 
 def build() {
-        build_stage'Build'
+        build_stage('Build') {
         
                 def install_dir = pwd tmp: true
@@ -269 +266 @@
                 //Compile the project
                 sh 'make -j 8 --no-print-directory V=0 install'
+        }
 }
 
 def test() {
-        build_stage'Test'
+        build_stage('Test') {
 
                 //Run the tests from the tests directory
@@ -282 +280 @@
                         sh 'make -C src/tests'
                 }
+        }
 }
 
 def benchmark() {
-        build_stage'Benchmark'
+        build_stage('Benchmark') {
 
                 if( !do_benchmark ) return
@@ -294 +293 @@
                 //Append bench results
                 sh 'make -C src/benchmark --no-print-directory csv-data >> bench.csv'
+        }
 }
 
 def clean() {
-        build_stage'Cleanup'
+        build_stage('Cleanup') {
 
                 //do a maintainer-clean to make sure we need to remake from scratch
                 sh 'make maintainer-clean > /dev/null'
+        }
 }
 
 def build_doc() {
-        build_stage'Documentation'
+        build_stage('Documentation') {
 
                 if( !do_doc ) return
@@ -315 +316 @@
                         make_doc()
                 }
+        }
 }
 
 def publish() {
-        build_stage'Publish'
+        build_stage('Publish') {
 
                 if( !do_publish ) return
@@ -324 +326 @@
                 //Then publish the results
                 sh 'curl --silent --data @bench.csv http://plg2:8082/jenkins/publish > /dev/null || true'
+        }
 }
 

src/Common/utility.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec 14 21:25:25 2016
-// Update Count     : 31
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri May 5 11:03:00 2017
+// Update Count     : 32
 //
 
@@ -322 +322 @@
         std::string filename;
 
-        CodeLocation() 
+    /// Create a new unset CodeLocation.
+        CodeLocation()
                 : linenumber( -1 )
                 , filename("")
         {}
 
+    /// Create a new CodeLocation with the given values.
         CodeLocation( const char* filename, int lineno )
                 : linenumber( lineno )
                 , filename(filename ? filename : "")
         {}
+
+    bool isSet () const {
+        return -1 != linenumber;
+    }
+
+    bool isUnset () const {
+        return !isSet();
+    }
+
+        void unset () {
+                linenumber = -1;
+                filename = "";
+        }
+
+        // Use field access for set.
 };
 
 inline std::string to_string( const CodeLocation& location ) {
-        return location.linenumber >= 0 ? location.filename + ":" + std::to_string(location.linenumber) + " " : "";
+        return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + " " : "";
 }
 #endif // _UTILITY_H

src/benchmark/csv-data.c

@@ -100 +100 @@
 }
 
+//-----------------------------------------------------------------------------
+// single internal sched entry
+mon_t mon1;
+
+condition cond1a; 
+condition cond1b;
+
+thread thrd1a { long long int * out; };
+thread thrd1b {};
+
+void ?{}( thrd1a * this, long long int * out ) {
+        this->out = out;
+}
+
+void side1A( mon_t * mutex a, long long int * out ) {
+        long long int StartTime, EndTime;
+
+        StartTime = Time();
+        for( int i = 0;; i++ ) {
+                signal(&cond1a);
+                if( i > N ) break;
+                wait(&cond1b);
+        }
+        EndTime = Time();
+
+        *out = ( EndTime - StartTime ) / N;
+}
+
+void side1B( mon_t * mutex a ) {
+        for( int i = 0;; i++ ) {
+                signal(&cond1b);
+                if( i > N ) break;
+                wait(&cond1a);
+        }
+}
+
+void main( thrd1a * this ) { side1A( &mon1, this->out ); }
+void main( thrd1b * this ) { side1B( &mon1 ); }
+
+long long int measure_1_sched_int() {
+        long long int t;
+        {
+                thrd1a a = { &t };
+                thrd1b b;
+        }
+        return t;
+}
+
+//-----------------------------------------------------------------------------
+// multi internal sched entry
+mon_t mon2;
+
+condition cond2a; 
+condition cond2b;
+
+thread thrd2a { long long int * out; };
+thread thrd2b {};
+
+void ?{}( thrd2a * this, long long int * out ) {
+        this->out = out;
+}
+
+void side2A( mon_t * mutex a, mon_t * mutex b, long long int * out ) {
+        long long int StartTime, EndTime;
+
+        StartTime = Time();
+        for( int i = 0;; i++ ) {
+                signal(&cond2a);
+                if( i > N ) break;
+                wait(&cond2b);
+        }
+        EndTime = Time();
+
+        *out = ( EndTime - StartTime ) / N;
+}
+
+void side2B( mon_t * mutex a, mon_t * mutex b ) {
+        for( int i = 0;; i++ ) {
+                signal(&cond2b);
+                if( i > N ) break;
+                wait(&cond2a);
+        }
+}
+
+void main( thrd2a * this ) { side2A( &mon1, &mon2, this->out ); }
+void main( thrd2b * this ) { side2B( &mon1, &mon2 ); }
+
+long long int measure_2_sched_int() {
+        long long int t;
+        {
+                thrd2a a = { &t };
+                thrd2b b;
+        }
+        return t;
+}
+
+//-----------------------------------------------------------------------------
+// main loop
 int main()
 {
@@ -106 +204 @@
         sout | measure_thread() | ',';
         sout | measure_1_monitor_entry() | ',';
-        sout | measure_2_monitor_entry() | endl;
-}
+        sout | measure_2_monitor_entry() | ',';
+        sout | measure_1_sched_int() | ',';
+        sout | measure_2_sched_int() | endl;
+}