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

Fix broken CI, check reset even for constants, trim rstmux

This commit is contained in:
Eddie Hung 2019-10-02 21:26:26 -07:00
parent e4bd5aaebf
commit e9645c7fa7
2 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
passes/pmgen/peepopt_dffmux.pmg
View File

@ -74,9 +74,9 @@ code
return lhs == rhs; return lhs == rhs;
}; };
int i = width; int i = width-1;
while (i > 2) { while (i > 1) {
i--; log_dump(i, D[i], D[i-1], rst[i], rst[i-1], init[i], init[i-1]);
if (D[i] != D[i-1]) if (D[i] != D[i-1])
break; break;
if (!cmpx(rst[i], rst[i-1])) if (!cmpx(rst[i], rst[i-1]))
@ -86,26 +86,36 @@ code
if (!cmpx(rst[i], init[i])) if (!cmpx(rst[i], init[i]))
break; break;
module->connect(Q[i], Q[i-1]); module->connect(Q[i], Q[i-1]);
did_something = true; i--;
} }
if (i < width-1) { if (i < width-1) {
did_something = true;
if (cemux) { if (cemux) {
SigSpec &ceA = cemux->connections_.at(\A); SigSpec &ceA = cemux->connections_.at(\A);
SigSpec &ceB = cemux->connections_.at(\B); SigSpec &ceB = cemux->connections_.at(\B);
SigSpec &ceY = cemux->connections_.at(\Y); SigSpec &ceY = cemux->connections_.at(\Y);
ceA.remove(i, width-i); ceA.remove(i, width-1-i);
ceB.remove(i, width-i); ceB.remove(i, width-1-i);
ceY.remove(i, width-i); ceY.remove(i, width-1-i);
cemux->fixup_parameters(); cemux->fixup_parameters();
} }
dffD.remove(i, width-i); if (rstmux) {
dffQ.remove(i, width-i); SigSpec &rstA = rstmux->connections_.at(\A);
SigSpec &rstB = rstmux->connections_.at(\B);
SigSpec &rstY = rstmux->connections_.at(\Y);
rstA.remove(i, width-1-i);
rstB.remove(i, width-1-i);
rstY.remove(i, width-1-i);
rstmux->fixup_parameters();
}
dffD.remove(i, width-1-i);
dffQ.remove(i, width-1-i);
dff->fixup_parameters(); dff->fixup_parameters();
log("dffcemux pattern in %s: dff=%s, cemux=%s; removed top %d bits.\n", log_id(module), log_id(dff), log_id(cemux), width-i); log("dffcemux pattern in %s: dff=%s, cemux=%s, rstmux=%s; removed top %d bits.\n", log_id(module), log_id(dff), log_id(cemux, "n/a"), log_id(rstmux, "n/a"), width-1-i);
accept; width = i+1;
} }
else if (cemux) { if (cemux) {
SigSpec &ceA = cemux->connections_.at(\A); SigSpec &ceA = cemux->connections_.at(\A);
SigSpec &ceB = cemux->connections_.at(\B); SigSpec &ceB = cemux->connections_.at(\B);
SigSpec &ceY = cemux->connections_.at(\Y); SigSpec &ceY = cemux->connections_.at(\Y);
@ -114,15 +124,7 @@ code
for (int i = width-1; i >= 0; i--) { for (int i = width-1; i >= 0; i--) {
if (D[i].wire) if (D[i].wire)
continue; continue;
Wire *w = Q[i].wire; if (cmpx(rst[i], D[i].data) && cmpx(init[i], D[i].data)) {
auto it = w->attributes.find(\init);
State init;
if (it != w->attributes.end())
init = it->second[Q[i].offset];
else
init = State::Sx;
if (init == State::Sx || init == D[i].data) {
count++; count++;
module->connect(Q[i], D[i]); module->connect(Q[i], D[i]);
ceA.remove(i); ceA.remove(i);
@ -136,9 +138,10 @@ code
did_something = true; did_something = true;
cemux->fixup_parameters(); cemux->fixup_parameters();
dff->fixup_parameters(); dff->fixup_parameters();
log("dffcemux pattern in %s: dff=%s, cemux=%s; removed %d constant bits.\n", log_id(module), log_id(dff), log_id(cemux), count); log("dffcemux pattern in %s: dff=%s, cemux=%s, rstmux=%s; removed %d constant bits.\n", log_id(module), log_id(dff), log_id(cemux), log_id(rstmux, "n/a"), count);
}
} }
if (did_something)
accept; accept;
}
endcode endcode

4
tests/various/peepopt.ys
View File

@ -131,8 +131,8 @@ EOT
proc proc
equiv_opt -assert peepopt equiv_opt -assert peepopt
design -load postopt design -load postopt
select -assert-count 1 t:$dff r:WIDTH=5 %i select -assert-count 1 t:$dff r:WIDTH=4 %i
select -assert-count 1 t:$mux r:WIDTH=5 %i select -assert-count 1 t:$mux r:WIDTH=4 %i
select -assert-count 0 t:$dff t:$mux %% t:* %D select -assert-count 0 t:$dff t:$mux %% t:* %D
#################### ####################