Fix MSR module and offcore events

knweiss · Jan 21, 2015 · 4960720 · 4960720
1 parent 2d3192f
commit 4960720
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/msr.py b/msr.py
@@ -3,6 +3,7 @@
 # Author: Andi Kleen
 import glob
 import struct
+import os
 
 def writemsr(msr, val):
     n = glob.glob('/dev/cpu/*/msr')

diff --git a/ocperf.py b/ocperf.py
@@ -464,11 +464,12 @@ def add_offcore(self, name):
         def create_event(req_name, req_val, req_desc, res_name, res_val, res_desc):
             oe = copy.deepcopy(offcore_response)
             oe.name = ("OFFCORE_RESPONSE.%s.%s" % (req_name, res_name)).lower()
-            oe.msr = 0x1a6
             oe.msrval = int(req_val, 16) | int(res_val, 16)
             oe.desc = req_desc + " " + res_desc
             if version.offcore:
                 oe.newextra = ",offcore_rsp=0x%x" % (oe.msrval, )
+            else:
+                oe.msr = 0x1a6
             self.add_event(oe)
 
         for a, b in itertools.product(requests, responses):