diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-06-10 14:34:43 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-06-10 14:34:43 -0700 |
| commit | a1d4ae78a0ee474af6782bc5e12d8bd1fc790f04 (patch) | |
| tree | 0a2678fcccc897d651904c42ac1f5dfd34d6dedd | |
| parent | 7d27e1e4312499b72d253470c97cfbf98e4c9d8e (diff) | |
| download | yosys-a1d4ae78a0ee474af6782bc5e12d8bd1fc790f04.tar.gz yosys-a1d4ae78a0ee474af6782bc5e12d8bd1fc790f04.tar.bz2 yosys-a1d4ae78a0ee474af6782bc5e12d8bd1fc790f04.zip | |
Revert "Rename shregmap -tech xilinx -> xilinx_dynamic"
This reverts commit 94a5f4e60985fc1e3fea75eec85638fa29874bea.
| -rw-r--r-- | passes/techmap/shregmap.cc | 8 | ||||
| -rw-r--r-- | techlibs/xilinx/synth_xilinx.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/passes/techmap/shregmap.cc b/passes/techmap/shregmap.cc index 60b04be6f..21dfe9619 100644 --- a/passes/techmap/shregmap.cc +++ b/passes/techmap/shregmap.cc @@ -93,12 +93,12 @@ struct ShregmapTechGreenpak4 : ShregmapTech } }; -struct ShregmapTechXilinx7Dynamic : ShregmapTech +struct ShregmapTechXilinx7 : ShregmapTech { dict<SigBit, std::tuple<Cell*,int,int>> sigbit_to_shiftx_offset; const ShregmapOptions &opts; - ShregmapTechXilinx7Dynamic(const ShregmapOptions &opts) : opts(opts) {} + ShregmapTechXilinx7(const ShregmapOptions &opts) : opts(opts) {} virtual void init(const Module* module, const SigMap &sigmap) override { @@ -663,11 +663,11 @@ struct ShregmapPass : public Pass { opts.zinit = true; opts.tech = new ShregmapTechGreenpak4; } - else if (tech == "xilinx_dynamic") { + else if (tech == "xilinx") { opts.init = true; opts.params = true; enpol = "any_or_none"; - opts.tech = new ShregmapTechXilinx7Dynamic(opts); + opts.tech = new ShregmapTechXilinx7(opts); } else { argidx--; break; diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc index ffdb22960..689a40135 100644 --- a/techlibs/xilinx/synth_xilinx.cc +++ b/techlibs/xilinx/synth_xilinx.cc @@ -266,8 +266,8 @@ struct SynthXilinxPass : public ScriptPass // shregmap operates on bit-level flops, not word-level, // so break those down here run("simplemap t:$dff t:$dffe", "(skip if '-nosrl')"); - // shregmap to infer variable length shift regs - run("shregmap -tech xilinx_dynamic -minlen 3", "(skip if '-nosrl')"); + // shregmap with '-tech xilinx' infers variable length shift regs + run("shregmap -tech xilinx -minlen 3", "(skip if '-nosrl')"); } std::string techmap_files = " -map +/techmap.v"; |