remove direct calls to comp_layer_bb_cost

Author: soheilshahrouz

vpr/src/place/net_cost_handler.cpp

@@ -1609,6 +1609,10 @@ void NetCostHandler::find_affected_nets_and_update_costs(const t_place_algorithm
 }
 
 double NetCostHandler::comp_bb_cost(e_cost_methods method) {
+    return comp_bb_cost_functor_(method);
+}
+
+double NetCostHandler::comp_3d_bb_cost_(e_cost_methods method) {
     double cost = 0;
     double expected_wirelength = 0.0;
     auto& cluster_ctx = g_vpr_ctx.clustering();
@@ -1644,7 +1648,7 @@ double NetCostHandler::comp_bb_cost(e_cost_methods method) {
     return cost;
 }
 
-double NetCostHandler::comp_layer_bb_cost(e_cost_methods method) {
+double NetCostHandler::comp_per_layer_bb_cost_(e_cost_methods method) {
     double cost = 0;
     double expected_wirelength = 0.0;
     auto& cluster_ctx = g_vpr_ctx.clustering();
@@ -1910,9 +1914,11 @@ NetCostHandler::NetCostHandler(PlacerContext& placer_ctx, size_t num_nets, bool
     if (cube_bb_) {
         ts_info.ts_bb_edge_new.resize(num_nets, t_bb());
         ts_info.ts_bb_coord_new.resize(num_nets, t_bb());
+        comp_bb_cost_functor_ =  std::bind(&NetCostHandler::comp_3d_bb_cost_, this, std::placeholders::_1);
     } else {
         ts_info.layer_ts_bb_edge_new.resize(num_nets, std::vector<t_2D_bb>(num_layers, t_2D_bb()));
         ts_info.layer_ts_bb_coord_new.resize(num_nets, std::vector<t_2D_bb>(num_layers, t_2D_bb()));
+        comp_bb_cost_functor_ =  std::bind(&NetCostHandler::comp_per_layer_bb_cost_, this, std::placeholders::_1);
     }
 
     /* This initializes the whole matrix to OPEN which is an invalid value*/

vpr/src/place/net_cost_handler.h

@@ -75,7 +75,7 @@ class NetCostHandler {
                                              double& timing_delta_c);
 
     /**
-     * @brief Finds the bb cost from scratch (based on 3D BB).
+     * @brief Finds the bb cost from scratch.
      * Done only when the placement has been radically changed
      * (i.e. after initial placement). Otherwise find the cost
      * change incrementally. If method check is NORMAL, we find
@@ -84,23 +84,10 @@ class NetCostHandler {
      * non_updateable_bb routine, to provide a cost which can be
      * used to check the correctness of the other routine.
      * @param method The method used to calculate placement cost.
-     * @return The bounding box cost of the placement, computed by the 3D method.
+     * @return The bounding box cost of the placement.
      */
     double comp_bb_cost(e_cost_methods method);
 
-    /**
-     * @brief Finds the bb cost from scratch (based on per-layer BB).
-     * Done only when the placement has been radically changed
-     * (i.e. after initial placement). Otherwise find the cost change
-     * incrementally.  If method check is NORMAL, we find bounding boxes
-     * that are updateable for the larger nets.  If method is CHECK, all
-     * bounding boxes are found via the non_updateable_bb routine, to provide
-     * a cost which can be used to check the correctness of the other routine.
-     * @param method The method used to calculate placement cost.
-     * @return The placement bounding box cost, computed by the per layer method.
-     */
-    double comp_layer_bb_cost(e_cost_methods method);
-
     /**
      * @brief Reset the net cost function flags (proposed_net_cost and bb_updated_before)
      */
@@ -169,6 +156,8 @@ class NetCostHandler {
     bool cube_bb_ = false;
     PlacerContext& placer_ctx_;
 
+    std::function<double(e_cost_methods method)> comp_bb_cost_functor_;
+
   private:
     /**
     * @brief Update the bounding box (3D) of the net connected to blk_pin. The old and new locations of the pin are
@@ -415,4 +404,7 @@ class NetCostHandler {
                                              std::vector<t_2D_bb>& bb_edge_new,
                                              std::vector<t_2D_bb>& bb_coord_new);
 
+     double comp_per_layer_bb_cost_(e_cost_methods method);
+     double comp_3d_bb_cost_(e_cost_methods method);
+
 };

vpr/src/place/place.cpp

@@ -497,12 +497,7 @@ void try_place(const Netlist<>& net_list,
     /* Gets initial cost and loads bounding boxes. */
 
     if (placer_opts.place_algorithm.is_timing_driven()) {
-        if (cube_bb) {
-            costs.bb_cost = net_cost_handler.comp_bb_cost(e_cost_methods::NORMAL);
-        } else {
-            VTR_ASSERT_SAFE(!cube_bb);
-            costs.bb_cost = net_cost_handler.comp_layer_bb_cost(e_cost_methods::NORMAL);
-        }
+        costs.bb_cost = net_cost_handler.comp_bb_cost(e_cost_methods::NORMAL);
 
         first_crit_exponent = placer_opts.td_place_exp_first; /*this will be modified when rlim starts to change */
 
@@ -578,12 +573,7 @@ void try_place(const Netlist<>& net_list,
         VTR_ASSERT(placer_opts.place_algorithm == BOUNDING_BOX_PLACE);
 
         /* Total cost is the same as wirelength cost normalized*/
-        if (cube_bb) {
-            costs.bb_cost = net_cost_handler.comp_bb_cost(e_cost_methods::NORMAL);
-        } else {
-            VTR_ASSERT_SAFE(!cube_bb);
-            costs.bb_cost = net_cost_handler.comp_layer_bb_cost(e_cost_methods::NORMAL);
-        }
+        costs.bb_cost = net_cost_handler.comp_bb_cost(e_cost_methods::NORMAL);
         costs.bb_cost_norm = 1 / costs.bb_cost;
 
         /* Timing cost and normalization factors are not used */
@@ -2029,17 +2019,9 @@ static int check_placement_costs(const t_placer_costs& costs,
                                  PlacerContext& placer_ctx,
                                  NetCostHandler& net_cost_handler) {
     int error = 0;
-    double bb_cost_check;
     double timing_cost_check;
 
-    const bool cube_bb = g_vpr_ctx.placement().cube_bb;
-
-    if (cube_bb) {
-        bb_cost_check = net_cost_handler.comp_bb_cost(e_cost_methods::CHECK);
-    } else {
-        VTR_ASSERT_SAFE(!cube_bb);
-        bb_cost_check = net_cost_handler.comp_layer_bb_cost(e_cost_methods::CHECK);
-    }
+    double bb_cost_check = net_cost_handler.comp_bb_cost(e_cost_methods::CHECK);
 
     if (fabs(bb_cost_check - costs.bb_cost) > costs.bb_cost * ERROR_TOL) {
         VTR_LOG_ERROR(