Changeset 0bd6a14

Timestamp:

Apr 27, 2022, 7:37:20 PM (3 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

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

Children:

d24be37a

Parents:

4b2ea0d (diff), e9c5db2 (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

Files:

• plot.py (modified) (7 diffs)
• process-mutilate.py (added)
• rmit.py (modified) (1 diff)

benchmark/plot.py

@@ -22 +22 @@
 
 class Field:
-        def __init__(self, unit, _min):
+        def __init__(self, unit, _min, _log):
                 self.unit = unit
                 self.min  = _min
+                self.log  = _log
 
 field_names = {
-        "ns per ops"           : Field('ns'    , 0),
-        "Number of processors" : Field(''      , 1),
-        "Ops per procs"        : Field('Ops'   , 0),
-        "Ops per threads"      : Field('Ops'   , 0),
-        "ns per ops/procs"     : Field('ns'    , 0),
-        "Number of threads"    : Field('thrd'  , 1),
-        "Total Operations(ops)": Field('Ops'   , 0),
-        "Ops/sec/procs"        : Field('Ops'   , 0),
-        "Total blocks"         : Field('Blocks', 0),
-        "Ops per second"       : Field('Ops'   , 0),
-        "Cycle size (# thrds)" : Field('thrd'  , 1),
-        "Duration (ms)"        : Field('ms'    , 0),
+        "ns per ops"            : Field('ns'    , 0, False),
+        "Number of processors"  : Field(''      , 1, False),
+        "Ops per procs"         : Field('Ops'   , 0, False),
+        "Ops per threads"       : Field('Ops'   , 0, False),
+        "ns per ops/procs"      : Field('ns'    , 0, False),
+        "Number of threads"     : Field('thrd'  , 1, False),
+        "Total Operations(ops)" : Field('Ops'   , 0, False),
+        "Ops/sec/procs"         : Field('Ops'   , 0, False),
+        "Total blocks"          : Field('Blocks', 0, False),
+        "Ops per second"        : Field('Ops'   , 0, False),
+        "Cycle size (# thrds)"  : Field('thrd'  , 1, False),
+        "Duration (ms)"         : Field('ms'    , 0, False),
+        "Target QPS"            : Field('QPS'   , 0, False),
+        "Actual QPS"            : Field('QPS'   , 0, False),
+        "Median Read Latency"   : Field('us'    , 0, True),
+        "Tail Read Latency"     : Field('us'    , 0, True),
+        "Median Update Latency" : Field('us'    , 0, True),
+        "Tail Update Latency"   : Field('us'    , 0, True),
 }
 
@@ -46 +53 @@
         series = {} # scatter data for each individual data point
         groups = {} # data points for x value
+
+        print("Preparing Data")
+
         for entry in in_data:
                 name = entry[0]
@@ -65 +75 @@
                         groups[name][xval].append(yval)
 
+        print("Preparing Lines")
+
         lines = {} # lines from groups with min, max, median, etc.
         for name, data in groups.items():
@@ -78 +90 @@
                         lines[name]['avg'].append(statistics.mean(ys))
 
+        print("Making Plots")
+
         for name, data in series.items():
                 _col = next(colors)
@@ -85 +99 @@
                 plt.plot(lines[name]['x'], lines[name]['med'], '-', color=_col)
 
+        print("Calculating Extremums")
+
         mx = max([max(s['x']) for s in series.values()])
         my = max([max(s['y']) for s in series.values()])
 
+        print("Finishing Plots")
+
         plt.ylabel(y)
-        plt.xlim(field_names[x].min, mx + 0.25)
-        plt.xticks(range(1, math.ceil(mx) + 1))
+        # plt.xticks(range(1, math.ceil(mx) + 1))
         plt.xlabel(x)
-        plt.ylim(field_names[y].min, my*1.2)
         plt.grid(b = True)
         ax.xaxis.set_major_formatter( EngFormatter(unit=field_names[x].unit) )
+        if field_names[x].log:
+                ax.set_xscale('log')
+        else:
+                plt.xlim(field_names[x].min, mx + 0.25)
+
         ax.yaxis.set_major_formatter( EngFormatter(unit=field_names[y].unit) )
+        if field_names[y].log:
+                ax.set_yscale('log')
+        else:
+                plt.ylim(field_names[y].min, my*1.2)
+
         plt.legend(loc='upper left')
+
+        print("Results Ready")
         if out:
                 plt.savefig(out)
@@ -106 +134 @@
         # ================================================================================
         # parse command line arguments
-        parser = parser = argparse.ArgumentParser(description='Python Script to draw R.M.I.T. results')
-        parser.add_argument('-f', '--file', nargs='?', type=argparse.FileType('r'), default=sys.stdin)
-        parser.add_argument('-o', '--out', nargs='?', type=str, default=None)
-        parser.add_argument('-y', nargs='?', type=str, default="")
+        parser = argparse.ArgumentParser(description='Python Script to draw R.M.I.T. results')
+        parser.add_argument('-f', '--file', nargs='?', type=argparse.FileType('r'), default=sys.stdin, help="Input file")
+        parser.add_argument('-o', '--out', nargs='?', type=str, default=None, help="Output file")
+        parser.add_argument('-y', nargs='?', type=str, default="", help="Which field to use as the Y axis")
+        parser.add_argument('-x', nargs='?', type=str, default="", help="Which field to use as the X axis")
 
-        try:
-                options =  parser.parse_args()
-        except:
-                print('ERROR: invalid arguments', file=sys.stderr)
-                parser.print_help(sys.stderr)
-                sys.exit(1)
+        options =  parser.parse_args()
 
         # ================================================================================
@@ -140 +164 @@
         if not options.out :
                 print(series)
-                print("fields")
-                for f in fields:
-                        print("{}".format(f))
+                print("fields: ", ' '.join(fields))
 
-        if options.y and options.y in field_names.keys():
-                plot(data, "Number of processors", options.y, options.out)
-        else:
-                if options.y:
-                        print("Could not find key '{}', defaulting to 'ns per ops'".format(options.y))
-                plot(data, "Number of processors", "ns per ops", options.out)
+        wantx = "Number of processors"
+        wanty = "ns per ops"
+
+        if options.x:
+                if options.x in field_names.keys():
+                        wantx = options.x
+                else:
+                        print("Could not find X key '{}', defaulting to '{}'".format(options.x, wantx))
+
+        if options.y:
+                if options.y in field_names.keys():
+                        wanty = options.y
+                else:
+                        print("Could not find Y key '{}', defaulting to '{}'".format(options.y, wanty))
+
+
+        plot(data, wantx, wanty, options.out)

benchmark/rmit.py

@@ -281 +281 @@
 
         if options.file != sys.stdout:
-                print("Done                                                                                ")
+                print("Done");                                                                                ")