Changeset 76a8400

Timestamp:

Mar 30, 2023, 4:01:02 PM (13 months ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

e2f827f

Parents:

a45e21c

Message:

added all cfa benchmarks, contend is the only one used in the thesis, but other may be used later so Im keeping them around

Location:

doc/theses/colby_parsons_MMAth/benchmarks/channels/cfa

Files:

• barrier.cfa (added)
• churn.cfa (added)
• contend.cfa (modified) (9 diffs)
• daisy_chain.cfa (added)
• hot_potato.cfa (added)
• ping_pong.cfa (added)
• pub_sub.cfa (added)

doc/theses/colby_parsons_MMAth/benchmarks/channels/cfa/contend.cfa

@@ -8 +8 @@
 
 // user defines this
-#define BIG 1
+// #define BIG 1
 
 owner_lock o;
 
-unsigned long long total_operations = 0;
+size_t total_operations = 0;
 
 struct bigObject {
@@ -36 +36 @@
 Channel * channels;
 
-volatile bool cons_done = false, prod_done = false;
+bool cons_done = false, prod_done = false;
 volatile int cons_done_count = 0;
 size_t cons_check = 0, prod_check = 0;
@@ -48 +48 @@
 }
 void main(Consumer & this) {
-    unsigned long long runs = 0;
+    size_t runs = 0;
     size_t my_check = 0;
     for ( ;; ) {
@@ -78 +78 @@
 }
 void main(Producer & this) {
-    unsigned long long runs = 0;
+    size_t runs = 0;
     size_t my_check = 0;
+    size_t my_id = this.i;
     for ( ;; ) {
         if ( prod_done ) break;
         #ifdef BIG
         bigObject j{(size_t)runs};
-        insert( channels[ this.i ], j );
+        insert( channels[ my_id ], j );
         my_check = my_check ^ (j.a + j.b + j.c + j.d + j.d + j.e + j.f + j.g + j.h);
         #else
-        insert( channels[ this.i ], (size_t)runs );
+        insert( channels[ my_id ], (size_t)runs );
         my_check = my_check ^ ((size_t)runs);
         #endif
@@ -99 +100 @@
 }
 
-int test( size_t Processors, size_t Channels, size_t Producers, size_t Consumers, size_t ChannelSize ) {
-    size_t Clusters = Processors;
+static inline int test( size_t Processors, size_t Channels, size_t Producers, size_t Consumers, size_t ChannelSize ) {
+    size_t Clusters = 1;
     // create a cluster
     cluster clus[Clusters];
     processor * proc[Processors];
     for ( i; Processors ) {
-        (*(proc[i] = alloc())){clus[i % Clusters]};
+        (*(proc[i] = malloc())){clus[i % Clusters]};
     }
 
@@ -120 +121 @@
     Producer * p[Producers * Channels];
 
-    for ( i; Consumers * Channels ) {
-        (*(c[i] = alloc())){ i % Channels, clus[i % Clusters] };
-    }
-
-    for ( i; Producers * Channels ) {
-        (*(p[i] = alloc())){ i % Channels, clus[i % Clusters] };
+    for ( j; Channels ) {
+        for ( i; Producers ) {
+            (*(p[i] = malloc())){ j, clus[j % Clusters] };
+        }
+
+        for ( i; Consumers ) {
+            (*(c[i] = malloc())){ j, clus[j % Clusters] };
+        }
     }
 
@@ -148 +151 @@
             }
         }
-        
     }
 
@@ -185 +187 @@
 
 int main( int argc, char * argv[] ) {
-    size_t Processors = 10, Channels = 1, Producers = 10, Consumers = 10, ChannelSize = 128;
+    size_t Processors = 1, Channels = 1, Producers = 1, Consumers = 1, ChannelSize = 128;
     switch ( argc ) {
           case 3:
@@ -206 +208 @@
                 exit( EXIT_FAILURE );
         } // switch
-    Producers = Processors;
-    Consumers = Processors;
+    Producers = Processors / 2;
+    Consumers = Processors / 2;
     test(Processors, Channels, Producers, Consumers, ChannelSize);
 }