diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-12-19 10:29:40 -0800 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-12-19 10:29:40 -0800 |
| commit | 94f15f023c8720d84211ac75980cf0b0f492411d (patch) | |
| tree | 29f40490883b15fec68ef6aba99767a0deaecc4f /techlibs/xilinx/synth_xilinx.cc | |
| parent | 76ba06a79ea917a0e515aa0e99ae41f42e8bddc9 (diff) | |
| parent | f52c6efd9da161e625538f9e8c23875efebda60f (diff) | |
| download | yosys-94f15f023c8720d84211ac75980cf0b0f492411d.tar.gz yosys-94f15f023c8720d84211ac75980cf0b0f492411d.tar.bz2 yosys-94f15f023c8720d84211ac75980cf0b0f492411d.zip | |
Merge remote-tracking branch 'origin/master' into xaig_dff
Diffstat (limited to 'techlibs/xilinx/synth_xilinx.cc')
| -rw-r--r-- | techlibs/xilinx/synth_xilinx.cc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc index de262c8ad..ac6fedc58 100644 --- a/techlibs/xilinx/synth_xilinx.cc +++ b/techlibs/xilinx/synth_xilinx.cc @@ -445,6 +445,16 @@ struct SynthXilinxPass : public ScriptPass } if (check_label("map_ffram")) { + // Required for dffsr2dff to work. + run("simplemap t:$dff t:$adff t:$mux"); + // Needs to be done before opt -mux_bool happens. + run("dffsr2dff"); + if (help_mode) + run("dff2dffs [-match-init]", "(-match-init for xc6s only)"); + else if (family == "xc6s") + run("dff2dffs -match-init"); + else + run("dff2dffs"); if (widemux > 0) run("opt -fast -mux_bool -undriven -fine"); // Necessary to omit -mux_undef otherwise muxcover // performs less efficiently @@ -454,14 +464,11 @@ struct SynthXilinxPass : public ScriptPass } if (check_label("fine")) { - run("dffsr2dff"); - run("dff2dffe"); + run("dff2dffe -direct-match $_DFF_* -direct-match $__DFFS_*"); if (help_mode) { - run("simplemap t:$mux", " ('-widemux' only)"); run("muxcover <internal options>, ('-widemux' only)"); } else if (widemux > 0) { - run("simplemap t:$mux"); constexpr int cost_mux2 = 100; std::string muxcover_args = stringf(" -nodecode -mux2=%d", cost_mux2); switch (widemux) { @@ -563,6 +570,7 @@ struct SynthXilinxPass : public ScriptPass else if (!abc9) techmap_args += stringf(" -map %s", ff_map_file.c_str()); run("techmap " + techmap_args, "(option without '-abc9')"); + run("xilinx_dffopt"); } if (check_label("finalize")) { |