enum class e_cost_methods

Author: soheilshahrouz

vpr/src/place/move_utils.cpp

@@ -467,8 +467,8 @@ e_block_move_result record_macro_self_swaps(t_pl_blocks_to_be_moved& blocks_affe
 
     //Fit the displaced blocks into the empty locations
     auto loc_itr = empty_locs.begin();
-    for (auto blk : non_macro_displaced_blocks) {
-        outcome = blocks_affected.record_block_move(blk, *loc_itr, place_locs_vars);
+    for (ClusterBlockId blk : non_macro_displaced_blocks) {
+        outcome = blocks_affected.record_block_move(blk, *loc_itr, place_loc_vars);
         ++loc_itr;
     }
 

vpr/src/place/net_cost_handler.cpp

@@ -1950,7 +1950,7 @@ double comp_bb_cost(e_cost_methods method) {
         if (!cluster_ctx.clb_nlist.net_is_ignored(net_id)) { /* Do only if not ignored. */
             /* Small nets don't use incremental updating on their bounding boxes, *
              * so they can use a fast bounding box calculator.                    */
-            if (cluster_ctx.clb_nlist.net_sinks(net_id).size() >= SMALL_NET && method == NORMAL) {
+            if (cluster_ctx.clb_nlist.net_sinks(net_id).size() >= SMALL_NET && method == e_cost_methods::NORMAL) {
                 get_bb_from_scratch(net_id,
                                     place_move_ctx.bb_coords[net_id],
                                     place_move_ctx.bb_num_on_edges[net_id],
@@ -1963,12 +1963,12 @@ double comp_bb_cost(e_cost_methods method) {
 
             pl_net_cost.net_cost[net_id] = get_net_cost(net_id, place_move_ctx.bb_coords[net_id]);
             cost += pl_net_cost.net_cost[net_id];
-            if (method == CHECK)
+            if (method == e_cost_methods::CHECK)
                 expected_wirelength += get_net_wirelength_estimate(net_id, place_move_ctx.bb_coords[net_id]);
         }
     }
 
-    if (method == CHECK) {
+    if (method == e_cost_methods::CHECK) {
         VTR_LOG("\n");
         VTR_LOG("BB estimate of min-dist (placement) wire length: %.0f\n",
                 expected_wirelength);
@@ -1987,7 +1987,7 @@ double comp_layer_bb_cost(e_cost_methods method) {
         if (!cluster_ctx.clb_nlist.net_is_ignored(net_id)) { /* Do only if not ignored. */
             /* Small nets don't use incremental updating on their bounding boxes, *
              * so they can use a fast bounding box calculator.                    */
-            if (cluster_ctx.clb_nlist.net_sinks(net_id).size() >= SMALL_NET && method == NORMAL) {
+            if (cluster_ctx.clb_nlist.net_sinks(net_id).size() >= SMALL_NET && method == e_cost_methods::NORMAL) {
                 get_layer_bb_from_scratch(net_id,
                                           place_move_ctx.layer_bb_num_on_edges[net_id],
                                           place_move_ctx.layer_bb_coords[net_id],
@@ -2002,14 +2002,14 @@ double comp_layer_bb_cost(e_cost_methods method) {
                                                                       place_move_ctx.layer_bb_coords[net_id],
                                                                       place_move_ctx.num_sink_pin_layer[size_t(net_id)]);
             cost += pl_net_cost.net_cost[net_id];
-            if (method == CHECK)
+            if (method == e_cost_methods::CHECK)
                 expected_wirelength += get_net_wirelength_from_layer_bb(net_id,
                                                                         place_move_ctx.layer_bb_coords[net_id],
                                                                         place_move_ctx.num_sink_pin_layer[size_t(net_id)]);
         }
     }
 
-    if (method == CHECK) {
+    if (method == e_cost_methods::CHECK) {
         VTR_LOG("\n");
         VTR_LOG("BB estimate of min-dist (placement) wire length: %.0f\n",
                 expected_wirelength);

vpr/src/place/net_cost_handler.h

@@ -22,7 +22,7 @@ constexpr double ERROR_TOL = .01;
  * NORMAL: Compute cost efficiently using incremental techniques.
  * CHECK: Brute-force cost computation; useful to validate the more complex incremental cost update code.
  */
-enum e_cost_methods {
+enum class e_cost_methods {
     NORMAL,
     CHECK
 };

vpr/src/place/place.cpp

@@ -493,10 +493,10 @@ void try_place(const Netlist<>& net_list,
 
     if (placer_opts.place_algorithm.is_timing_driven()) {
         if (cube_bb) {
-            costs.bb_cost = comp_bb_cost(NORMAL);
+            costs.bb_cost = comp_bb_cost(e_cost_methods::NORMAL);
         } else {
             VTR_ASSERT_SAFE(!cube_bb);
-            costs.bb_cost = comp_layer_bb_cost(NORMAL);
+            costs.bb_cost = comp_layer_bb_cost(e_cost_methods::NORMAL);
         }
 
         first_crit_exponent = placer_opts.td_place_exp_first; /*this will be modified when rlim starts to change */
@@ -574,10 +574,10 @@ void try_place(const Netlist<>& net_list,
 
         /* Total cost is the same as wirelength cost normalized*/
         if (cube_bb) {
-            costs.bb_cost = comp_bb_cost(NORMAL);
+            costs.bb_cost = comp_bb_cost(e_cost_methods::NORMAL);
         } else {
             VTR_ASSERT_SAFE(!cube_bb);
-            costs.bb_cost = comp_layer_bb_cost(NORMAL);
+            costs.bb_cost = comp_layer_bb_cost(e_cost_methods::NORMAL);
         }
         costs.bb_cost_norm = 1 / costs.bb_cost;
 
@@ -2026,10 +2026,10 @@ static int check_placement_costs(const t_placer_costs& costs,
     const bool cube_bb = g_vpr_ctx.placement().cube_bb;
 
     if (cube_bb) {
-        bb_cost_check = comp_bb_cost(CHECK);
+        bb_cost_check = comp_bb_cost(e_cost_methods::CHECK);
     } else {
         VTR_ASSERT_SAFE(!cube_bb);
-        bb_cost_check = comp_layer_bb_cost(CHECK);
+        bb_cost_check = comp_layer_bb_cost(e_cost_methods::CHECK);
     }
 
     if (fabs(bb_cost_check - costs.bb_cost) > costs.bb_cost * ERROR_TOL) {