Merge branch 'master' into rel_3.0

2026-01-29 19:47:56 -07:00 · 2026-01-29 19:47:56 -07:00 · 98bffa3b95
parent 5605979049 0c6c3d3d35
commit 98bffa3b95
1 changed files with 6 additions and 3 deletions
--- a/power/Power.cc
+++ b/power/Power.cc
@ -1530,12 +1530,15 @@ Power::findLeakagePower(const Instance *inst,
    cell_leakage *= duty;
  }
  // Ignore unconditional leakage unless there are no conditional leakage groups.
-  if (found_cond)
+  if (found_cond) {
    leakage = cond_leakage;
+    if (cell_leakage_exists)
+      leakage += cell_leakage;
+  }
  else if (found_uncond)
    leakage = uncond_leakage;
-  if (cell_leakage_exists)
-    leakage += cell_leakage;
+  else if (cell_leakage_exists)
+    leakage = cell_leakage;
  debugPrint(debug_, "power", 2, "leakage %s %.3e",
             cell->name(),
             leakage);