Changeset 9791ab5

Timestamp:

Jun 24, 2020, 4:57:42 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

8b58bae

Parents:

564148f

Message:

Harmonized readv and yield benchmark

Location:

benchmark

Files:

• benchcltr.hfa (modified) (2 diffs)
• io/readv.cfa (modified) (3 diffs)
• readyQ/yield.cfa (modified) (3 diffs)

benchmark/benchcltr.hfa

@@ -10 +10 @@
 };
 
-void ?{}( BenchCluster & this ) {
-      (this.self){ "Benchmark Cluster" };
+void ?{}( BenchCluster & this, int flags ) {
+      (this.self){ "Benchmark Cluster", flags };
 
       assert( the_benchmark_cluster == 0p );
@@ -26 +26 @@
 }
 
-
+void wait(double duration, Time & start, Time & end, bool is_tty) {
+      for() {
+            sleep(500`ms);
+            end = getTime();
+            if( (end - start) >= duration`s ) {
+                  break;
+            }
+            if(is_tty) {
+                  printf("\r%.4lf", (double)(end - start)`s);
+                  fflush(stdout);
+            }
+      }
+}

benchmark/io/readv.cfa

@@ -17 +17 @@
 #include <time.hfa>
 
+#include "../benchcltr.hfa"
+
 extern bool traceHeapOn();
 extern ssize_t cfa_preadv2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags);
@@ -26 +28 @@
 unsigned long int buflen = 50;
 
-cluster * the_cluster;
-
-thread Reader {};
+thread __attribute__((aligned(128))) Reader {};
 void ?{}( Reader & this ) {
-        ((thread&)this){ "Reader Thread", *the_cluster };
-}
-
-struct my_processor {
-        processor p;
-};
-
-void ?{}( my_processor & this ) {
-        (this.p){ "I/O Processor", *the_cluster };
+        ((thread&)this){ "Reader Thread", *the_benchmark_cluster };
 }
 
 void main( Reader & ) {
-        while(!__atomic_load_n(&run, __ATOMIC_RELAXED)) yield();
+        park( __cfaabi_dbg_ctx );
+        /* paranoid */ assert( true == __atomic_load_n(&run, __ATOMIC_RELAXED) );
 
         char data[buflen];
@@ -153 +146 @@
         {
                 Time start, end;
-                cluster cl = { "IO Cluster", flags };
-                the_cluster = &cl;
+                BenchCluster cl = { flags };
                 #if !defined(__CFA_NO_STATISTICS__)
-                        print_stats_at_exit( cl );
+                        print_stats_at_exit( cl.self );
                 #endif
                 {
-                        my_processor procs[nprocs];
+                        BenchProc procs[nprocs];
                         {
                                 Reader threads[nthreads];
 
                                 printf("Starting\n");
+                                bool is_tty = isatty(STDOUT_FILENO);
                                 start = getTime();
                                 run = true;
-                                do {
-                                        sleep(500`ms);
-                                        end = getTime();
-                                } while( (end - start) < duration`s );
+
+                                for(i; nthreads) {
+                                        unpark( threads[i] __cfaabi_dbg_ctx2 );
+                                }
+                                wait(duration, start, end, is_tty);
+
                                 run = false;
                                 end = getTime();
-                                printf("Done\n");
+                                printf("\nDone\n");
                         }
                 }

benchmark/readyQ/yield.cfa

@@ -105 +105 @@
 
                 Time start, end;
-                BenchCluster cl;
+                BenchCluster cl = { 0 };
                 #if !defined(__CFA_NO_STATISTICS__)
                         print_stats_at_exit( cl.self );
@@ -113 +113 @@
                         {
                                 Yielder threads[nthreads];
+                                printf("Starting\n");
+
                                 bool is_tty = isatty(STDOUT_FILENO);
-                                printf("Starting\n");
                                 start = getTime();
                                 run = true;
@@ -121 +122 @@
                                         unpark( threads[i] __cfaabi_dbg_ctx2 );
                                 }
-                                for() {
-                                        sleep(500`ms);
-                                        end = getTime();
-                                        if( (end - start) >= duration`s ) {
-                                                break;
-                                        }
-                                        if(is_tty) {
-                                                printf("\r%.4lf", (double)(end - start)`s);
-                                                fflush(stdout);
-                                        }
-                                }
+                                wait(duration, start, end, is_tty);
 
                                 run = false;
                                 end = getTime();
-                                printf("Done\n");
+                                printf("\nDone\n");
                         }
                 }