From: Nikos Nikoleris <nikos.nikoleris@arm.com>
Date: Tue, 7 Apr 2020 14:43:23 +0000 (+0100)
Subject: configs: Change fs_power.py to use absolute paths for stats
X-Git-Tag: v20.0.0.0~100
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=84003b7cc702e350e470b047d03774079a803844;p=gem5.git

configs: Change fs_power.py to use absolute paths for stats

fs_power.py is an example script that demonstrates how power models
can be used with gem5. Previously, the formulas used to calculate the
dynamic and static power of the cores and the L2 cache were using
stats in equations as determined by their path relative to the
SimObject where the power model is attached to or full paths. This CL
changes these formulas to refer to the stats only by their full paths.

Change-Id: I91ea16c88c6a884fce90fd4cd2dfabcba4a1326c
Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27893
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/configs/example/arm/fs_power.py b/configs/example/arm/fs_power.py
index 13afe9088..abc759e22 100644
--- a/configs/example/arm/fs_power.py
+++ b/configs/example/arm/fs_power.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 ARM Limited
+# Copyright (c) 2017, 2020 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -49,42 +49,52 @@ import fs_bigLITTLE as bL
 
 
 class CpuPowerOn(MathExprPowerModel):
-    # 2A per IPC, 3pA per cache miss
-    # and then convert to Watt
-    dyn = "voltage * (2 * ipc + " \
-            "3 * 0.000000001 * dcache.overall_misses / sim_seconds)"
-    st = "4 * temp"
+    def __init__(self, cpu_path, **kwargs):
+        super(CpuPowerOn, self).__init__(**kwargs)
+        # 2A per IPC, 3pA per cache miss
+        # and then convert to Watt
+        self.dyn =  "voltage * (2 * {}.ipc + 3 * 0.000000001 * " \
+                    "{}.dcache.overall_misses / sim_seconds)".format(cpu_path,
+                                                                     cpu_path)
+        self.st = "4 * temp"
 
 class CpuPowerOff(MathExprPowerModel):
     dyn = "0"
     st = "0"
 
 class CpuPowerModel(PowerModel):
-    pm = [
-        CpuPowerOn(), # ON
-        CpuPowerOff(), # CLK_GATED
-        CpuPowerOff(), # SRAM_RETENTION
-        CpuPowerOff(), # OFF
-    ]
+    def __init__(self, cpu_path, **kwargs):
+        super(CpuPowerModel, self).__init__(**kwargs)
+        self.pm = [
+            CpuPowerOn(cpu_path), # ON
+            CpuPowerOff(), # CLK_GATED
+            CpuPowerOff(), # SRAM_RETENTION
+            CpuPowerOff(), # OFF
+        ]
 
 class L2PowerOn(MathExprPowerModel):
-    # Example to report l2 Cache overall_accesses
-    # The estimated power is converted to Watt and will vary based on the size of the cache
-    dyn = "overall_accesses*0.000018000"
-    st = "(voltage * 3)/10"
+    def __init__(self, l2_path, **kwargs):
+        super(L2PowerOn, self).__init__(**kwargs)
+        # Example to report l2 Cache overall_accesses
+        # The estimated power is converted to Watt and will vary based
+        # on the size of the cache
+        self.dyn = "{}.overall_accesses * 0.000018000".format(l2_path)
+        self.st = "(voltage * 3)/10"
 
 class L2PowerOff(MathExprPowerModel):
     dyn = "0"
     st = "0"
 
 class L2PowerModel(PowerModel):
-    # Choose a power model for every power state
-    pm = [
-        L2PowerOn(), # ON
-        L2PowerOff(), # CLK_GATED
-        L2PowerOff(), # SRAM_RETENTION
-        L2PowerOff(), # OFF
-    ]
+    def __init__(self, l2_path, **kwargs):
+        super(L2PowerModel, self).__init__(**kwargs)
+        # Choose a power model for every power state
+        self.pm = [
+            L2PowerOn(l2_path), # ON
+            L2PowerOff(), # CLK_GATED
+            L2PowerOff(), # SRAM_RETENTION
+            L2PowerOff(), # OFF
+        ]
 
 
 def main():
@@ -105,7 +115,7 @@ def main():
             continue
 
         cpu.default_p_state = "ON"
-        cpu.power_model = CpuPowerModel()
+        cpu.power_model = CpuPowerModel(cpu.path())
 
     # Example power model for the L2 Cache of the bigCluster
     for l2 in root.system.bigCluster.l2.descendants():
@@ -113,7 +123,7 @@ def main():
             continue
 
         l2.default_p_state = "ON"
-        l2.power_model = L2PowerModel()
+        l2.power_model = L2PowerModel(l2.path())
 
     bL.instantiate(options)