Changeset 8197ca5

Timestamp:

May 4, 2022, 11:58:59 AM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

1f4fde5, 3b80db8, 7ad47df

Parents:

9cf2b0f

Message:

Update yield.cfa to be more consistent with other benchmarks.

File:

• benchmark/readyQ/yield.cfa (modified) (4 diffs)

benchmark/readyQ/yield.cfa

@@ -1 +1 @@
 #include "rq_bench.hfa"
 
-extern bool traceHeapOn();
-
-
-volatile bool run = false;
-volatile unsigned long long global_counter;
-
 thread __attribute__((aligned(128))) Yielder {
-        unsigned long long counter;
+        unsigned long long count;
 };
 void ?{}( Yielder & this ) {
-        this.counter = 0;
-        ((thread&)this){ "Yielder Thread" };
+        ((thread&)this){ "Yielder Thread", bench_cluster };
+        this.count = 0;
 }
 
 void main( Yielder & this ) {
         park();
-        /* paranoid */ assert( true == __atomic_load_n(&run, __ATOMIC_RELAXED) );
+        for() {
+                yield();
+                this.count++;
+                if( clock_mode && stop) break;
+                if(!clock_mode && this.count >= stop_count) break;
+        }
 
-        while(__atomic_load_n(&run, __ATOMIC_RELAXED)) {
-                yield();
-                this.counter++;
-        }
-        __atomic_fetch_add(&global_counter, this.counter, __ATOMIC_SEQ_CST);
+        __atomic_fetch_add(&threads_left, -1, __ATOMIC_SEQ_CST);
 }
 
@@ -33 +28 @@
 
         {
-                printf("Running %d threads on %d processors for %f seconds\n", nthreads, nprocs, duration);
+                unsigned long long global_counter = 0;
 
                 Time start, end;
                 BenchCluster bc = { nprocs };
                 {
+                        threads_left = nthreads;
                         Yielder threads[nthreads];
                         printf("Starting\n");
@@ -43 +39 @@
                         bool is_tty = isatty(STDOUT_FILENO);
                         start = timeHiRes();
-                        run = true;
 
                         for(i; nthreads) {
@@ -50 +45 @@
                         wait(start, is_tty);
 
-                        run = false;
+                        stop = true;
                         end = timeHiRes();
                         printf("\nDone\n");
+
+                        for(i; nthreads) {
+                                Yielder & y = join( threads[i] );
+                                global_counter += y.count;
+                        }
                 }