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

Merge branch 'master' into io_port

Browse Source
This commit is contained in:
YRabbit 2021-07-03 10:09:38 +10:00
commit 1aae331ddc
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fpga_interchange/fpga_interchange.cpp
View File

@ -544,7 +544,9 @@ void FpgaInterchange::write_physical_netlist(const Context * ctx, const std::str
for(auto & net_pair : ctx->nets) { for(auto & net_pair : ctx->nets) {
auto &net = *net_pair.second; auto &net = *net_pair.second;
if (net.users.empty()) // Remove disconnected nets that do not have any users
auto net_name = std::string(net.name.c_str(ctx));
if (net.users.empty() && net_name.rfind("$frontend$", 0) == 0)
nets_to_remove++; nets_to_remove++;
} }
@ -553,7 +555,8 @@ void FpgaInterchange::write_physical_netlist(const Context * ctx, const std::str
for(auto & net_pair : ctx->nets) { for(auto & net_pair : ctx->nets) {
auto &net = *net_pair.second; auto &net = *net_pair.second;
if (net.users.empty()) auto net_name = std::string(net.name.c_str(ctx));
if (net.users.empty() && net_name.rfind("$frontend$", 0) == 0)
continue; continue;
const CellInfo *driver_cell = net.driver.cell; const CellInfo *driver_cell = net.driver.cell;
@ -1087,6 +1090,14 @@ ModuleReader::ModuleReader(const LogicalNetlistImpl *root,
if(iter == net_indicies.end()) { if(iter == net_indicies.end()) {
PortKey port_key = port_connections.first; PortKey port_key = port_connections.first;
auto port = ports[port_key.port_idx]; auto port = ports[port_key.port_idx];
// Disconnected outputs should be marked, so to be ignored when
// writing the physical netlist.
// Skipping these nets lets the basic frontend to assign a default
// name that starts with $frontend$.
if (port.getDir() == LogicalNetlist::Netlist::Direction::OUTPUT)
continue;
disconnected_nets[net_idx] = stringf("%s.%d", root->strings.at(port.getName()).c_str(), i); disconnected_nets[net_idx] = stringf("%s.%d", root->strings.at(port.getName()).c_str(), i);
} }
} }