3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-23 09:05:32 +00:00

Merge remote-tracking branch 'origin/eddie/wreduce_add' into ice40dsp

This commit is contained in:
Eddie Hung 2019-07-19 14:03:34 -07:00
commit e87916b7eb
3 changed files with 29 additions and 5 deletions

View file

@ -366,13 +366,13 @@ struct WreduceWorker
}
if (cell->type.in("$add", "$sub")) {
SigSpec A = cell->getPort("\\A");
SigSpec B = cell->getPort("\\B");
SigSpec A = mi.sigmap(cell->getPort("\\A"));
SigSpec B = mi.sigmap(cell->getPort("\\B"));
bool sub = cell->type == "$sub";
int i;
for (i = 0; i < GetSize(sig); i++) {
if (B[i] != S0 && (sub || A[i] != S0))
if (B.at(i, Sx) != S0 && (sub || A.at(i, Sx) != S0))
break;
if (B[i] == S0)
module->connect(sig[i], A[i]);
@ -395,7 +395,7 @@ struct WreduceWorker
}
if (bits_removed) {
log("Removed top %d bits (of %d) from port Y of cell %s.%s (%s).\n",
log("Removed %d bits (of %d) from port Y of cell %s.%s (%s).\n",
bits_removed, GetSize(sig) + bits_removed, log_id(module), log_id(cell), log_id(cell->type));
cell->setPort("\\Y", sig);
did_something = true;