Changeset 2a301ff for doc/theses/colby_parsons_MMAth/benchmarks/waituntil/run

Timestamp:

Aug 31, 2023, 11:31:15 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

• doc/theses/colby_parsons_MMAth/benchmarks/waituntil/run (modified) (4 diffs)

doc/theses/colby_parsons_MMAth/benchmarks/waituntil/run

@@ -85 +85 @@
 }
 
-# numtimes=5
-numtimes=1
+numtimes=5
+# numtimes=1
 
 # num_threads='2 4 8 16 24 32'
-# side_chan_threads='6 12 18 24 30' # must be mults of 6
+side_chan_threads='6 12 18 24 30' # must be mults of 6
 num_threads='2'
-side_chan_threads='6'
+# side_chan_threads='6'
 
 chan_size='10'
 future_time='10'
+future_flags=('-DOR' '-DAND3' '-DANDOR' '-DORAND')
+future_names=('OR' 'AND' 'ANDOR' 'ORAND')
 
 # toggle benchmarks
@@ -101 +103 @@
 sidechan=${true}
 future=${true}
+order=${true}
 spin=${false}
 contend=${false}
 sidechan=${false}
-# future=${false}
+future=${false}
+# order=${false}
 
 runCFA=${true}
 runGO=${true}
-runUCPP=${true}
+# runUCPP=${true}
 # runCFA=${false}
-runGO=${false}
-# runUCPP=${false}
+# runGO=${false}
+runUCPP=${false}
 
 cfa=~/cfa-cc/driver/cfa
@@ -163 +167 @@
 }
 
+run_order() {
+    affinity 4
+    preprint="4\t"
+    repeat_command taskset -c ${taskset} ./a.${hostname}
+}
+
 run_future() {
-    for p in ${num_threads} ; do
-        pre_args=$(( ${p} - 1 ))
-        affinity ${p}
-        preprint="${p}\t"
-        repeat_command taskset -c ${taskset} ./a.${hostname} ${pre_args} ${post_args}
-    done
+    affinity 2
+    preprint="2\t"
+    repeat_command taskset -c ${taskset} ./a.${hostname} ${post_args}
 }
 
@@ -262 +269 @@
 
 if [ ${future} -eq ${true} ] ; then
-    echo "future: "
     post_args=${future_time}
+    for i in ${!future_flags[@]}; do
+        echo 'future '${future_names[$i]}':'
+        if [ ${runCFA} -eq ${true} ] ; then
+            cd cfa # CFA RUN
+            print_header 'CFA'
+            ${cfa} ${cfa_flags} ${future_flags[$i]} future.cfa -o a.${hostname} > /dev/null 2>&1
+            run_future
+            rm a.${hostname}
+            cd - > /dev/null
+        fi # done CFA
+
+        if [ ${runUCPP} -eq ${true} ] ; then
+            cd ucpp
+            print_header 'uC++'
+            ${UCPP} ${UCPPflags} ${future_flags[$i]} future.cc -o a.${hostname} > /dev/null 2>&1
+            run_future
+            rm a.${hostname}
+            cd - > /dev/null
+        fi # done Go
+    done
+fi
+
+if [ ${order} -eq ${true} ] ; then
+    echo "order: "
+    post_args=${chan_size}
     if [ ${runCFA} -eq ${true} ] ; then
         cd cfa # CFA RUN
         print_header 'CFA'
-        ${cfa} ${cfa_flags} future.cfa -o a.${hostname} > /dev/null 2>&1
-        run_future
+        ${cfa} ${cfa_flags} order.cfa -o a.${hostname} > /dev/null 2>&1
+        run_order
         rm a.${hostname}
         cd - > /dev/null
     fi # done CFA
 
-    if [ ${runUCPP} -eq ${true} ] ; then
-        cd ucpp
-        print_header 'uC++'
-        ${UCPP} ${UCPPflags} future.cc -o a.${hostname} > /dev/null 2>&1
-        run_future
+    if [ ${runGO} -eq ${true} ] ; then
+        cd go/order
+        print_header 'Go'
+        go build -o a.${hostname} > /dev/null 2>&1
+        run_order
         rm a.${hostname}
         cd - > /dev/null
     fi # done Go
 fi
-