From 0968cc8cbf077dacbe4c4ec9f12de6baaa54a0ee Mon Sep 17 00:00:00 2001
From: James Cherry <cherry@parallaxsw.com>
Date: Wed, 25 Oct 2023 12:57:29 -0700
Subject: [PATCH] power cleanup

Signed-off-by: James Cherry <cherry@parallaxsw.com>
---
 power/Power.cc | 37 ++++++++++++-------------------------
 power/Power.hh |  7 -------
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/power/Power.cc b/power/Power.cc
index 158f41ac..649bc32b 100644
--- a/power/Power.cc
+++ b/power/Power.cc
@@ -1049,6 +1049,7 @@ Power::findSwitchingPower(const Instance *inst,
                           PowerResult &result)
 {
   const DcalcAnalysisPt *dcalc_ap = corner->findDcalcAnalysisPt(MinMax::max());
+  LibertyCell *corner_cell = cell->cornerCell(dcalc_ap);
   InstancePinIterator *pin_iter = network_->pinIterator(inst);
   while (pin_iter->hasNext()) {
     const Pin *to_pin = pin_iter->next();
@@ -1058,36 +1059,22 @@ Power::findSwitchingPower(const Instance *inst,
         ? graph_delay_calc_->loadCap(to_pin, dcalc_ap)
         : 0.0;
       PwrActivity activity = findClkedActivity(to_pin, inst_clk);
-      if (to_port->direction()->isAnyOutput())
-        findSwitchingPower(cell, to_port, activity, load_cap, corner, result);
+      if (to_port->direction()->isAnyOutput()) {
+        float volt = portVoltage(corner_cell, to_port, dcalc_ap);
+        float switching = .5 * load_cap * volt * volt * activity.activity();
+        debugPrint(debug_, "power", 2, "switching %s/%s activity = %.2e volt = %.2f %.3e",
+                   cell->name(),
+                   to_port->name(),
+                   activity.activity(),
+                   volt,
+                   switching);
+        result.switching() += switching;
+      }
     }
   }
   delete pin_iter;
 }
 
-void
-Power::findSwitchingPower(LibertyCell *cell,
-			  const LibertyPort *to_port,
-			  PwrActivity &activity,
-			  float load_cap,
-			  const Corner *corner,
-			  // Return values.
-			  PowerResult &result)
-{
-  MinMax *mm = MinMax::max();
-  const DcalcAnalysisPt *dcalc_ap = corner->findDcalcAnalysisPt(mm);
-  LibertyCell *corner_cell = cell->cornerCell(dcalc_ap);
-  float volt = portVoltage(corner_cell, to_port, dcalc_ap);
-  float switching = .5 * load_cap * volt * volt * activity.activity();
-  debugPrint(debug_, "power", 2, "switching %s/%s activity = %.2e volt = %.2f %.3e",
-             cell->name(),
-             to_port->name(),
-             activity.activity(),
-             volt,
-             switching);
-  result.switching() += switching;
-}
-
 ////////////////////////////////////////////////////////////////
 
 
diff --git a/power/Power.hh b/power/Power.hh
index 29acb34d..7aef5f31 100644
--- a/power/Power.hh
+++ b/power/Power.hh
@@ -144,13 +144,6 @@ protected:
                           const Clock *inst_clk,
                           // Return values.
                           PowerResult &result);
-  void findSwitchingPower(LibertyCell *cell,
-			  const LibertyPort *to_port,
-			  PwrActivity &activity,
-			  float load_cap,
-			  const Corner *corner,
-			  // Return values.
-			  PowerResult &result);
   float getSlew(Vertex *vertex,
                 const RiseFall *rf,
                 const Corner *corner);