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

* 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 <[email protected]> * 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 <[email protected]> --------- Signed-off-by: YRabbit <[email protected]>
YosysHQ · Oct 2, 2024 · 65cf6d8 · 65cf6d8
1 parent 268b32c
commit 65cf6d8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/himbaechel/uarch/gowin/gowin_utils.h b/himbaechel/uarch/gowin/gowin_utils.h
@@ -1,6 +1,7 @@
 #ifndef GOWIN_UTILS_H
 #define GOWIN_UTILS_H
 
+#include "design_utils.h"
 #include "idstringlist.h"
 #include "nextpnr_namespaces.h"
 #include "nextpnr_types.h"
@@ -37,6 +38,19 @@ struct GowinUtils
     BelId get_dcs_bel(IdString spine_name);
     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
     bool has_SP32(void);
     bool need_SP_fix(void);

diff --git a/himbaechel/uarch/gowin/pack.cc b/himbaechel/uarch/gowin/pack.cc
@@ -454,7 +454,7 @@ struct GowinPacker
         }
 
         // 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));
             nets_to_remove.push_back(ci.getPort(tx_port)->name);
             out_iob->disconnectPort(id_OEN);
@@ -3160,7 +3160,7 @@ struct GowinPacker
             // add invertor
             int lut_idx = 0;
             auto add_inv = [&](IdString port, PortType port_type) {
-                if (!port_used(&ci, port)) {
+                if (!gwu.port_used(&ci, port)) {
                     return;
                 }