mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-31 03:32:29 +00:00
Code Activity

More cleanup

Browse source
This commit is contained in:
Eddie Hung 2019-07-12 15:43:39 -07:00
parent 91c07be196
commit 39a7c7c54c
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
passes/techmap/abc9.cc
View file

@ -607,8 +607,8 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
// If a driver couldn't be found (could be from PI or box CI) // If a driver couldn't be found (could be from PI or box CI)
// then implement using a LUT // then implement using a LUT
cell = module->addLut(remap_name(stringf("%s$lut", c->name.c_str())), cell = module->addLut(remap_name(stringf("%s$lut", c->name.c_str())),
RTLIL::SigBit(module->wires_[remap_name(a_bit.wire->name)], a_bit.offset), RTLIL::SigBit(module->wires_.at(remap_name(a_bit.wire->name)), a_bit.offset),
RTLIL::SigBit(module->wires_[remap_name(y_bit.wire->name)], y_bit.offset), RTLIL::SigBit(module->wires_.at(remap_name(y_bit.wire->name)), y_bit.offset),
RTLIL::Const::from_string("01")); RTLIL::Const::from_string("01"));
bit2sinks[cell->getPort("\\A")].push_back(cell); bit2sinks[cell->getPort("\\A")].push_back(cell);
} }
@ -619,8 +619,8 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
} }
else { else {
cell = module->addCell(remap_name(c->name), "$_NOT_"); cell = module->addCell(remap_name(c->name), "$_NOT_");
cell->setPort("\\A", RTLIL::SigBit(module->wires_[remap_name(a_bit.wire->name)], a_bit.offset)); cell->setPort("\\A", RTLIL::SigBit(module->wires_.at(remap_name(a_bit.wire->name)), a_bit.offset));
cell->setPort("\\Y", RTLIL::SigBit(module->wires_[remap_name(y_bit.wire->name)], y_bit.offset)); cell->setPort("\\Y", RTLIL::SigBit(module->wires_.at(remap_name(y_bit.wire->name)), y_bit.offset));
cell_stats[RTLIL::unescape_id(c->type)]++; cell_stats[RTLIL::unescape_id(c->type)]++;
log_abort(); log_abort();
} }
@ -633,8 +633,8 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
RTLIL::Cell *existing_cell = nullptr; RTLIL::Cell *existing_cell = nullptr;
if (c->type == "$lut") { if (c->type == "$lut") {
if (GetSize(c->getPort("\\A")) == 1 && c->getParam("\\LUT") == RTLIL::Const::from_string("01")) { if (GetSize(c->getPort("\\A")) == 1 && c->getParam("\\LUT") == RTLIL::Const::from_string("01")) {
SigSpec my_a = module->wires_[remap_name(c->getPort("\\A").as_wire()->name)]; SigSpec my_a = module->wires_.at(remap_name(c->getPort("\\A").as_wire()->name));
SigSpec my_y = module->wires_[remap_name(c->getPort("\\Y").as_wire()->name)]; SigSpec my_y = module->wires_.at(remap_name(c->getPort("\\Y").as_wire()->name));
module->connect(my_y, my_a); module->connect(my_y, my_a);
if (markgroups) c->attributes["\\abcgroup"] = map_autoidx; if (markgroups) c->attributes["\\abcgroup"] = map_autoidx;
log_abort(); log_abort();
@ -664,7 +664,7 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
continue; continue;
//log_assert(c.width == 1); //log_assert(c.width == 1);
if (c.wire) if (c.wire)
c.wire = module->wires_[remap_name(c.wire->name)]; c.wire = module->wires_.at(remap_name(c.wire->name));
newsig.append(c); newsig.append(c);
} }
cell->setPort(conn.first, newsig); cell->setPort(conn.first, newsig);
@ -683,14 +683,14 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
if (!conn.first.is_fully_const()) { if (!conn.first.is_fully_const()) {
auto chunks = conn.first.chunks(); auto chunks = conn.first.chunks();
for (auto &c : chunks) for (auto &c : chunks)
c.wire = module->wires_[remap_name(c.wire->name)]; c.wire = module->wires_.at(remap_name(c.wire->name));
conn.first = std::move(chunks); conn.first = std::move(chunks);
} }
if (!conn.second.is_fully_const()) { if (!conn.second.is_fully_const()) {
auto chunks = conn.second.chunks(); auto chunks = conn.second.chunks();
for (auto &c : chunks) for (auto &c : chunks)
if (c.wire) if (c.wire)
c.wire = module->wires_[remap_name(c.wire->name)]; c.wire = module->wires_.at(remap_name(c.wire->name));
conn.second = std::move(chunks); conn.second = std::move(chunks);
} }
module->connect(conn); module->connect(conn);
@ -777,12 +777,11 @@ duplicate_lut:
} }
auto driver_a = driving_lut->getPort("\\A").chunks(); auto driver_a = driving_lut->getPort("\\A").chunks();
for (auto &chunk : driver_a) for (auto &chunk : driver_a)
chunk.wire = module->wires_[remap_name(chunk.wire->name)]; chunk.wire = module->wires_.at(remap_name(chunk.wire->name));
module->addLut(remap_name(not_cell->name), module->addLut(remap_name(not_cell->name),
driver_a, driver_a,
y_bit, y_bit,
driver_lut); driver_lut);
//mapped_mod->remove(not_cell);
} }
//log("ABC RESULTS: internal signals: %8d\n", int(signal_list.size()) - in_wires - out_wires); //log("ABC RESULTS: internal signals: %8d\n", int(signal_list.size()) - in_wires - out_wires);