mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-11-04 13:29:12 +00:00
Code Activity

disabled problematic mux -> and/or transform

Browse source
This commit is contained in:
Clifford Wolf 2015-01-07 23:25:51 +01:00
parent d1e38693d5
commit fd787609aa
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
passes/opt/opt_const.cc
View file

@ -681,13 +681,17 @@ void replace_const_cells(RTLIL::Design *design, RTLIL::Module *module, bool cons
goto next_cell; goto next_cell;
} }
#if 0
// disabled because replacing muxes with and/or gates sometimes causes probems with
// simulating undefs (e.g. lm32 from yosys-bigsim vs. icarus verilog init problems)
if (consume_x && mux_bool && (cell->type == "$mux" || cell->type == "$_MUX_") && cell->getPort("\\A") == RTLIL::SigSpec(0, 1)) { if (consume_x && mux_bool && (cell->type == "$mux" || cell->type == "$_MUX_") && cell->getPort("\\A") == RTLIL::SigSpec(0, 1)) {
cover_list("opt.opt_const.mux_and", "$mux", "$_MUX_", cell->type.str()); cover_list("opt.opt_const.mux_and", "$mux", "$_MUX_", cell->type.str());
log("Replacing %s cell `%s' in module `%s' with and-gate.\n", log_id(cell->type), log_id(cell), log_id(module)); log("Replacing %s cell `%s' in module `%s' with and-gate.\n", log_id(cell->type), log_id(cell), log_id(module));
cell->setPort("\\A", cell->getPort("\\S")); cell->setPort("\\A", cell->getPort("\\S"));
cell->unsetPort("\\S"); cell->unsetPort("\\S");
if (cell->type == "$mux") { if (cell->type == "$mux") {
auto width = cell->parameters["\\WIDTH"]; Const width = cell->parameters["\\WIDTH"];
cell->parameters["\\A_WIDTH"] = width; cell->parameters["\\A_WIDTH"] = width;
cell->parameters["\\B_WIDTH"] = width; cell->parameters["\\B_WIDTH"] = width;
cell->parameters["\\Y_WIDTH"] = width; cell->parameters["\\Y_WIDTH"] = width;
@ -707,7 +711,7 @@ void replace_const_cells(RTLIL::Design *design, RTLIL::Module *module, bool cons
cell->setPort("\\B", cell->getPort("\\S")); cell->setPort("\\B", cell->getPort("\\S"));
cell->unsetPort("\\S"); cell->unsetPort("\\S");
if (cell->type == "$mux") { if (cell->type == "$mux") {
auto width = cell->parameters["\\WIDTH"]; Const width = cell->parameters["\\WIDTH"];
cell->parameters["\\A_WIDTH"] = width; cell->parameters["\\A_WIDTH"] = width;
cell->parameters["\\B_WIDTH"] = width; cell->parameters["\\B_WIDTH"] = width;
cell->parameters["\\Y_WIDTH"] = width; cell->parameters["\\Y_WIDTH"] = width;
@ -720,6 +724,7 @@ void replace_const_cells(RTLIL::Design *design, RTLIL::Module *module, bool cons
did_something = true; did_something = true;
goto next_cell; goto next_cell;
} }
#endif
if (mux_undef && (cell->type == "$mux" || cell->type == "$pmux")) { if (mux_undef && (cell->type == "$mux" || cell->type == "$pmux")) {
RTLIL::SigSpec new_a, new_b, new_s; RTLIL::SigSpec new_a, new_b, new_s;