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

Fix wrong results when opt_share called before opt_clean

This commit is contained in:
Bogdan Vukobratovic 2019-08-07 09:30:58 +02:00
parent 6a796accc0
commit 067b44938c
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
passes/opt/opt_share.cc
View File

@ -177,14 +177,12 @@ void merge_operators(RTLIL::Module *module, RTLIL::Cell *mux, const std::vector<
auto op = p.op; auto op = p.op;
RTLIL::IdString muxed_port_name = "\\A"; RTLIL::IdString muxed_port_name = "\\A";
if (op->getPort("\\A") == operand.sig) { if (decode_port(op, "\\A", &assign_map) == operand)
muxed_port_name = "\\B"; muxed_port_name = "\\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)
max_width = operand.sig.size(); max_width = operand.sig.size();
}
muxed_operands.push_back(operand); muxed_operands.push_back(operand);
} }
@ -196,10 +194,8 @@ void merge_operators(RTLIL::Module *module, RTLIL::Cell *mux, const std::vector<
max_width = shared_op->getParam("\\Y_WIDTH").as_int(); max_width = shared_op->getParam("\\Y_WIDTH").as_int();
for (auto &operand : muxed_operands) { for (auto &operand : muxed_operands)
operand.sig.extend_u0(max_width, operand.is_signed); operand.sig.extend_u0(max_width, operand.is_signed);
}
for (const auto& p : ports) { for (const auto& p : ports) {
auto op = p.op; auto op = p.op;
@ -208,11 +204,10 @@ void merge_operators(RTLIL::Module *module, RTLIL::Cell *mux, const std::vector<
module->remove(op); module->remove(op);
} }
for (auto &muxed_op : muxed_operands) { for (auto &muxed_op : muxed_operands)
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("\\Y"); RTLIL::SigSpec mux_y = mux->getPort("\\Y");
RTLIL::SigSpec mux_a = mux->getPort("\\A"); RTLIL::SigSpec mux_a = mux->getPort("\\A");
@ -261,7 +256,7 @@ void merge_operators(RTLIL::Module *module, RTLIL::Cell *mux, const std::vector<
shared_op->setParam("\\Y_WIDTH", conn_width); shared_op->setParam("\\Y_WIDTH", conn_width);
if (shared_op->getPort("\\A") == operand.sig) { if (decode_port(shared_op, "\\A", &assign_map) == operand) {
shared_op->setPort("\\B", mux_to_oper); shared_op->setPort("\\B", mux_to_oper);
shared_op->setParam("\\B_WIDTH", max_width); shared_op->setParam("\\B_WIDTH", max_width);
} else { } else {
@ -299,7 +294,7 @@ void check_muxed_operands(std::vector<const OpMuxConn *> &ports, const ExtSigSpe
auto op = p->op; auto op = p->op;
RTLIL::IdString muxed_port_name = "\\A"; RTLIL::IdString muxed_port_name = "\\A";
if (op->getPort("\\A") == shared_operand.sig) { if (decode_port(op, "\\A", &assign_map) == shared_operand) {
muxed_port_name = "\\B"; muxed_port_name = "\\B";
} }
@ -486,9 +481,10 @@ struct OptSharePass : public Pass {
log("\n"); log("\n");
log("This pass identifies mutually exclusive cells of the same type that:\n"); log("This pass identifies mutually exclusive cells of the same type that:\n");
log(" (a) share an input signal\n"); log(" (a) share an input signal,\n");
log(" (b) drive the same $mux, $_MUX_, or $pmux multiplexing cell allowing\n"); log(" (b) drive the same $mux, $_MUX_, or $pmux multiplexing cell,\n");
log(" the cell to be merged and the multiplexer to be moved from\n"); log("\n");
log("allowing the cell to be merged and the multiplexer to be moved from\n");
log("multiplexing its output to multiplexing the non-shared input signals.\n"); log("multiplexing its output to multiplexing the non-shared input signals.\n");
log("\n"); log("\n");
} }

1
tests/opt/opt_share_large_pmux_cat_multipart.ys
View File

@ -7,7 +7,6 @@ opt merged
opt_share merged opt_share merged
opt_clean merged opt_clean merged
opt -full
miter -equiv -flatten -ignore_gold_x -make_outputs -make_outcmp opt_share_test merged miter miter -equiv -flatten -ignore_gold_x -make_outputs -make_outcmp opt_share_test merged miter
sat -set-def-inputs -verify -prove trigger 0 -show-inputs -show-outputs miter sat -set-def-inputs -verify -prove trigger 0 -show-inputs -show-outputs miter