From 9d067fecea8d17dc3e800d09973f5ddaae41774b Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Mon, 27 Apr 2015 11:36:13 +0200 Subject: [PATCH] ice40_opt bugfix --- techlibs/ice40/ice40_opt.cc | 6 ++---- techlibs/ice40/synth_ice40.cc | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/techlibs/ice40/ice40_opt.cc b/techlibs/ice40/ice40_opt.cc index 1b32ce448..990d29aae 100644 --- a/techlibs/ice40/ice40_opt.cc +++ b/techlibs/ice40/ice40_opt.cc @@ -57,11 +57,9 @@ static void run_ice40_opts(Module *module) if (count_zeros >= 2) replacement_output = State::S0; - - if (count_ones >= 2) + else if (count_ones >= 2) replacement_output = State::S1; - - if (GetSize(non_const_inputs) == 1) + else if (GetSize(non_const_inputs) == 1) replacement_output = non_const_inputs; if (GetSize(replacement_output)) { diff --git a/techlibs/ice40/synth_ice40.cc b/techlibs/ice40/synth_ice40.cc index 769addf1f..e23290319 100644 --- a/techlibs/ice40/synth_ice40.cc +++ b/techlibs/ice40/synth_ice40.cc @@ -88,7 +88,7 @@ struct SynthIce40Pass : public Pass { log(" opt -undriven -fine\n"); log(" techmap -map +/techmap.v [-map +/ice40/arith_map.v]\n"); log(" abc -dff (only if -retime)\n"); - log(" opt -fast\n"); + log(" ice40_opt\n"); log("\n"); log(" map_ffs:\n"); log(" dff2dffe -direct-match $_DFF_*\n"); @@ -96,7 +96,7 @@ struct SynthIce40Pass : public Pass { log(" opt_const -mux_undef\n"); log(" simplemap\n"); log(" ice40_ffssr\n"); - log(" clean\n"); + log(" ice40_opt -full\n"); log("\n"); log(" map_luts:\n"); log(" abc -lut 4\n"); -- 2.30.2