diff options
| author | YRabbit <rabbit@yrabbit.cyou> | 2021-07-07 08:36:45 +1000 |
|---|---|---|
| committer | YRabbit <rabbit@yrabbit.cyou> | 2021-07-07 08:36:45 +1000 |
| commit | 5f018df4e463a37f5a63aeb9bd7a55988e4f2027 (patch) | |
| tree | fac6d37cd3954f44475d904094a3af231fc664f6 /fpga_interchange/arch.h | |
| parent | fd7734f0006d6522dea1ea4ea29750c8bafc77c4 (diff) | |
| parent | c696e885736ed052bd1d5e8fd91b42ee3bc6af9f (diff) | |
| download | nextpnr-5f018df4e463a37f5a63aeb9bd7a55988e4f2027.tar.gz nextpnr-5f018df4e463a37f5a63aeb9bd7a55988e4f2027.tar.bz2 nextpnr-5f018df4e463a37f5a63aeb9bd7a55988e4f2027.zip | |
Merge branch 'master' into io_port
Diffstat (limited to 'fpga_interchange/arch.h')
| -rw-r--r-- | fpga_interchange/arch.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fpga_interchange/arch.h b/fpga_interchange/arch.h index 6e77054f..896a603a 100644 --- a/fpga_interchange/arch.h +++ b/fpga_interchange/arch.h @@ -576,7 +576,8 @@ struct Arch : ArchAPI<ArchRanges> const PipInfoPOD &pip_data = pip_info(chip_info, pip); for (int32_t wire_index : pip_data.pseudo_cell_wires) { wire.index = wire_index; - assign_net_to_wire(wire, net, "pseudo", /*require_empty=*/true); + if (getBoundWireNet(wire) != net) + assign_net_to_wire(wire, net, "pseudo", /*require_empty=*/true); } if (pip_data.pseudo_cell_wires.size() > 0) { @@ -708,7 +709,8 @@ struct Arch : ArchAPI<ArchRanges> // ------------------------------------------------- - void place_iobufs(WireId pad_wire, NetInfo *net, const pool<CellInfo *, hash_ptr_ops> &tightly_attached_bels, + void place_iobufs(WireId pad_wire, NetInfo *net, + const dict<CellInfo *, IdString, hash_ptr_ops> &tightly_attached_bels, pool<CellInfo *, hash_ptr_ops> *placed_cells); void pack_ports(); |