Changeset ebb6158 for benchmark

Timestamp:

Sep 14, 2021, 12:47:47 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

a3769cc, fdfb0ba

Parents:

72bd9cd

Message:

Minor fixes to warnings, printing and ridiculous go/rust requirements.

Location:

benchmark

Files:

• Makefile.am (modified) (2 diffs)
• readyQ/cycle.cpp (modified) (3 diffs)
• readyQ/locality.rs (modified) (1 diff)
• readyQ/transfer.cfa (modified) (2 diffs)
• readyQ/transfer.rs (modified) (2 diffs)

benchmark/Makefile.am

@@ -607 +607 @@
 
 clean-rdq-benches:
-        rm -rf $(RDQBENCHES)
-
-rdq-%-tokio$(EXEEXT): $(srcdir)/readyQ/%.rs $(srcdir)/bench.rs
-        cd $(builddir) && cargo build --release
-        cp $(builddir)/target/release/$(basename $@) $@
+        rm -rf $(RDQBENCHES) $(builddir)/target go.mod
+
+rdq-%-tokio$(EXEEXT): $(builddir)/target/release/rdq-%-tokio$(EXEEXT)
+        $(BENCH_V_RUSTC)cp $(builddir)/target/release/$(basename $@) $@
+
+$(builddir)/target/release/rdq-%-tokio$(EXEEXT): $(srcdir)/readyQ/%.rs $(srcdir)/bench.rs
+        $(BENCH_V_RUSTC)cd $(builddir) && cargo build --release
 
 rdq-%-cfa$(EXEEXT): $(srcdir)/readyQ/%.cfa $(srcdir)/readyQ/rq_bench.hfa
@@ -618 +620 @@
 go.mod:
         touch $@
-        go mod edit -module=rdqbench
+        go mod edit -module=rdq.bench
         go get golang.org/x/sync/semaphore
         go get golang.org/x/text/language

benchmark/readyQ/cycle.cpp

@@ -41 +41 @@
                         Fibre * threads[tthreads];
                         Partner thddata[tthreads];
-                        for(int i = 0; i < tthreads; i++) {
+                        for(unsigned i = 0; i < tthreads; i++) {
                                 unsigned pi = (i + nthreads) % tthreads;
                                 thddata[i].next = &thddata[pi].self;
                         }
-                        for(int i = 0; i < tthreads; i++) {
+                        for(unsigned i = 0; i < tthreads; i++) {
                                 threads[i] = new Fibre( reinterpret_cast<void (*)(void *)>(partner_main), &thddata[i] );
                         }
@@ -53 +53 @@
                         start = timeHiRes();
 
-                        for(int i = 0; i < nthreads; i++) {
+                        for(unsigned i = 0; i < nthreads; i++) {
                                 thddata[i].self.post();
                         }
@@ -62 +62 @@
                         printf("\nDone\n");
 
-                        for(int i = 0; i < tthreads; i++) {
+                        for(unsigned i = 0; i < tthreads; i++) {
                                 thddata[i].self.post();
                                 fibre_join( threads[i], nullptr );

benchmark/readyQ/locality.rs

@@ -124 +124 @@
                                                 return (r as *mut MyData, true);
                                         }
-                                        let got = self.ptr.compare_and_swap(expected, ctx as *mut MyCtx as u64, Ordering::SeqCst);
-                                        if got == expected {
+                                        let got = self.ptr.compare_exchange_weak(expected, ctx as *mut MyCtx as u64, Ordering::SeqCst, Ordering::SeqCst);
+                                        if got == Ok(expected) {
                                                 break expected;// We got the seat
                                         }

benchmark/readyQ/transfer.cfa

@@ -39 +39 @@
                         Pause();
                         if( (timeHiRes() - start) > 5`s ) {
+                                print_stats_now( bench_cluster, CFA_STATS_READY_Q | CFA_STATS_IO );
                                 serr | "Programs has been blocked for more than 5 secs";
                                 exit(1);
@@ -110 +111 @@
         cfa_option opt[] = {
                 BENCH_OPT,
-                { 'e', "exhaust", "Whether or not threads that have seen the new epoch should yield or park.", exhaust, parse_yesno}
+                { 'e', "exhaust", "Whether or not threads that have seen the new epoch should park instead of yielding.", exhaust, parse_yesno}
         };
         BENCH_OPT_PARSE("cforall transition benchmark");

benchmark/readyQ/transfer.rs

@@ -4 +4 @@
 use std::process;
 use std::option;
+use std::hint;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};
@@ -104 +105 @@
                 debug!( "Waiting for :{} ({})", t.id, t.idx.load(Ordering::Relaxed) );
                 while t.idx.load(Ordering::Relaxed) != idx {
-                        std::sync::atomic::spin_loop_hint();
+                        hint::spin_loop();
                         if start.elapsed() > Duration::from_secs(5) {
                                 eprintln!("Programs has been blocked for more than 5 secs");