Consistency

diff --git a/passes/pmgen/ice40_dsp.pmg b/passes/pmgen/ice40_dsp.pmg
index fca30745384ba5bafc9abae0833dbe8e5705937d..9d649cb98a2b0b3950a389fa0305b2a771af3867 100644 (file)
--- a/passes/pmgen/ice40_dsp.pmg
+++ b/passes/pmgen/ice40_dsp.pmg
@@ -56,10 +56,12 @@ code sigA sigB sigH
                        break;
                sigH.append(O[i]);
        }
-       log_assert(nusers(O.extract_end(i)) <= 1);
-
-       if (sigH.empty())
+       // This sigM could have no users if downstream sinks (e.g. $add) is
+       //   narrower than $mul result, for example
+       if (i == 0)
                reject;
+
+       log_assert(nusers(O.extract_end(i)) <= 1);
 endcode
 
 code argQ ffA ffAholdmux ffArstmux ffAholdpol ffArstpol sigA clock clock_pol

diff --git a/passes/pmgen/xilinx_dsp.pmg b/passes/pmgen/xilinx_dsp.pmg
index b9a4b08646541dfe0a5a51a0a3c1f082e36b809f..20925c0dc8d6c15203cab033b81fbe73c07dbfd0 100644 (file)
--- a/passes/pmgen/xilinx_dsp.pmg
+++ b/passes/pmgen/xilinx_dsp.pmg
@@ -460,7 +460,7 @@ arg argD argQ clock
 
 code
        dff = nullptr;
-       if (GetSize(argQ) == 0)
+       if (argQ.empty() == 0)
                reject;
        for (const auto &c : argQ.chunks()) {
                // Abandon matches when 'Q' is a constant