Changeset 74ec742 for benchmark/readyQ/churn.cfa

Timestamp:

May 20, 2022, 10:36:45 AM (4 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

25fa20a

Parents:

29d8c02 (diff), 7831e8fb (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:

• benchmark/readyQ/churn.cfa (modified) (8 diffs)

benchmark/readyQ/churn.cfa

@@ -1 +1 @@
 #include "rq_bench.hfa"
 
+#include <locks.hfa>
+
 unsigned spot_cnt = 2;
-bench_sem * volatile * spots;
+semaphore * spots;
 
 thread BThrd {
         unsigned long long count;
         unsigned long long blocks;
-        bench_sem sem;
+        bool skip;
 };
 
@@ -14 +16 @@
         this.count  = 0;
         this.blocks = 0;
+        this.skip = false;
 }
 
@@ -19 +22 @@
 
 void main( BThrd & this ) with( this ) {
-        wait( sem );
+        park();
         for() {
-                uint32_t r = prng();
-                bench_sem * next = __atomic_exchange_n(&spots[r % spot_cnt], &sem, __ATOMIC_SEQ_CST);
-                if(next) post( *next );
-                blocks += wait( sem );
+                uint32_t r = prng(this);
+                semaphore & sem = spots[r % spot_cnt];
+                if(!skip) V( sem );
+                blocks += P( sem );
+                skip = false;
+
                 count ++;
                 if( clock_mode && stop) break;
@@ -39 +44 @@
                 { 's', "spots", "Number of spots in the system", spot_cnt }
         };
-        BENCH_OPT_PARSE("cforall cycle benchmark");
+        BENCH_OPT_PARSE("cforall churn benchmark");
 
         {
@@ -49 +54 @@
                         spots = aalloc(spot_cnt);
                         for(i; spot_cnt) {
-                                spots[i] = 0p;
+                                (spots[i]){ 0 };
                         }
 
@@ -55 +60 @@
                         BThrd * threads[nthreads];
                         for(i; nthreads ) {
-                                threads[i] = malloc();
-                                (*threads[i]){};
+                                BThrd & t = *(threads[i] = malloc());
+                                (t){};
+                                t.skip = i < spot_cnt;
                         }
                         printf("Starting\n");
@@ -64 +70 @@
 
                         for(i; nthreads) {
-                                post( threads[i]->sem );
+                                unpark( *threads[i] );
                         }
                         wait(start, is_tty);
@@ -72 +78 @@
                         printf("\nDone\n");
 
+                        for(i; spot_cnt) {
+                                for(10000) V( spots[i] );
+                        }
+
                         for(i; nthreads) {
-                                post( threads[i]->sem );
                                 BThrd & thrd = join( *threads[i] );
                                 global_counter += thrd.count;