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

Fix when -dff not given

This commit is contained in:
Eddie Hung 2020-01-04 09:17:01 -08:00
parent 930f03e883
commit 6556a1347a
4 changed files with 56 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
backends/aiger/xaiger.cc
View File

@ -239,17 +239,13 @@ struct XAigerWriter
RTLIL::Module* inst_module = module->design->module(cell->type); RTLIL::Module* inst_module = module->design->module(cell->type);
if (inst_module) { if (inst_module) {
bool abc9_box = inst_module->attributes.count("\\abc9_box_id"); auto it = cell->attributes.find("\\abc9_box_seq");
bool abc9_flop = inst_module->get_bool_attribute("\\abc9_flop"); if (it != cell->attributes.end()) {
if (abc9_box && cell->get_bool_attribute("\\abc9_keep")) int abc9_box_seq = it->second.as_int();
abc9_box = false; if (GetSize(box_list) <= abc9_box_seq)
box_list.resize(abc9_box_seq+1);
if (abc9_box) { box_list[abc9_box_seq] = cell;
int abc9_box_order = cell->attributes.at("\\abc9_box_order").as_int(); if (!inst_module->get_bool_attribute("\\abc9_flop"))
if (GetSize(box_list) <= abc9_box_order)
box_list.resize(abc9_box_order+1);
box_list[abc9_box_order] = cell;
if (!abc9_flop)
continue; continue;
} }
@ -542,6 +538,8 @@ struct XAigerWriter
int box_count = 0; int box_count = 0;
for (auto cell : box_list) { for (auto cell : box_list) {
log_assert(cell);
RTLIL::Module* box_module = module->design->module(cell->type); RTLIL::Module* box_module = module->design->module(cell->type);
log_assert(box_module); log_assert(box_module);
@ -611,7 +609,7 @@ struct XAigerWriter
f.write(buffer_str.data(), buffer_str.size()); f.write(buffer_str.data(), buffer_str.size());
if (holes_module) { if (holes_module) {
log_push(); log_module(holes_module);
std::stringstream a_buffer; std::stringstream a_buffer;
XAigerWriter writer(holes_module); XAigerWriter writer(holes_module);
@ -622,8 +620,6 @@ struct XAigerWriter
int32_t buffer_size_be = to_big_endian(buffer_str.size()); int32_t buffer_size_be = to_big_endian(buffer_str.size());
f.write(reinterpret_cast<const char*>(&buffer_size_be), sizeof(buffer_size_be)); f.write(reinterpret_cast<const char*>(&buffer_size_be), sizeof(buffer_size_be));
f.write(buffer_str.data(), buffer_str.size()); f.write(buffer_str.data(), buffer_str.size());
log_pop();
} }
} }

5
passes/techmap/abc9.cc
View File

@ -186,7 +186,10 @@ struct Abc9Pass : public ScriptPass
void script() YS_OVERRIDE void script() YS_OVERRIDE
{ {
run("scc -set_attr abc9_scc_id {}"); run("scc -set_attr abc9_scc_id {}");
run("abc9_ops -break_scc -prep_holes"); if (help_mode)
run("abc9_ops -break_scc -prep_holes [-dff]", "(option for -dff)");
else
run("abc9_ops -break_scc -prep_holes" + std::string(dff_mode ? " -dff" : ""), "(option for -dff)");
run("select -set abc9_holes A:abc9_holes"); run("select -set abc9_holes A:abc9_holes");
run("flatten -wb @abc9_holes"); run("flatten -wb @abc9_holes");
run("techmap @abc9_holes"); run("techmap @abc9_holes");

18
passes/techmap/abc9_map.cc
View File

@ -355,28 +355,14 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *module, std::string scrip
if (markgroups) remap_wire->attributes[ID(abcgroup)] = map_autoidx; if (markgroups) remap_wire->attributes[ID(abcgroup)] = map_autoidx;
} }
dict<IdString, bool> abc9_box;
vector<RTLIL::Cell*> boxes; vector<RTLIL::Cell*> boxes;
for (auto cell : cells) { for (auto cell : cells) {
if (cell->type.in(ID($_AND_), ID($_NOT_), ID($__ABC9_FF_))) { if (cell->type.in(ID($_AND_), ID($_NOT_), ID($__ABC9_FF_))) {
module->remove(cell); module->remove(cell);
continue; continue;
} }
auto jt = abc9_box.find(cell->type); if (cell->attributes.erase("\\abc9_box_seq"))
if (jt == abc9_box.end()) { boxes.emplace_back(cell);
RTLIL::Module* box_module = design->module(cell->type);
jt = abc9_box.insert(std::make_pair(cell->type, box_module && box_module->attributes.count(ID(abc9_box_id)))).first;
}
if (jt->second) {
auto kt = cell->attributes.find("\\abc9_keep");
bool abc9_keep = false;
if (kt != cell->attributes.end()) {
abc9_keep = kt->second.as_bool();
cell->attributes.erase(kt);
}
if (!abc9_keep)
boxes.emplace_back(cell);
}
} }
dict<SigBit, pool<IdString>> bit_drivers, bit_users; dict<SigBit, pool<IdString>> bit_drivers, bit_users;

79
passes/techmap/abc9_ops.cc
View File

@ -109,39 +109,31 @@ void prep_dff(RTLIL::Module *module)
typedef SigSpec clkdomain_t; typedef SigSpec clkdomain_t;
dict<clkdomain_t, int> clk_to_mergeability; dict<clkdomain_t, int> clk_to_mergeability;
//if (dff_mode) for (auto cell : module->selected_cells()) {
for (auto cell : module->selected_cells()) { if (cell->type != "$__ABC9_FF_")
if (cell->type != "$__ABC9_FF_") continue;
continue;
Wire *abc9_clock_wire = module->wire(stringf("%s.clock", cell->name.c_str())); Wire *abc9_clock_wire = module->wire(stringf("%s.clock", cell->name.c_str()));
if (abc9_clock_wire == NULL) if (abc9_clock_wire == NULL)
log_error("'%s.clock' is not a wire present in module '%s'.\n", cell->name.c_str(), log_id(module)); log_error("'%s.clock' is not a wire present in module '%s'.\n", cell->name.c_str(), log_id(module));
SigSpec abc9_clock = assign_map(abc9_clock_wire); SigSpec abc9_clock = assign_map(abc9_clock_wire);
clkdomain_t key(abc9_clock); clkdomain_t key(abc9_clock);
auto r = clk_to_mergeability.insert(std::make_pair(abc9_clock, clk_to_mergeability.size() + 1)); auto r = clk_to_mergeability.insert(std::make_pair(abc9_clock, clk_to_mergeability.size() + 1));
auto r2 YS_ATTRIBUTE(unused) = cell->attributes.insert(std::make_pair(ID(abc9_mergeability), r.first->second)); auto r2 YS_ATTRIBUTE(unused) = cell->attributes.insert(std::make_pair(ID(abc9_mergeability), r.first->second));
log_assert(r2.second); log_assert(r2.second);
Wire *abc9_init_wire = module->wire(stringf("%s.init", cell->name.c_str())); Wire *abc9_init_wire = module->wire(stringf("%s.init", cell->name.c_str()));
if (abc9_init_wire == NULL) if (abc9_init_wire == NULL)
log_error("'%s.init' is not a wire present in module '%s'.\n", cell->name.c_str(), log_id(module)); log_error("'%s.init' is not a wire present in module '%s'.\n", cell->name.c_str(), log_id(module));
log_assert(GetSize(abc9_init_wire) == 1); log_assert(GetSize(abc9_init_wire) == 1);
SigSpec abc9_init = assign_map(abc9_init_wire); SigSpec abc9_init = assign_map(abc9_init_wire);
if (!abc9_init.is_fully_const()) if (!abc9_init.is_fully_const())
log_error("'%s.init' is not a constant wire present in module '%s'.\n", cell->name.c_str(), log_id(module)); log_error("'%s.init' is not a constant wire present in module '%s'.\n", cell->name.c_str(), log_id(module));
r2 = cell->attributes.insert(std::make_pair(ID(abc9_init), abc9_init.as_const())); r2 = cell->attributes.insert(std::make_pair(ID(abc9_init), abc9_init.as_const()));
log_assert(r2.second); log_assert(r2.second);
} }
//else
// for (auto cell : module->selected_cells()) {
// auto inst_module = design->module(cell->type);
// if (!inst_module || !inst_module->get_bool_attribute("\\abc9_flop"))
// continue;
// cell->set_bool_attribute("\\abc9_keep");
// }
RTLIL::Module *holes_module = design->module(stringf("%s$holes", module->name.c_str())); RTLIL::Module *holes_module = design->module(stringf("%s$holes", module->name.c_str()));
if (holes_module) { if (holes_module) {
@ -188,7 +180,7 @@ void prep_dff(RTLIL::Module *module)
} }
} }
void prep_holes(RTLIL::Module *module) void prep_holes(RTLIL::Module *module, bool dff)
{ {
auto design = module->design; auto design = module->design;
log_assert(design); log_assert(design);
@ -204,10 +196,15 @@ void prep_holes(RTLIL::Module *module)
continue; continue;
auto inst_module = module->design->module(cell->type); auto inst_module = module->design->module(cell->type);
bool abc9_box = inst_module && inst_module->attributes.count("\\abc9_box_id") && !cell->get_bool_attribute("\\abc9_keep"); bool abc9_box = inst_module && inst_module->attributes.count("\\abc9_box_id");
abc9_box_seen = abc9_box_seen || abc9_box; bool abc9_flop = false;
if (abc9_box) {
if (!abc9_box && !yosys_celltypes.cell_known(cell->type)) abc9_flop = inst_module->get_bool_attribute("\\abc9_flop");
if (abc9_flop && !dff)
continue;
abc9_box_seen = abc9_box;
}
else if (!yosys_celltypes.cell_known(cell->type))
continue; continue;
for (auto conn : cell->connections()) { for (auto conn : cell->connections()) {
@ -215,7 +212,7 @@ void prep_holes(RTLIL::Module *module)
for (auto bit : sigmap(conn.second)) for (auto bit : sigmap(conn.second))
bit_users[bit].insert(cell->name); bit_users[bit].insert(cell->name);
if (cell->output(conn.first)) if (cell->output(conn.first) && !abc9_flop)
for (auto bit : sigmap(conn.second)) for (auto bit : sigmap(conn.second))
bit_drivers[bit].insert(cell->name); bit_drivers[bit].insert(cell->name);
} }
@ -255,8 +252,7 @@ void prep_holes(RTLIL::Module *module)
log_assert(cell); log_assert(cell);
RTLIL::Module* box_module = design->module(cell->type); RTLIL::Module* box_module = design->module(cell->type);
if (!box_module || !box_module->attributes.count("\\abc9_box_id") if (!box_module || !box_module->attributes.count("\\abc9_box_id"))
|| cell->get_bool_attribute("\\abc9_keep"))
continue; continue;
bool blackbox = box_module->get_blackbox_attribute(true /* ignore_wb */); bool blackbox = box_module->get_blackbox_attribute(true /* ignore_wb */);
@ -297,7 +293,7 @@ void prep_holes(RTLIL::Module *module)
} }
} }
cell->attributes["\\abc9_box_order"] = box_list.size(); cell->attributes["\\abc9_box_seq"] = box_list.size();
box_list.emplace_back(cell); box_list.emplace_back(cell);
} }
log_assert(!box_list.empty()); log_assert(!box_list.empty());
@ -437,6 +433,7 @@ struct Abc9OpsPass : public Pass {
bool unbreak_scc_mode = false; bool unbreak_scc_mode = false;
bool prep_dff_mode = false; bool prep_dff_mode = false;
bool prep_holes_mode = false; bool prep_holes_mode = false;
bool dff_mode = false;
size_t argidx; size_t argidx;
for (argidx = 1; argidx < args.size(); argidx++) { for (argidx = 1; argidx < args.size(); argidx++) {
@ -457,6 +454,10 @@ struct Abc9OpsPass : public Pass {
prep_holes_mode = true; prep_holes_mode = true;
continue; continue;
} }
if (arg == "-dff") {
dff_mode = true;
continue;
}
break; break;
} }
extra_args(args, argidx, design); extra_args(args, argidx, design);
@ -479,7 +480,7 @@ struct Abc9OpsPass : public Pass {
if (prep_dff_mode) if (prep_dff_mode)
prep_dff(mod); prep_dff(mod);
if (prep_holes_mode) if (prep_holes_mode)
prep_holes(mod); prep_holes(mod, dff_mode);
} }
} }
} Abc9OpsPass; } Abc9OpsPass;