From 1a0f7ed09c5c14242aa89d572f617ad96ed42fa1 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Thu, 19 Sep 2019 14:27:25 -0700 Subject: [PATCH] Refactor ce{mux,pol} -> hold{mux,pol} --- passes/pmgen/ice40_dsp.cc | 26 ++++---- passes/pmgen/ice40_dsp.pmg | 128 ++++++++++++++++++------------------- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/passes/pmgen/ice40_dsp.cc b/passes/pmgen/ice40_dsp.cc index f3cc83699..b119b6b7c 100644 --- a/passes/pmgen/ice40_dsp.cc +++ b/passes/pmgen/ice40_dsp.cc @@ -31,15 +31,15 @@ void create_ice40_dsp(ice40_dsp_pm &pm) #if 1 log("\n"); - log("ffA: %s %s %s\n", log_id(st.ffA, "--"), log_id(st.ffAcemux, "--"), log_id(st.ffArstmux, "--")); - log("ffB: %s %s %s\n", log_id(st.ffB, "--"), log_id(st.ffBcemux, "--"), log_id(st.ffBrstmux, "--")); - log("ffCD: %s %s\n", log_id(st.ffCD, "--"), log_id(st.ffCDcemux, "--")); + log("ffA: %s %s %s\n", log_id(st.ffA, "--"), log_id(st.ffAholdmux, "--"), log_id(st.ffArstmux, "--")); + log("ffB: %s %s %s\n", log_id(st.ffB, "--"), log_id(st.ffBholdmux, "--"), log_id(st.ffBrstmux, "--")); + log("ffCD: %s %s\n", log_id(st.ffCD, "--"), log_id(st.ffCDholdmux, "--")); log("mul: %s\n", log_id(st.mul, "--")); log("ffFJKG: %s\n", log_id(st.ffFJKG, "--")); log("ffH: %s\n", log_id(st.ffH, "--")); log("add: %s\n", log_id(st.add, "--")); log("mux: %s\n", log_id(st.mux, "--")); - log("ffO: %s %s %s\n", log_id(st.ffO, "--"), log_id(st.ffOcemux, "--"), log_id(st.ffOrstmux, "--")); + log("ffO: %s %s %s\n", log_id(st.ffO, "--"), log_id(st.ffOholdmux, "--"), log_id(st.ffOrstmux, "--")); #endif log("Checking %s.%s for iCE40 DSP inference.\n", log_id(pm.module), log_id(st.mul)); @@ -99,16 +99,16 @@ void create_ice40_dsp(ice40_dsp_pm &pm) cell->setParam("\\D_REG", st.ffCD ? State::S1 : State::S0); SigSpec AHOLD, BHOLD, CDHOLD; - if (st.ffAcemux) - AHOLD = st.ffAcepol ? pm.module->Not(NEW_ID, st.ffAcemux->getPort("\\S")) : st.ffAcemux->getPort("\\S"); + if (st.ffAholdmux) + AHOLD = st.ffAholdpol ? st.ffAholdmux->getPort("\\S") : pm.module->Not(NEW_ID, st.ffAholdmux->getPort("\\S")); else AHOLD = State::S0; - if (st.ffBcemux) - BHOLD = st.ffBcepol ? pm.module->Not(NEW_ID, st.ffBcemux->getPort("\\S")) : st.ffBcemux->getPort("\\S"); + if (st.ffBholdmux) + BHOLD = st.ffBholdpol ? st.ffBholdmux->getPort("\\S") : pm.module->Not(NEW_ID, st.ffBholdmux->getPort("\\S")); else BHOLD = State::S0; - if (st.ffCDcemux) - CDHOLD = st.ffCDcepol ? pm.module->Not(NEW_ID, st.ffCDcemux->getPort("\\S")) : st.ffCDcemux->getPort("\\S"); + if (st.ffCDholdmux) + CDHOLD = st.ffCDholdpol ? st.ffCDholdmux->getPort("\\S") : pm.module->Not(NEW_ID, st.ffCDholdmux->getPort("\\S")); else CDHOLD = State::S0; cell->setPort("\\AHOLD", AHOLD); @@ -210,8 +210,8 @@ void create_ice40_dsp(ice40_dsp_pm &pm) } SigSpec OHOLD; - if (st.ffOcemux) - OHOLD = st.ffOcemux ? pm.module->Not(NEW_ID, st.ffOcemux->getPort("\\S")) : st.ffOcemux->getPort("\\S"); + if (st.ffOholdmux) + OHOLD = st.ffOholdpol ? st.ffOholdmux->getPort("\\S") : pm.module->Not(NEW_ID, st.ffOholdmux->getPort("\\S")); else OHOLD = State::S0; cell->setPort("\\OHOLDTOP", OHOLD); @@ -219,7 +219,7 @@ void create_ice40_dsp(ice40_dsp_pm &pm) SigSpec ORST; if (st.ffOrstmux) - ORST = st.ffOrstmux ? st.ffOrstmux->getPort("\\S") : pm.module->Not(NEW_ID, st.ffOrstmux->getPort("\\S")); + ORST = st.ffOrstpol ? st.ffOrstmux->getPort("\\S") : pm.module->Not(NEW_ID, st.ffOrstmux->getPort("\\S")); else ORST = State::S0; cell->setPort("\\ORSTTOP", ORST); diff --git a/passes/pmgen/ice40_dsp.pmg b/passes/pmgen/ice40_dsp.pmg index 01e344767..aa081241d 100644 --- a/passes/pmgen/ice40_dsp.pmg +++ b/passes/pmgen/ice40_dsp.pmg @@ -6,20 +6,20 @@ state sigA sigB sigCD sigH sigO state add mux state addAB muxAB -state ffAcepol ffBcepol ffCDcepol ffOcepol +state ffAholdpol ffBholdpol ffCDholdpol ffOholdpol state ffArstpol ffBrstpol ffCDrstpol ffOrstpol -state ffA ffAcemux ffArstmux ffB ffBcemux ffBrstmux ffCD ffCDcemux -state ffFJKG ffH ffO ffOcemux ffOrstmux +state ffA ffAholdmux ffArstmux ffB ffBholdmux ffBrstmux ffCD ffCDholdmux +state ffFJKG ffH ffO ffOholdmux ffOrstmux // subpattern state argQ argD -state ffcepol ffrstpol +state ffholdpol ffrstpol state ffoffset udata dffD dffQ udata dffclock -udata dff dffcemux dffrstmux -udata dffcepol dffrstpol dffclock_pol +udata dff dffholdmux dffrstmux +udata dffholdpol dffrstpol dffclock_pol match mul select mul->type.in($mul, \SB_MAC16) @@ -63,7 +63,7 @@ code sigA sigB sigH log_assert(nusers(O.extract_end(i)) <= 1); endcode -code argQ ffA ffAcemux ffArstmux ffAcepol ffArstpol sigA clock clock_pol +code argQ ffA ffAholdmux ffArstmux ffAholdpol ffArstpol sigA clock clock_pol if (mul->type != \SB_MAC16 || !param(mul, \A_REG).as_bool()) { argQ = sigA; subpattern(in_dffe); @@ -75,16 +75,16 @@ code argQ ffA ffAcemux ffArstmux ffAcepol ffArstpol sigA clock clock_pol ffArstmux = dffrstmux; ffArstpol = dffrstpol; } - if (dffcemux) { - ffAcemux = dffcemux; - ffAcepol = dffcepol; + if (dffholdmux) { + ffAholdmux = dffholdmux; + ffAholdpol = dffholdpol; } sigA = dffD; } } endcode -code argQ ffB ffBcemux ffBrstmux ffBcepol ffBrstpol sigB clock clock_pol +code argQ ffB ffBholdmux ffBrstmux ffBholdpol ffBrstpol sigB clock clock_pol if (mul->type != \SB_MAC16 || !param(mul, \B_REG).as_bool()) { argQ = sigB; subpattern(in_dffe); @@ -96,9 +96,9 @@ code argQ ffB ffBcemux ffBrstmux ffBcepol ffBrstpol sigB clock clock_pol ffBrstmux = dffrstmux; ffBrstpol = dffrstpol; } - if (dffcemux) { - ffBcemux = dffcemux; - ffBcepol = dffcepol; + if (dffholdmux) { + ffBholdmux = dffholdmux; + ffBholdpol = dffholdpol; } sigB = dffD; } @@ -113,7 +113,7 @@ code argD ffFJKG sigH sigO clock clock_pol subpattern(out_dffe); if (dff) { // F/J/K/G do not have a CE-like (hold) input - if (dffcemux) + if (dffholdmux) goto reject_ffFJKG; // Reset signal of F/J (IRSTTOP) and K/G (IRSTBOT) @@ -154,7 +154,7 @@ code argD ffH sigH sigO clock clock_pol subpattern(out_dffe); if (dff) { // H does not have a CE-like (hold) input - if (dffcemux) + if (dffholdmux) goto reject_ffH; // Reset signal of H (IRSTBOT) shared with B @@ -226,7 +226,7 @@ code sigO sigO = port(mux, \Y); endcode -code argD ffO ffOcemux ffOrstmux ffOcepol ffOrstpol sigO sigCD clock clock_pol cd_signed o_lo +code argD ffO ffOholdmux ffOrstmux ffOholdpol ffOrstpol sigO sigCD clock clock_pol cd_signed o_lo if (mul->type != \SB_MAC16 || // Ensure that register is not already used ((mul->parameters.at(\TOPOUTPUT_SELECT, 0).as_int() != 1 && mul->parameters.at(\BOTOUTPUT_SELECT, 0).as_int() != 1) && @@ -258,9 +258,9 @@ code argD ffO ffOcemux ffOrstmux ffOcepol ffOrstpol sigO sigCD clock clock_pol c ffOrstmux = dffrstmux; ffOrstpol = dffrstpol; } - if (dffcemux) { - ffOcemux = dffcemux; - ffOcepol = dffcepol; + if (dffholdmux) { + ffOholdmux = dffholdmux; + ffOholdpol = dffholdpol; } sigO.replace(sigO.extract(0, GetSize(dffQ)), dffQ); @@ -278,15 +278,15 @@ code argD ffO ffOcemux ffOrstmux ffOcepol ffOrstpol sigO sigCD clock clock_pol c } endcode -code argQ ffCD ffCDcemux ffCDcepol ffCDrstpol sigCD clock clock_pol +code argQ ffCD ffCDholdmux ffCDholdpol ffCDrstpol sigCD clock clock_pol if (!sigCD.empty() && (mul->type != \SB_MAC16 || (!param(mul, \C_REG).as_bool() && !param(mul, \D_REG).as_bool()))) { argQ = sigCD; subpattern(in_dffe); if (dff) { - if (dffcemux) { - ffCDcemux = dffcemux; - ffCDcepol = dffcepol; + if (dffholdmux) { + ffCDholdmux = dffholdmux; + ffCDholdpol = dffholdpol; } // Reset signal of C (IRSTTOP) and D (IRSTBOT) @@ -403,7 +403,7 @@ code argD argD = port(ffrstmux, ffrstpol ? \A : \B); dffD.replace(port(ffrstmux, \Y), argD); - // Only search for ffcemux if argQ has at + // Only search for ffholdmux if argQ has at // least 3 users (ff, , ffrstmux) and // dffD only has two (ff, ffrstmux) if (!(nusers(argQ) >= 3 && nusers(dffD) == 2)) @@ -413,26 +413,26 @@ code argD dffrstmux = nullptr; endcode -match ffcemux +match ffholdmux if !argD.empty() - select ffcemux->type.in($mux) - index port(ffcemux, \Y) === argD - choice AB {\A, \B} - index port(ffcemux, AB) === argQ - define pol (AB == \A) - set ffcepol pol + select ffholdmux->type.in($mux) + index port(ffholdmux, \Y) === argD + choice BA {\B, \A} + index port(ffholdmux, BA) === argQ + define pol (BA == \B) + set ffholdpol pol semioptional endmatch code argD - if (ffcemux) { - dffcemux = ffcemux; - dffcepol = ffcepol; - argD = port(ffcemux, ffcepol ? \B : \A); - dffD.replace(port(ffcemux, \Y), argD); + if (ffholdmux) { + dffholdmux = ffholdmux; + dffholdpol = ffholdpol; + argD = port(ffholdmux, ffholdpol ? \A : \B); + dffD.replace(port(ffholdmux, \Y), argD); } else - dffcemux = nullptr; + dffholdmux = nullptr; endcode // ####################### @@ -447,41 +447,41 @@ code reject; endcode -match ffcemux - select ffcemux->type.in($mux) - // ffcemux output must have two users: ffcemux and ff.D - select nusers(port(ffcemux, \Y)) == 2 +match ffholdmux + select ffholdmux->type.in($mux) + // ffholdmux output must have two users: ffholdmux and ff.D + select nusers(port(ffholdmux, \Y)) == 2 - choice AB {\A, \B} - // keep-last-value net must have at least three users: ffcemux, ff, downstream sink(s) - select nusers(port(ffcemux, AB)) >= 3 + choice BA {\B, \A} + // keep-last-value net must have at least three users: ffholdmux, ff, downstream sink(s) + select nusers(port(ffholdmux, BA)) >= 3 - slice offset GetSize(port(ffcemux, \Y)) - define BA (AB == \A ? \B : \A) - index port(ffcemux, BA)[offset] === argD[0] + slice offset GetSize(port(ffholdmux, \Y)) + define AB (BA == \B ? \A : \B) + index port(ffholdmux, AB)[offset] === argD[0] // Check that the rest of argD is present - filter GetSize(port(ffcemux, BA)) >= offset + GetSize(argD) - filter port(ffcemux, BA).extract(offset, GetSize(argD)) == argD + filter GetSize(port(ffholdmux, AB)) >= offset + GetSize(argD) + filter port(ffholdmux, AB).extract(offset, GetSize(argD)) == argD set ffoffset offset define pol (BA == \B) - set ffcepol pol + set ffholdpol pol semioptional endmatch code argD argQ - dffcemux = ffcemux; - if (ffcemux) { - SigSpec BA = port(ffcemux, ffcepol ? \B : \A); - SigSpec Y = port(ffcemux, \Y); + dffholdmux = ffholdmux; + if (ffholdmux) { + SigSpec AB = port(ffholdmux, ffholdpol ? \A : \B); + SigSpec Y = port(ffholdmux, \Y); argQ = argD; - argD.replace(BA, Y); - argQ.replace(BA, port(ffcemux, ffcepol ? \A : \B)); + argD.replace(AB, Y); + argQ.replace(AB, port(ffholdmux, ffholdpol ? \B : \A)); - dffcemux = ffcemux; - dffcepol = ffcepol; + dffholdmux = ffholdmux; + dffholdpol = ffholdpol; } endcode @@ -499,7 +499,7 @@ match ffrstmux index port(ffrstmux, AB)[offset] === argD[0] // Check that offset is consistent - filter !ffcemux || ffoffset == offset + filter !ffholdmux || ffoffset == offset // Check that the rest of argD is present filter GetSize(port(ffrstmux, AB)) >= offset + GetSize(argD) filter port(ffrstmux, AB).extract(offset, GetSize(argD)) == argD @@ -532,12 +532,12 @@ match ff index port(ff, \D)[offset] === argD[0] // Check that offset is consistent - filter (!ffcemux && !ffrstmux) || ffoffset == offset + filter (!ffholdmux && !ffrstmux) || ffoffset == offset // Check that the rest of argD is present filter GetSize(port(ff, \D)) >= offset + GetSize(argD) filter port(ff, \D).extract(offset, GetSize(argD)) == argD // Check that FF.Q is connected to CE-mux - filter !ffcemux || port(ff, \Q).extract(offset, GetSize(argQ)) == argQ + filter !ffholdmux || port(ff, \Q).extract(offset, GetSize(argQ)) == argQ set ffoffset offset endmatch @@ -552,7 +552,7 @@ code argQ } SigSpec D = port(ff, \D); SigSpec Q = port(ff, \Q); - if (!ffcemux) { + if (!ffholdmux) { argQ = argD; argQ.replace(D, Q); } @@ -569,6 +569,6 @@ code argQ dffclock_pol = param(ff, \CLK_POLARITY).as_bool(); } // No enable/reset mux possible without flop - else if (dffcemux || dffrstmux) + else if (dffholdmux || dffrstmux) reject; endcode