diff options
| author | David Shah <dave@ds0.me> | 2020-11-17 16:03:52 +0000 |
|---|---|---|
| committer | David Shah <dave@ds0.me> | 2020-11-30 08:45:28 +0000 |
| commit | 91d746cfc83e3e78424ae079bc2bb36fa266788e (patch) | |
| tree | 151b746d74305fdc56e43811d9991f5856dcd312 | |
| parent | fcde8e2d56ec76df5a21e83660608188fdc1a7b9 (diff) | |
| download | nextpnr-91d746cfc83e3e78424ae079bc2bb36fa266788e.tar.gz nextpnr-91d746cfc83e3e78424ae079bc2bb36fa266788e.tar.bz2 nextpnr-91d746cfc83e3e78424ae079bc2bb36fa266788e.zip | |
nexus: Add DSP pre-adder support
Signed-off-by: David Shah <dave@ds0.me>
| -rw-r--r-- | nexus/constids.inc | 6 | ||||
| -rw-r--r-- | nexus/pack.cc | 19 |
2 files changed, 23 insertions, 2 deletions
diff --git a/nexus/constids.inc b/nexus/constids.inc index de3d27bc..f1f255ee 100644 --- a/nexus/constids.inc +++ b/nexus/constids.inc @@ -322,3 +322,9 @@ X(SFTEN) X(MULT18X36) X(MULT36X36H) X(MULT36X36) + +X(SIGNEDC) +X(REGINPUTC) + +X(MULTPREADD9X9) +X(MULTPREADD18X18) diff --git a/nexus/pack.cc b/nexus/pack.cc index 383599a0..e095afa6 100644 --- a/nexus/pack.cc +++ b/nexus/pack.cc @@ -1412,8 +1412,6 @@ struct NexusPacker cell->params[id_GSR] = std::string("DISABLED"); cell->params[id_OPC] = std::string("INPUT_B_AS_PREADDER_OPERAND"); cell->params[id_PREADDCAS_EN] = std::string("DISABLED"); - cell->params[id_PREADDCAS_EN] = std::string("DISABLED"); - cell->params[id_PREADDCAS_EN] = std::string("DISABLED"); cell->params[id_REGBYPSBL] = std::string("REGISTER"); cell->params[id_REGBYPSBR0] = std::string("BYPASS"); cell->params[id_REGBYPSBR1] = std::string("BYPASS"); @@ -1494,6 +1492,8 @@ struct NexusPacker {id_MULT18X18, {18, 18, 0, 36, 2, 1, 0, false, false}}, {id_MULT18X36, {18, 36, 0, 54, 4, 2, 1, false, false}}, {id_MULT36X36, {36, 36, 0, 72, 8, 4, 2, false, false}}, + {id_MULTPREADD9X9, {9, 9, 9, 18, 1, 0, 0, true, false}}, + {id_MULTPREADD18X18, {18, 18, 18, 36, 2, 1, 0, true, false}}, }; void pack_dsps() @@ -1542,6 +1542,21 @@ struct NexusPacker copy_param(ci, id_REGINPUTA, mult9[i], id_REGBYPSA1); copy_param(ci, id_REGINPUTB, preadd9[i], id_REGBYPSBR0); + // Connect and configure pre-adder if it isn't bypassed + if (mt.has_preadd) { + copy_bus(ctx, ci, id_C, 9 * i, true, preadd9[i], id_C, 0, false, 9); + if (i == (mt.N9x9 - 1)) + copy_port(ctx, ci, id_SIGNEDC, preadd9[i], id_C9); + copy_param(ci, id_REGINPUTC, preadd9[i], id_REGBYPSBL); + copy_port(ctx, ci, id_CEC, preadd9[i], id_CECL); + copy_port(ctx, ci, id_RSTC, preadd9[i], id_RSTCL); + // Enable preadder + preadd9[i]->params[id_BYPASS_PREADD9] = std::string("USED"); + preadd9[i]->params[id_OPC] = std::string("INPUT_C_AS_PREADDER_OPERAND"); + if (i > 0) + preadd9[i]->params[id_PREADDCAS_EN] = std::string("ENABLED"); + } + // Connect up signedness for the most significant nonet if ((b_start + 9) == mt.b_width) copy_port(ctx, ci, id_SIGNEDB, preadd9[i], id_BSIGNED); |