caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gowin. Fix the port check for connectivity. (#1376)

Browse Source 
* Gowin. Fix the port check for connectivity.

What happens is that it's not enough to check for a network, we also
need to make sure that the network is functional: has src and sinks.

And the style edits - they get automatically when I make sure to run
clang-format10.

Signed-off-by: YRabbit <rabbit@yrabbit.cyou>

* Gowin. Fix the port check for connectivity.

What happens is that it's not enough to check for a network, we also
need to make sure that the network is functional: has src and sinks

Signed-off-by: YRabbit <rabbit@yrabbit.cyou>

---------

Signed-off-by: YRabbit <rabbit@yrabbit.cyou>
This commit is contained in:
YRabbit 2024-10-03 06:36:36 +10:00 committed by GitHub
parent 268b32c341
commit 65cf6d8da7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
himbaechel/uarch/gowin/gowin_utils.h
View File

@ -1,6 +1,7 @@
#ifndef GOWIN_UTILS_H #ifndef GOWIN_UTILS_H
#define GOWIN_UTILS_H #define GOWIN_UTILS_H
#include "design_utils.h"
#include "idstringlist.h" #include "idstringlist.h"
#include "nextpnr_namespaces.h" #include "nextpnr_namespaces.h"
#include "nextpnr_types.h" #include "nextpnr_types.h"
@ -37,6 +38,19 @@ struct GowinUtils
BelId get_dcs_bel(IdString spine_name); BelId get_dcs_bel(IdString spine_name);
BelId get_dhcen_bel(WireId hclkin_wire, IdString &side); BelId get_dhcen_bel(WireId hclkin_wire, IdString &side);
// ports
inline bool port_used(CellInfo *cell, IdString port_name)
{
if (!nextpnr_himbaechel::port_used(cell, port_name)) {
return false;
}
NetInfo *ni = cell->ports.at(port_name).net;
if (ni->driver.cell == nullptr) {
return false;
}
return ni->users.entries() != 0;
}
// BSRAM // BSRAM
bool has_SP32(void); bool has_SP32(void);
bool need_SP_fix(void); bool need_SP_fix(void);

4
himbaechel/uarch/gowin/pack.cc
View File

@ -454,7 +454,7 @@ struct GowinPacker
} }
// if Q1 is connected then disconnect it too // if Q1 is connected then disconnect it too
if (port_used(&ci, tx_port)) { if (gwu.port_used(&ci, tx_port)) {
NPNR_ASSERT(out_iob == net_only_drives(ctx, ci.ports.at(tx_port).net, is_iob, id_OEN, true)); NPNR_ASSERT(out_iob == net_only_drives(ctx, ci.ports.at(tx_port).net, is_iob, id_OEN, true));
nets_to_remove.push_back(ci.getPort(tx_port)->name); nets_to_remove.push_back(ci.getPort(tx_port)->name);
out_iob->disconnectPort(id_OEN); out_iob->disconnectPort(id_OEN);
@ -3160,7 +3160,7 @@ struct GowinPacker
// add invertor // add invertor
int lut_idx = 0; int lut_idx = 0;
auto add_inv = [&](IdString port, PortType port_type) { auto add_inv = [&](IdString port, PortType port_type) {
if (!port_used(&ci, port)) { if (!gwu.port_used(&ci, port)) {
return; return;
} }