remove duplication get_parallel_seg_index() function

Author: soheilshahrouz

libs/libarchfpga/src/read_xml_arch_file.cpp

@@ -101,7 +101,7 @@ struct t_pin_locs {
   public:
     e_pin_location_distr distribution = e_pin_location_distr::SPREAD;
 
-    /* [0..num_sub_tiles-1][0..width-1][0..height-1][0..3][0..num_tokens-1] */
+    // [0..num_sub_tiles-1][0..width-1][0..height-1][0..3][0..num_tokens-1]
     vtr::NdMatrix<std::vector<std::string>, 4> assignments;
 
     bool is_distribution_set() const {

libs/librrgraph/src/base/get_parallel_segs.cpp

@@ -23,9 +23,9 @@ std::vector<t_segment_inf> get_parallel_segs(const std::vector<t_segment_inf>& s
     return result;
 }
 
-int get_parallel_seg_index(const int abs_index,
+int get_parallel_seg_index(int abs_index,
                            const t_unified_to_parallel_seg_index& index_map,
-                           const e_parallel_axis parallel_axis) {
+                           e_parallel_axis parallel_axis) {
     int index = -1;
     auto itr_pair = index_map.equal_range(abs_index);
 

libs/librrgraph/src/base/get_parallel_segs.h

@@ -22,6 +22,6 @@ std::vector<t_segment_inf> get_parallel_segs(const std::vector<t_segment_inf>& s
                                              e_parallel_axis parallel_axis,
                                              bool keep_original_index = false);
 
-int get_parallel_seg_index(const int abs,
+int get_parallel_seg_index(int abs,
                            const t_unified_to_parallel_seg_index& index_map,
-                           const e_parallel_axis parallel_axis);
+                           e_parallel_axis parallel_axis);

vpr/src/route/rr_graph_generation/clock_network_builders.cpp

@@ -2,6 +2,7 @@
 
 #include "globals.h"
 
+#include "get_parallel_segs.h"
 #include "rr_rc_data.h"
 #include "vtr_assert.h"
 #include "vtr_log.h"
@@ -394,26 +395,13 @@ void ClockRib::record_tap_locations(unsigned x_start,
     }
 }
 
-static void get_parallel_seg_index(int& unified_seg_index, e_parallel_axis axis, const t_unified_to_parallel_seg_index& indices_map) {
-    auto itr_pair = indices_map.equal_range(unified_seg_index);
-
-    for (auto itr = itr_pair.first; itr != itr_pair.second; ++itr) {
-        if (itr->second.second == axis) {
-            unified_seg_index = itr->second.first;
-            return;
-        }
-    }
-}
-
 /* AA: Map drive_seg_idx, left_seg_idx, and right_seg_idx to equivalent index in segment_inf_x as produced in rr_graph.cpp:build_rr_graph */
 void ClockRib::map_relative_seg_indices(const t_unified_to_parallel_seg_index& indices_map) {
-    /*We have horizontal segments in clock-ribs so we search for X_AXIS*/
+    // We have horizontal segments in clock-ribs so we search for X_AXIS
 
-    get_parallel_seg_index(drive_seg_idx, e_parallel_axis::X_AXIS, indices_map);
-
-    get_parallel_seg_index(left_seg_idx, e_parallel_axis::X_AXIS, indices_map);
-
-    get_parallel_seg_index(right_seg_idx, e_parallel_axis::X_AXIS, indices_map);
+    drive_seg_idx = get_parallel_seg_index(drive_seg_idx, indices_map, e_parallel_axis::X_AXIS);
+    left_seg_idx = get_parallel_seg_index(left_seg_idx, indices_map, e_parallel_axis::X_AXIS);
+    right_seg_idx = get_parallel_seg_index(right_seg_idx, indices_map, e_parallel_axis::X_AXIS);
 }
 
 /*********************************************************************************
@@ -737,13 +725,11 @@ void ClockSpine::record_tap_locations(unsigned y_start,
 
 /* AA: Map drive_seg_idx, left_seg_idx, and right_seg_idx to equivalent index in segment_inf_y as produced in rr_graph.cpp:build_rr_graph */
 void ClockSpine::map_relative_seg_indices(const t_unified_to_parallel_seg_index& indices_map) {
-    /*We have vertical segments in clock-spines so we search for Y_AXIS*/
-
-    get_parallel_seg_index(drive_seg_idx, e_parallel_axis::Y_AXIS, indices_map);
-
-    get_parallel_seg_index(left_seg_idx, e_parallel_axis::Y_AXIS, indices_map);
+    // We have vertical segments in clock-spines so we search for Y_AXIS
 
-    get_parallel_seg_index(right_seg_idx, e_parallel_axis::Y_AXIS, indices_map);
+    drive_seg_idx = get_parallel_seg_index(drive_seg_idx, indices_map, e_parallel_axis::Y_AXIS);
+    left_seg_idx = get_parallel_seg_index(left_seg_idx, indices_map, e_parallel_axis::Y_AXIS);
+    right_seg_idx = get_parallel_seg_index(right_seg_idx, indices_map, e_parallel_axis::Y_AXIS);
 }
 
 /*********************************************************************************