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

Do not treat $__ABC_FF_ as a user cell

This commit is contained in:
Eddie Hung 2019-06-15 19:36:55 -07:00
parent 9ec57b46c2
commit 2309459605
2 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backends/aiger/xaiger.cc
View File

@ -222,15 +222,15 @@ struct XAigerWriter
log_assert(!holes_mode); log_assert(!holes_mode);
// FIXME: Should short here, rather than provide $__ABC_FF_ if (cell->type == "$__ABC_FF_")
// to ABC like a user cell {
//if (cell->type == "$__ABC_FF_") SigBit D = sigmap(cell->getPort("\\D").as_bit());
//{ SigBit Q = sigmap(cell->getPort("\\Q").as_bit());
// SigBit D = sigmap(cell->getPort("\\D").as_bit()); unused_bits.erase(D);
// SigBit Q = sigmap(cell->getPort("\\Q").as_bit()); undriven_bits.erase(Q);
// alias_map[Q] = D; alias_map[Q] = D;
// continue; continue;
//} }
RTLIL::Module* inst_module = !holes_mode ? module->design->module(cell->type) : nullptr; RTLIL::Module* inst_module = !holes_mode ? module->design->module(cell->type) : nullptr;
bool inst_flop = inst_module ? inst_module->attributes.count("\\abc_flop") : false; bool inst_flop = inst_module ? inst_module->attributes.count("\\abc_flop") : false;

27
passes/techmap/abc9.cc
View File

@ -512,26 +512,18 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
} }
} }
// Remove all AND, NOT, and ABC box instances
// in preparation for stitching mapped_mod in
// Short $_FF_ cells used by ABC (FIXME)
dict<IdString, decltype(RTLIL::Cell::parameters)> erased_boxes; dict<IdString, decltype(RTLIL::Cell::parameters)> erased_boxes;
std::vector<RTLIL::Cell*> abc_dff;
for (auto it = module->cells_.begin(); it != module->cells_.end(); ) { for (auto it = module->cells_.begin(); it != module->cells_.end(); ) {
RTLIL::Cell* cell = it->second; RTLIL::Cell* cell = it->second;
if (cell->type.in("$_AND_", "$_NOT_")) { if (cell->type.in("$_AND_", "$_NOT_", "$__ABC_FF_")) {
it = module->cells_.erase(it); it = module->cells_.erase(it);
continue; continue;
} }
if (cell->type.in("$__ABC_FF_")) RTLIL::Module* box_module = design->module(cell->type);
abc_dff.emplace_back(cell); if (box_module && box_module->attributes.count("\\abc_box_id")) {
else { erased_boxes.insert(std::make_pair(it->first, std::move(cell->parameters)));
RTLIL::Module* box_module = design->module(cell->type); it = module->cells_.erase(it);
if (box_module && box_module->attributes.count("\\abc_box_id")) { continue;
erased_boxes.insert(std::make_pair(it->first, std::move(cell->parameters)));
it = module->cells_.erase(it);
continue;
}
} }
++it; ++it;
} }
@ -695,13 +687,6 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
} }
} }
for (auto cell : abc_dff) {
RTLIL::SigBit D = cell->getPort("\\D");
RTLIL::SigBit Q = cell->getPort("\\Q");
module->connect(Q, D);
module->remove(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);
log("ABC RESULTS: input signals: %8d\n", in_wires); log("ABC RESULTS: input signals: %8d\n", in_wires);
log("ABC RESULTS: output signals: %8d\n", out_wires); log("ABC RESULTS: output signals: %8d\n", out_wires);