toplev: Revert Stores_Bound to old formula

andikleen · Aug 26, 2015 · 61d2f63 · 61d2f63
1 parent 78b52f6
commit 61d2f63
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/bdw_client_ratios.py b/bdw_client_ratios.py
@@ -976,7 +976,7 @@ class Stores_Bound:
     sibling = None
     def compute(self, EV):
         try:
-	    self.val = (EV("RESOURCE_STALLS.SB", 3) - EV("CYCLE_ACTIVITY.STALLS_MEM_ANY", 3)) / CLKS(EV, 3 )
+	    self.val = EV("RESOURCE_STALLS.SB", 3) / EV("CPU_CLK_UNHALTED.THREAD", 3)
             self.thresh = (self.val > 0.2) and self.parent.thresh
         except ZeroDivisionError:
             print_error("Stores_Bound zero division")

diff --git a/hsw_client_ratios.py b/hsw_client_ratios.py
@@ -1048,7 +1048,7 @@ class Stores_Bound:
     sibling = None
     def compute(self, EV):
         try:
-	    self.val = (EV("RESOURCE_STALLS.SB", 3) - STALLS_MEM_ANY(EV, 3)) / CLKS(EV, 3 )
+	    self.val = EV("RESOURCE_STALLS.SB", 3) / EV("CPU_CLK_UNHALTED.THREAD", 3)
             self.thresh = (self.val > 0.2) and self.parent.thresh
         except ZeroDivisionError:
             print_error("Stores_Bound zero division")

diff --git a/hsx_server_ratios.py b/hsx_server_ratios.py
@@ -1124,7 +1124,7 @@ class Stores_Bound:
     sibling = None
     def compute(self, EV):
         try:
-	    self.val = (EV("RESOURCE_STALLS.SB", 3) - STALLS_MEM_ANY(EV, 3)) / CLKS(EV, 3 )
+	    self.val = EV("RESOURCE_STALLS.SB", 3) / EV("CPU_CLK_UNHALTED.THREAD", 3)
             self.thresh = (self.val > 0.2) and self.parent.thresh
         except ZeroDivisionError:
             print_error("Stores_Bound zero division")

diff --git a/ivb_client_ratios.py b/ivb_client_ratios.py
@@ -1027,7 +1027,7 @@ class Stores_Bound:
     sibling = None
     def compute(self, EV):
         try:
-            self.val = self.Memory_Bound.compute(EV) - STALLS_MEM_ANY(EV, 3) / CLKS(EV, 3 )
+	    self.val = EV("RESOURCE_STALLS.SB", 3) / EV("CPU_CLK_UNHALTED.THREAD", 3)
             self.thresh = (self.val > 0.2) and self.parent.thresh
         except ZeroDivisionError:
             print_error("Stores_Bound zero division")

diff --git a/ivb_server_ratios.py b/ivb_server_ratios.py
@@ -1099,7 +1099,7 @@ class Stores_Bound:
     sibling = None
     def compute(self, EV):
         try:
-            self.val = self.Memory_Bound.compute(EV) - STALLS_MEM_ANY(EV, 3) / CLKS(EV, 3 )
+	    self.val = EV("RESOURCE_STALLS.SB", 3) / EV("CPU_CLK_UNHALTED.THREAD", 3)
             self.thresh = (self.val > 0.2) and self.parent.thresh
         except ZeroDivisionError:
             print_error("Stores_Bound zero division")