Fix stupid, stupid bug that assigned some samples incorrectly to L2 sharing.

1 files changed, 15 insertions, 6 deletions

diff --git a/plot_pm2.py b/plot_pm2.py
index 40e6a63..c2fcbf3 100755
--- a/plot_pm2.py
+++ b/plot_pm2.py
@@ -17,6 +17,19 @@ 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 = {
     'jupiter-cs' : (4, [('preempt', lambda x, y: x == y),
@@ -29,12 +42,8 @@ MACHINE_TOPOLOGY = {
     # |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),
+                                ('l2', ludwig_l2),
+                                ('l3', ludwig_l3),
                                 ('mem', lambda x, y: abs(y - x) % 4 != 0)])
 }