apply PR comments

Author: soheilshahrouz

libs/libarchfpga/src/physical_types_util.cpp

@@ -682,12 +682,10 @@ std::vector<std::string> block_type_class_index_to_pin_names(t_physical_tile_typ
         pin_info.push_back(block_type_pin_index_to_pin_inst(type, pin_physical_num, is_flat));
     }
 
-    auto cmp = [](const t_pin_inst_port& lhs, const t_pin_inst_port& rhs) noexcept {
-        return lhs.pin_physical_num < rhs.pin_physical_num;
-    };
-
     // Ensure all the pins are in order
-    std::ranges::sort(pin_info, cmp);
+    std::ranges::sort(pin_info, [](const t_pin_inst_port& lhs, const t_pin_inst_port& rhs) noexcept {
+        return lhs.pin_physical_num < rhs.pin_physical_num;
+    });
 
     // Determine ranges for each capacity instance and port pair
     std::map<std::tuple<int, int, int, int, int>, std::array<int, 4>> pin_ranges;

vpr/src/route/route_budgets.cpp

@@ -165,18 +165,15 @@ void route_budgets::allocate_slack_using_weights(NetPinsMatrix<float>& net_delay
     std::shared_ptr<SetupHoldTimingInfo> timing_info_min = nullptr;
     std::shared_ptr<SetupHoldTimingInfo> original_timing_info = nullptr;
 
-    unsigned iteration;
-    float max_budget_change;
-
     /*Preprocessing algorithm in order to consider short paths when setting initial maximum budgets.
      * Not necessary unless budgets are really hard to meet*/
     // process_negative_slack_using_minimax();
     if (negative_hold_slack) {
         process_negative_slack_using_minimax(net_delay, netlist_pin_lookup);
     }
 
-    iteration = 0;
-    max_budget_change = 900e-12;
+    unsigned iteration = 0;
+    float max_budget_change = 900e-12;
 
     // Cutoff threshold so slack allocator can detect if budgets aren't changing, and stop loop early
     // An experimentally derived constant that allows for a balance between budget calculation time, and quality
@@ -249,13 +246,11 @@ void route_budgets::process_negative_slack_using_minimax(NetPinsMatrix<float>& n
      * This ensures that the short path slacks are also taken into account for the maximum budgets.
      * Ensures that maximum budgets will always be above minimum budgets.
      * Can be unnecessary for not so strict budgets*/
-    unsigned iteration;
-    float max_budget_change;
     std::shared_ptr<SetupHoldTimingInfo> timing_info = nullptr;
     std::shared_ptr<SetupHoldTimingInfo> original_timing_info = nullptr;
 
-    iteration = 0;
-    max_budget_change = 900e-12;
+    unsigned iteration = 0;
+    float max_budget_change = 900e-12;
     float second_max_budget_change = 900e-12;
     original_timing_info = perform_sta(net_delay);
 
@@ -576,10 +571,9 @@ void route_budgets::allocate_slack_using_delays_and_criticalities(NetPinsMatrix<
      * the maximum delay budget = delay through this connection / pin criticality.
      * The minimum delay budget is set to 0 to promote finding the fastest path*/
 
-    float pin_criticality;
     for (auto net_id : net_list_.nets()) {
         for (auto pin_id : net_list_.net_sinks(net_id)) {
-            pin_criticality = calculate_clb_net_pin_criticality(*timing_info, netlist_pin_lookup, pin_id, is_flat_);
+            float pin_criticality = calculate_clb_net_pin_criticality(*timing_info, netlist_pin_lookup, pin_id, is_flat_);
 
             /* Pin criticality is between 0 and 1.
              * Shift it downwards by 1 - max_criticality (max_criticality is 0.99 by default,
@@ -894,7 +888,7 @@ void route_budgets::print_route_budget(std::string filename, NetPinsMatrix<float
     fp.close();
 }
 
-void route_budgets::print_temporary_budgets_to_file(NetPinsMatrix<float>& temp_budgets) {
+void route_budgets::print_temporary_budgets_to_file(NetPinsMatrix<float>& temp_budgets) const {
     /*Used for debugging. Print one specific budget to an external file called
      * temporary_budgets.txt. This can be used to see how the budgets change between
      * each minimax PERT iteration*/

vpr/src/route/route_budgets.h

@@ -112,7 +112,7 @@ class route_budgets {
     tatum::EdgeId get_edge_from_nets(ParentNetId net_id, int ipin);
 
     /*debugging tools*/
-    void print_temporary_budgets_to_file(NetPinsMatrix<float>& temp_budgets);
+    void print_temporary_budgets_to_file(NetPinsMatrix<float>& temp_budgets) const;
 
     /*Budget variables*/
     NetPinsMatrix<float> delay_min_budget;  //[0..num_nets][0..clb_net[inet].pins]

vpr/src/route/route_utils.cpp

@@ -457,7 +457,7 @@ vtr::vector<ParentNetId, std::vector<std::unordered_map<RRNodeId, int>>> set_net
                 continue;
             } else {
                 // get the ptc_number of the sinks in the group
-                std::for_each(sink_grp.begin(), sink_grp.end(), [&rr_graph](int& sink_rr_num) {
+                std::ranges::for_each(sink_grp, [&rr_graph](int& sink_rr_num) {
                     sink_rr_num = rr_graph.node_ptc_num(RRNodeId(sink_rr_num));
                 });
 
@@ -494,7 +494,7 @@ vtr::vector<ParentNetId, std::vector<std::unordered_map<RRNodeId, int>>> set_net
 void try_graph(int width_fac,
                const t_router_opts& router_opts,
                t_det_routing_arch& det_routing_arch,
-               std::vector<t_segment_inf>& segment_inf,
+               const std::vector<t_segment_inf>& segment_inf,
                t_chan_width_dist chan_width_dist,
                const std::vector<t_direct_inf>& directs,
                bool is_flat) {
@@ -680,12 +680,12 @@ void update_router_info_and_check_bp(bp_router_type type, int net_id) {
         // Between net id iters, check only net id and expression breakpoints
         get_bp_state_globals()->get_glob_breakpoint_state()->route_net_id = net_id;
         t_draw_state* draw_state = get_draw_state_vars();
-        for (size_t i = 0; i < draw_state->list_of_breakpoints.size(); i++) {
-            if (draw_state->list_of_breakpoints[i].type == BT_ROUTE_NET_ID && draw_state->list_of_breakpoints[i].active) {
-                hit_bp = check_for_route_net_id_iter_breakpoints(draw_state->list_of_breakpoints[i].bt_route_net_id);
+        for (const Breakpoint& breakpoint : draw_state->list_of_breakpoints) {
+            if (breakpoint.type == BT_ROUTE_NET_ID && breakpoint.active) {
+                hit_bp = check_for_route_net_id_iter_breakpoints(breakpoint.bt_route_net_id);
                 break;
-            } else if (draw_state->list_of_breakpoints[i].type == BT_EXPRESSION && draw_state->list_of_breakpoints[i].active) {
-                hit_bp = check_for_expression_breakpoints(draw_state->list_of_breakpoints[i].bt_expression, false);
+            } else if (breakpoint.type == BT_EXPRESSION && breakpoint.active) {
+                hit_bp = check_for_expression_breakpoints(breakpoint.bt_expression, false);
                 break;
             }
         }

vpr/src/route/route_utils.h

@@ -150,7 +150,7 @@ vtr::vector<ParentNetId, std::vector<std::unordered_map<RRNodeId, int>>> set_net
 void try_graph(int width_fac,
                const t_router_opts& router_opts,
                t_det_routing_arch& det_routing_arch,
-               std::vector<t_segment_inf>& segment_inf,
+               const std::vector<t_segment_inf>& segment_inf,
                t_chan_width_dist chan_width_dist,
                const std::vector<t_direct_inf>& directs,
                bool is_flat);

vpr/src/util/vpr_utils.cpp

@@ -1373,7 +1373,7 @@ std::tuple<int, int, std::string, std::string> parse_direct_pin_name(std::string
 
         // Replace '.' and '[' characters with ' '
         std::ranges::replace_if(source_string,
-            [](char c) { return c == '.' || c == '[' || c == ':' || c == ']'; },
+            [](char c) noexcept { return c == '.' || c == '[' || c == ':' || c == ']'; },
             ' ');
 
         std::istringstream source_iss(source_string);