From de336d93b22feea3f36883fac9f92c3f175e91e4 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sun, 2 Feb 2014 22:41:24 +0100 Subject: More opt_const -mux_bool features --- passes/opt/opt_const.cc | 53 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/passes/opt/opt_const.cc b/passes/opt/opt_const.cc index 535dd02fc..2bb542c29 100644 --- a/passes/opt/opt_const.cc +++ b/passes/opt/opt_const.cc @@ -244,20 +244,59 @@ void replace_const_cells(RTLIL::Design *design, RTLIL::Module *module, bool cons } } - if (mux_bool && cell->type == "$mux" && cell->connections["\\A"] == RTLIL::SigSpec(0, 1) && cell->connections["\\B"] == RTLIL::SigSpec(1, 1)) { + if (mux_bool && (cell->type == "$mux" || cell->type == "$_MUX_") && + cell->connections["\\A"] == RTLIL::SigSpec(0, 1) && cell->connections["\\B"] == RTLIL::SigSpec(1, 1)) { replace_cell(module, cell, "mux_bool", "\\Y", cell->connections["\\S"]); goto next_cell; } - if (mux_bool && cell->type == "$mux" && cell->connections["\\A"] == RTLIL::SigSpec(1, 1) && cell->connections["\\B"] == RTLIL::SigSpec(0, 1)) { + if (mux_bool && (cell->type == "$mux" || cell->type == "$_MUX_") && + cell->connections["\\A"] == RTLIL::SigSpec(1, 1) && cell->connections["\\B"] == RTLIL::SigSpec(0, 1)) { cell->connections["\\A"] = cell->connections["\\S"]; cell->connections.erase("\\B"); cell->connections.erase("\\S"); - cell->parameters["\\A_WIDTH"] = cell->parameters["\\WIDTH"]; - cell->parameters["\\Y_WIDTH"] = cell->parameters["\\WIDTH"]; - cell->parameters["\\A_SIGNED"] = 0; - cell->parameters.erase("\\WIDTH"); - cell->type = "$not"; + if (cell->type == "$mux") { + cell->parameters["\\A_WIDTH"] = cell->parameters["\\WIDTH"]; + cell->parameters["\\Y_WIDTH"] = cell->parameters["\\WIDTH"]; + cell->parameters["\\A_SIGNED"] = 0; + cell->parameters.erase("\\WIDTH"); + cell->type = "$not"; + } else + cell->type = "$_INV_"; + did_something = true; + goto next_cell; + } + + if (consume_x && mux_bool && (cell->type == "$mux" || cell->type == "$_MUX_") && cell->connections["\\A"] == RTLIL::SigSpec(0, 1)) { + cell->connections["\\A"] = cell->connections["\\S"]; + cell->connections.erase("\\S"); + if (cell->type == "$mux") { + cell->parameters["\\A_WIDTH"] = cell->parameters["\\WIDTH"]; + cell->parameters["\\B_WIDTH"] = cell->parameters["\\WIDTH"]; + cell->parameters["\\Y_WIDTH"] = cell->parameters["\\WIDTH"]; + cell->parameters["\\A_SIGNED"] = 0; + cell->parameters["\\B_SIGNED"] = 0; + cell->parameters.erase("\\WIDTH"); + cell->type = "$and"; + } else + cell->type = "$_AND_"; + did_something = true; + goto next_cell; + } + + if (consume_x && mux_bool && (cell->type == "$mux" || cell->type == "$_MUX_") && cell->connections["\\B"] == RTLIL::SigSpec(1, 1)) { + cell->connections["\\B"] = cell->connections["\\S"]; + cell->connections.erase("\\S"); + if (cell->type == "$mux") { + cell->parameters["\\A_WIDTH"] = cell->parameters["\\WIDTH"]; + cell->parameters["\\B_WIDTH"] = cell->parameters["\\WIDTH"]; + cell->parameters["\\Y_WIDTH"] = cell->parameters["\\WIDTH"]; + cell->parameters["\\A_SIGNED"] = 0; + cell->parameters["\\B_SIGNED"] = 0; + cell->parameters.erase("\\WIDTH"); + cell->type = "$or"; + } else + cell->type = "$_or_"; did_something = true; goto next_cell; } -- cgit v1.2.3