From 93ad99b9e1618798dd6d510a102d5fc1e06ded08 Mon Sep 17 00:00:00 2001 From: Hunter Nichols Date: Wed, 28 Feb 2018 12:32:54 -0800 Subject: [PATCH] Changed variable names in analytical power function to be more clear. --- compiler/pgates/pinv.py | 4 ++-- compiler/pgates/pnand2.py | 4 ++-- compiler/pgates/pnand3.py | 4 ++-- compiler/pgates/pnor2.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compiler/pgates/pinv.py b/compiler/pgates/pinv.py index 4a39d065..84f14590 100644 --- a/compiler/pgates/pinv.py +++ b/compiler/pgates/pinv.py @@ -245,8 +245,8 @@ class pinv(pgate.pgate): def analytical_power(self, proc, vdd, temp, load): #Returns dynamic and leakage power. Results in nW c_eff = self.calculate_effective_capacitance(load) - f = spice["default_event_rate"] - power_dyn = c_eff*vdd*vdd*f + freq = spice["default_event_rate"] + power_dyn = c_eff*vdd*vdd*freq power_leak = spice["inv_leakage"] total_power = self.return_power(power_dyn, power_leak) diff --git a/compiler/pgates/pnand2.py b/compiler/pgates/pnand2.py index 98138395..c95e814c 100644 --- a/compiler/pgates/pnand2.py +++ b/compiler/pgates/pnand2.py @@ -217,8 +217,8 @@ class pnand2(pgate.pgate): def analytical_power(self, proc, vdd, temp, load): #Returns dynamic and leakage power. Results in nW c_eff = self.calculate_effective_capacitance(load) - f = spice["default_event_rate"] - power_dyn = c_eff*vdd*vdd*f + freq = spice["default_event_rate"] + power_dyn = c_eff*vdd*vdd*freq power_leak = spice["nand2_leakage"] total_power = self.return_power(power_dyn, power_leak) diff --git a/compiler/pgates/pnand3.py b/compiler/pgates/pnand3.py index 7fe4897e..ca1c6244 100644 --- a/compiler/pgates/pnand3.py +++ b/compiler/pgates/pnand3.py @@ -237,8 +237,8 @@ class pnand3(pgate.pgate): def analytical_power(self, proc, vdd, temp, load): #Returns dynamic and leakage power. Results in nW c_eff = self.calculate_effective_capacitance(load) - f = spice["default_event_rate"] - power_dyn = c_eff*vdd*vdd*f + freq = spice["default_event_rate"] + power_dyn = c_eff*vdd*vdd*freq power_leak = spice["nand3_leakage"] total_power = self.return_power(power_dyn, power_leak) diff --git a/compiler/pgates/pnor2.py b/compiler/pgates/pnor2.py index b59f8733..1508a487 100644 --- a/compiler/pgates/pnor2.py +++ b/compiler/pgates/pnor2.py @@ -227,8 +227,8 @@ class pnor2(pgate.pgate): def analytical_power(self, proc, vdd, temp, load): #Returns dynamic and leakage power. Results in nW c_eff = self.calculate_effective_capacitance(load) - f = spice["default_event_rate"] - power_dyn = c_eff*vdd*vdd*f + freq = spice["default_event_rate"] + power_dyn = c_eff*vdd*vdd*freq power_leak = spice["nor2_leakage"] total_power = self.return_power(power_dyn, power_leak)