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

Merge branch 'xaig' into xc7mux

This commit is contained in:
Eddie Hung 2019-04-10 14:03:09 -07:00
parent 17a02df05c 1a49cf29d8
commit bf92218e0f
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
frontends/aiger/aigerparse.cc
View File

@ -165,15 +165,9 @@ void AigerReader::parse_aiger()
int width = wp.second + 1; int width = wp.second + 1;
RTLIL::Wire *wire = module->wire(name); RTLIL::Wire *wire = module->wire(name);
if (wire) { if (wire)
RTLIL::Cell* driver = module->cell(stringf("%s$lut", wire->name.c_str()));
module->rename(wire, RTLIL::escape_id(stringf("%s[%d]", name.c_str(), 0))); module->rename(wire, RTLIL::escape_id(stringf("%s[%d]", name.c_str(), 0)));
if (driver)
module->rename(driver, stringf("%s$lut", wire->name.c_str()));
}
// Do not make ports with a mix of input/output into // Do not make ports with a mix of input/output into
// wide ports // wide ports
bool port_input = false, port_output = false; bool port_input = false, port_output = false;
@ -210,6 +204,15 @@ void AigerReader::parse_aiger()
design->add(module); design->add(module);
Pass::call(design, "clean"); Pass::call(design, "clean");
for (auto cell : module->cells().to_vector()) {
if (cell->type != "$lut") continue;
auto y_port = cell->getPort("\\Y").as_bit();
if (y_port.wire->width == 1)
module->rename(cell, stringf("%s$lut", y_port.wire->name.c_str()));
else
module->rename(cell, stringf("%s[%d]$lut", y_port.wire->name.c_str(), y_port.offset));
}
} }
static uint32_t parse_xaiger_literal(std::istream &f) static uint32_t parse_xaiger_literal(std::istream &f)
@ -357,7 +360,7 @@ void AigerReader::parse_xaiger()
RTLIL::Cell *output_cell = module->cell(stringf("\\__%d__$and", rootNodeID)); RTLIL::Cell *output_cell = module->cell(stringf("\\__%d__$and", rootNodeID));
log_assert(output_cell); log_assert(output_cell);
module->remove(output_cell); module->remove(output_cell);
module->addLut(stringf("\\__%d__$lut", rootNodeID), input_sig, output_sig, std::move(lut_mask)); module->addLut(stringf("\\__%d__$lut", rootNodeID), input_sig, output_sig, std::move(lut_mask));
} }
} }
else if (c == 'n') { else if (c == 'n') {
@ -408,13 +411,9 @@ next_line:
dict<RTLIL::IdString, int> wideports_cache; dict<RTLIL::IdString, int> wideports_cache;
for (const auto &i : deferred_renames) { for (const auto &i : deferred_renames) {
RTLIL::Wire *wire = i.first; RTLIL::Wire *wire = i.first;
RTLIL::Cell* driver = module->cell(stringf("%s$lut", wire->name.c_str()));
module->rename(wire, i.second); module->rename(wire, i.second);
if (driver)
module->rename(driver, stringf("%s$lut", wire->name.c_str()));
if (wideports && (wire->port_input || wire->port_output)) { if (wideports && (wire->port_input || wire->port_output)) {
RTLIL::IdString escaped_symbol; RTLIL::IdString escaped_symbol;
int index; int index;
@ -461,8 +460,6 @@ next_line:
log_assert(wire); log_assert(wire);
log_assert(wire->port_output); log_assert(wire->port_output);
RTLIL::Cell* driver = module->cell(stringf("%s$lut", wire->name.c_str()));
if (index == 0) if (index == 0)
module->rename(wire, escaped_symbol); module->rename(wire, escaped_symbol);
else if (index > 0) { else if (index > 0) {
@ -470,9 +467,6 @@ next_line:
if (wideports) if (wideports)
wideports_cache[escaped_symbol] = std::max(wideports_cache[escaped_symbol], index); wideports_cache[escaped_symbol] = std::max(wideports_cache[escaped_symbol], index);
} }
if (driver)
module->rename(driver, stringf("%s$lut", wire->name.c_str()));
} }
else else
log_error("Symbol type '%s' not recognised.\n", type.c_str()); log_error("Symbol type '%s' not recognised.\n", type.c_str());
@ -484,15 +478,9 @@ next_line:
int width = wp.second + 1; int width = wp.second + 1;
RTLIL::Wire *wire = module->wire(name); RTLIL::Wire *wire = module->wire(name);
if (wire) { if (wire)
RTLIL::Cell* driver = module->cell(stringf("%s$lut", wire->name.c_str()));
module->rename(wire, RTLIL::escape_id(stringf("%s[%d]", name.c_str(), 0))); module->rename(wire, RTLIL::escape_id(stringf("%s[%d]", name.c_str(), 0)));
if (driver)
module->rename(driver, stringf("%s$lut", wire->name.c_str()));
}
// Do not make ports with a mix of input/output into // Do not make ports with a mix of input/output into
// wide ports // wide ports
bool port_input = false, port_output = false; bool port_input = false, port_output = false;
@ -529,6 +517,15 @@ next_line:
design->add(module); design->add(module);
Pass::call(design, "clean"); Pass::call(design, "clean");
for (auto cell : module->cells().to_vector()) {
if (cell->type != "$lut") continue;
auto y_port = cell->getPort("\\Y").as_bit();
if (y_port.wire->width == 1)
module->rename(cell, stringf("%s$lut", y_port.wire->name.c_str()));
else
module->rename(cell, stringf("%s[%d]$lut", y_port.wire->name.c_str(), y_port.offset));
}
} }
void AigerReader::parse_aiger_ascii() void AigerReader::parse_aiger_ascii()