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

ecp5: DCU clocking fixes

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2018-11-11 10:22:57 +00:00
parent 0eba7d9789
commit 084f9cf63f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ecp5/globals.cc
View File

@ -55,6 +55,9 @@ class Ecp5GlobalRouter
{ {
if (user.cell->type == id_TRELLIS_SLICE && (user.port == id_CLK || user.port == id_WCK)) if (user.cell->type == id_TRELLIS_SLICE && (user.port == id_CLK || user.port == id_WCK))
return true; return true;
if (user.cell->type == id_DCUA && (user.port == id_CH0_FF_RXI_CLK || user.port == id_CH1_FF_RXI_CLK ||
user.port == id_CH0_FF_TXI_CLK || user.port == id_CH1_FF_TXI_CLK))
return true;
return false; return false;
} }
@ -65,8 +68,11 @@ class Ecp5GlobalRouter
NetInfo *ni = net.second.get(); NetInfo *ni = net.second.get();
clockCount[ni->name] = 0; clockCount[ni->name] = 0;
for (const auto &user : ni->users) { for (const auto &user : ni->users) {
if (is_clock_port(user)) if (is_clock_port(user)) {
clockCount[ni->name]++; clockCount[ni->name]++;
if (user.cell->type == id_DCUA)
clockCount[ni->name] += 100;
}
} }
// log_info("clkcount %s: %d\n", ni->name.c_str(ctx),clockCount[ni->name]); // log_info("clkcount %s: %d\n", ni->name.c_str(ctx),clockCount[ni->name]);
} }
@ -379,7 +385,7 @@ class Ecp5GlobalRouter
for (auto user : net->users) { for (auto user : net->users) {
if (user.port == id_CLKFB) { if (user.port == id_CLKFB) {
keep_users.push_back(user); keep_users.push_back(user);
} else if (net->driver.cell->type == id_EXTREFB && user.cell->type == id_DCCA) { } else if (net->driver.cell->type == id_EXTREFB && user.cell->type == id_DCUA) {
keep_users.push_back(user); keep_users.push_back(user);
} else { } else {
glbnet->users.push_back(user); glbnet->users.push_back(user);