Merge branch 'master' of cvs.cs.unc.edu:/cvs/proj/litmus/repo/simple-gnuplot-wrapper

Conflicts:
	gnuplot.py

- Merge to add my "non clean" (ehm.. crappy) support to errorbars in plot_pm.py

5 files changed, 524 insertions, 31 deletions

diff --git a/gnuplot.py b/gnuplot.py
index 4a34d1f..2604cb0 100755
--- a/gnuplot.py
+++ b/gnuplot.py
@@ -16,12 +16,39 @@ class CommandBuffer(object):
     def __str__(self):
         return '\n'.join([str(x) for x in self.cmds])
 
+class FileGraph(object):
+    def __init__(self, fname, xcol=1, ycol=2, error=None,
+                 title=None,
+                 style=None):
+        self.fname = fname
+        self.xcol  = xcol
+        self.ycol  = ycol
+        self.error = error
+        self.title = title
+        self.style = style
+
+    def __str__(self):
+        return self.get_command()
+
+    def get_command(self, default_style=None):
+        if self.error:
+            using_txt = "%s:%s:%s" % (self.xcol, self.ycol, self.error)
+            style     = self.style if self.style else "errorbars"
+        else:
+            using_txt = "%s:%s" % (self.xcol, self.ycol)
+            style     = self.style if self.style else default_style
+        style_txt = " with %s" % style if style else ""
+        title_txt = " title '%s'" % self.title if self.title else ""
+        return "'%s' using %s%s%s" % \
+            (self.fname, using_txt, title_txt, style_txt)
+
 def gnuplot_cmd(graphs, title=None, ylabel=None, xlabel=None,
                 format='show', term_opts=None,
                 style='linespoints', xrange=None,
                 yrange=None,
                 xticks=None, yticks=None,
                 key='below',
+                logscale=None,
                 fname=None):
     g = CommandBuffer()
     if format == 'png':
@@ -57,18 +84,31 @@ def gnuplot_cmd(graphs, title=None, ylabel=None, xlabel=None,
         g("set xtics %s, %s" % xticks)
     if yticks:
         g("set ytics %s, %s" % yticks)
+    if logscale:
+        if type(logscale) == tuple:
+            for x in logscale:
+                g("set logscale %s" % x)
+        else:
+            g("set logscale %s" % logscale)
     g('set key %s' % key)
     plot = []
     for gr in graphs:
-        if len(gr) == 4:
+        if type(gr) == str:
+            # literal plot command
+            plot.append(str(gr))
+        elif type(gr) == FileGraph:
+            # formatter object
+            plot.append(gr.get_command(style))
+        elif len(gr) == 4:
             par = (gr[0], gr[1], gr[2], gr[3], style)
             plot += ["'%s' using %s:%s title '%s' with %s" % par]
         elif len(gr) == 6:
             par = (gr[0], gr[1], gr[2], gr[3], gr[4], style, gr[5])
             plot += ["'%s' using %s:%s:%s:%s with %s title '%s'" % par]
-        else:
-            par = gr
-            plot += ["'%s' using %s:%s title '%s' with %s" % par]
+        elif len(gr) == 5:
+            plot += ["'%s' using %s:%s title '%s' with %s" % gr]
+        elif len(gr) == 3:
+            plot += ["%s title '%s' with %s" % gr]
     if plot:
         g('plot ' + ', '.join(plot))
     if format != 'show' and fname:
diff --git a/plot.py b/plot.py
index 426b77c..6acd1ea 100755
--- a/plot.py
+++ b/plot.py
@@ -11,6 +11,7 @@ options = [
       choices=FORMATS, help='output format'),
     o(None, '--paper', action='store_true', dest='paper'),
     o(None, '--wide', action='store_true', dest='wide'),
+    o(None, '--column', action='store_true', dest='column'),
     o(None, '--split', action='store_true', dest='split'),
     ]
 
@@ -26,6 +27,7 @@ defaults = {
     'paper'  : False,
     'split'  : False,
     'wide'   : False,
+    'column' : False,
     }
 
 def decode(name):
@@ -117,6 +119,27 @@ class SchedPlotter(defapp.App):
                 term_opts=tops,
                 **xtra)
 
+# width  = 3.4in
+# height = 2.0in
+
+    def plot_column(self, graphs, title, name, conf, **xtra):
+        scale = 1.0
+        tops = 'color solid  font "Helvetica,8" linewidth 1.0 ' \
+               'rounded size %.1fin,%.1fin' % (scale * 7.0, scale * 2.0)
+        gnuplot(graphs, title=title,
+                xlabel=self.options.xlabel,
+                ylabel=self.options.ylabel +
+                (' [soft]' if 'soft' in conf else ' [hard]'),
+                xrange=self.options.xrange,
+                yrange=self.options.yrange,
+                xticks=self.options.xticks,
+                yticks=self.options.yticks,
+                format=self.options.format,
+                fname=name,
+                key='right bottom' if '250' in conf else 'right top',
+                term_opts=tops)
+
+
     def plot_paper(self, graphs, title, name, conf, **xtra):
         tops = 'color solid  font "Helvetica,10" linewidth 1.0 rounded size 16cm,8.5cm'
         gnuplot(graphs, title=title,
@@ -283,9 +306,9 @@ class SchedPlotter(defapp.App):
             (tmpfile, 1, 9, 'P-EDF'),
             ]
 
-        self.options.xrange = (-5, 1005)
-        self.options.xticks = (0, 50)
-        self.options.xlabel = "preemption/migration overhead (in us)"
+        self.options.xrange = (-5, 5005)
+        self.options.xticks = (0, 250)
+        self.options.xlabel = "cache-related preemption/migration delay (in us)"
         for (tag, gs) in [('cumulative', graphs), ('weighted', graphs_w)]:
             xname = name + '_' + tag
             self.options.ylabel = tag + ' schedulability'
@@ -293,6 +316,8 @@ class SchedPlotter(defapp.App):
                 self.plot_paper(gs, title, xname, conf)
             elif self.options.wide and self.options.format == 'pdf':
                 self.plot_wide(gs, title, xname, conf)
+            elif self.options.column and self.options.format == 'pdf':
+                self.plot_column(gs, title, xname, conf)
             else:
                 self.plot(gs, title, xname, conf)
 
diff --git a/plot_pm2.py b/plot_pm2.py
index d53a6da..c2fcbf3 100755
--- a/plot_pm2.py
+++ b/plot_pm2.py
@@ -1,17 +1,50 @@
 #!/usr/bin/env python
-import defapp
 from os.path  import splitext, basename
 from optparse import make_option as o
 from tempfile import NamedTemporaryFile as Tmp
 
-import csv
+from collections import defaultdict
+from itertools import izip
+
+import numpy as np
+from util import *
+
+import stats
+import defapp
 
 from plot     import decode
-from gnuplot  import gnuplot, FORMATS
+from gnuplot  import gnuplot, FileGraph, FORMATS
+
+
+
+def ludwig_l2(x, y):
+    # x left column, y right column, or # y left column, x, right column
+    return (x % 8 < 4 and x + 4 == y) or \
+        (y % 8 < 4 and x - 4 == y)
+
+def ludwig_l3(x, y):
+    # same socket
+    # not a a shared L2
+    # not identical
+    return (y % 4) == (x % 4) and \
+        not ludwig_l2(x, y) and \
+        x != y
 
 
 MACHINE_TOPOLOGY = {