remove pins_connected() function and rename rr_graph_3d files to rr_graph_sg

Author: soheilshahrouz

vpr/src/route/rr_graph_generation/rr_graph.cpp

@@ -33,7 +33,7 @@
 #include "rr_graph_sbox.h"
 #include "rr_graph_intra_cluster.h"
 #include "rr_graph_tile_nodes.h"
-#include "rr_graph_3d.h"
+#include "rr_graph_sg.h"
 #include "rr_graph_timing_params.h"
 #include "check_rr_graph.h"
 #include "echo_files.h"
@@ -3247,65 +3247,6 @@ t_non_configurable_rr_sets identify_non_configurable_rr_sets() {
     return groups.output_sets();
 }
 
-bool pins_connected(t_block_loc cluster_loc,
-                    t_physical_tile_type_ptr physical_type,
-                    t_logical_block_type_ptr logical_block,
-                    int from_pin_logical_num,
-                    int to_pin_logical_num) {
-    const auto& rr_graph = g_vpr_ctx.device().rr_graph;
-    const auto& rr_spatial_look_up = rr_graph.node_lookup();
-
-    t_physical_tile_loc loc;
-    loc.x = cluster_loc.loc.x;
-    loc.y = cluster_loc.loc.y;
-    loc.layer_num = cluster_loc.loc.layer;
-    int abs_cap = cluster_loc.loc.sub_tile;
-    const t_sub_tile* sub_tile = nullptr;
-
-    for (const t_sub_tile& sub_tile_ : physical_type->sub_tiles) {
-        if (sub_tile_.capacity.is_in_range(abs_cap)) {
-            sub_tile = &sub_tile_;
-            break;
-        }
-    }
-    VTR_ASSERT(sub_tile != nullptr);
-    int rel_cap = abs_cap - sub_tile->capacity.low;
-    VTR_ASSERT(rel_cap >= 0);
-
-    auto from_pb_pin = logical_block->pin_logical_num_to_pb_pin_mapping.at(from_pin_logical_num);
-    int from_pin_physical_num = get_pb_pin_physical_num(physical_type,
-                                                        sub_tile,
-                                                        logical_block,
-                                                        rel_cap,
-                                                        from_pb_pin);
-    VTR_ASSERT(from_pin_physical_num != UNDEFINED);
-
-    auto to_pb_pin = logical_block->pin_logical_num_to_pb_pin_mapping.at(to_pin_logical_num);
-    int to_pin_physical_num = get_pb_pin_physical_num(physical_type,
-                                                      sub_tile,
-                                                      logical_block,
-                                                      rel_cap,
-                                                      to_pb_pin);
-
-    VTR_ASSERT(to_pin_physical_num != UNDEFINED);
-
-    RRNodeId from_node = get_pin_rr_node_id(rr_spatial_look_up, physical_type, loc, from_pin_physical_num);
-    VTR_ASSERT(from_node != RRNodeId::INVALID());
-
-    RRNodeId to_node = get_pin_rr_node_id(rr_spatial_look_up, physical_type, loc, to_pin_physical_num);
-    VTR_ASSERT(to_node != RRNodeId::INVALID());
-
-    int num_edges = rr_graph.num_edges(from_node);
-
-    for (int iedge = 0; iedge < num_edges; iedge++) {
-        RRNodeId sink_node = rr_graph.edge_sink_node(from_node, iedge);
-        if (sink_node == to_node) {
-            return true;
-        }
-    }
-    return false;
-}
-
 static void process_non_config_sets() {
     auto& device_ctx = g_vpr_ctx.mutable_device();
     EdgeGroups groups;

vpr/src/route/rr_graph_generation/rr_graph.h

@@ -58,9 +58,3 @@ std::vector<vtr::Matrix<int>> alloc_and_load_actual_fc(const std::vector<t_physi
                                                        bool is_flat);
 
 t_non_configurable_rr_sets identify_non_configurable_rr_sets();
-
-bool pins_connected(t_block_loc cluster_loc,
-                    t_physical_tile_type_ptr physical_type,
-                    t_logical_block_type_ptr logical_block,
-                    int from_pin_logical_num,
-                    int to_pin_logical_num);

vpr/src/route/rr_graph_generation/rr_graph_3d.cpp renamed to vpr/src/route/rr_graph_generation/rr_graph_sg.cpp

@@ -1,5 +1,5 @@
 
-#include "rr_graph_3d.h"
+#include "rr_graph_sg.h"
 
 #include "rr_graph_builder.h"
 #include "rr_rc_data.h"