Rename shregmap -tech xilinx -> xilinx_dynamic
authorEddie Hung <eddie@fpgeh.com>
Tue, 4 Jun 2019 21:34:36 +0000 (14:34 -0700)
committerEddie Hung <eddie@fpgeh.com>
Tue, 4 Jun 2019 21:34:36 +0000 (14:34 -0700)
passes/techmap/shregmap.cc
techlibs/xilinx/synth_xilinx.cc

index 75eedfbcc2204b2b73460064c9535ade187c8d28..3e2c34c0da40a05ae26bbcabac816f716bbaa79e 100644 (file)
@@ -93,12 +93,12 @@ struct ShregmapTechGreenpak4 : ShregmapTech
        }
 };
 
-struct ShregmapTechXilinx7 : ShregmapTech
+struct ShregmapTechXilinx7Dynamic : ShregmapTech
 {
        dict<SigBit, std::tuple<Cell*,int,int>> sigbit_to_shiftx_offset;
        const ShregmapOptions &opts;
 
-       ShregmapTechXilinx7(const ShregmapOptions &opts) : opts(opts) {}
+       ShregmapTechXilinx7Dynamic(const ShregmapOptions &opts) : opts(opts) {}
 
        virtual void init(const Module* module, const SigMap &sigmap) override
        {
@@ -660,11 +660,11 @@ struct ShregmapPass : public Pass {
                                        opts.zinit = true;
                                        opts.tech = new ShregmapTechGreenpak4;
                                }
-                               else if (tech == "xilinx") {
+                               else if (tech == "xilinx_dynamic") {
                                        opts.init = true;
                                        opts.params = true;
                                        enpol = "any_or_none";
-                                       opts.tech = new ShregmapTechXilinx7(opts);
+                                       opts.tech = new ShregmapTechXilinx7Dynamic(opts);
                                } else {
                                        argidx--;
                                        break;
index e9eccfc0e6a2af63cd4253fdfaed85fffbb271e8..b2559d272d0d57834c60898e70919645a74484bb 100644 (file)
@@ -263,8 +263,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 with '-tech xilinx' infers variable length shift regs
-                               run("shregmap -tech xilinx -minlen 3", "(skip if '-nosrl')");
+                               // shregmap to infer variable length shift regs
+                               run("shregmap -tech xilinx_dynamic -minlen 3", "(skip if '-nosrl')");
                        }
 
                        std::string techmap_files = " -map +/techmap.v";