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

Cleanup

This commit is contained in:
Eddie Hung 2019-09-11 13:22:52 -07:00
parent f46ef47893
commit 4937917cd8
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
passes/pmgen/peepopt_dffmux.pmg
View File

@ -1,30 +1,27 @@
pattern dffmux pattern dffmux
state <IdString> muxAB state <IdString> cemuxAB
match dff match dff
select dff->type == $dff select dff->type == $dff
select GetSize(port(dff, \D)) > 1 select GetSize(port(dff, \D)) > 1
endmatch endmatch
match mux match cemux
select mux->type == $mux select cemux->type == $mux
select GetSize(port(mux, \Y)) > 1 select GetSize(port(cemux, \Y)) > 1
index <SigSpec> port(cemux, \Y) === port(dff, \D)
choice <IdString> AB {\A, \B} choice <IdString> AB {\A, \B}
//select port(mux, AB)[GetSize(port(mux, \Y))-1].wire index <SigSpec> port(cemux, AB) === port(dff, \Q)
index <SigSpec> port(mux, \Y) === port(dff, \D) set cemuxAB AB
define <IdString> BA (AB == \A ? \B : \A)
index <SigSpec> port(mux, BA) === port(dff, \Q)
set muxAB AB
endmatch endmatch
code code
SigSpec &D = mux->connections_.at(muxAB); SigSpec &D = cemux->connections_.at(cemuxAB == \A ? \B : \A);
SigSpec &Q = dff->connections_.at(\Q); SigSpec &Q = dff->connections_.at(\Q);
int width = GetSize(D); int width = GetSize(D);
SigSpec AB = port(mux, muxAB); if (D[width-1] == D[width-2]) {
if (AB[width-1] == AB[width-2]) {
did_something = true; did_something = true;
SigBit sign = D[width-1]; SigBit sign = D[width-1];
@ -43,21 +40,21 @@ code
} }
} }
mux->connections_.at(\A).remove(i, width-i); cemux->connections_.at(\A).remove(i, width-i);
mux->connections_.at(\B).remove(i, width-i); cemux->connections_.at(\B).remove(i, width-i);
mux->connections_.at(\Y).remove(i, width-i); cemux->connections_.at(\Y).remove(i, width-i);
mux->fixup_parameters(); cemux->fixup_parameters();
dff->connections_.at(\D).remove(i, width-i); dff->connections_.at(\D).remove(i, width-i);
dff->connections_.at(\Q).remove(i, width-i); dff->connections_.at(\Q).remove(i, width-i);
dff->fixup_parameters(); dff->fixup_parameters();
log("dffmux pattern in %s: dff=%s, mux=%s; removed top %d bits.\n", log_id(module), log_id(dff), log_id(mux), width-i); 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);
accept; accept;
} }
else { else {
int count = 0; int count = 0;
for (int i = width-1; i >= 0; i--) { for (int i = width-1; i >= 0; i--) {
if (AB[i].wire) if (D[i].wire)
continue; continue;
Wire *w = Q[i].wire; Wire *w = Q[i].wire;
auto it = w->attributes.find(\init); auto it = w->attributes.find(\init);
@ -67,21 +64,21 @@ code
else else
init = State::Sx; init = State::Sx;
if (init == State::Sx || init == AB[i].data) { if (init == State::Sx || init == D[i].data) {
count++; count++;
module->connect(Q[i], AB[i]); module->connect(Q[i], D[i]);
mux->connections_.at(\A).remove(i); cemux->connections_.at(\A).remove(i);
mux->connections_.at(\B).remove(i); cemux->connections_.at(\B).remove(i);
mux->connections_.at(\Y).remove(i); cemux->connections_.at(\Y).remove(i);
dff->connections_.at(\D).remove(i); dff->connections_.at(\D).remove(i);
dff->connections_.at(\Q).remove(i); dff->connections_.at(\Q).remove(i);
} }
} }
if (count > 0) { if (count > 0) {
did_something = true; did_something = true;
mux->fixup_parameters(); cemux->fixup_parameters();
dff->fixup_parameters(); dff->fixup_parameters();
log("dffmux pattern in %s: dff=%s, mux=%s; removed %d constant bits.\n", log_id(module), log_id(dff), log_id(mux), count); log("dffcemux pattern in %s: dff=%s, cemux=%s; removed %d constant bits.\n", log_id(module), log_id(dff), log_id(cemux), count);
} }
accept; accept;