mirror of
https://github.com/YosysHQ/yosys
synced 2025-07-29 15:37:59 +00:00
macc: Rename 'ports' to 'terms' throughout codebase
This commit is contained in:
parent
05cd1e2942
commit
91cd382f8b
8 changed files with 121 additions and 121 deletions
|
@ -142,7 +142,7 @@ struct AlumaccWorker
|
|||
log(" creating $macc model for %s (%s).\n", log_id(cell), log_id(cell->type));
|
||||
|
||||
maccnode_t *n = new maccnode_t;
|
||||
Macc::port_t new_port;
|
||||
Macc::term_t new_term;
|
||||
|
||||
n->cell = cell;
|
||||
n->y = sigmap(cell->getPort(ID::Y));
|
||||
|
@ -153,32 +153,32 @@ struct AlumaccWorker
|
|||
|
||||
if (cell->type.in(ID($pos), ID($neg)))
|
||||
{
|
||||
new_port.in_a = sigmap(cell->getPort(ID::A));
|
||||
new_port.is_signed = cell->getParam(ID::A_SIGNED).as_bool();
|
||||
new_port.do_subtract = cell->type == ID($neg);
|
||||
n->macc.ports.push_back(new_port);
|
||||
new_term.in_a = sigmap(cell->getPort(ID::A));
|
||||
new_term.is_signed = cell->getParam(ID::A_SIGNED).as_bool();
|
||||
new_term.do_subtract = cell->type == ID($neg);
|
||||
n->macc.terms.push_back(new_term);
|
||||
}
|
||||
|
||||
if (cell->type.in(ID($add), ID($sub)))
|
||||
{
|
||||
new_port.in_a = sigmap(cell->getPort(ID::A));
|
||||
new_port.is_signed = cell->getParam(ID::A_SIGNED).as_bool();
|
||||
new_port.do_subtract = false;
|
||||
n->macc.ports.push_back(new_port);
|
||||
new_term.in_a = sigmap(cell->getPort(ID::A));
|
||||
new_term.is_signed = cell->getParam(ID::A_SIGNED).as_bool();
|
||||
new_term.do_subtract = false;
|
||||
n->macc.terms.push_back(new_term);
|
||||
|
||||
new_port.in_a = sigmap(cell->getPort(ID::B));
|
||||
new_port.is_signed = cell->getParam(ID::B_SIGNED).as_bool();
|
||||
new_port.do_subtract = cell->type == ID($sub);
|
||||
n->macc.ports.push_back(new_port);
|
||||
new_term.in_a = sigmap(cell->getPort(ID::B));
|
||||
new_term.is_signed = cell->getParam(ID::B_SIGNED).as_bool();
|
||||
new_term.do_subtract = cell->type == ID($sub);
|
||||
n->macc.terms.push_back(new_term);
|
||||
}
|
||||
|
||||
if (cell->type.in(ID($mul)))
|
||||
{
|
||||
new_port.in_a = sigmap(cell->getPort(ID::A));
|
||||
new_port.in_b = sigmap(cell->getPort(ID::B));
|
||||
new_port.is_signed = cell->getParam(ID::A_SIGNED).as_bool();
|
||||
new_port.do_subtract = false;
|
||||
n->macc.ports.push_back(new_port);
|
||||
new_term.in_a = sigmap(cell->getPort(ID::A));
|
||||
new_term.in_b = sigmap(cell->getPort(ID::B));
|
||||
new_term.is_signed = cell->getParam(ID::A_SIGNED).as_bool();
|
||||
new_term.do_subtract = false;
|
||||
n->macc.terms.push_back(new_term);
|
||||
}
|
||||
|
||||
log_assert(sig_macc.count(n->y) == 0);
|
||||
|
@ -190,7 +190,7 @@ struct AlumaccWorker
|
|||
{
|
||||
std::vector<int> port_sizes;
|
||||
|
||||
for (auto &port : macc.ports) {
|
||||
for (auto &port : macc.terms) {
|
||||
if (port.is_signed != is_signed)
|
||||
return true;
|
||||
if (!port.is_signed && port.do_subtract)
|
||||
|
@ -235,9 +235,9 @@ struct AlumaccWorker
|
|||
if (delete_nodes.count(n))
|
||||
continue;
|
||||
|
||||
for (int i = 0; i < GetSize(n->macc.ports); i++)
|
||||
for (int i = 0; i < GetSize(n->macc.terms); i++)
|
||||
{
|
||||
auto &port = n->macc.ports[i];
|
||||
auto &port = n->macc.terms[i];
|
||||
|
||||
if (GetSize(port.in_b) > 0 || sig_macc.count(port.in_a) == 0)
|
||||
continue;
|
||||
|
@ -253,13 +253,13 @@ struct AlumaccWorker
|
|||
log(" merging $macc model for %s into %s.\n", log_id(other_n->cell), log_id(n->cell));
|
||||
|
||||
bool do_subtract = port.do_subtract;
|
||||
for (int j = 0; j < GetSize(other_n->macc.ports); j++) {
|
||||
for (int j = 0; j < GetSize(other_n->macc.terms); j++) {
|
||||
if (do_subtract)
|
||||
other_n->macc.ports[j].do_subtract = !other_n->macc.ports[j].do_subtract;
|
||||
other_n->macc.terms[j].do_subtract = !other_n->macc.terms[j].do_subtract;
|
||||
if (j == 0)
|
||||
n->macc.ports[i--] = other_n->macc.ports[j];
|
||||
n->macc.terms[i--] = other_n->macc.terms[j];
|
||||
else
|
||||
n->macc.ports.push_back(other_n->macc.ports[j]);
|
||||
n->macc.terms.push_back(other_n->macc.terms[j]);
|
||||
}
|
||||
|
||||
delete_nodes.insert(other_n);
|
||||
|
@ -288,7 +288,7 @@ struct AlumaccWorker
|
|||
bool subtract_b = false;
|
||||
alunode_t *alunode;
|
||||
|
||||
for (auto &port : n->macc.ports)
|
||||
for (auto &port : n->macc.terms)
|
||||
if (GetSize(port.in_b) > 0) {
|
||||
goto next_macc;
|
||||
} else if (GetSize(port.in_a) == 1 && !port.is_signed && !port.do_subtract) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue