Changes in / [eac318a:60e14fc]

Location:

doc/theses/colby_parsons_MMAth/benchmarks/mutex_stmt

Files:

• bench.h (modified) (2 diffs)
• cfa/baseline.cfa (deleted)
• cfa/order-basic.cfa (added)
• cfa/order.cfa (modified) (2 diffs)
• cfa/rand.cfa (deleted)
• cpp/baseline.cc (deleted)
• cpp/order-basic.cc (added)
• cpp/rand.cc (deleted)
• run (modified) (6 diffs)

doc/theses/colby_parsons_MMAth/benchmarks/mutex_stmt/bench.h

@@ -47 +47 @@
 #endif
 
-size_t threads = 1, num_locks = -1;
+size_t threads = 1;
 
 #define BENCH_START()                           \
-        if ( argc > 3 ) exit( EXIT_FAILURE );   \
+        if ( argc > 2 ) exit( EXIT_FAILURE );   \
         if ( argc == 2 ) {                      \
                 threads = atoi( argv[1] );      \
-        } else if ( argc == 3 ) {                       \
-                threads = atoi( argv[1] );      \
-        num_locks = atoi( argv[2] );    \
         }
 
@@ -80 +77 @@
 }
 #endif
-
-// splitmix64 rand num generator
-// https://rosettacode.org/wiki/Pseudo-random_numbers/Splitmix64
-uint64_t state;                                  /* The state can be seeded with any (upto) 64 bit integer value. */
-
-uint64_t next_int() {
-    state += 0x9e3779b97f4a7c15;               /* increment the state variable */
-    uint64_t z = state;                          /* copy the state to a working variable */
-    z = (z ^ (z >> 30)) * 0xbf58476d1ce4e5b9;  /* xor the variable with the variable right bit shifted 30 then multiply by a constant */
-    z = (z ^ (z >> 27)) * 0x94d049bb133111eb;  /* xor the variable with the variable right bit shifted 27 then multiply by a constant */
-    return z ^ (z >> 31);                      /* return the variable xored with itself right bit shifted 31 */
-}
-

doc/theses/colby_parsons_MMAth/benchmarks/mutex_stmt/cfa/order.cfa

@@ -10 +10 @@
 uint64_t total = 0;
 thread worker {};
-static inline void ?{}( worker & this, cluster & clu ) {
-    ((thread &)this){ clu };
-}
 void main( worker & w ) {
     BENCH( mutex ( LOCKS ) { }, total, done )
@@ -19 +16 @@
 int main( int argc, char * argv[] ) {
         BENCH_START()
-    cluster clus;
-    processor * proc[threads];
-    for ( i; threads ) // create procs
-        (*(proc[i] = alloc())){clus};
-
-    worker * w[threads];
-    for ( i; threads ) // create threads
-        (*(w[i] = alloc())){ clus };
-    
-    sleep( 10`s );
-    done = true;
-
-    for ( i; threads ) // delete threads
-        delete(w[i]);
-
-    for ( i; threads ) // delete procs
-        delete(proc[i]);
+    processor p[threads]; // one extra for main thread
+    {
+        worker w[threads];
+        sleep( 10`s );
+        done = true;
+    }
         printf( "%lu\n", total );
 }

doc/theses/colby_parsons_MMAth/benchmarks/mutex_stmt/run

@@ -85 +85 @@
 }
 
-numtimes=11
+numtimes=1
 
 # locks=('-DLOCKS=L1' '-DLOCKS=L2' '-DLOCKS=L3' '-DLOCKS=L4' '-DLOCKS=L5' '-DLOCKS=L6' '-DLOCKS=L7' '-DLOCKS=L8')
@@ -92 +92 @@
 locks=('2' '4' '8')
 
-num_threads='2 4 8 16 24 32'
-# num_threads='2 4 8'
+# num_threads='2 4 8 16 24 32'
+num_threads='2 4 8'
 
 # toggle benchmarks
 order=${true}
-rand=${true}
-baseline=${true}
 
 runCFA=${true}
@@ -158 +156 @@
 
 if [ ${runCFA} -eq ${true} ] ; then
-    if [ ${order} -eq ${true} ] ; then
-        echo -n 'CFA-order '
-    fi
-    if [ ${baseline} -eq ${true} ] ; then
-        echo -n 'CFA-baseline '
-    fi
-    if [ ${rand} -eq ${true} ] ; then
-        echo -n 'CFA-rand '
-    fi
+    echo -n 'CFA '
 fi # done CFA
 if [ ${runCPP} -eq ${true} ] ; then
-    if [ ${order} -eq ${true} ] ; then
-        echo -n 'CPP-order '
-    fi
-    if [ ${baseline} -eq ${true} ] ; then
-        echo -n 'CPP-baseline '
-    fi
-    if [ ${rand} -eq ${true} ] ; then
-        echo -n 'CPP-rand '
-    fi
+    echo -n 'CPP '
 fi # done CPP
 echo ""
@@ -192 +174 @@
 
 run_order() {
-    echo "locks: "${1}
-    post_args=${1}
+    echo "order locks: "${1}
 
     if [ ${runCFA} -eq ${true} ] ; then
         cd cfa # CFA RUN
-        print_header 'CFA-'${3}
-        ${cfa} ${cfa_flags} ${2} ${3}.cfa -o a.${hostname} > /dev/null 2>&1
+        print_header 'CFA'${3}
+        ${cfa} ${cfa_flags} ${2} order${3}.cfa -o a.${hostname} > /dev/null 2>&1
         run_bench
         rm a.${hostname}
@@ -206 +187 @@
     if [ ${runCPP} -eq ${true} ] ; then
         cd cpp # CPP RUN
-        print_header 'CPP-'${3}
-        ${cpp} ${cpp_flags} ${2} ${3}.cc -o a.${hostname} > /dev/null 2>&1
+        print_header 'CPP'${3}
+        ${cpp} ${cpp_flags} ${2} order${3}.cc -o a.${hostname} > /dev/null 2>&1
         run_bench
         rm a.${hostname}
@@ -215 +196 @@
 
 # /usr/bin/time -f "%Uu %Ss %Er %Mkb"
-
-for i in ${!locks[@]}; do
-    if [ ${order} -eq ${true} ] ; then
-        run_order ${locks[$i]} ${lock_flags[$i]} 'order'
-    fi
-    if [ ${baseline} -eq ${true} ] ; then
-        run_order ${locks[$i]} ${lock_flags[$i]} 'baseline'
-    fi
-    if [ ${rand} -eq ${true} ] ; then
-        run_order ${locks[$i]} '-DLOCKS=L8' 'rand'
-    fi
-done
-
-
+if [ ${order} -eq ${true} ] ; then
+    for i in ${!locks[@]}; do
+        run_order ${locks[$i]} ${lock_flags[$i]} ''
+        run_order ${locks[$i]} ${lock_flags[$i]} '-basic'
+    done
+fi
+