diff options
| author | David Shah <dave@ds0.me> | 2019-08-09 10:27:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 10:27:15 +0100 |
| commit | c70f87e4c52a8d1d5da37b4409a8ae4245b36de0 (patch) | |
| tree | a58e44eeb943c43f12cd5660009140ff4f26f7ee | |
| parent | 67488f780c0ddf6cd4fda38214f4c3ed651d9988 (diff) | |
| parent | 2da41a66c76d082c94f846b6d914d01092b956d7 (diff) | |
| download | nextpnr-c70f87e4c52a8d1d5da37b4409a8ae4245b36de0.tar.gz nextpnr-c70f87e4c52a8d1d5da37b4409a8ae4245b36de0.tar.bz2 nextpnr-c70f87e4c52a8d1d5da37b4409a8ae4245b36de0.zip | |
Merge pull request #309 from YosysHQ/dsptiming
ecp5: Conservative analysis of comb DSP timing
| -rw-r--r-- | ecp5/arch.cc | 18 | ||||
| -rw-r--r-- | ecp5/constids.inc | 9 |
2 files changed, 25 insertions, 2 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc index 9f137b9b..01a4346f 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -707,6 +707,13 @@ bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort return false; } else if (cell->type == id_DP16KD) { return false; + } else if (cell->type == id_MULT18X18D) { + std::string fn = fromPort.str(this), tn = toPort.str(this); + if (fn.size() > 1 && (fn.front() == 'A' || fn.front() == 'B') && std::isdigit(fn.at(1))) { + if (tn.size() > 1 && tn.front() == 'P' && std::isdigit(tn.at(1))) + return getDelayFromTimingDatabase(id_MULT18X18D_REGS_NONE, id(std::string("") + fn.front()), id_P, delay); + } + return false; } else if (cell->type == id_IOLOGIC || cell->type == id_SIOLOGIC) { return false; } else { @@ -784,7 +791,16 @@ TimingPortClass Arch::getPortTimingClass(const CellInfo *cell, IdString port, in } NPNR_ASSERT_FALSE_STR("no timing type for RAM port '" + port.str(this) + "'"); } else if (cell->type == id_MULT18X18D) { - return TMG_IGNORE; // FIXME + if (port == id_CLK0 || port == id_CLK1 || port == id_CLK2 || port == id_CLK3) + return TMG_CLOCK_INPUT; + std::string pname = port.str(this); + if (pname.size() > 1) { + if ((pname.front() == 'A' || pname.front() == 'B') && std::isdigit(pname.at(1))) + return TMG_COMB_INPUT; + if (pname.front() == 'P' && std::isdigit(pname.at(1))) + return TMG_COMB_OUTPUT; + } + return TMG_IGNORE; } else if (cell->type == id_ALU54B) { return TMG_IGNORE; // FIXME } else if (cell->type == id_EHXPLLL) { diff --git a/ecp5/constids.inc b/ecp5/constids.inc index 8a3179b6..007e952a 100644 --- a/ecp5/constids.inc +++ b/ecp5/constids.inc @@ -1281,4 +1281,11 @@ X(RDCFLAG) X(WRCFLAG) X(SCLK) -X(TRELLIS_ECLKBUF)
\ No newline at end of file +X(TRELLIS_ECLKBUF) + +X(MULT18X18D_REGS_ALL) +X(MULT18X18D_REGS_INPUT) +X(MULT18X18D_REGS_NONE) +X(MULT18X18D_REGS_OUTPUT) +X(MULT18X18D_REGS_PIPELINE) +X(P)
\ No newline at end of file |