riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Add shregmap -init_msb_first and use in synth_xilinx" 

This reverts commit 26ecbc1aee.
This commit is contained in:
Eddie Hung 2019-03-14 09:01:48 -07:00
parent f1a8e8a480
commit 8af9979aab
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
passes/techmap/shregmap.cc
View File

@ -34,7 +34,7 @@ struct ShregmapOptions
{ {
int minlen, maxlen; int minlen, maxlen;
int keep_before, keep_after; int keep_before, keep_after;
bool zinit, init, params, ffe, init_msb_first; bool zinit, init, params, ffe;
dict<IdString, pair<IdString, IdString>> ffcells; dict<IdString, pair<IdString, IdString>> ffcells;
ShregmapTech *tech; ShregmapTech *tech;
@ -48,7 +48,6 @@ struct ShregmapOptions
init = false; init = false;
params = false; params = false;
ffe = false; ffe = false;
init_msb_first = false;
tech = nullptr; tech = nullptr;
} }
}; };
@ -308,8 +307,6 @@ struct ShregmapWorker
initval.push_back(State::S0); initval.push_back(State::S0);
remove_init.insert(bit); remove_init.insert(bit);
} }
if (opts.init_msb_first)
std::reverse(initval.begin(), initval.end());
first_cell->setParam("\\INIT", initval); first_cell->setParam("\\INIT", initval);
} }
@ -445,13 +442,9 @@ struct ShregmapPass : public Pass {
log("\n"); log("\n");
log(" -init\n"); log(" -init\n");
log(" map initialized registers to the shift reg, add an INIT parameter to\n"); log(" map initialized registers to the shift reg, add an INIT parameter to\n");
log(" generated cells with the initialization value. (First bit to shift out\n"); log(" generated cells with the initialization value. (first bit to shift out\n");
log(" in LSB position)\n"); log(" in LSB position)\n");
log("\n"); log("\n");
log(" -init_msb_first\n");
log(" same as -init, but INIT parameter to have first bit to shift out\n");
log(" in MSB position.\n");
log("\n");
log(" -tech greenpak4\n"); log(" -tech greenpak4\n");
log(" map to greenpak4 shift registers.\n"); log(" map to greenpak4 shift registers.\n");
log("\n"); log("\n");
@ -522,11 +515,6 @@ struct ShregmapPass : public Pass {
opts.init = true; opts.init = true;
continue; continue;
} }
if (args[argidx] == "-init_msb_first") {
opts.init = true;
opts.init_msb_first = true;
continue;
}
if (args[argidx] == "-params") { if (args[argidx] == "-params") {
opts.params = true; opts.params = true;
continue; continue;

5
techlibs/xilinx/synth_xilinx.cc
View File

@ -111,7 +111,7 @@ struct SynthXilinxPass : public Pass
log(" dff2dffe\n"); log(" dff2dffe\n");
log(" opt -full\n"); log(" opt -full\n");
log(" techmap -map +/techmap.v -map +/xilinx/arith_map.v\n"); log(" techmap -map +/techmap.v -map +/xilinx/arith_map.v\n");
log(" shregmap -init_msb_first -params -enpol any_or_none\n"); log(" shregmap -init -params -enpol any_or_none\n");
log(" techmap -map +/xilinx/ff_map.v\n"); log(" techmap -map +/xilinx/ff_map.v\n");
log(" opt -fast\n"); log(" opt -fast\n");
log("\n"); log("\n");
@ -262,9 +262,8 @@ struct SynthXilinxPass : public Pass
Pass::call(design, "techmap -map +/techmap.v -map +/xilinx/arith_map.v"); Pass::call(design, "techmap -map +/techmap.v -map +/xilinx/arith_map.v");
} }
Pass::call(design, "shregmap -init_msb_first -params -enpol any_or_none"); Pass::call(design, "shregmap -initt -params -enpol any_or_none");
Pass::call(design, "techmap -map +/xilinx/ff_map.v"); Pass::call(design, "techmap -map +/xilinx/ff_map.v");
Pass::call(design, "hierarchy -check");
Pass::call(design, "opt -fast"); Pass::call(design, "opt -fast");
} }