Changeset 2c7eee0 for benchmark/readyQ/cycle.cfa

Timestamp:

Nov 3, 2020, 1:21:36 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

dbb1073

Parents:

58688bf

Message:

Fixed cycle benchmark to avoid extra unmatched unpark.
Added libfibre implementation.
Split out go common code into bench.go

File:

• benchmark/readyQ/cycle.cfa (modified) (5 diffs)

benchmark/readyQ/cycle.cfa

@@ -1 +1 @@
 #include "rq_bench.hfa"
 
-thread Partner {
-        Partner * partner;
+struct Partner {
         unsigned long long count;
+        unsigned long long blocks;
+        bench_sem self;
+        bench_sem * next;
 };
 
 void ?{}( Partner & this ) {
-        ((thread&)this){ bench_cluster };
+        this.count = this.blocks = 0;
 }
 
-void main( Partner & this ) {
-        this.count = 0;
+thread BThrd {
+        Partner & partner;
+};
+
+void ?{}( BThrd & this, Partner * partner ) {
+        ((thread&)this){ bench_cluster };
+        &this.partner = partner;
+}
+
+void ^?{}( BThrd & mutex this ) {}
+
+void main( BThrd & thrd ) with(thrd.partner) {
+        count = 0;
         for() {
-                park();
-                unpark( *this.partner );
-                this.count ++;
+                blocks += wait( self );
+                post( *next );
+                count ++;
                 if( clock_mode && stop) break;
-                if(!clock_mode && this.count >= stop_count) break;
+                if(!clock_mode && count >= stop_count) break;
         }
 
@@ -33 +46 @@
         {
                 unsigned long long global_counter = 0;
+                unsigned long long global_blocks  = 0;
                 unsigned tthreads = nthreads * ring_size;
                 Time start, end;
@@ -38 +52 @@
                 {
                         threads_left = tthreads;
-                        Partner threads[tthreads];
+                        BThrd * threads[tthreads];
+                        Partner thddata[tthreads];
                         for(i; tthreads) {
                                 unsigned pi = (i + nthreads) % tthreads;
-                                threads[i].partner = &threads[pi];
+                                thddata[i].next = &thddata[pi].self;
+                        }
+                        for(int i = 0; i < tthreads; i++) {
+                                threads[i] = malloc();
+                                (*threads[i]){ &thddata[i] };
                         }
                         printf("Starting\n");
@@ -49 +68 @@
 
                         for(i; nthreads) {
-                                unpark( threads[i] );
+                                post( thddata[i].self );
                         }
                         wait(start, is_tty);
@@ -58 +77 @@
 
                         for(i; tthreads) {
-                                global_counter += join( threads[i] ).count;
+                                Partner & partner = join( *threads[i] ).partner;
+                                global_counter += partner.count;
+                                global_blocks  += partner.blocks;
+                                delete(threads[i]);
                         }
                 }
 
-                printf("Duration (ms)       : %'ld\n", (end - start)`ms);
-                printf("Number of processors: %'d\n", nprocs);
-                printf("Number of threads   : %'d\n", tthreads);
-                printf("Cycle size (# thrds): %'d\n", ring_size);
-                printf("Yields per second   : %'18.2lf\n", ((double)global_counter) / (end - start)`s);
-                printf("ns per yields       : %'18.2lf\n", ((double)(end - start)`ns) / global_counter);
-                printf("Total yields        : %'15llu\n", global_counter);
-                printf("Yields per threads  : %'15llu\n", global_counter / tthreads);
-                printf("Yields per procs    : %'15llu\n", global_counter / nprocs);
-                printf("Yields/sec/procs    : %'18.2lf\n", (((double)global_counter) / nprocs) / (end - start)`s);
-                printf("ns per yields/procs : %'18.2lf\n", ((double)(end - start)`ns) / (global_counter / nprocs));
+                printf("Duration (ms)        : %'ld\n", (end - start)`ms);
+                printf("Number of processors : %'d\n", nprocs);
+                printf("Number of threads    : %'d\n", tthreads);
+                printf("Cycle size (# thrds) : %'d\n", ring_size);
+                printf("Total Operations(ops): %'15llu\n", global_counter);
+                printf("Total blocks         : %'15llu\n", global_blocks);
+                printf("Ops per second       : %'18.2lf\n", ((double)global_counter) / (end - start)`s);
+                printf("ns per ops           : %'18.2lf\n", ((double)(end - start)`ns) / global_counter);
+                printf("Ops per threads      : %'15llu\n", global_counter / tthreads);
+                printf("Ops per procs        : %'15llu\n", global_counter / nprocs);
+                printf("Ops/sec/procs        : %'18.2lf\n", (((double)global_counter) / nprocs) / (end - start)`s);
+                printf("ns per ops/procs     : %'18.2lf\n", ((double)(end - start)`ns) / (global_counter / nprocs));
                 fflush(stdout);
         }