Revert "Move mul2dsp before wreduce"

This reverts commit e4f4f6a9d5.
This commit is contained in:
Eddie Hung 2019-09-20 08:56:16 -07:00
parent e4f4f6a9d5
commit 829e4f5d2c
1 changed files with 5 additions and 4 deletions

View File

@ -265,10 +265,6 @@ struct SynthIce40Pass : public ScriptPass
run("opt_clean");
run("check");
run("opt");
if (help_mode || dsp)
run("techmap -map +/mul2dsp.v -map +/ice40/dsp_map.v -D DSP_A_MAXWIDTH=16 -D DSP_B_MAXWIDTH=16 "
"-D DSP_A_MINWIDTH=2 -D DSP_Y_MINWIDTH=11 "
"-D DSP_NAME=$__MUL16X16", "(if -dsp)");
run("wreduce");
run("peepopt");
run("opt_clean");
@ -277,6 +273,11 @@ struct SynthIce40Pass : public ScriptPass
run("opt_expr");
run("opt_clean");
if (help_mode || dsp) {
run("techmap -map +/mul2dsp.v -map +/ice40/dsp_map.v -D DSP_A_MAXWIDTH=16 -D DSP_B_MAXWIDTH=16 "
"-D DSP_A_MINWIDTH=2 -D DSP_Y_MINWIDTH=11 "
"-D DSP_NAME=$__MUL16X16", "(if -dsp)");
run("opt_expr -fine", " (if -dsp)");
run("wreduce", " (if -dsp)");
run("ice40_dsp", " (if -dsp)");
run("chtype -set $mul t:$__soft_mul","(if -dsp)");
}