diff options
| author | gatecat <gatecat@ds0.me> | 2021-05-11 13:59:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-11 13:59:09 +0100 |
| commit | 7e3bb720490c22957d6e4f045de34d88c007a549 (patch) | |
| tree | 9df73515a41dbedbd20ca2efc5b5752a14131967 | |
| parent | 744e91dda8829a9c5b8c891c5e490612389f48e3 (diff) | |
| parent | e9fdbf618c5d36c3d6b31b53d90d6d1ad322f1a5 (diff) | |
| download | nextpnr-7e3bb720490c22957d6e4f045de34d88c007a549.tar.gz nextpnr-7e3bb720490c22957d6e4f045de34d88c007a549.tar.bz2 nextpnr-7e3bb720490c22957d6e4f045de34d88c007a549.zip | |
Merge pull request #702 from YosysHQ/gatecat/interchange-fix-bb
interchange: Fix bounding box computation
| -rw-r--r-- | common/router2.cc | 2 | ||||
| -rw-r--r-- | fpga_interchange/arch.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/router2.cc b/common/router2.cc index b62873c0..b48857d7 100644 --- a/common/router2.cc +++ b/common/router2.cc @@ -175,7 +175,7 @@ struct Router2 nets.at(i).bb.x0 = std::min(nets.at(i).bb.x0, ad.bb.x0); nets.at(i).bb.x1 = std::max(nets.at(i).bb.x1, ad.bb.x1); nets.at(i).bb.y0 = std::min(nets.at(i).bb.y0, ad.bb.y0); - nets.at(i).bb.y1 = std::max(nets.at(i).bb.x1, ad.bb.y1); + nets.at(i).bb.y1 = std::max(nets.at(i).bb.y1, ad.bb.y1); } // Add location to centroid sum Loc usr_loc = ctx->getBelLocation(usr.cell->bel); diff --git a/fpga_interchange/arch.cc b/fpga_interchange/arch.cc index 938c4f2c..602f3913 100644 --- a/fpga_interchange/arch.cc +++ b/fpga_interchange/arch.cc @@ -733,11 +733,12 @@ ArcBounds Arch::getRouteBoundingBox(WireId src, WireId dst) const int dst_tile = dst.tile == -1 ? chip_info->nodes[dst.index].tile_wires[0].tile : dst.tile; int src_tile = src.tile == -1 ? chip_info->nodes[src.index].tile_wires[0].tile : src.tile; - int x0 = 0, x1 = 0, y0 = 0, y1 = 0; int src_x, src_y; get_tile_x_y(src_tile, &src_x, &src_y); + int x0 = src_x, x1 = src_x, y0 = src_y, y1 = src_y; + int dst_x, dst_y; get_tile_x_y(dst_tile, &dst_x, &dst_y); @@ -748,7 +749,6 @@ ArcBounds Arch::getRouteBoundingBox(WireId src, WireId dst) const y1 = std::max(y1, y); }; - expand(src_x, src_y); expand(dst_x, dst_y); if (source_locs.count(src)) |