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

Improved opt_reduce handling of mem wr_en mux bits

Browse source
This commit is contained in:
Clifford Wolf 2014-07-17 12:12:04 +02:00
parent 274c514879
commit 1b00861d0a
1 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
passes/opt/opt_reduce.cc
View file

@ -186,11 +186,21 @@ struct OptReduceWorker
for (int i = 0; i < int(sig_y.size()); i++) for (int i = 0; i < int(sig_y.size()); i++)
{ {
std::vector<RTLIL::SigBit> in_tuple; std::vector<RTLIL::SigBit> in_tuple;
in_tuple.push_back(sig_a.at(i)); bool all_tuple_bits_same = true;
for (int j = i; j < int(sig_b.size()); j += int(sig_a.size()))
in_tuple.push_back(sig_b.at(j));
if (consolidated_in_tuples_map.count(in_tuple)) in_tuple.push_back(sig_a.at(i));
for (int j = i; j < int(sig_b.size()); j += int(sig_a.size())) {
if (sig_b.at(j) != sig_a.at(i))
all_tuple_bits_same = false;
in_tuple.push_back(sig_b.at(j));
}
if (all_tuple_bits_same)
{
old_sig_conn.first.append_bit(sig_y.at(i));
old_sig_conn.second.append_bit(sig_a.at(i));
}
else if (consolidated_in_tuples_map.count(in_tuple))
{ {
old_sig_conn.first.append_bit(sig_y.at(i)); old_sig_conn.first.append_bit(sig_y.at(i));
old_sig_conn.second.append_bit(consolidated_in_tuples_map.at(in_tuple)); old_sig_conn.second.append_bit(consolidated_in_tuples_map.at(in_tuple));
@ -206,7 +216,8 @@ struct OptReduceWorker
if (new_sig_y.size() != sig_y.size()) if (new_sig_y.size() != sig_y.size())
{ {
log(" Consolidated identical input bits for %s cell %s:\n", cell->type.c_str(), cell->name.c_str()); log(" Consolidated identical input bits for %s cell %s:\n", cell->type.c_str(), cell->name.c_str());
log(" Old inputs: A=%s, B=%s\n", log_signal(cell->connections["\\A"]), log_signal(cell->connections["\\B"])); log(" Old ports: A=%s, B=%s, Y=%s\n", log_signal(cell->connections["\\A"]),
log_signal(cell->connections["\\B"]), log_signal(cell->connections["\\Y"]));
cell->connections["\\A"] = RTLIL::SigSpec(); cell->connections["\\A"] = RTLIL::SigSpec();
for (auto &in_tuple : consolidated_in_tuples) for (auto &in_tuple : consolidated_in_tuples)
@ -217,11 +228,13 @@ struct OptReduceWorker
for (auto &in_tuple : consolidated_in_tuples) for (auto &in_tuple : consolidated_in_tuples)
cell->connections["\\B"].append(in_tuple.at(i)); cell->connections["\\B"].append(in_tuple.at(i));
log(" New inputs: A=%s, B=%s\n", log_signal(cell->connections["\\A"]), log_signal(cell->connections["\\B"]));
cell->parameters["\\WIDTH"] = RTLIL::Const(new_sig_y.size()); cell->parameters["\\WIDTH"] = RTLIL::Const(new_sig_y.size());
cell->connections["\\Y"] = new_sig_y; cell->connections["\\Y"] = new_sig_y;
log(" New ports: A=%s, B=%s, Y=%s\n", log_signal(cell->connections["\\A"]),
log_signal(cell->connections["\\B"]), log_signal(cell->connections["\\Y"]));
log(" New connections: %s = %s\n", log_signal(old_sig_conn.first), log_signal(old_sig_conn.second));
module->connections.push_back(old_sig_conn); module->connections.push_back(old_sig_conn);
module->check(); module->check();