riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ql_dsp_macc: dspv2

This commit is contained in:
Emil J. Tywoniak 2025-02-27 17:36:50 +01:00 committed by Martin Povišer
parent 30473c4899
commit c1d2107fe0
2 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
techlibs/quicklogic/ql_dsp_macc.cc
View File

@ -27,9 +27,11 @@ PRIVATE_NAMESPACE_BEGIN
// ============================================================================ // ============================================================================
static void create_ql_macc_dsp(ql_dsp_macc_pm &pm) static void create_ql_macc_dsp(ql_dsp_macc_pm &pm, int dsp_version)
{ {
auto &st = pm.st_ql_dsp_macc; auto &st = pm.st_ql_dsp_macc;
log_assert(dsp_version < 3);
log_assert(dsp_version > 0);
// Get port widths // Get port widths
size_t a_width = GetSize(st.mul->getPort(ID(A))); size_t a_width = GetSize(st.mul->getPort(ID(A)));
@ -49,26 +51,55 @@ static void create_ql_macc_dsp(ql_dsp_macc_pm &pm)
size_t tgt_b_width; size_t tgt_b_width;
size_t tgt_z_width; size_t tgt_z_width;
string cell_base_name = "dsp_t1"; string cell_base_name;
string cell_size_name = ""; string cell_size_name = "";
string cell_cfg_name = ""; string cell_cfg_name = "";
string cell_full_name = ""; string cell_full_name = "";
if (dsp_version == 1)
cell_base_name = "dsp_t1";
if (dsp_version == 2)
cell_base_name = "dspv2";
if (min_width <= 2 && max_width <= 2 && z_width <= 4) { if (min_width <= 2 && max_width <= 2 && z_width <= 4) {
log_debug("\trejected: too narrow (%zd %zd %zd)\n", min_width, max_width, z_width); log_debug("\trejected: too narrow (%zd %zd %zd)\n", min_width, max_width, z_width);
return; return;
} else if (min_width <= 9 && max_width <= 10 && z_width <= 19) { }
cell_size_name = "_10x9x32";
tgt_a_width = 10; bool reject = false;
tgt_b_width = 9; if (dsp_version == 1) {
tgt_z_width = 19; if (min_width <= 9 && max_width <= 10 && z_width <= 19) {
} else if (min_width <= 18 && max_width <= 20 && z_width <= 38) { cell_size_name = "_10x9x32";
cell_size_name = "_20x18x64"; tgt_a_width = 10;
tgt_a_width = 20; tgt_b_width = 9;
tgt_b_width = 18; tgt_z_width = 19;
tgt_z_width = 38; } else if (min_width <= 18 && max_width <= 20 && z_width <= 38) {
cell_size_name = "_20x18x64";
tgt_a_width = 20;
tgt_b_width = 18;
tgt_z_width = 38;
} else {
reject = true;
}
} else if (dsp_version == 2) {
if (min_width <= 9 && max_width <= 16 && z_width <= 25) {
cell_size_name = "_16x9x32";
tgt_a_width = 16;
tgt_b_width = 9;
tgt_z_width = 25;
} else if (min_width <= 18 && max_width <= 32 && z_width <= 50) {
cell_size_name = "_32x18x64";
tgt_a_width = 20;
tgt_b_width = 18;
tgt_z_width = 50;
} else {
reject = true;
}
} else { } else {
log_debug("\trejected: too wide (%zd %zd %zd)\n", min_width, max_width, z_width); log_assert(false);
}
if (reject) {
log_debug("\trejected: too wide (%zd %zd %zd) for v%d\n",
min_width, max_width, z_width, dsp_version);
return; return;
} }
@ -197,16 +228,22 @@ struct QlDspMacc : public Pass {
void execute(std::vector<std::string> a_Args, RTLIL::Design *a_Design) override void execute(std::vector<std::string> a_Args, RTLIL::Design *a_Design) override
{ {
int dsp_version = 1;
log_header(a_Design, "Executing QL_DSP_MACC pass.\n"); log_header(a_Design, "Executing QL_DSP_MACC pass.\n");
size_t argidx; size_t argidx;
for (argidx = 1; argidx < a_Args.size(); argidx++) { for (argidx = 1; argidx < a_Args.size(); argidx++) {
if (a_Args[argidx] == "-dspv2") {
dsp_version = 2;
continue;
}
break; break;
} }
extra_args(a_Args, argidx, a_Design); extra_args(a_Args, argidx, a_Design);
auto l = [dsp_version](ql_dsp_macc_pm& pm) { create_ql_macc_dsp(pm, dsp_version); };
for (auto module : a_Design->selected_modules()) for (auto module : a_Design->selected_modules())
ql_dsp_macc_pm(module, module->selected_cells()).run_ql_dsp_macc(create_ql_macc_dsp); ql_dsp_macc_pm(module, module->selected_cells()).run_ql_dsp_macc(l);
} }
} QlDspMacc; } QlDspMacc;

1
techlibs/quicklogic/synth_quicklogic.cc
View File

@ -252,6 +252,7 @@ struct SynthQuickLogicPass : public ScriptPass {
run("techmap -map " + lib_path + family + "/dspv1_final_map.v"); run("techmap -map " + lib_path + family + "/dspv1_final_map.v");
run("ql_dsp_io_regs"); run("ql_dsp_io_regs");
} else if (dsp == V2) { } else if (dsp == V2) {
run("ql_dsp_macc -dspv2");
run("techmap -map +/mul2dsp.v -map " + lib_path + family + "/dspv2_map.v -D USE_DSP_CFG_PARAMS=0 -D DSP_SIGNEDONLY " run("techmap -map +/mul2dsp.v -map " + lib_path + family + "/dspv2_map.v -D USE_DSP_CFG_PARAMS=0 -D DSP_SIGNEDONLY "
"-D DSP_A_MAXWIDTH=32 -D DSP_B_MAXWIDTH=18 -D DSP_A_MINWIDTH=10 -D DSP_B_MINWIDTH=10 -D DSP_NAME=$__MUL32X18"); "-D DSP_A_MAXWIDTH=32 -D DSP_B_MAXWIDTH=18 -D DSP_A_MINWIDTH=10 -D DSP_B_MINWIDTH=10 -D DSP_NAME=$__MUL32X18");
run("chtype -set $mul t:$__soft_mul"); run("chtype -set $mul t:$__soft_mul");