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

ID({A,B,Y}) -> ID::{A,B,Y} for opt_share.cc

Browse source
This commit is contained in:
Eddie Hung 2019-08-19 10:11:47 -07:00
parent 4adcbecec5
commit f42ba811b6
1 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
passes/opt/opt_share.cc
View file

@ -127,7 +127,7 @@ bool mergeable(RTLIL::Cell *a, RTLIL::Cell *b)
RTLIL::IdString decode_port_semantics(RTLIL::Cell *cell, RTLIL::IdString port_name) RTLIL::IdString decode_port_semantics(RTLIL::Cell *cell, RTLIL::IdString port_name)
{ {
if (cell->type.in(ID($lt), ID($le), ID($ge), ID($gt), ID($div), ID($mod), ID($concat), SHIFT_OPS) && port_name == ID(B)) if (cell->type.in(ID($lt), ID($le), ID($ge), ID($gt), ID($div), ID($mod), ID($concat), SHIFT_OPS) && port_name == ID::B)
return port_name; return port_name;
return ""; return "";
@ -135,9 +135,9 @@ RTLIL::IdString decode_port_semantics(RTLIL::Cell *cell, RTLIL::IdString port_na
RTLIL::SigSpec decode_port_sign(RTLIL::Cell *cell, RTLIL::IdString port_name) { RTLIL::SigSpec decode_port_sign(RTLIL::Cell *cell, RTLIL::IdString port_name) {
if (cell->type == ID($alu) && port_name == ID(B)) if (cell->type == ID($alu) && port_name == ID::B)
return cell->getPort(ID(BI)); return cell->getPort(ID(BI));
else if (cell->type == ID($sub) && port_name == ID(B)) else if (cell->type == ID($sub) && port_name == ID::B)
return RTLIL::Const(1, 1); return RTLIL::Const(1, 1);
return RTLIL::Const(0, 1); return RTLIL::Const(0, 1);
@ -173,9 +173,9 @@ void merge_operators(RTLIL::Module *module, RTLIL::Cell *mux, const std::vector<
for (const auto& p : ports) { for (const auto& p : ports) {
auto op = p.op; auto op = p.op;
RTLIL::IdString muxed_port_name = ID(A); RTLIL::IdString muxed_port_name = ID::A;
if (decode_port(op, ID(A), &assign_map) == operand) if (decode_port(op, ID::A, &assign_map) == operand)
muxed_port_name = ID(B); muxed_port_name = ID::B;
auto operand = decode_port(op, muxed_port_name, &assign_map); auto operand = decode_port(op, muxed_port_name, &assign_map);
if (operand.sig.size() > max_width) if (operand.sig.size() > max_width)
@ -204,9 +204,9 @@ void merge_operators(RTLIL::Module *module, RTLIL::Cell *mux, const std::vector<
if (muxed_op.sign != muxed_operands[0].sign) if (muxed_op.sign != muxed_operands[0].sign)
muxed_op = ExtSigSpec(module->Neg(NEW_ID, muxed_op.sig, muxed_op.is_signed)); muxed_op = ExtSigSpec(module->Neg(NEW_ID, muxed_op.sig, muxed_op.is_signed));
RTLIL::SigSpec mux_y = mux->getPort(ID(Y)); RTLIL::SigSpec mux_y = mux->getPort(ID::Y);
RTLIL::SigSpec mux_a = mux->getPort(ID(A)); RTLIL::SigSpec mux_a = mux->getPort(ID::A);
RTLIL::SigSpec mux_b = mux->getPort(ID(B)); RTLIL::SigSpec mux_b = mux->getPort(ID::B);
RTLIL::SigSpec mux_s = mux->getPort(ID(S)); RTLIL::SigSpec mux_s = mux->getPort(ID(S));
RTLIL::SigSpec shared_pmux_a = RTLIL::Const(RTLIL::State::Sx, max_width); RTLIL::SigSpec shared_pmux_a = RTLIL::Const(RTLIL::State::Sx, max_width);
@ -216,24 +216,24 @@ void merge_operators(RTLIL::Module *module, RTLIL::Cell *mux, const std::vector<
int conn_width = ports[0].sig.size(); int conn_width = ports[0].sig.size();
int conn_offset = ports[0].mux_port_offset; int conn_offset = ports[0].mux_port_offset;
shared_op->setPort(ID(Y), shared_op->getPort(ID(Y)).extract(0, conn_width)); shared_op->setPort(ID::Y, shared_op->getPort(ID::Y).extract(0, conn_width));
if (mux->type == ID($pmux)) { if (mux->type == ID($pmux)) {
shared_pmux_s = RTLIL::SigSpec(); shared_pmux_s = RTLIL::SigSpec();
for (const auto &p : ports) { for (const auto &p : ports) {
shared_pmux_s.append(mux_s[p.mux_port_id]); shared_pmux_s.append(mux_s[p.mux_port_id]);
mux_b.replace(p.mux_port_id * mux_a.size() + conn_offset, shared_op->getPort(ID(Y))); mux_b.replace(p.mux_port_id * mux_a.size() + conn_offset, shared_op->getPort(ID::Y));
} }
} else { } else {
shared_pmux_s = RTLIL::SigSpec{mux_s, module->Not(NEW_ID, mux_s)}; shared_pmux_s = RTLIL::SigSpec{mux_s, module->Not(NEW_ID, mux_s)};
mux_a.replace(conn_offset, shared_op->getPort(ID(Y))); mux_a.replace(conn_offset, shared_op->getPort(ID::Y));
mux_b.replace(conn_offset, shared_op->getPort(ID(Y))); mux_b.replace(conn_offset, shared_op->getPort(ID::Y));
} }
mux->setPort(ID(A), mux_a); mux->setPort(ID::A, mux_a);
mux->setPort(ID(B), mux_b); mux->setPort(ID::B, mux_b);
mux->setPort(ID(Y), mux_y); mux->setPort(ID::Y, mux_y);
mux->setPort(ID(S), mux_s); mux->setPort(ID(S), mux_s);
for (const auto &op : muxed_operands) for (const auto &op : muxed_operands)
@ -251,11 +251,11 @@ void merge_operators(RTLIL::Module *module, RTLIL::Cell *mux, const std::vector<
shared_op->setParam(ID(Y_WIDTH), conn_width); shared_op->setParam(ID(Y_WIDTH), conn_width);
if (decode_port(shared_op, ID(A), &assign_map) == operand) { if (decode_port(shared_op, ID::A, &assign_map) == operand) {
shared_op->setPort(ID(B), mux_to_oper); shared_op->setPort(ID::B, mux_to_oper);
shared_op->setParam(ID(B_WIDTH), max_width); shared_op->setParam(ID(B_WIDTH), max_width);
} else { } else {
shared_op->setPort(ID(A), mux_to_oper); shared_op->setPort(ID::A, mux_to_oper);
shared_op->setParam(ID(A_WIDTH), max_width); shared_op->setParam(ID(A_WIDTH), max_width);
} }
} }
@ -286,9 +286,9 @@ void check_muxed_operands(std::vector<const OpMuxConn *> &ports, const ExtSigSpe
auto p = *it; auto p = *it;
auto op = p->op; auto op = p->op;
RTLIL::IdString muxed_port_name = ID(A); RTLIL::IdString muxed_port_name = ID::A;
if (decode_port(op, ID(A), &assign_map) == shared_operand) { if (decode_port(op, ID::A, &assign_map) == shared_operand) {
muxed_port_name = ID(B); muxed_port_name = ID::B;
} }
auto operand = decode_port(op, muxed_port_name, &assign_map); auto operand = decode_port(op, muxed_port_name, &assign_map);
@ -315,7 +315,7 @@ ExtSigSpec find_shared_operand(const OpMuxConn* seed, std::vector<const OpMuxCon
auto op_a = seed->op; auto op_a = seed->op;
for (RTLIL::IdString port_name : {ID(A), ID(B)}) { for (RTLIL::IdString port_name : {ID::A, ID::B}) {
oper = decode_port(op_a, port_name, &assign_map); oper = decode_port(op_a, port_name, &assign_map);
auto operand_users = operand_to_users.at(oper); auto operand_users = operand_to_users.at(oper);
@ -355,7 +355,7 @@ dict<RTLIL::SigSpec, OpMuxConn> find_valid_op_mux_conns(RTLIL::Module *module, d
std::function<void(RTLIL::SigBit)> remove_outsig_from_aux_bit = [&](RTLIL::SigBit auxbit) { std::function<void(RTLIL::SigBit)> remove_outsig_from_aux_bit = [&](RTLIL::SigBit auxbit) {
auto aux_outsig = op_aux_to_outsig.at(auxbit); auto aux_outsig = op_aux_to_outsig.at(auxbit);
auto op = outsig_to_operator.at(aux_outsig); auto op = outsig_to_operator.at(aux_outsig);
auto op_outsig = assign_map(op->getPort(ID(Y))); auto op_outsig = assign_map(op->getPort(ID::Y));
remove_outsig(op_outsig); remove_outsig(op_outsig);
for (auto aux_outbit : aux_outsig) for (auto aux_outbit : aux_outsig)
@ -367,11 +367,11 @@ dict<RTLIL::SigSpec, OpMuxConn> find_valid_op_mux_conns(RTLIL::Module *module, d
int mux_port_size; int mux_port_size;
if (mux->type.in(ID($mux), ID($_MUX_))) { if (mux->type.in(ID($mux), ID($_MUX_))) {
mux_port_size = mux->getPort(ID(A)).size(); mux_port_size = mux->getPort(ID::A).size();
sig = RTLIL::SigSpec{mux->getPort(ID(B)), mux->getPort(ID(A))}; sig = RTLIL::SigSpec{mux->getPort(ID::B), mux->getPort(ID::A)};
} else { } else {
mux_port_size = mux->getPort(ID(A)).size(); mux_port_size = mux->getPort(ID::A).size();
sig = mux->getPort(ID(B)); sig = mux->getPort(ID::B);
} }
auto mux_insig = assign_map(sig); auto mux_insig = assign_map(sig);
@ -510,12 +510,12 @@ struct OptSharePass : public Pass {
} }
} }
auto mux_insig = assign_map(cell->getPort(ID(Y))); auto mux_insig = assign_map(cell->getPort(ID::Y));
outsig_to_operator[mux_insig] = cell; outsig_to_operator[mux_insig] = cell;
for (auto outbit : mux_insig) for (auto outbit : mux_insig)
op_outbit_to_outsig[outbit] = mux_insig; op_outbit_to_outsig[outbit] = mux_insig;
for (RTLIL::IdString port_name : {ID(A), ID(B)}) { for (RTLIL::IdString port_name : {ID::A, ID::B}) {
auto op_insig = decode_port(cell, port_name, &assign_map); auto op_insig = decode_port(cell, port_name, &assign_map);
op_insigs.push_back(op_insig); op_insigs.push_back(op_insig);
operand_to_users[op_insig].insert(cell); operand_to_users[op_insig].insert(cell);