1 files changed, 24 insertions, 1 deletions

diff --git a/plot_pm2.py b/plot_pm2.py
index d53a6da..d7d6536 100755
--- a/plot_pm2.py
+++ b/plot_pm2.py
@@ -10,8 +10,26 @@ from plot     import decode
 from gnuplot  import gnuplot, FORMATS
 
 
+
+
 MACHINE_TOPOLOGY = {
-    'jupiter-cs' : (4, [('preempt', lambda x, y: x == y), ('mem', lambda x, y: x != y)])
+    'jupiter-cs' : (4, [('preempt', lambda x, y: x == y),
+                        ('mem', lambda x, y: x != y)]),
+
+    # Socket0  Socket1  Socket2  Socket3
+    # ------   -------  -------  -------
+    # | 0, 4|  | 1, 5|  | 2, 6|  | 3, 7|
+    # | 8,12|  | 9,13|  |10,14|  |11,15|
+    # |16,20|  |17,21|  |18,22|  |19,23|
+    # -------  -------  -------  -------
+    'ludwig.cs.unc.edu' : (24, [('preempt', lambda x, y: x == y),
+                                ('l2',
+                                 lambda x, y: abs(y - x) == 4),
+                                ('l3',
+                                 lambda x, y:
+                                     abs(y - x) > 4 and \
+                                     abs(y - x) % 4 == 0),
+                                ('mem', lambda x, y: abs(y - x) % 4 != 0)])
 }
 
 PMO_PARAM = {
@@ -22,6 +40,8 @@ PMO_PARAM = {
 
 PMO_MEM = {
     'mem'     : 'a migration through main memory',
+    'l3'      : 'a migration through a shared L3 cache',
+    'l2'      : 'a migration through a shared L2 cache',
     'preempt' : 'a preemption',
     'all'     : 'either a migration or preemption',
 }
@@ -108,6 +128,9 @@ class CyclePlotter(defapp.App):
 
     def plot_preempt_migrate(self, datafile, name, conf):
         plots = self.setup_pmo_graphs(datafile, conf)
+        if plots is None:
+            print "Skipping %s..." % datafile
+            return
         for (tmp, xcol, ycol, yminus, tag) in plots:
             xtag = PMO_COL_LABEL[xcol][1]
             ytag = PMO_COL_LABEL[ycol][1]