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

pnr runs1111

Browse Source
This commit is contained in:
Pepijn de Vos 2020-12-07 10:05:27 +01:00
parent 2a98510f91
commit c924ade85d
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gowin/arch.cc
View File

@ -332,8 +332,8 @@ const GlobalAliasPOD* aliasLookup(const GlobalAliasPOD *first, int len, const Gl
Arch::Arch(ArchArgs args) : args(args) Arch::Arch(ArchArgs args) : args(args)
{ {
family = "GW1N-9"; family = "GW1N-1";
device = "GW1N-9"; device = "GW1N-1";
speed = "C6/E5"; // or whatever speed = "C6/E5"; // or whatever
package = "QFN48"; // or something package = "QFN48"; // or something
@ -461,11 +461,11 @@ Arch::Arch(ArchArgs args) : args(args)
portname = pairLookup(bel->ports.get(), bel->num_ports, -1, ID_O)->src_id; portname = pairLookup(bel->ports.get(), bel->num_ports, -1, ID_O)->src_id;
snprintf(buf, 32, "R%dC%d_%s", row + 1, col + 1, portname.c_str(this)); snprintf(buf, 32, "R%dC%d_%s", row + 1, col + 1, portname.c_str(this));
wirename = id(buf); wirename = id(buf);
addBelInput(belname, id_I, wirename); addBelOutput(belname, id_O, wirename);
portname = pairLookup(bel->ports.get(), bel->num_ports, -1, ID_O)->src_id; portname = pairLookup(bel->ports.get(), bel->num_ports, -1, ID_I)->src_id;
snprintf(buf, 32, "R%dC%d_%s", row + 1, col + 1, portname.c_str(this)); snprintf(buf, 32, "R%dC%d_%s", row + 1, col + 1, portname.c_str(this));
wirename = id(buf); wirename = id(buf);
addBelInput(belname, id_O, wirename); addBelInput(belname, id_I, wirename);
portname = pairLookup(bel->ports.get(), bel->num_ports, -1, ID_OE)->src_id; portname = pairLookup(bel->ports.get(), bel->num_ports, -1, ID_OE)->src_id;
snprintf(buf, 32, "R%dC%d_%s", row + 1, col + 1, portname.c_str(this)); snprintf(buf, 32, "R%dC%d_%s", row + 1, col + 1, portname.c_str(this));
wirename = id(buf); wirename = id(buf);
@ -961,12 +961,29 @@ const std::vector<std::string> Arch::availableRouters = {"router1", "router2"};
void Arch::assignArchInfo() void Arch::assignArchInfo()
{ {
for (auto &cell : getCtx()->cells) { for (auto &cell : getCtx()->cells) {
IdString cname = cell.first;
CellInfo *ci = cell.second.get(); CellInfo *ci = cell.second.get();
if (ci->type == id("SLICE")) { if (ci->type == id("SLICE")) {
ci->is_slice = true; ci->is_slice = true;
ci->slice_clk = get_net_or_empty(ci, id("CLK")); ci->slice_clk = get_net_or_empty(ci, id("CLK"));
ci->slice_ce = get_net_or_empty(ci, id("CE")); ci->slice_ce = get_net_or_empty(ci, id("CE"));
ci->slice_lsr = get_net_or_empty(ci, id("LSR")); ci->slice_lsr = get_net_or_empty(ci, id("LSR"));
// add timing paths
addCellTimingClock(cname, id_CLK);
IdString ports[4] = {id_A, id_B, id_C, id_D};
for (int i=0; i<4; i++) {
DelayInfo setup = getDelayFromNS(0.1);
DelayInfo hold = getDelayFromNS(0.1);
addCellTimingSetupHold(cname, ports[i], id_CLK, setup, hold);
}
DelayInfo clkout = getDelayFromNS(0.1);
addCellTimingClockToOut(cname, id_Q, id_CLK, clkout);
for (int i=0; i<4; i++) {
DelayInfo delay = getDelayFromNS(0.1);
addCellTimingDelay(cname, ports[i], id_F, delay);
}
} else { } else {
ci->is_slice = false; ci->is_slice = false;
} }

2
gowin/arch.h
View File

@ -97,7 +97,7 @@ struct ArchArgs
int K = 4; int K = 4;
// y = mx + c relationship between distance and delay for interconnect // y = mx + c relationship between distance and delay for interconnect
// delay estimates // delay estimates
double delayScale = 0.1, delayOffset = 0; double delayScale = 0.1, delayOffset = 0.1;
}; };
struct WireInfo; struct WireInfo;