Changeset a3769cc for benchmark/readyQ

Timestamp:

Sep 14, 2021, 10:21:11 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

b8454c6

Parents:

347925c (diff), ebb6158 (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:

• cycle.cpp (modified) (3 diffs)
• cycle.rs (modified) (1 diff)
• locality.rs (modified) (2 diffs)
• transfer.cfa (modified) (2 diffs)
• transfer.rs (added)
• yield.rs (modified) (2 diffs)

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/cycle.rs

@@ -46 +46 @@
 
         let tthreads = nthreads * ring_size;
-        let exp = Arc::new(bench::BenchData::new(options, tthreads));
+        let exp = Arc::new(bench::BenchData::new(options, tthreads, None));
 
         let s = (1000000 as u64).to_formatted_string(&Locale::en);

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
                                         }
@@ -285 +285 @@
         assert_eq!(&s, "1,000,000");
 
-        let exp = Arc::new(bench::BenchData::new(options, nprocs));
+        let exp = Arc::new(bench::BenchData::new(options, nprocs, None));
         let mut results = Result::new();
 

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/yield.rs

@@ -44 +44 @@
         let nprocs    = options.value_of("nprocs").unwrap().parse::<usize>().unwrap();
 
-        let exp = Arc::new(bench::BenchData::new(options, nthreads));
+        let exp = Arc::new(bench::BenchData::new(options, nthreads, None));
 
         let s = (1000000 as u64).to_formatted_string(&Locale::en);
@@ -50 +50 @@
 
         let thddata : Arc<Vec<Arc<Yielder>>> = Arc::new(
-                (0..nthreads).map(|i| {
-                        let pi = (i + nthreads) % nthreads;
+                (0..nthreads).map(|_i| {
                         Arc::new(Yielder{
                                 sem: sync::Semaphore::new(0),