Skip to content

[RR Graph] RR Node Indices Value Type #2941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 20, 2025
Merged

[RR Graph] RR Node Indices Value Type #2941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fdd98d
[vpr][route] remove redundant functions from rr_graph2
amin1377 Mar 19, 2025
11c9a57
[vpr][route] remove redundant functions from rr_graph2
amin1377 Mar 19, 2025
1a17be2
[libs][rr_graph] change rr_node_indices value type to RRNodeId
amin1377 Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion libs/librrgraph/src/base/rr_node_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <cstdint>
#include "vtr_range.h"
#include "vtr_ndmatrix.h"
#include "rr_graph_fwd.h"

/**
* @brief Type of a routing resource node.
Expand Down Expand Up @@ -123,6 +124,6 @@ struct t_rr_rc_data {

// This is the data type of fast lookups of an rr-node given an (rr_type, layer, x, y, and the side)
//[0..num_rr_types-1][0..num_layer-1][0..grid_width-1][0..grid_height-1][0..NUM_2D_SIDES-1][0..max_ptc-1]
typedef std::array<vtr::NdMatrix<std::vector<int>, 4>, NUM_RR_TYPES> t_rr_node_indices;
typedef std::array<vtr::NdMatrix<std::vector<RRNodeId>, 4>, NUM_RR_TYPES> t_rr_node_indices;

#endif
18 changes: 9 additions & 9 deletions libs/librrgraph/src/base/rr_spatial_lookup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ RRNodeId RRSpatialLookup::find_node(int layer,
return RRNodeId::INVALID();
}

return RRNodeId(rr_node_indices_[type][layer][node_x][node_y][node_side][ptc]);
return rr_node_indices_[type][layer][node_x][node_y][node_side][ptc];
}

std::vector<RRNodeId> RRSpatialLookup::find_nodes_in_range(int layer,
Expand Down Expand Up @@ -155,14 +155,14 @@ std::vector<RRNodeId> RRSpatialLookup::find_nodes(int layer,
/* Reserve space to avoid memory fragmentation */
size_t num_nodes = 0;
for (const auto& node : rr_node_indices_[type][layer][node_x][node_y][side]) {
if (RRNodeId(node)) {
if (node.is_valid()) {
num_nodes++;
}
}

nodes.reserve(num_nodes);
for (const auto& node : rr_node_indices_[type][layer][node_x][node_y][side]) {
if (RRNodeId(node)) {
if (node.is_valid()) {
nodes.emplace_back(node);
}
}
Expand Down Expand Up @@ -272,11 +272,11 @@ void RRSpatialLookup::add_node(RRNodeId node,

if (size_t(ptc) >= rr_node_indices_[type][layer][x][y][side].size()) {
/* Deposit invalid ids to newly allocated elements while original elements are untouched */
rr_node_indices_[type][layer][x][y][side].resize(ptc + 1, int(RRNodeId::INVALID()));
rr_node_indices_[type][layer][x][y][side].resize(ptc + 1, RRNodeId::INVALID());
}

/* Resize on demand finished; Register the node */
rr_node_indices_[type][layer][x][y][side][ptc] = int(node);
rr_node_indices_[type][layer][x][y][side][ptc] = node;
}

bool RRSpatialLookup::remove_node(RRNodeId node,
Expand All @@ -302,11 +302,11 @@ bool RRSpatialLookup::remove_node(RRNodeId node,
if ((size_t)y >= rr_node_indices_[type].dim_size(2)) return false;
if (side >= rr_node_indices_[type].dim_size(3)) return false;
if ((size_t)ptc >= rr_node_indices_[type][layer][x][y][side].size()) return false;
if (rr_node_indices_[type][layer][x][y][side][ptc] != int(node)) return false;
if (rr_node_indices_[type][layer][x][y][side][ptc] != node) return false;

// The node was in the spatial lookup; remove it. -1 corresponds to an invalid node id,
// and so is treated as absent in the spatial lookup
rr_node_indices_[type][layer][x][y][side][ptc] = -1;
rr_node_indices_[type][layer][x][y][side][ptc] = RRNodeId::INVALID();
return true;
}

Expand Down Expand Up @@ -353,8 +353,8 @@ void RRSpatialLookup::reorder(const vtr::vector<RRNodeId, RRNodeId> dest_order)
for (size_t y = 0; y < grid.dim_size(2); y++) {
for (size_t s = 0; s < grid.dim_size(3); s++) {
for (auto &node: grid[l][x][y][s]) {
if (node != OPEN) {
node = size_t(dest_order[RRNodeId(node)]);
if (node.is_valid()) {
node = dest_order[node];
}
}
}
Expand Down
1 change: 0 additions & 1 deletion vpr/src/route/rr_graph2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1870,7 +1870,6 @@ int get_track_to_pins(RRGraphBuilder& rr_graph_builder,
}

/* Check there is a connection and Fc map isn't wrong */
/*int to_node = get_rr_node_index(L_rr_node_indices, x + width_offset, y + height_offset, IPIN, ipin, side);*/
RRNodeId to_node = rr_graph_builder.node_lookup().find_node(layer_index, x, y, IPIN, ipin, side);
int switch_type = (layer_index == layer) ? wire_to_ipin_switch : wire_to_pin_between_dice_switch;
if (to_node) {
Expand Down
23 changes: 0 additions & 23 deletions vpr/src/route/rr_graph2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,6 @@ bool verify_rr_node_indices(const DeviceGrid& grid,
const vtr::vector<RRIndexedDataId, t_rr_indexed_data>& rr_indexed_data,
const t_rr_graph_storage& rr_nodes,
bool is_flat);

//Returns all x-channel or y-channel wires at the specified location
std::vector<int> get_rr_node_chan_wires_at_location(const t_rr_node_indices& L_rr_node_indices,
t_rr_type rr_type,
int x,
int y);

//Return the first rr node of the specified type and coordinates
// For non-IPIN/OPIN types 'side' is ignored
int get_rr_node_index(const t_rr_node_indices& L_rr_node_indices,
int x,
int y,
t_rr_type rr_type,
int ptc,
e_side side = NUM_2D_SIDES);
/**
* @brief goes through 3D custom switch blocks and counts how many connections are crossing dice for each switch block.
*
Expand All @@ -90,12 +75,6 @@ vtr::NdMatrix<int, 2> get_number_track_to_track_inter_die_conn(t_sb_connection_m
const int custom_3d_sb_fanin_fanout,
RRGraphBuilder& rr_graph_builder);

int find_average_rr_node_index(int device_width,
int device_height,
t_rr_type rr_type,
int ptc,
const t_rr_node_indices& L_rr_node_indices);

t_seg_details* alloc_and_load_seg_details(int* max_chan_width,
const int max_len,
const std::vector<t_segment_inf>& segment_inf,
Expand Down Expand Up @@ -270,8 +249,6 @@ void dump_track_to_pin_map(t_track_to_pin_lookup& track_to_pin_map,
int max_chan_width,
FILE* fp);

void add_to_rr_node_indices(t_rr_node_indices& rr_node_indices, const t_rr_graph_storage& rr_nodes, int inode);

void insert_at_ptc_index(std::vector<int>& rr_indices, int ptc, int inode);

inline int get_chan_width(enum e_side side, const t_chan_width* nodes_per_channel);
Expand Down