Changeset 12c1eef for benchmark

Timestamp:

Jan 19, 2022, 2:36:56 PM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

97c215f

Parents:

5235d49 (diff), 6a33e40 (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

Location:

benchmark/readyQ

Files:

• churn.cfa (modified) (1 diff)
• locality.cfa (modified) (2 diffs)
• transfer.cfa (modified) (6 diffs)

benchmark/readyQ/churn.cfa

@@ -21 +21 @@
         wait( sem );
         for() {
-                uint64_t r = thread_rand();
+                uint32_t r = prng();
                 bench_sem * next = __atomic_exchange_n(&spots[r % spot_cnt], &sem, __ATOMIC_SEQ_CST);
                 if(next) post( *next );

benchmark/readyQ/locality.cfa

@@ -128 +128 @@
 __attribute__((noinline)) void work(MyData & data, size_t cnt_, uint64_t & state) {
         for (cnt_) {
-                access(data, __xorshift64(state));
+                access(data, xorshift_13_7_17(state));
         }
 }
 
 void main(MyThread & this) {
-        uint64_t state = thread_rand();
+        uint64_t state = prng();
 
         // Wait for start
@@ -144 +144 @@
 
                 // Wait on a random spot
-                uint64_t idx = __xorshift64(state) % this.spots.len;
+                uint64_t idx = xorshift_13_7_17(state) % this.spots.len;
                 bool closed = put(*this.spots.ptr[idx], this, this.data, this.share);
 

benchmark/readyQ/transfer.cfa

@@ -1 +1 @@
 #include "rq_bench.hfa"
 #include <fstream.hfa>
+#include <locale.h>
 
 Duration default_preemption() {
@@ -8 +9 @@
 #define PRINT(...)
 
-__lehmer64_state_t lead_seed;
+__uint128_t lead_seed;
 volatile unsigned leader;
 volatile size_t lead_idx;
@@ -68 +69 @@
         waitgroup();
 
-        unsigned nleader = __lehmer64( lead_seed ) % nthreads;
+        unsigned nleader = lehmer64( lead_seed ) % nthreads;
         __atomic_store_n( &leader, nleader, __ATOMIC_SEQ_CST );
 
@@ -105 +106 @@
 // ==================================================
 int main(int argc, char * argv[]) {
-        __lehmer64_state_t lead_seed = getpid();
-        for(10) __lehmer64( lead_seed );
+        uint64_t lead_seed = getpid();
+        for(10) lehmer64( lead_seed );
         unsigned nprocs = 2;
 
@@ -126 +127 @@
 
         lead_idx = 0;
-        leader = __lehmer64( lead_seed ) % nthreads;
+        leader = lehmer64( lead_seed ) % nthreads;
 
         size_t rechecks = 0;
@@ -167 +168 @@
         }
 
+        setlocale( LC_NUMERIC, getenv( "LANG" ) );
         sout | "Duration (ms)           : " | ws(3, 3, unit(eng((end - start)`dms)));
         sout | "Number of processors    : " | nprocs;