diff options
| author | David Shah <dave@ds0.me> | 2021-01-28 16:10:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-28 16:10:22 +0000 |
| commit | 15b2852b916c1299dfc1d91a217de3060701bfbe (patch) | |
| tree | 8e7ffbce4b7d253f05d0bb58ea6430aae8e1b065 /ecp5 | |
| parent | 0d9790421699a22fc6a5962b41910c3b7d089353 (diff) | |
| parent | 94e8847d674388c3c8ac663fa4912bb8029b2951 (diff) | |
| download | nextpnr-15b2852b916c1299dfc1d91a217de3060701bfbe.tar.gz nextpnr-15b2852b916c1299dfc1d91a217de3060701bfbe.tar.bz2 nextpnr-15b2852b916c1299dfc1d91a217de3060701bfbe.zip | |
Merge pull request #556 from YosysHQ/dave/cleanup
General opportunistic cleanup
Diffstat (limited to 'ecp5')
| -rw-r--r-- | ecp5/arch.cc | 25 | ||||
| -rw-r--r-- | ecp5/bitstream.cc | 2 | ||||
| -rw-r--r-- | ecp5/pack.cc | 2 |
3 files changed, 2 insertions, 27 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc index 8ebb7425..74a1b17f 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -615,31 +615,6 @@ bool Arch::route() log_error("ECP5 architecture does not support router '%s'\n", router.c_str()); } -#if 0 - std::vector<std::pair<WireId, int>> fanout_vector; - std::copy(wire_fanout.begin(), wire_fanout.end(), std::back_inserter(fanout_vector)); - std::sort(fanout_vector.begin(), fanout_vector.end(), [](const std::pair<WireId, int> &a, const std::pair<WireId, int> &b) { - return a.second > b.second; - }); - for (size_t i = 0; i < std::min(size_t(20), fanout_vector.size()); i++) - log_info(" fanout %s = %d\n", getWireName(fanout_vector[i].first).c_str(this), fanout_vector[i].second); - log_break(); - PipId slowest_pip; - delay_t slowest_pipdelay = 0; - for (auto pip : pip_to_net) { - if (pip.second) { - delay_t dly = getPipDelay(pip.first).maxDelay(); - if (dly > slowest_pipdelay) { - slowest_pip = pip.first; - slowest_pipdelay = dly; - } - } - } - log_info(" slowest pip %s = %.02f ns\n", getPipName(slowest_pip).c_str(this), getDelayNS(slowest_pipdelay)); - log_info(" fanout %d\n", wire_fanout[getPipSrcWire(slowest_pip)]); - log_info(" base %d adder %d\n", speed_grade->pip_classes[locInfo(slowest_pip)->pip_data[slowest_pip.index].timing_class].max_base_delay, - speed_grade->pip_classes[locInfo(slowest_pip)->pip_data[slowest_pip.index].timing_class].max_fanout_adder); -#endif getCtx()->settings[getCtx()->id("route")] = 1; archInfoToAttributes(); return result; diff --git a/ecp5/bitstream.cc b/ecp5/bitstream.cc index eddbc129..0841fa32 100644 --- a/ecp5/bitstream.cc +++ b/ecp5/bitstream.cc @@ -527,7 +527,7 @@ static std::vector<bool> parse_config_str(const Property &p, int length) std::vector<bool> word; if (p.is_string) { std::string str = p.as_string(); - // For DCU config which might be bin, hex or dec using prefices accordingly + // For DCU config which might be bin, hex or dec using prefixes accordingly std::string base = str.substr(0, 2); word.resize(length, false); if (base == "0b") { diff --git a/ecp5/pack.cc b/ecp5/pack.cc index 58737bfe..b60d6c7d 100644 --- a/ecp5/pack.cc +++ b/ecp5/pack.cc @@ -1126,7 +1126,7 @@ class Ecp5Packer flush_cells(); } - // Find a cell that meets some criterea near an origin cell + // Find a cell that meets some criteria near an origin cell // Used for packing an FF into a nearby SLICE template <typename TFunc> CellInfo *find_nearby_cell(CellInfo *origin, TFunc Func) { |