mirror of
https://github.com/YosysHQ/yosys
synced 2025-06-23 22:33:41 +00:00
Use more ID::{A,B,Y,blackbox,whitebox}
This commit is contained in:
parent
6cd8cace0c
commit
52355f5185
40 changed files with 889 additions and 887 deletions
|
@ -122,7 +122,7 @@ struct MuxcoverWorker
|
|||
}
|
||||
}
|
||||
if (cell->type == ID($_MUX_))
|
||||
sig_to_mux[sigmap(cell->getPort(ID(Y)))] = cell;
|
||||
sig_to_mux[sigmap(cell->getPort(ID::Y))] = cell;
|
||||
}
|
||||
|
||||
log(" Treeifying %d MUXes:\n", GetSize(sig_to_mux));
|
||||
|
@ -141,8 +141,8 @@ struct MuxcoverWorker
|
|||
if (sig_to_mux.count(bit) && (bit == rootsig || !roots.count(bit))) {
|
||||
Cell *c = sig_to_mux.at(bit);
|
||||
tree.muxes[bit] = c;
|
||||
wavefront.insert(sigmap(c->getPort(ID(A))));
|
||||
wavefront.insert(sigmap(c->getPort(ID(B))));
|
||||
wavefront.insert(sigmap(c->getPort(ID::A)));
|
||||
wavefront.insert(sigmap(c->getPort(ID::B)));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -517,31 +517,31 @@ struct MuxcoverWorker
|
|||
if (GetSize(mux.inputs) == 2) {
|
||||
count_muxes_by_type[0]++;
|
||||
Cell *cell = module->addCell(NEW_ID, ID($_MUX_));
|
||||
cell->setPort(ID(A), mux.inputs[0]);
|
||||
cell->setPort(ID(B), mux.inputs[1]);
|
||||
cell->setPort(ID::A, mux.inputs[0]);
|
||||
cell->setPort(ID::B, mux.inputs[1]);
|
||||
cell->setPort(ID(S), mux.selects[0]);
|
||||
cell->setPort(ID(Y), bit);
|
||||
cell->setPort(ID::Y, bit);
|
||||
return;
|
||||
}
|
||||
|
||||
if (GetSize(mux.inputs) == 4) {
|
||||
count_muxes_by_type[1]++;
|
||||
Cell *cell = module->addCell(NEW_ID, ID($_MUX4_));
|
||||
cell->setPort(ID(A), mux.inputs[0]);
|
||||
cell->setPort(ID(B), mux.inputs[1]);
|
||||
cell->setPort(ID::A, mux.inputs[0]);
|
||||
cell->setPort(ID::B, mux.inputs[1]);
|
||||
cell->setPort(ID(C), mux.inputs[2]);
|
||||
cell->setPort(ID(D), mux.inputs[3]);
|
||||
cell->setPort(ID(S), mux.selects[0]);
|
||||
cell->setPort(ID(T), mux.selects[1]);
|
||||
cell->setPort(ID(Y), bit);
|
||||
cell->setPort(ID::Y, bit);
|
||||
return;
|
||||
}
|
||||
|
||||
if (GetSize(mux.inputs) == 8) {
|
||||
count_muxes_by_type[2]++;
|
||||
Cell *cell = module->addCell(NEW_ID, ID($_MUX8_));
|
||||
cell->setPort(ID(A), mux.inputs[0]);
|
||||
cell->setPort(ID(B), mux.inputs[1]);
|
||||
cell->setPort(ID::A, mux.inputs[0]);
|
||||
cell->setPort(ID::B, mux.inputs[1]);
|
||||
cell->setPort(ID(C), mux.inputs[2]);
|
||||
cell->setPort(ID(D), mux.inputs[3]);
|
||||
cell->setPort(ID(E), mux.inputs[4]);
|
||||
|
@ -551,15 +551,15 @@ struct MuxcoverWorker
|
|||
cell->setPort(ID(S), mux.selects[0]);
|
||||
cell->setPort(ID(T), mux.selects[1]);
|
||||
cell->setPort(ID(U), mux.selects[2]);
|
||||
cell->setPort(ID(Y), bit);
|
||||
cell->setPort(ID::Y, bit);
|
||||
return;
|
||||
}
|
||||
|
||||
if (GetSize(mux.inputs) == 16) {
|
||||
count_muxes_by_type[3]++;
|
||||
Cell *cell = module->addCell(NEW_ID, ID($_MUX16_));
|
||||
cell->setPort(ID(A), mux.inputs[0]);
|
||||
cell->setPort(ID(B), mux.inputs[1]);
|
||||
cell->setPort(ID::A, mux.inputs[0]);
|
||||
cell->setPort(ID::B, mux.inputs[1]);
|
||||
cell->setPort(ID(C), mux.inputs[2]);
|
||||
cell->setPort(ID(D), mux.inputs[3]);
|
||||
cell->setPort(ID(E), mux.inputs[4]);
|
||||
|
@ -578,7 +578,7 @@ struct MuxcoverWorker
|
|||
cell->setPort(ID(T), mux.selects[1]);
|
||||
cell->setPort(ID(U), mux.selects[2]);
|
||||
cell->setPort(ID(V), mux.selects[3]);
|
||||
cell->setPort(ID(Y), bit);
|
||||
cell->setPort(ID::Y, bit);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue