Skip to content

Deploy new API rr_node.node_sides() to GUI #1661

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 12 commits into from
Mar 3, 2021
Merged

Deploy new API rr_node.node_sides() to GUI #1661

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c62eba2
[VPR] Consider multiple node sides in GUI
tangxifan Feb 11, 2021
25f9044
[VPR] Code format fix
tangxifan Feb 11, 2021
56b71fc
[VPR] Bug fix in GUI on selecting from multiple sides
tangxifan Feb 12, 2021
8df8018
[VPR] Code format fix; Opin->IPIN connection in GUI remains buggy
tangxifan Feb 12, 2021
43c4277
[VPR] Tweak GUI for pin-to-pin connection display on multiple sides
tangxifan Feb 13, 2021
c5b83d0
Merge branch 'master' into rr_graph_node_side_patch
tangxifan Feb 18, 2021
ba8424c
[VPR] Bug fix on pin offset to be drawn
tangxifan Feb 20, 2021
0c791f2
Merge branch 'master' into rr_graph_node_side_patch
tangxifan Feb 25, 2021
a33ffb5
Merge branch 'master' into rr_graph_node_side_patch
tangxifan Feb 26, 2021
9e46be7
Merge branch 'master' into rr_graph_node_side_patch
vaughnbetz Mar 3, 2021
c09f839
[VPR] Add comments for pin offset in GUI drawing
tangxifan Mar 3, 2021
a3eebdc
Merge branch 'master' into rr_graph_node_side_patch
vaughnbetz Mar 3, 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
180 changes: 143 additions & 37 deletions vpr/src/draw/draw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2121,24 +2121,32 @@ static void draw_rr_pin(int inode, const ezgl::color& color, ezgl::renderer* g)
g->set_color(color);

/* TODO: This is where we can hide fringe physical pins and also identify globals (hide, color, show) */
draw_get_rr_pin_coords(inode, &xcen, &ycen);
g->fill_rectangle({xcen - draw_coords->pin_size, ycen - draw_coords->pin_size},
{xcen + draw_coords->pin_size, ycen + draw_coords->pin_size});
sprintf(str, "%d", ipin);
g->set_color(ezgl::BLACK);
g->draw_text({xcen, ycen}, str, 2 * draw_coords->pin_size, 2 * draw_coords->pin_size);
g->set_color(color);
/* As nodes may appear on more than one side, walk through the possible nodes
* - draw the pin on each side that it appears
*/
for (const e_side& pin_side : SIDES) {
if (!device_ctx.rr_nodes[inode].is_node_on_specific_side(pin_side)) {
continue;
}
draw_get_rr_pin_coords(inode, &xcen, &ycen, pin_side);
g->fill_rectangle({xcen - draw_coords->pin_size, ycen - draw_coords->pin_size},
{xcen + draw_coords->pin_size, ycen + draw_coords->pin_size});
sprintf(str, "%d", ipin);
g->set_color(ezgl::BLACK);
g->draw_text({xcen, ycen}, str, 2 * draw_coords->pin_size, 2 * draw_coords->pin_size);
g->set_color(color);
}
}

