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

write_verilog: emit intermediate wire for constant values in sensitivity list

This commit is contained in:
N. Engelhardt 2020-09-28 18:11:18 +02:00
parent 08eb0821c9
commit 8f1d53e66f
1 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
backends/verilog/verilog_backend.cc
View File

@ -926,7 +926,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
{ {
SigSpec sig_d; SigSpec sig_d;
Const val_arst, val_srst; Const val_arst, val_srst;
std::string reg_bit_name; std::string reg_bit_name, sig_set_name, sig_clr_name, sig_arst_name;
if (chunky) { if (chunky) {
reg_bit_name = stringf("%s[%d]", reg_name.c_str(), i); reg_bit_name = stringf("%s[%d]", reg_name.c_str(), i);
if (ff.has_d) if (ff.has_d)
@ -941,6 +941,32 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
if (ff.has_srst) if (ff.has_srst)
val_srst = chunky ? ff.val_srst[i] : ff.val_srst; val_srst = chunky ? ff.val_srst[i] : ff.val_srst;
// If there are constants in the sensitivity list, replace them with an intermediate wire
if (ff.has_sr) {
if (ff.sig_set[i].wire == NULL)
{
sig_set_name = next_auto_id();
f << stringf("%s" "wire %s = ", indent.c_str(), sig_set_name.c_str());
dump_const(f, ff.sig_set[i].data);
f << stringf(";\n");
}
if (ff.sig_clr[i].wire == NULL)
{
sig_clr_name = next_auto_id();
f << stringf("%s" "wire %s = ", indent.c_str(), sig_clr_name.c_str());
dump_const(f, ff.sig_clr[i].data);
f << stringf(";\n");
}
} else if (ff.has_arst) {
if (ff.sig_arst[i].wire == NULL)
{
sig_arst_name = next_auto_id();
f << stringf("%s" "wire %s = ", indent.c_str(), sig_arst_name.c_str());
dump_const(f, ff.sig_arst[i].data);
f << stringf(";\n");
}
}
dump_attributes(f, indent, cell->attributes); dump_attributes(f, indent, cell->attributes);
if (ff.has_clk) if (ff.has_clk)
{ {
@ -949,27 +975,47 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
dump_sigspec(f, ff.sig_clk); dump_sigspec(f, ff.sig_clk);
if (ff.has_sr) { if (ff.has_sr) {
f << stringf(", %sedge ", ff.pol_set ? "pos" : "neg"); f << stringf(", %sedge ", ff.pol_set ? "pos" : "neg");
dump_sigspec(f, ff.sig_set[i]); if (ff.sig_set[i].wire == NULL)
f << stringf("%s", sig_set_name.c_str());
else
dump_sigspec(f, ff.sig_set[i]);
f << stringf(", %sedge ", ff.pol_clr ? "pos" : "neg"); f << stringf(", %sedge ", ff.pol_clr ? "pos" : "neg");
dump_sigspec(f, ff.sig_clr[i]); if (ff.sig_clr[i].wire == NULL)
f << stringf("%s", sig_clr_name.c_str());
else
dump_sigspec(f, ff.sig_clr[i]);
} else if (ff.has_arst) { } else if (ff.has_arst) {
f << stringf(", %sedge ", ff.pol_arst ? "pos" : "neg"); f << stringf(", %sedge ", ff.pol_arst ? "pos" : "neg");
dump_sigspec(f, ff.sig_arst); if (ff.sig_arst[i].wire == NULL)
f << stringf("%s", sig_arst_name.c_str());
else
dump_sigspec(f, ff.sig_arst);
} }
f << stringf(")\n"); f << stringf(")\n");
f << stringf("%s" " ", indent.c_str()); f << stringf("%s" " ", indent.c_str());
if (ff.has_sr) { if (ff.has_sr) {
f << stringf("if (%s", ff.pol_clr ? "" : "!"); f << stringf("if (%s", ff.pol_clr ? "" : "!");
dump_sigspec(f, ff.sig_clr[i]); if (ff.sig_clr[i].wire == NULL)
f << stringf("%s", sig_clr_name.c_str());
else
dump_sigspec(f, ff.sig_clr[i]);
f << stringf(") %s <= 1'b0;\n", reg_bit_name.c_str()); f << stringf(") %s <= 1'b0;\n", reg_bit_name.c_str());
f << stringf("%s" " else if (%s", indent.c_str(), ff.pol_set ? "" : "!"); f << stringf("%s" " else if (%s", indent.c_str(), ff.pol_set ? "" : "!");
dump_sigspec(f, ff.sig_set[i]); if (ff.sig_set[i].wire == NULL)
f << stringf("%s", sig_set_name.c_str());
else
dump_sigspec(f, ff.sig_set[i]);
f << stringf(") %s <= 1'b1;\n", reg_bit_name.c_str()); f << stringf(") %s <= 1'b1;\n", reg_bit_name.c_str());
f << stringf("%s" " else ", indent.c_str()); f << stringf("%s" " else ", indent.c_str());
} else if (ff.has_arst) { } else if (ff.has_arst) {
f << stringf("if (%s", ff.pol_arst ? "" : "!"); f << stringf("if (%s", ff.pol_arst ? "" : "!");
dump_sigspec(f, ff.sig_arst); if (ff.sig_arst[i].wire == NULL)
f << stringf("%s", sig_arst_name.c_str());
else
dump_sigspec(f, ff.sig_arst);
f << stringf(") %s <= ", reg_bit_name.c_str()); f << stringf(") %s <= ", reg_bit_name.c_str());
dump_sigspec(f, val_arst); dump_sigspec(f, val_arst);
f << stringf(";\n"); f << stringf(";\n");