gpl: Changed MBFF objective function to use total power.

Signed-off-by: Ted Hong <tedhong@google.com>

Author: hongted

src/gpl/src/mbff.cpp

@@ -2091,7 +2091,7 @@ void MBFF::SetVars(const std::vector<Flop>& flops)
         = std::min(single_bit_width_, master->getWidth() / multiplier_);
     sta::PowerResult ff_power
         = sta_->power(network_->dbToSta(insts_[flop.idx]), corner_);
-    single_bit_power_ = std::min(single_bit_power_, ff_power.leakage());
+    single_bit_power_ = std::min(single_bit_power_, ff_power.total());
   }
 }
 
@@ -2309,7 +2309,7 @@ void MBFF::ReadLibs()
 
       if (tray_area_[array_mask][idx] > cur_area) {
         tray_area_[array_mask][idx] = cur_area;
-        tray_power_[array_mask][idx] = tray_power.leakage();
+        tray_power_[array_mask][idx] = tray_power.total();
         best_master_[array_mask][idx] = master;
         pin_mappings_[array_mask][idx] = GetPinMapping(tmp_tray);
         tray_width_[array_mask][idx] = master->getWidth() / multiplier_;

src/gpl/test/clust01.defok

@@ -4,9 +4,10 @@ BUSBITCHARS "[]" ;
 DESIGN tray_test ;
 UNITS DISTANCE MICRONS 1000 ;
 DIEAREA ( 0 0 ) ( 10000 10000 ) ;
-COMPONENTS 2 ;
-    - _tray_size2_6 DFFHQNV2Xx1_ASAP7_75t_L + PLACED ( 3350 3864 ) N ;
+COMPONENTS 3 ;
+    - _tray_size2_5 DFFHQNV2Xx1_ASAP7_75t_L + PLACED ( 3350 3864 ) N ;
     - _tray_size2_7 DFFHQNV2Xx1_ASAP7_75t_L + PLACED ( 5350 3864 ) N ;
+    - _tray_size4_6 DFFHQNV4Xx1_ASAP7_75t_L + PLACED ( 3350 3864 ) N ;
 END COMPONENTS
 PINS 9 ;
     - clk1 + NET clk1 + DIRECTION INPUT + USE SIGNAL
@@ -47,14 +48,14 @@ PINS 9 ;
         + FIXED ( 990 10090 ) N ;
 END PINS
 NETS 9 ;
-    - clk1 ( PIN clk1 ) ( _tray_size2_6 CLK ) ( _tray_size2_7 CLK ) + USE SIGNAL ;
+    - clk1 ( PIN clk1 ) ( _tray_size2_5 CLK ) ( _tray_size4_6 CLK ) ( _tray_size2_7 CLK ) + USE SIGNAL ;
     - d1 ( PIN d1 ) ( _tray_size2_7 D1 ) + USE SIGNAL ;
-    - d2 ( PIN d2 ) ( _tray_size2_6 D1 ) + USE SIGNAL ;
-    - d3 ( PIN d3 ) ( _tray_size2_6 D0 ) + USE SIGNAL ;
+    - d2 ( PIN d2 ) ( _tray_size4_6 D3 ) + USE SIGNAL ;
+    - d3 ( PIN d3 ) ( _tray_size2_5 D0 ) + USE SIGNAL ;
     - d4 ( PIN d4 ) ( _tray_size2_7 D0 ) + USE SIGNAL ;
     - o1 ( PIN o1 ) ( _tray_size2_7 QN1 ) + USE SIGNAL ;
-    - o2 ( PIN o2 ) ( _tray_size2_6 QN1 ) + USE SIGNAL ;
-    - o3 ( PIN o3 ) ( _tray_size2_6 QN0 ) + USE SIGNAL ;
+    - o2 ( PIN o2 ) ( _tray_size4_6 QN3 ) + USE SIGNAL ;
+    - o3 ( PIN o3 ) ( _tray_size2_5 QN0 ) + USE SIGNAL ;
     - o4 ( PIN o4 ) ( _tray_size2_7 QN0 ) + USE SIGNAL ;
 END NETS
 END DESIGN

src/gpl/test/clust01.ok

@@ -10,10 +10,11 @@
 [INFO ODB-0131]     Created 4 components and 20 component-terminals.
 [INFO ODB-0133]     Created 9 nets and 12 connections.
 Alpha = 40.0, Beta = 1.0, #paths = 0, max size = -1
-Total ILP Cost: 97.228
+Total ILP Cost: 2.922
 Total Timing Critical Path Displacement: 0.0
-Average slot-to-flop displacement: 0.865
-Final Objective Value: 97.228
+Average slot-to-flop displacement: 0.730
+Final Objective Value: 2.922
 Sizes used
   2-bit: 2
+  4-bit: 1
 No differences found.