/* Returns the coordinates at which the center of this pin should be drawn. *
* inode gives the node number, and iside gives the side of the clb or pad *
* the physical pin is on. */
void draw_get_rr_pin_coords(int inode, float* xcen, float* ycen) {
void draw_get_rr_pin_coords(int inode, float* xcen, float* ycen, const e_side& pin_side) {
auto& device_ctx = g_vpr_ctx.device();
draw_get_rr_pin_coords(device_ctx.rr_nodes[inode], xcen, ycen);
draw_get_rr_pin_coords(device_ctx.rr_nodes[inode], xcen, ycen, pin_side);
}

void draw_get_rr_pin_coords(const t_rr_node& node, float* xcen, float* ycen) {
void draw_get_rr_pin_coords(const t_rr_node& node, float* xcen, float* ycen, const e_side& pin_side) {
t_draw_coords* draw_coords = get_draw_coords_vars();

int i, j, k, ipin, pins_per_sub_tile;
Expand All @@ -2164,7 +2172,7 @@ void draw_get_rr_pin_coords(const t_rr_node& node, float* xcen, float* ycen) {
step = (float)(draw_coords->get_tile_width()) / (float)(type->num_pins + type->capacity);
offset = (ipin + k + 1) * step;

switch (node.side()) {
switch (pin_side) {
case LEFT:
yc += offset;
break;
Expand All @@ -2185,7 +2193,8 @@ void draw_get_rr_pin_coords(const t_rr_node& node, float* xcen, float* ycen) {

default:
vpr_throw(VPR_ERROR_OTHER, __FILE__, __LINE__,
"in draw_get_rr_pin_coords: Unexpected side %s.\n", node.side_string());
"in draw_get_rr_pin_coords: Unexpected side %s.\n",
SIDE_STRING[pin_side]);
break;
}

Expand Down Expand Up @@ -2588,11 +2597,10 @@ static int draw_check_rr_node_hit(float click_x, float click_y) {
int height_offset = device_ctx.grid[i][j].height_offset;
int ipin = device_ctx.rr_nodes[inode].ptc_num();
float xcen, ycen;
int iside;
for (iside = 0; iside < 4; iside++) {
for (const e_side& iside : SIDES) {
// If pin exists on this side of the block, then get pin coordinates
if (type->pinloc[width_offset][height_offset][iside][ipin]) {
draw_get_rr_pin_coords(inode, &xcen, &ycen);
if (type->pinloc[width_offset][height_offset][size_t(iside)][ipin]) {
draw_get_rr_pin_coords(inode, &xcen, &ycen, iside);

// Now check if we clicked on this pin
if (click_x >= xcen - draw_coords->pin_size && click_x <= xcen + draw_coords->pin_size && click_y >= ycen - draw_coords->pin_size && click_y <= ycen + draw_coords->pin_size) {
Expand Down Expand Up @@ -2955,19 +2963,84 @@ static void draw_pin_to_chan_edge(int pin_node, int chan_node, ezgl::renderer* g

const t_grid_tile& grid_tile = device_ctx.grid[pin_rr.xlow()][pin_rr.ylow()];
t_physical_tile_type_ptr grid_type = grid_tile.type;
VTR_ASSERT_MSG(grid_type->pinloc[grid_tile.width_offset][grid_tile.height_offset][pin_rr.side()][pin_rr.pin_num()],
"Pin coordinates should match block type pin locations");

float x1 = 0, y1 = 0;
/* If there is only one side, no need for the following inference!!!
* When a node may have multiple sides,
* we lack direct information about which side of the node drives the channel node
* However, we can infer which side is actually used by the driver based on the
* coordinates of the channel node.
* In principle, in a regular rr_graph that can pass check_rr_graph() function,
* the coordinates should follow the illustration:
*
* +----------+
* | CHANX |
* | [x][y] |
* +----------+
* +----------+ +----------+ +--------+
* | | | | | |
* | CHANY | | Grid | | CHANY |
* | [x-1][y] | | [x][y] | | [x][y] |
* | | | | | |
* +----------+ +----------+ +--------+
* +----------+
* | CHANX |
* | [x][y-1] |
* +----------+
*
*
* Therefore, when there are multiple side:
* - a TOP side node is considered when the ylow of CHANX >= ylow of the node
* - a BOTTOM side node is considered when the ylow of CHANX <= ylow - 1 of the node
* - a RIGHT side node is considered when the xlow of CHANY >= xlow of the node
* - a LEFT side node is considered when the xlow of CHANY <= xlow - 1 of the node
*
* Note: ylow == yhigh for CHANX and xlow == xhigh for CHANY
*
* Note: Similar rules are applied for grid that has width > 1 and height > 1
* This is because (xlow, ylow) or (xhigh, yhigh) of the node follows
* the actual offset of the pin in the context of grid width and height
*/
std::vector<e_side> pin_candidate_sides;
for (const e_side& pin_candidate_side : SIDES) {
if ((pin_rr.is_node_on_specific_side(pin_candidate_side))
&& (grid_type->pinloc[grid_tile.width_offset][grid_tile.height_offset][pin_candidate_side][pin_rr.pin_num()])) {
pin_candidate_sides.push_back(pin_candidate_side);
}
}
/* Only 1 side will be picked in the end
* Any rr_node of a grid should have at least 1 side!!!
*/
e_side pin_side = NUM_SIDES;
if (1 == pin_candidate_sides.size()) {
pin_side = pin_candidate_sides[0];
} else {
VTR_ASSERT(1 < pin_candidate_sides.size());
if (CHANX == chan_rr.type() && pin_rr.ylow() <= chan_rr.ylow()) {
pin_side = TOP;
} else if (CHANX == chan_rr.type() && pin_rr.ylow() - 1 >= chan_rr.ylow()) {
pin_side = BOTTOM;
} else if (CHANY == chan_rr.type() && pin_rr.xlow() <= chan_rr.xlow()) {
pin_side = RIGHT;
} else if (CHANY == chan_rr.type() && pin_rr.xlow() - 1 >= chan_rr.xlow()) {
pin_side = LEFT;
}
/* The inferred side must be in the list of sides of the pin rr_node!!! */
VTR_ASSERT(pin_candidate_sides.end() != std::find(pin_candidate_sides.begin(), pin_candidate_sides.end(), pin_side));
}
/* Sanity check */
VTR_ASSERT(NUM_SIDES != pin_side);

/* Now we determine which side to be used, calculate the offset to be drawn*/
float draw_pin_offset;
if (pin_rr.side() == TOP || pin_rr.side() == RIGHT) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think this logic needs a comment. Now that pin rr nodes have multiple edges, I don't think this logic is right. I recommend you write a short comment explaining why you believe this is correct.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed. In the later part of this code block, I have logics to identify which side to be used for GUI. Therefore, I move the offset calculation there.

Copy link
Contributor

Choose a reason for hiding this comment

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

Agreed: good to comment why the offset is +ve or -ve (draw above / right, or draw below/left --> latter implies a negative offset).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@vaughnbetz No problem. I have added comments about why the positive/negative offset is needed

if (TOP == pin_side || RIGHT == pin_side) {
draw_pin_offset = draw_coords->pin_size;
} else {
VTR_ASSERT(pin_rr.side() == BOTTOM || pin_rr.side() == LEFT);
VTR_ASSERT(BOTTOM == pin_side || LEFT == pin_side);
draw_pin_offset = -draw_coords->pin_size;
}

float x1 = 0, y1 = 0;
draw_get_rr_pin_coords(pin_node, &x1, &y1);
draw_get_rr_pin_coords(pin_node, &x1, &y1, pin_side);

ezgl::rectangle chan_bbox = draw_get_rr_chan_bbox(chan_node);

Expand Down Expand Up @@ -3022,11 +3095,30 @@ static void draw_pin_to_pin(int opin_node, int ipin_node, ezgl::renderer* g) {
VTR_ASSERT(device_ctx.rr_nodes[opin_node].type() == OPIN);
VTR_ASSERT(device_ctx.rr_nodes[ipin_node].type() == IPIN);

/* FIXME: May use a smarter strategy
* Currently, we use the last side found for both OPIN and IPIN
* when draw the direct connection between the two nodes
* Note: tried first side but see missing connections
*/
float x1 = 0, y1 = 0;
draw_get_rr_pin_coords(opin_node, &x1, &y1);
std::vector<e_side> opin_candidate_sides;
for (const e_side& opin_candidate_side : SIDES) {
if (device_ctx.rr_nodes[opin_node].is_node_on_specific_side(opin_candidate_side)) {
opin_candidate_sides.push_back(opin_candidate_side);
}
}
VTR_ASSERT(1 <= opin_candidate_sides.size());
draw_get_rr_pin_coords(opin_node, &x1, &y1, opin_candidate_sides.back());

float x2 = 0, y2 = 0;
draw_get_rr_pin_coords(ipin_node, &x2, &y2);
std::vector<e_side> ipin_candidate_sides;
for (const e_side& ipin_candidate_side : SIDES) {
if (device_ctx.rr_nodes[ipin_node].is_node_on_specific_side(ipin_candidate_side)) {
ipin_candidate_sides.push_back(ipin_candidate_side);
}
}
VTR_ASSERT(1 <= ipin_candidate_sides.size());
draw_get_rr_pin_coords(ipin_node, &x2, &y2, ipin_candidate_sides.back());

g->draw_line({x1, y1}, {x2, y2});

Expand All @@ -3039,16 +3131,23 @@ static void draw_pin_to_sink(int ipin_node, int sink_node, ezgl::renderer* g) {
auto& device_ctx = g_vpr_ctx.device();

float x1 = 0, y1 = 0;
draw_get_rr_pin_coords(ipin_node, &x1, &y1);
/* Draw the line for each ipin on different sides */
for (const e_side& pin_side : SIDES) {
if (!device_ctx.rr_nodes[ipin_node].is_node_on_specific_side(pin_side)) {
continue;
}

float x2 = 0, y2 = 0;
draw_get_rr_src_sink_coords(device_ctx.rr_nodes[sink_node], &x2, &y2);
draw_get_rr_pin_coords(ipin_node, &x1, &y1, pin_side);

g->draw_line({x1, y1}, {x2, y2});
float x2 = 0, y2 = 0;
draw_get_rr_src_sink_coords(device_ctx.rr_nodes[sink_node], &x2, &y2);

float xend = x2 + (x1 - x2) / 10.;
float yend = y2 + (y1 - y2) / 10.;
draw_triangle_along_line(g, xend, yend, x1, x2, y1, y2);
g->draw_line({x1, y1}, {x2, y2});

float xend = x2 + (x1 - x2) / 10.;
float yend = y2 + (y1 - y2) / 10.;
draw_triangle_along_line(g, xend, yend, x1, x2, y1, y2);
}
}

static void draw_source_to_pin(int source_node, int opin_node, ezgl::renderer* g) {
Expand All @@ -3057,14 +3156,21 @@ static void draw_source_to_pin(int source_node, int opin_node, ezgl::renderer* g
float x1 = 0, y1 = 0;
draw_get_rr_src_sink_coords(device_ctx.rr_nodes[source_node], &x1, &y1);

float x2 = 0, y2 = 0;
draw_get_rr_pin_coords(opin_node, &x2, &y2);
/* Draw the line for each ipin on different sides */
for (const e_side& pin_side : SIDES) {
if (!device_ctx.rr_nodes[opin_node].is_node_on_specific_side(pin_side)) {
continue;
}

g->draw_line({x1, y1}, {x2, y2});
float x2 = 0, y2 = 0;
draw_get_rr_pin_coords(opin_node, &x2, &y2, pin_side);

float xend = x2 + (x1 - x2) / 10.;
float yend = y2 + (y1 - y2) / 10.;
draw_triangle_along_line(g, xend, yend, x1, x2, y1, y2);
g->draw_line({x1, y1}, {x2, y2});

float xend = x2 + (x1 - x2) / 10.;
float yend = y2 + (y1 - y2) / 10.;
draw_triangle_along_line(g, xend, yend, x1, x2, y1, y2);
}
}

static inline void draw_mux_with_size(ezgl::point2d origin, e_side orientation, float height, int size, ezgl::renderer* g) {
Expand Down
4 changes: 2 additions & 2 deletions vpr/src/draw/draw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ void free_draw_structs();

#ifndef NO_GRAPHICS

void draw_get_rr_pin_coords(int inode, float* xcen, float* ycen);
void draw_get_rr_pin_coords(const t_rr_node& node, float* xcen, float* ycen);
void draw_get_rr_pin_coords(int inode, float* xcen, float* ycen, const e_side& pin_side);
void draw_get_rr_pin_coords(const t_rr_node& node, float* xcen, float* ycen, const e_side& pin_side);

void draw_triangle_along_line(ezgl::renderer* g, ezgl::point2d start, ezgl::point2d end, float relative_position = 1., float arrow_size = DEFAULT_ARROW_SIZE);
void draw_triangle_along_line(ezgl::renderer* g, ezgl::point2d loc, ezgl::point2d start, ezgl::point2d end, float arrow_size = DEFAULT_ARROW_SIZE);
Expand Down
7 changes: 3 additions & 4 deletions vpr/src/draw/search_bar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,9 @@ void auto_zoom_rr_node(int rr_node_id) {
int ipin = device_ctx.rr_nodes[rr_node_id].ptc_num();
float xcen, ycen;

int iside;
for (iside = 0; iside < 4; iside++) {
if (type->pinloc[width_offset][height_offset][iside][ipin]) {
draw_get_rr_pin_coords(rr_node_id, &xcen, &ycen);
for (const e_side& iside : SIDES) {
if (type->pinloc[width_offset][height_offset][size_t(iside)][ipin]) {
draw_get_rr_pin_coords(rr_node_id, &xcen, &ycen, iside);
rr_node = {{xcen - draw_coords->pin_size, ycen - draw_coords->pin_size},
{xcen + draw_coords->pin_size, ycen + draw_coords->pin_size}};
}
Expand Down