Skip to content

RRGraphView edge_sink_node()/edge_switch() Implementation #1930

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 21 commits into from
Dec 23, 2021
Merged

RRGraphView edge_sink_node()/edge_switch() Implementation #1930

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
975e37d
edge_switch api created and removed from node_impl.h
umariqbal-rs Dec 3, 2021
1f27d87
formatting has been set
umariqbal-rs Dec 3, 2021
2203367
comments and required chanings has been done
umariqbal-rs Dec 6, 2021
6d73d49
edge_switch() API implemented in rr_graph_view.h and deleted from rr_…
behzadmehmood-rs Dec 6, 2021
f28874f
formaating and warnings has been fixed
umariqbal-rs Dec 6, 2021
8a3abba
created edge_sink_node
umariqbal-rs Dec 6, 2021
e76f49c
edge_sink_node api created and changes in respective functions
umariqbal-rs Dec 8, 2021
ddaf9b1
warnings resolved
umariqbal-rs Dec 8, 2021
026c13c
removed from rr_node_impl.h
umariqbal-rs Dec 8, 2021
272d531
required changes done
umariqbal-rs Dec 9, 2021
5fda3ee
Merge branch 'master' of github.com:verilog-to-routing/vtr-verilog-to…
umariqbal-rs Dec 9, 2021
3d8c9e9
upstream
umariqbal-rs Dec 9, 2021
e3c30e0
required changes has been done
umariqbal-rs Dec 10, 2021
b73359f
changed to rr_node and removed open
umariqbal-rs Dec 15, 2021
61e0a9b
Updated readme
behzadmehmood-rs Dec 15, 2021
ae49c2c
conflicts resolved
umariqbal-rs Dec 15, 2021
353a0c4
resolved errors
umariqbal-rs Dec 15, 2021
d2de2b0
resolved num_edges
umariqbal-rs Dec 17, 2021
c4beebe
with a warning
umariqbal-rs Dec 17, 2021
bccca16
removed unsused argument
behzadmehmood-rs Dec 20, 2021
52a60bf
final comments and rr_graph argument has been added
umariqbal-rs Dec 21, 2021
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
4 changes: 2 additions & 2 deletions utils/fasm/test/test_fasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@ TEST_CASE("fasm_integration_test", "[fasm]") {
const auto& rr_graph = device_ctx.rr_graph;
for(size_t inode = 0; inode < device_ctx.rr_nodes.size(); ++inode) {
for(t_edge_size iedge = 0; iedge < device_ctx.rr_nodes[inode].num_edges(); ++iedge) {
auto sink_inode = device_ctx.rr_nodes[inode].edge_sink_node(iedge);
auto switch_id = device_ctx.rr_nodes[inode].edge_switch(iedge);
auto sink_inode = size_t(rr_graph.edge_sink_node(RRNodeId(inode), iedge));
auto switch_id = rr_graph.edge_switch(RRNodeId(inode), iedge);
auto value = vtr::string_fmt("%d_%d_%zu",
inode, sink_inode, switch_id);

Expand Down
26 changes: 19 additions & 7 deletions vpr/src/device/rr_graph_view.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,18 @@ class RRGraphView {
inline const char* node_side_string(RRNodeId node) const {
return node_storage_.node_side_string(node);
}
/** @brief Get the switch id that represents the iedge'th outgoing edge from a specific node
* TODO: We may need to revisit this API and think about higher level APIs, like ``switch_delay()``
**/
inline short edge_switch(RRNodeId id, t_edge_size iedge) const {
return node_storage_.edge_switch(id, iedge);
}
/** @brief Get the destination node for the iedge'th edge from specified RRNodeId.
* This method should generally not be used, and instead first_edge and
* last_edge should be used.*/
inline RRNodeId edge_sink_node(RRNodeId id, t_edge_size iedge) const {
return node_storage_.edge_sink_node(id, iedge);
}

/** @brief The ptc_num carries different meanings for different node types
* (true in VPR RRG that is currently supported, may not be true in customized RRG)
Expand All @@ -268,13 +280,6 @@ class RRGraphView {
* This API is very powerful and developers should not use it unless it is necessary,
* e.g the node type is unknown. If the node type is known, the more specific routines, `node_pin_num()`,
* `node_track_num()`and `node_class_num()`, for different types of nodes should be used.*/
/** @brief Return detailed routing segment information with a given id* @note The routing segments here may not be exactly same as those defined in architecture file. They have been
* adapted to fit the context of routing resource graphs.
*/

inline const t_segment_inf& rr_segments(RRSegmentId seg_id) const {
return rr_segments_[seg_id];
}
inline short node_ptc_num(RRNodeId node) const {
return node_storage_.node_ptc_num(node);
}
Expand All @@ -301,6 +306,13 @@ class RRGraphView {
RRIndexedDataId node_cost_index(RRNodeId node) const {
return node_storage_.node_cost_index(node);
}
/** @brief Return detailed routing segment information with a given id* @note The routing segments here may not be exactly same as those defined in architecture file. They have been
* adapted to fit the context of routing resource graphs.
*/

inline const t_segment_inf& rr_segments(RRSegmentId seg_id) const {
return rr_segments_[seg_id];
}

/** @brief Return the fast look-up data structure for queries from client functions */
const RRSpatialLookup& node_lookup() const {
Expand Down
32 changes: 16 additions & 16 deletions vpr/src/draw/draw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,10 +1686,10 @@ static void draw_rr_edges(int inode, ezgl::renderer* g) {
return; /* Nothing to draw. */
}

from_ptc_num = rr_graph.node_ptc_num(RRNodeId(inode));
from_ptc_num = rr_graph.node_ptc_num(rr_node);

for (t_edge_size iedge = 0, l = device_ctx.rr_nodes[inode].num_edges(); iedge < l; iedge++) {
to_node = device_ctx.rr_nodes[inode].edge_sink_node(iedge);
to_node = size_t(rr_graph.edge_sink_node(rr_node, iedge));
to_type = rr_graph.node_type(RRNodeId(to_node));
to_ptc_num = rr_graph.node_ptc_num(RRNodeId(to_node));
bool edge_configurable = device_ctx.rr_nodes[inode].edge_is_configurable(iedge);
Expand Down Expand Up @@ -1772,8 +1772,8 @@ static void draw_rr_edges(int inode, ezgl::renderer* g) {
} else {
g->set_color(blk_DARKGREEN);
}
switch_type = device_ctx.rr_nodes[inode].edge_switch(iedge);
draw_chanx_to_chanx_edge(RRNodeId(inode), RRNodeId(to_node),
switch_type = rr_graph.edge_switch(RRNodeId(inode), iedge);
draw_chanx_to_chanx_edge(rr_node, RRNodeId(to_node),
to_ptc_num, switch_type, g);
break;

Expand All @@ -1789,7 +1789,7 @@ static void draw_rr_edges(int inode, ezgl::renderer* g) {
} else {
g->set_color(blk_DARKGREEN);
}
switch_type = device_ctx.rr_nodes[inode].edge_switch(iedge);
switch_type = rr_graph.edge_switch(rr_node, iedge);
draw_chanx_to_chany_edge(inode, from_ptc_num, to_node,
to_ptc_num, FROM_X_TO_Y, switch_type, g);
break;
Expand Down Expand Up @@ -1842,7 +1842,7 @@ static void draw_rr_edges(int inode, ezgl::renderer* g) {
} else {
g->set_color(blk_DARKGREEN);
}
switch_type = device_ctx.rr_nodes[inode].edge_switch(iedge);
switch_type = rr_graph.edge_switch(rr_node, iedge);
draw_chanx_to_chany_edge(to_node, to_ptc_num, inode,
from_ptc_num, FROM_Y_TO_X, switch_type, g);
break;
Expand All @@ -1860,8 +1860,8 @@ static void draw_rr_edges(int inode, ezgl::renderer* g) {
} else {
g->set_color(blk_DARKGREEN);
}
switch_type = device_ctx.rr_nodes[inode].edge_switch(iedge);
draw_chany_to_chany_edge(RRNodeId(inode), RRNodeId(to_node),
switch_type = rr_graph.edge_switch(rr_node, iedge);
draw_chany_to_chany_edge(rr_node, RRNodeId(to_node),
to_ptc_num, switch_type, g);
break;

Expand Down Expand Up @@ -2519,7 +2519,7 @@ void draw_partial_route(const std::vector<int>& rr_nodes_to_draw, ezgl::renderer
auto prev_type = rr_graph.node_type(RRNodeId(prev_node));

auto iedge = find_edge(prev_node, inode);
auto switch_type = device_ctx.rr_nodes[prev_node].edge_switch(iedge);
auto switch_type = rr_graph.edge_switch(RRNodeId(prev_node), iedge);

switch (rr_type) {
case OPIN: {
Expand Down Expand Up @@ -2697,12 +2697,12 @@ void highlight_nets(char* message, int hit_node) {
void draw_highlight_fan_in_fan_out(const std::set<int>& nodes) {
t_draw_state* draw_state = get_draw_state_vars();
auto& device_ctx = g_vpr_ctx.device();

const auto& rr_graph = device_ctx.rr_graph;
for (auto node : nodes) {
/* Highlight the fanout nodes in red. */
for (t_edge_size iedge = 0, l = device_ctx.rr_nodes[node].num_edges();
iedge < l; iedge++) {
int fanout_node = device_ctx.rr_nodes[node].edge_sink_node(iedge);
int fanout_node = size_t(rr_graph.edge_sink_node(RRNodeId(node), iedge));

if (draw_state->draw_rr_node[node].color == ezgl::MAGENTA
&& draw_state->draw_rr_node[fanout_node].color
Expand All @@ -2721,8 +2721,7 @@ void draw_highlight_fan_in_fan_out(const std::set<int>& nodes) {
for (size_t inode = 0; inode < device_ctx.rr_nodes.size(); inode++) {
for (t_edge_size iedge = 0, l = device_ctx.rr_nodes[inode].num_edges(); iedge < l;
iedge++) {
int fanout_node = device_ctx.rr_nodes[inode].edge_sink_node(
iedge);
int fanout_node = size_t(rr_graph.edge_sink_node(RRNodeId(node), iedge));
if (fanout_node == node) {
if (draw_state->draw_rr_node[node].color == ezgl::MAGENTA
&& draw_state->draw_rr_node[inode].color
Expand Down Expand Up @@ -2823,13 +2822,13 @@ std::set<int> draw_expand_non_configurable_rr_nodes(int from_node) {
void draw_expand_non_configurable_rr_nodes_recurr(int from_node,
std::set<int>& expanded_nodes) {
auto& device_ctx = g_vpr_ctx.device();

const auto& rr_graph = device_ctx.rr_graph;
expanded_nodes.insert(from_node);

for (t_edge_size iedge = 0;
iedge < device_ctx.rr_nodes[from_node].num_edges(); ++iedge) {
bool edge_configurable = device_ctx.rr_nodes[from_node].edge_is_configurable(iedge);
int to_node = device_ctx.rr_nodes[from_node].edge_sink_node(iedge);
int to_node = size_t(rr_graph.edge_sink_node(RRNodeId(from_node), iedge));

if (!edge_configurable && !expanded_nodes.count(to_node)) {
draw_expand_non_configurable_rr_nodes_recurr(to_node,
Expand Down Expand Up @@ -3783,9 +3782,10 @@ bool trace_routed_connection_rr_nodes_recurr(const t_rt_node* rt_node,
//Find the edge between two rr nodes
static t_edge_size find_edge(int prev_inode, int inode) {
auto& device_ctx = g_vpr_ctx.device();
const auto& rr_graph = device_ctx.rr_graph;
for (t_edge_size iedge = 0;
iedge < device_ctx.rr_nodes[prev_inode].num_edges(); ++iedge) {
if (device_ctx.rr_nodes[prev_inode].edge_sink_node(iedge) == inode) {
if (size_t(rr_graph.edge_sink_node(RRNodeId(prev_inode), iedge)) == size_t(inode)) {
return iedge;
}
}
Expand Down
6 changes: 3 additions & 3 deletions vpr/src/place/timing_place_lookup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,16 +1167,16 @@ bool directconnect_exists(int src_rr_node, int sink_rr_node) {

//TODO: This is a constant depth search, but still may be too slow
for (t_edge_size i_src_edge = 0; i_src_edge < rr_nodes[src_rr_node].num_edges(); ++i_src_edge) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

int opin_rr_node = rr_nodes[src_rr_node].edge_sink_node(i_src_edge);
int opin_rr_node = size_t(rr_graph.edge_sink_node(RRNodeId(src_rr_node), i_src_edge));

if (rr_graph.node_type(RRNodeId(opin_rr_node)) != OPIN) continue;

for (t_edge_size i_opin_edge = 0; i_opin_edge < rr_nodes[opin_rr_node].num_edges(); ++i_opin_edge) {
int ipin_rr_node = rr_nodes[opin_rr_node].edge_sink_node(i_opin_edge);
int ipin_rr_node = size_t(rr_graph.edge_sink_node(RRNodeId(opin_rr_node), i_opin_edge));
if (rr_graph.node_type(RRNodeId(ipin_rr_node)) != IPIN) continue;

for (t_edge_size i_ipin_edge = 0; i_ipin_edge < rr_nodes[ipin_rr_node].num_edges(); ++i_ipin_edge) {
if (sink_rr_node == rr_nodes[ipin_rr_node].edge_sink_node(i_ipin_edge)) {
if (size_t(sink_rr_node) == size_t(rr_graph.edge_sink_node(RRNodeId(ipin_rr_node), i_ipin_edge))) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the for loop (starting from LINE 1169), we can change the data type of

  • opin_rr_node from int to RRNodeId
  • ipin_rr_node from int to RRNodeId

I see in LINE 1174, the num_edges() remain using an old API. I believe that you have patched these line in another PR #1917
It means that we should merge #1917 before this PR.
Let me know if this is fine for you or not.

return true;
}
}
Expand Down
20 changes: 10 additions & 10 deletions vpr/src/power/power.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,8 +822,8 @@ static void power_usage_routing(t_power_usage* power_usage,
}

for (t_edge_size edge_idx = 0; edge_idx < node.num_edges(); edge_idx++) {
const auto& next_node_id = node.edge_sink_node(edge_idx);
if (next_node_id != OPEN) {
const auto& next_node_id = size_t(rr_graph.edge_sink_node(RRNodeId(trace->index), edge_idx));
if (next_node_id != size_t(OPEN)) {
t_rr_node_power* next_node_power = &rr_node_power[next_node_id];

switch (rr_graph.node_type(RRNodeId(next_node_id))) {
Expand Down Expand Up @@ -982,9 +982,9 @@ static void power_usage_routing(t_power_usage* power_usage,
connectionbox_fanout = 0;
switchbox_fanout = 0;
for (t_edge_size iedge = 0; iedge < node.num_edges(); iedge++) {
if (node.edge_switch(iedge) == routing_arch->wire_to_rr_ipin_switch) {
if (rr_graph.edge_switch(rr_node, iedge) == routing_arch->wire_to_rr_ipin_switch) {
connectionbox_fanout++;
} else if (node.edge_switch(iedge) == routing_arch->delayless_switch) {
} else if (rr_graph.edge_switch(rr_node, iedge) == routing_arch->delayless_switch) {
/* Do nothing */
} else {
switchbox_fanout++;
Expand Down Expand Up @@ -1226,9 +1226,9 @@ void power_routing_init(const t_det_routing_arch* routing_arch) {
case CHANX:
case CHANY:
for (t_edge_size iedge = 0; iedge < node.num_edges(); iedge++) {
if (node.edge_switch(iedge) == routing_arch->wire_to_rr_ipin_switch) {
if (rr_graph.edge_switch(RRNodeId(rr_node_idx), iedge) == routing_arch->wire_to_rr_ipin_switch) {
fanout_to_IPIN++;
} else if (node.edge_switch(iedge) != routing_arch->delayless_switch) {
} else if (rr_graph.edge_switch(RRNodeId(rr_node_idx), iedge) != routing_arch->delayless_switch) {
fanout_to_seg++;
}
}
Expand Down Expand Up @@ -1261,11 +1261,11 @@ void power_routing_init(const t_det_routing_arch* routing_arch) {
auto node = device_ctx.rr_nodes[rr_node_idx];

for (t_edge_size edge_idx = 0; edge_idx < node.num_edges(); edge_idx++) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here.

if (node.edge_sink_node(edge_idx) != OPEN) {
if (rr_node_power[node.edge_sink_node(edge_idx)].driver_switch_type == OPEN) {
rr_node_power[node.edge_sink_node(edge_idx)].driver_switch_type = node.edge_switch(edge_idx);
if (size_t(rr_graph.edge_sink_node(RRNodeId(rr_node_idx), edge_idx)) != size_t(OPEN)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using the new API, you do not need the OPEN. This can be simplified as

if (rr_graph.edge_sink_node(RRNodeId(rr_node_idx), edge_idx)) {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure I will do that on Monday.

if (rr_node_power[size_t(rr_graph.edge_sink_node(RRNodeId(rr_node_idx), edge_idx))].driver_switch_type == OPEN) {
rr_node_power[size_t(rr_graph.edge_sink_node(RRNodeId(rr_node_idx), edge_idx))].driver_switch_type = rr_graph.edge_switch(RRNodeId(rr_node_idx), edge_idx);
} else {
VTR_ASSERT(rr_node_power[node.edge_sink_node(edge_idx)].driver_switch_type == node.edge_switch(edge_idx));
VTR_ASSERT(rr_node_power[size_t(rr_graph.edge_sink_node(RRNodeId(rr_node_idx), edge_idx))].driver_switch_type == rr_graph.edge_switch(RRNodeId(rr_node_idx), edge_idx));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion vpr/src/route/check_route.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ static bool check_adjacent(int from_node, int to_node) {
reached = false;

for (t_edge_size iconn = 0; iconn < device_ctx.rr_nodes[from_node].num_edges(); iconn++) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

if (device_ctx.rr_nodes[from_node].edge_sink_node(iconn) == to_node) {
if (size_t(rr_graph.edge_sink_node(RRNodeId(from_node), iconn)) == size_t(to_node)) {
reached = true;
break;
}
Expand Down
18 changes: 9 additions & 9 deletions vpr/src/route/check_rr_graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ void check_rr_graph(const t_graph_type graph_type,
edges.reserve(num_edges);

for (int iedge = 0; iedge < num_edges; iedge++) {
int to_node = device_ctx.rr_nodes[inode].edge_sink_node(iedge);
int to_node = size_t(rr_graph.edge_sink_node(rr_node, iedge));

if (to_node < 0 || to_node >= (int)device_ctx.rr_nodes.size()) {
VPR_FATAL_ERROR(VPR_ERROR_ROUTE,
Expand All @@ -94,7 +94,7 @@ void check_rr_graph(const t_graph_type graph_type,
edges.emplace_back(to_node, iedge);
total_edges_to_node[to_node]++;

auto switch_type = device_ctx.rr_nodes[inode].edge_switch(iedge);
auto switch_type = rr_graph.edge_switch(rr_node, iedge);

if (switch_type < 0 || switch_type >= num_rr_switches) {
VPR_FATAL_ERROR(VPR_ERROR_ROUTE,
Expand All @@ -110,7 +110,7 @@ void check_rr_graph(const t_graph_type graph_type,

//Check that multiple edges between the same from/to nodes make sense
for (int iedge = 0; iedge < num_edges; iedge++) {
int to_node = device_ctx.rr_nodes[inode].edge_sink_node(iedge);
int to_node = size_t(rr_graph.edge_sink_node(rr_node, iedge));

auto range = std::equal_range(edges.begin(), edges.end(),
to_node, node_edge_sorter());
Expand Down Expand Up @@ -158,7 +158,7 @@ void check_rr_graph(const t_graph_type graph_type,
std::map<short, int> switch_counts;
for (const auto& to_edge : vtr::Range<decltype(edges)::const_iterator>(range.first, range.second)) {
auto edge = to_edge.second;
auto edge_switch = device_ctx.rr_nodes[inode].edge_switch(edge);
auto edge_switch = rr_graph.edge_switch(rr_node, edge);

switch_counts[edge_switch]++;
}
Expand Down Expand Up @@ -547,13 +547,13 @@ static void check_unbuffered_edges(int from_node) {
from_num_edges = device_ctx.rr_nodes[from_node].num_edges();

for (from_edge = 0; from_edge < from_num_edges; from_edge++) {
to_node = device_ctx.rr_nodes[from_node].edge_sink_node(from_edge);
to_node = size_t(rr_graph.edge_sink_node(RRNodeId(from_node), from_edge));
to_rr_type = rr_graph.node_type(RRNodeId(to_node));

if (to_rr_type != CHANX && to_rr_type != CHANY)
continue;

from_switch_type = device_ctx.rr_nodes[from_node].edge_switch(from_edge);
from_switch_type = rr_graph.edge_switch(RRNodeId(from_node), from_edge);

if (device_ctx.rr_switch_inf[from_switch_type].buffered())
continue;
Expand All @@ -566,8 +566,8 @@ static void check_unbuffered_edges(int from_node) {
trans_matched = false;

for (to_edge = 0; to_edge < to_num_edges; to_edge++) {
if (device_ctx.rr_nodes[to_node].edge_sink_node(to_edge) == from_node
&& device_ctx.rr_nodes[to_node].edge_switch(to_edge) == from_switch_type) {
if (size_t(rr_graph.edge_sink_node(RRNodeId(to_node), to_edge)) == size_t(from_node)
&& rr_graph.edge_switch(RRNodeId(to_node), to_edge) == from_switch_type) {
trans_matched = true;
break;
}
Expand Down Expand Up @@ -606,7 +606,7 @@ static void check_rr_edge(int from_node, int iedge, int to_node) {
const auto& rr_graph = device_ctx.rr_graph;

//Check that to to_node's fan-in is correct, given the switch type
int iswitch = device_ctx.rr_nodes[from_node].edge_switch(iedge);
int iswitch = rr_graph.edge_switch(RRNodeId(from_node), iedge);
auto switch_type = device_ctx.rr_switch_inf[iswitch].type();

int to_fanin = rr_graph.node_fan_in(RRNodeId(to_node));
Expand Down
Loading