toplev: Support new error handling in simple_ratios

knweiss · Mar 25, 2015 · d431879 · d431879
1 parent 307b412
commit d431879
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/simple_ratios.py b/simple_ratios.py
@@ -2,6 +2,8 @@
 # Simple 5 event top level model
 #
 
+print_error = lambda msg: False
+
 # Constants
 
 PipelineWidth = 4
@@ -95,36 +97,42 @@ class Metric_IPC:
     name = "IPC"
     desc = """
 Instructions Per Cycle"""
+    errcount = 0
 
     def compute(self, EV):
         try:
             self.val = IPC(EV, 0)
         except ZeroDivisionError:
-            print "IPC zero division"
+            print_error("IPC zero division")
+            self.errcount += 1
             self.val = 0
 
 class Metric_UPI:
     name = "UPI"
     desc = """
 Uops Per Instruction"""
+    errcount = 0
 
     def compute(self, EV):
         try:
             self.val = UPI(EV, 0)
         except ZeroDivisionError:
-            print "UPI zero division"
+            print_error("UPI zero division")
+            self.errcount += 1
             self.val = 0
 
 class Metric_TurboUtilization:
     name = "TurboUtilization"
     desc = """
 Average Frequency Utilization relative nominal frequency"""
+    errcount = 0
 
     def compute(self, EV):
         try:
             self.val = TurboUtilization(EV, 0)
         except ZeroDivisionError:
-            print "TurboUtilization zero division"
+            print_error("TurboUtilization zero division")
+            self.errcount += 1
             self.val = 0
 
 class Setup:

diff --git a/toplev.py b/toplev.py
@@ -1362,6 +1362,7 @@ def ht_warning():
     if detailed_model:
         print >>sys.stderr, "Sorry, no detailed model for your CPU. Only Level 1 supported."
     import simple_ratios
+    simple_ratios.print_error = pe
     simple_ratios.Setup(runner)
 
 def setup_with_metrics(p, runner):