Changeset ffec1bf for benchmark/readyQ

Timestamp:

Jul 25, 2022, 2:23:28 PM (3 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

4c48be0, 5cf1228, def751f

Parents:

9e23b446 (diff), 1f950c3b (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) (2 diffs)
• cycle.cfa (modified) (2 diffs)
• cycle.cpp (modified) (2 diffs)
• locality.cfa (modified) (2 diffs)
• locality.cpp (modified) (4 diffs)
• yield.cfa (modified) (2 diffs)
• yield.cpp (modified) (2 diffs)

benchmark/readyQ/churn.cfa

@@ -58 +58 @@
 
                         threads_left = nthreads;
-                        BThrd * threads[nthreads];
+                        BThrd ** threads = alloc(nthreads);
                         for(i; nthreads ) {
                                 BThrd & t = *(threads[i] = malloc());
@@ -90 +90 @@
 
                         free(spots);
+                        free(threads);
                 }
 

benchmark/readyQ/cycle.cfa

@@ -52 +52 @@
                 {
                         threads_left = tthreads;
-                        BThrd * threads[tthreads];
-                        Partner thddata[tthreads];
+                        BThrd **  threads = alloc(tthreads);
+                        Partner * thddata = alloc(tthreads);
                         for(i; tthreads) {
+                                (thddata[i]){};
                                 unsigned pi = (i + nthreads) % tthreads;
                                 thddata[i].next = &thddata[pi].self;
@@ -83 +84 @@
                                 delete(threads[i]);
                         }
+                        free(threads);
+                        free(thddata);
                 }
 

benchmark/readyQ/cycle.cpp

@@ -39 +39 @@
                 {
                         threads_left = tthreads;
-                        Fibre * threads[tthreads];
-                        Partner thddata[tthreads];
+                        Fibre ** threads = new Fibre *[tthreads]();
+                        Partner* thddata = new Partner[tthreads]();
                         for(unsigned i = 0; i < tthreads; i++) {
                                 unsigned pi = (i + nthreads) % tthreads;
@@ -69 +69 @@
                                 global_blocks  += thddata[i].blocks;
                         }
+
+                        delete[](threads);
+                        delete[](thddata);
                 }
 

benchmark/readyQ/locality.cfa

@@ -222 +222 @@
                 threads_left = nprocs;
                 {
-                        MyThread * threads[nthreads];
+                        MyThread ** threads = alloc(nthreads);
                         for(i; nthreads) {
                                 threads[i] = malloc();
@@ -259 +259 @@
                                 free( threads[i] );
                         }
+                        free( threads );
                 }
 

benchmark/readyQ/locality.cpp

@@ -217 +217 @@
         {
                 FibreInit(1, nprocs);
-                MyData * data_arrays[nthreads];
+                MyData ** data_arrays = new MyData *[nthreads]();
                 for(size_t i = 0; i < nthreads; i++) {
                         data_arrays[i] = new MyData( i, wsize );
@@ -228 +228 @@
 
                 threads_left = nthreads - nspots;
-                Fibre * threads[nthreads];
-                MyCtx * thddata[nthreads];
+                Fibre ** threads = new Fibre *[nthreads]();
+                MyCtx ** thddata = new MyCtx *[nthreads]();
                 {
                         for(size_t i = 0; i < nthreads; i++) {
@@ -240 +240 @@
                                         i
                                 );
-                                threads[i] = new Fibre( reinterpret_cast<void (*)(void *)>(thread_main), thddata[i] );
+                                threads[i] = new Fibre();
+                                threads[i]->run( reinterpret_cast<void (*)(MyCtx*)>(thread_main), thddata[i] );
                         }
 
@@ -267 +268 @@
                         delete( data_arrays[i] );
                 }
+                delete[](data_arrays);
 
                 for(size_t i = 0; i < nspots; i++) {
                         delete( spots[i] );
                 }
+
+                delete[](threads);
+                delete[](thddata);
         }
 

benchmark/readyQ/yield.cfa

@@ -34 +34 @@
                 {
                         threads_left = nthreads;
-                        Yielder threads[nthreads];
+                        Yielder * threads = alloc(nthreads);
+                        for(i; nthreads) {
+                                (threads[i]){};
+                        }
+
                         printf("Starting\n");
 
@@ -52 +56 @@
                                 Yielder & y = join( threads[i] );
                                 global_counter += y.count;
+                                ^(threads[i]){};
                         }
+                        free(threads);
                 }
 

benchmark/readyQ/yield.cpp

@@ -33 +33 @@
                 {
                         threads_left = nthreads;
-                        Fibre * threads[nthreads];
+                        Fibre ** threads = new Fibre *[nthreads]();
                         for(unsigned i = 0; i < nthreads; i++) {
                                 threads[i] = new Fibre();
@@ -52 +52 @@
                                 fibre_join( threads[i], nullptr );
                         }
+                        delete[] threads;
                 }