Changeset bf1914e

Timestamp:

Dec 28, 2020, 4:09:20 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

3e36f220

Parents:

657c36f (diff), 772b300 (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

Files:

• Jenkins/FullBuild (modified) (2 diffs)
• benchmark/readyQ/locality.cfa (modified) (5 diffs)
• benchmark/readyQ/locality.go (modified) (1 diff)
• benchmark/readyQ/rq_bench.hfa (modified) (1 diff)
• libcfa/src/parseargs.cfa (modified) (1 diff)

Jenkins/FullBuild

@@ -32 +32 @@
 
                         stage('Package') {
-                                build job: 'Cforall_Distribute_Ref', parameters: [string(name: 'GitRef', value: commitId), string(name: 'Build', value: currentBuild.number.toString())]
+                                trigger_dist( commitId, currentBuild.number.toString() )
                         }
                 }
@@ -103 +103 @@
 }
 
+def trigger_dist(String commitId, String build) {
+        def result = build job: 'Cforall_Distribute_Ref',       \
+                parameters: [                                           \
+                        string(name: 'GitRef', value: commitId),        \
+                        string(name: 'Build' , value: build)    \
+                ]
+
+        echo(result.result)
+
+        if(result.result != 'SUCCESS') {
+                sh("wget -q -O - https://cforall.uwaterloo.ca/jenkins/job/Cforall_Distribute_Ref/${result.number}/consoleText")
+                error(result.result)
+        }
+}
+
 //===========================================================================================================
 //Routine responsible of sending the email notification once the build is completed

benchmark/readyQ/locality.cfa

@@ -63 +63 @@
 }
 
-void access(MyData & this, size_t idx) {
+__attribute__((noinline)) void access(MyData & this, size_t idx) {
         size_t l = this.len;
         this.data[idx % l] += 1;
@@ -126 +126 @@
 // ==================================================
 // Do some work by accessing 'cnt' cells in the array
-void work(MyData & data, size_t cnt, uint64_t & state) {
+__attribute__((noinline)) void work(MyData & data, size_t cnt, uint64_t & state) {
         for (cnt) {
                 access(data, __xorshift64(state));
@@ -166 +166 @@
 
 void ?{}( MyThread & this, MyData * data, MySpot ** spots, size_t spot_len, size_t cnt, bool share, size_t id) {
+        ((thread&)this){ bench_cluster };
         this.data = data;
         this.spots.ptr = spots;
@@ -196 +197 @@
         unsigned long long global_dmigs = 0;
 
-        MyData * data_arrays[nthreads];
-        for(i; nthreads) {
-                data_arrays[i] = malloc();
-                (*data_arrays[i]){ i, wsize };
-        }
-
-        MySpot * spots[nthreads - nprocs];
-        for(i; nthreads - nprocs) {
-                spots[i] = malloc();
-                (*spots[i]){ i };
-        }
-
         Time start, end;
         {
+                MyData * data_arrays[nthreads];
+                for(i; nthreads) {
+                        data_arrays[i] = malloc();
+                        (*data_arrays[i]){ i, wsize };
+                }
+
+                MySpot * spots[nthreads - nprocs];
+                for(i; nthreads - nprocs) {
+                        spots[i] = malloc();
+                        (*spots[i]){ i };
+                }
+
                 BenchCluster bc = { nprocs };
                 threads_left = nprocs;
@@ -250 +251 @@
                         }
                 }
-        }
-
-        printf("Duration (ms)          : %'ld\n", (end - start)`dms);
+
+                for(i; nthreads) {
+                        delete( data_arrays[i] );
+                }
+
+                for(i; nthreads - nprocs) {
+                        delete( spots[i] );
+                }
+        }
+
+        printf("Duration (ms)          : %'lf\n", (end - start)`dms);
         printf("Number of processors   : %'d\n", nprocs);
         printf("Number of threads      : %'d\n", nthreads);
         printf("Total Operations(ops)  : %'15llu\n", global_count);
-        printf("Work size (64bit words): %'15llu\n", wsize);
+        printf("Work size (64bit words): %'15u\n", wsize);
         printf("Total Operations(ops)  : %'15llu\n", global_count);
         printf("Total G Migrations     : %'15llu\n", global_gmigs);

benchmark/readyQ/locality.go

@@ -282 +282 @@
         // Print with nice 's, i.e. 1'000'000 instead of 1000000
         p := message.NewPrinter(language.English)
-        p.Printf("Duration (ms)          : %f\n", delta.Seconds());
+        p.Printf("Duration (s)           : %f\n", delta.Seconds());
         p.Printf("Number of processors   : %d\n", nprocs);
         p.Printf("Number of threads      : %d\n", nthreads);

benchmark/readyQ/rq_bench.hfa

@@ -39 +39 @@
                 } else if(stop_count > 0) { \
                         clock_mode = false; \
-                        printf("Running for %lu iterations\n", stop_count); \
+                        printf("Running for %llu iterations\n", stop_count); \
                 } else { \
                         duration = 5; clock_mode = true;\

libcfa/src/parseargs.cfa

@@ -105 +105 @@
                                         if(opt == options[i].short_name) {
                                                 const char * arg = optarg ? optarg : "";
+                                                if( arg[0] == '=' ) { arg++; }
                                                 bool success = options[i].parse( arg, options[i].variable );
                                                 if(success) continue NEXT_ARG;