diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/kernel/design_utils.h | 3 | ||||
| -rw-r--r-- | common/kernel/timing.cc | 8 | ||||
| -rw-r--r-- | common/kernel/util.h | 19 |
3 files changed, 4 insertions, 26 deletions
diff --git a/common/kernel/design_utils.h b/common/kernel/design_utils.h index 069600b5..c290a35b 100644 --- a/common/kernel/design_utils.h +++ b/common/kernel/design_utils.h @@ -31,9 +31,6 @@ NEXTPNR_NAMESPACE_BEGIN Utilities for design manipulation, intended for use inside packing algorithms */ -// Disconnect a net (if connected) from old, and connect it to rep -void replace_port(CellInfo *old_cell, IdString old_name, CellInfo *rep_cell, IdString rep_name); - // If a net drives a given port of a cell matching a predicate (in many // cases more than one cell type, e.g. SB_DFFxx so a predicate is used), return // the first instance of that cell (otherwise nullptr). If exclusive is set to diff --git a/common/kernel/timing.cc b/common/kernel/timing.cc index 47235789..924f336c 100644 --- a/common/kernel/timing.cc +++ b/common/kernel/timing.cc @@ -707,7 +707,7 @@ void TimingAnalyser::print_critical_path(CellPortKey endpoint, domain_id_t domai ctx->getDelayNS(ports.at(cursor).domain_pairs.at(domain_pair).setup_slack)); while (cursor != CellPortKey()) { log(" %s.%s (net %s)\n", ctx->nameOf(cursor.cell), ctx->nameOf(cursor.port), - ctx->nameOf(get_net_or_empty(ctx->cells.at(cursor.cell).get(), cursor.port))); + ctx->nameOf(ctx->cells.at(cursor.cell)->getPort(cursor.port))); if (!ports.at(cursor).arrival.count(dp.key.launch)) break; cursor = ports.at(cursor).arrival.at(dp.key.launch).bwd_max; @@ -865,7 +865,7 @@ struct Timing topological_order.emplace_back(o->net); for (int i = 0; i < clocks; i++) { TimingClockingInfo clkInfo = ctx->getPortClockingInfo(cell.second.get(), o->name, i); - const NetInfo *clknet = get_net_or_empty(cell.second.get(), clkInfo.clock_port); + const NetInfo *clknet = cell.second->getPort(clkInfo.clock_port); IdString clksig = clknet ? clknet->name : async_clock; net_data[o->net][ClockEvent{clksig, clknet ? clkInfo.edge : RISING_EDGE}] = TimingData{clkInfo.clockToQ.maxDelay()}; @@ -1125,7 +1125,7 @@ struct Timing if (portClass == TMG_REGISTER_INPUT) { for (int i = 0; i < port_clocks; i++) { TimingClockingInfo clkInfo = ctx->getPortClockingInfo(usr.cell, usr.port, i); - const NetInfo *clknet = get_net_or_empty(usr.cell, clkInfo.clock_port); + const NetInfo *clknet = usr.cell->getPort(clkInfo.clock_port); IdString clksig = clknet ? clknet->name : async_clock; process_endpoint(clksig, clknet ? clkInfo.edge : RISING_EDGE, clkInfo.setup.maxDelay()); } @@ -1295,7 +1295,7 @@ CriticalPath build_critical_path_report(Context *ctx, ClockPair &clocks, const P if (portClass == TMG_REGISTER_OUTPUT) { for (int i = 0; i < port_clocks; i++) { TimingClockingInfo clockInfo = ctx->getPortClockingInfo(front_driver.cell, front_driver.port, i); - const NetInfo *clknet = get_net_or_empty(front_driver.cell, clockInfo.clock_port); + const NetInfo *clknet = front_driver.cell->getPort(clockInfo.clock_port); if (clknet != nullptr && clknet->name == clocks.start.clock && clockInfo.edge == clocks.start.edge) { last_port = clockInfo.clock_port; clock_start = i; diff --git a/common/kernel/util.h b/common/kernel/util.h index c10abb72..f04a956b 100644 --- a/common/kernel/util.h +++ b/common/kernel/util.h @@ -102,25 +102,6 @@ bool bool_or_default(const Container &ct, const KeyType &key, bool def = false) return bool(int_or_default(ct, key, int(def))); }; -// Return a net if port exists, or nullptr -inline const NetInfo *get_net_or_empty(const CellInfo *cell, const IdString port) -{ - auto found = cell->ports.find(port); - if (found != cell->ports.end()) - return found->second.net; - else - return nullptr; -} - -inline NetInfo *get_net_or_empty(CellInfo *cell, const IdString port) -{ - auto found = cell->ports.find(port); - if (found != cell->ports.end()) - return found->second.net; - else - return nullptr; -} - // Get only value from a forward iterator begin/end pair. // // Generates assertion failure if std::distance(begin, end) != 1. |