diff options
| author | Bogdan Vukobratovic <bogdan.vukobratovic@gmail.com> | 2019-06-14 12:06:57 +0200 |
|---|---|---|
| committer | Bogdan Vukobratovic <bogdan.vukobratovic@gmail.com> | 2019-06-14 12:06:57 +0200 |
| commit | fe651922cbc4ab086354c04652adc986b31305fd (patch) | |
| tree | e06a152dbc08ffac344c1a9139b0c43b0651239f /techlibs/xilinx/synth_xilinx.cc | |
| parent | 53695e6729e8ae603be7e7cd9bc8b29758d61a11 (diff) | |
| parent | d4f77d408c754285969969bda3a6985c1fbe9fb6 (diff) | |
| download | yosys-fe651922cbc4ab086354c04652adc986b31305fd.tar.gz yosys-fe651922cbc4ab086354c04652adc986b31305fd.tar.bz2 yosys-fe651922cbc4ab086354c04652adc986b31305fd.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'techlibs/xilinx/synth_xilinx.cc')
| -rw-r--r-- | techlibs/xilinx/synth_xilinx.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc index c20cac09b..a293081f1 100644 --- a/techlibs/xilinx/synth_xilinx.cc +++ b/techlibs/xilinx/synth_xilinx.cc @@ -229,11 +229,6 @@ struct SynthXilinxPass : public ScriptPass run("dff2dffe"); run("opt -full"); - if (!vpr || help_mode) - run("techmap -map +/xilinx/arith_map.v"); - else - run("techmap -map +/xilinx/arith_map.v -D _EXPLICIT_CARRY"); - if (!nosrl || help_mode) { // shregmap operates on bit-level flops, not word-level, // so break those down here @@ -242,7 +237,11 @@ struct SynthXilinxPass : public ScriptPass run("shregmap -tech xilinx -minlen 3", "(skip if '-nosrl')"); } - run("techmap"); + if (!vpr || help_mode) + run("techmap -map +/techmap.v -map +/xilinx/arith_map.v"); + else + run("techmap -map +/techmap.v +/xilinx/arith_map.v -D _EXPLICIT_CARRY"); + run("opt -fast"); } |