Changeset eb47a80 for doc/theses/colby_parsons_MMAth/benchmarks/channels/plotData.py

Timestamp:

Mar 30, 2023, 9:48:06 PM (13 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

0b66ef9

Parents:

70056ed (diff), 6e83384 (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

File:

• doc/theses/colby_parsons_MMAth/benchmarks/channels/plotData.py (modified) (4 diffs)

doc/theses/colby_parsons_MMAth/benchmarks/channels/plotData.py

@@ -36 +36 @@
     procs.append(int(val))
 
-# 3rd line has num locks args
-line = readfile.readline()
-locks = []
-for val in line.split():
-    locks.append(int(val))
-
-# 4th line has number of variants
+# 3rd line has number of variants
 line = readfile.readline()
 names = line.split()
@@ -50 +44 @@
 lines = (line for line in lines if line) # Non-blank lines
 
+class Bench(Enum):
+    Unset = 0
+    Contend = 1
+    Zero = 2
+    Barrier = 3
+    Churn = 4
+    Daisy_Chain = 5
+    Hot_Potato = 6
+    Pub_Sub = 7
+
 nameSet = False
-currLocks = -1 # default val
+currBench = Bench.Unset # default val
 count = 0
 procCount = 0
 currVariant = 0
-name = "Aggregate Lock"
+name = ""
 var_name = ""
 sendData = [0.0 for j in range(numVariants)]
@@ -64 +68 @@
     # print(line)
     
-    if currLocks == -1:
-        lineArr = line.split()
-        currLocks = lineArr[-1]
+    if currBench == Bench.Unset:
+        if line == "contend:":
+            name = "Contend"
+            currBench = Bench.Contend
+        elif line == "zero:":
+            name = "Zero"
+            currBench = Bench.Zero
+        elif line == "barrier:":
+            name = "Barrier"
+            currBench = Bench.Barrier
+        elif line == "churn:":
+            name = "Churn"
+            currBench = Bench.Churn
+        elif line == "daisy_chain:":
+            name = "Daisy_Chain"
+            currBench = Bench.Daisy_Chain
+        elif line == "hot_potato:":
+            name = "Hot_Potato"
+            currBench = Bench.Hot_Potato
+        elif line == "pub_sub:":
+            name = "Pub_Sub"
+            currBench = Bench.Pub_Sub
+        else:
+            print("Expected benchmark name")
+            print("Line: " + line)
+            sys.exit()
         continue
 
@@ -95 +122 @@
             if currVariant == numVariants:
                 fig, ax = plt.subplots()
-                plt.title(name + " Benchmark: " + str(currLocks) + " Locks")
-                plt.ylabel("Throughput (entries)")
+                plt.title(name + " Benchmark")
+                plt.ylabel("Throughput (channel operations)")
                 plt.xlabel("Cores")
                 for idx, arr in enumerate(data):
                     plt.errorbar( procs, arr, [bars[idx][0], bars[idx][1]], capsize=2, marker='o' )
+                
                 plt.yscale("log")
+                # plt.ylim(1, None)
+                # ax.get_yaxis().set_major_formatter(ticks.ScalarFormatter())
+                # else:
+                #     plt.ylim(0, None)
                 plt.xticks(procs)
                 ax.legend(names)
-                # fig.savefig("plots/" + machineName + "Aggregate_Lock_" + str(currLocks) + ".png")
-                plt.savefig("plots/" + machineName + "Aggregate_Lock_" + str(currLocks) + ".pgf")
+                # fig.savefig("plots/" + machineName + name + ".png")
+                plt.savefig("plots/" + machineName + name + ".pgf")
                 fig.clf()
 
                 # reset
-                currLocks = -1
+                currBench = Bench.Unset
                 currVariant = 0