riscv
/
OpenFPGA
mirror of https://github.com/lnis-uofu/OpenFPGA.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bug fixing for heterogenenous FPGA when using the RRGraph object

This commit is contained in:
tangxifan 2020-02-04 17:31:39 -07:00
parent f098d40af1
commit 0cce1f4efc
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vpr/src/place/timing_place_lookup.cpp
View File

@ -302,18 +302,24 @@ static float route_connection_delay(
//Get the rr nodes to route between //Get the rr nodes to route between
auto best_driver_ptcs = get_best_classes(DRIVER, device_ctx.grid[source_x][source_y].type); auto best_driver_ptcs = get_best_classes(DRIVER, device_ctx.grid[source_x][source_y].type);
auto best_sink_ptcs = get_best_classes(RECEIVER, device_ctx.grid[sink_x][sink_y].type); auto best_sink_ptcs = get_best_classes(RECEIVER, device_ctx.grid[sink_x][sink_y].type);
int src_width_offset = device_ctx.grid[source_x][source_y].width_offset;
int src_height_offset = device_ctx.grid[source_x][source_y].height_offset;
int sink_width_offset = device_ctx.grid[sink_x][sink_y].width_offset;
int sink_height_offset = device_ctx.grid[sink_x][sink_y].height_offset;
for (int driver_ptc : best_driver_ptcs) { for (int driver_ptc : best_driver_ptcs) {
VTR_ASSERT(driver_ptc != OPEN); VTR_ASSERT(driver_ptc != OPEN);
RRNodeId source_rr_node = device_ctx.rr_graph.find_node(source_x, source_y, SOURCE, driver_ptc); RRNodeId source_rr_node = device_ctx.rr_graph.find_node(source_x - src_width_offset, source_y - src_height_offset, SOURCE, driver_ptc);
VTR_ASSERT(source_rr_node != RRNodeId::INVALID()); VTR_ASSERT(source_rr_node != RRNodeId::INVALID());
for (int sink_ptc : best_sink_ptcs) { for (int sink_ptc : best_sink_ptcs) {
VTR_ASSERT(sink_ptc != OPEN); VTR_ASSERT(sink_ptc != OPEN);
RRNodeId sink_rr_node = device_ctx.rr_graph.find_node(sink_x, sink_y, SINK, sink_ptc); RRNodeId sink_rr_node = device_ctx.rr_graph.find_node(sink_x - sink_width_offset, sink_y - sink_height_offset, SINK, sink_ptc);
VTR_ASSERT(sink_rr_node != RRNodeId::INVALID()); VTR_ASSERT(sink_rr_node != RRNodeId::INVALID());