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

Gowin. BUGFIX. Do not create missing wires. (#1418)

Browse Source 
Erroneously created wires for specific IOs on the underside of some
chips.

Fixes https://github.com/YosysHQ/nextpnr/issues/1417

Also cosmetic edits.

Signed-off-by: YRabbit <rabbit@yrabbit.cyou>
This commit is contained in:
YRabbit 2025-01-12 17:12:06 +10:00 committed by GitHub
parent 5fe680390f
commit 92694d7db7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
himbaechel/uarch/gowin/gowin_arch_gen.py
View File

@ -608,7 +608,6 @@ def create_extra_funcs(tt: TileType, db: chipdb, x: int, y: int):
bel = tt.create_bel("EMCU", "EMCU", EMCU_Z) bel = tt.create_bel("EMCU", "EMCU", EMCU_Z)
portmap = desc['ins'] portmap = desc['ins']
for port, wire in portmap.items(): for port, wire in portmap.items():
print(port, wire)
if not tt.has_wire(wire): if not tt.has_wire(wire):
tt.create_wire(wire, "EMCU_IN") tt.create_wire(wire, "EMCU_IN")
tt.add_bel_pin(bel, port, wire, PinType.INPUT) tt.add_bel_pin(bel, port, wire, PinType.INPUT)
@ -746,7 +745,7 @@ def create_io_tiletype(chip: Chip, db: chipdb, x: int, y: int, ttyp: int, tdesc:
tt.add_bel_pin(io, "OEN", portmap['OE'], PinType.INPUT) tt.add_bel_pin(io, "OEN", portmap['OE'], PinType.INPUT)
tt.add_bel_pin(io, "O", portmap['O'], PinType.OUTPUT) tt.add_bel_pin(io, "O", portmap['O'], PinType.OUTPUT)
# bottom io # bottom io
if 'BOTTOM_IO_PORT_A' in portmap: if 'BOTTOM_IO_PORT_A' in portmap and portmap['BOTTOM_IO_PORT_A']:
if not tt.has_wire(portmap['BOTTOM_IO_PORT_A']): if not tt.has_wire(portmap['BOTTOM_IO_PORT_A']):
tt.create_wire(portmap['BOTTOM_IO_PORT_A'], "IO_I") tt.create_wire(portmap['BOTTOM_IO_PORT_A'], "IO_I")
tt.create_wire(portmap['BOTTOM_IO_PORT_B'], "IO_I") tt.create_wire(portmap['BOTTOM_IO_PORT_B'], "IO_I")

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

@ -859,7 +859,6 @@ struct GowinPacker
iologic_o->setAttr(id_OREG_TYPE, ff->type.str(ctx)); iologic_o->setAttr(id_OREG_TYPE, ff->type.str(ctx));
cells_to_remove.push_back(ff->name); cells_to_remove.push_back(ff->name);
} }
break;
} while (false); } while (false);
} }
@ -966,7 +965,6 @@ struct GowinPacker
iologic_o->setAttr(id_TREG_TYPE, ff->type.str(ctx)); iologic_o->setAttr(id_TREG_TYPE, ff->type.str(ctx));
cells_to_remove.push_back(ff->name); cells_to_remove.push_back(ff->name);
} }
break;
} while (false); } while (false);
} }
} }