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

abc9_ops: generate flop box ids, add abc9_required to FD* cells

This commit is contained in:
Eddie Hung 2020-01-14 15:05:49 -08:00
parent 588a713b54
commit 0e4285ca0d
3 changed files with 106 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backends/aiger/xaiger.cc
View File

@ -596,7 +596,11 @@ struct XAigerWriter
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);
auto r = cell_cache.insert(cell->type); IdString derived_type = box_module->derive(box_module->design, cell->parameters);
box_module = box_module->design->module(derived_type);
log_assert(box_module);
auto r = cell_cache.insert(derived_type);
auto &v = r.first->second; auto &v = r.first->second;
if (r.second) { if (r.second) {
int box_inputs = 0, box_outputs = 0; int box_inputs = 0, box_outputs = 0;

121
passes/techmap/abc9_ops.cc
View File

@ -23,6 +23,7 @@
#include "kernel/utils.h" #include "kernel/utils.h"
#include "kernel/celltypes.h" #include "kernel/celltypes.h"
#define ABC9_FLOPS_BASE_ID 8000
#define ABC9_DELAY_BASE_ID 9000 #define ABC9_DELAY_BASE_ID 9000
USING_YOSYS_NAMESPACE USING_YOSYS_NAMESPACE
@ -39,20 +40,20 @@ void check(RTLIL::Design *design)
{ {
dict<IdString,IdString> box_lookup; dict<IdString,IdString> box_lookup;
for (auto m : design->modules()) { for (auto m : design->modules()) {
auto flop = m->get_bool_attribute(ID(abc9_flop));
auto it = m->attributes.find(ID(abc9_box_id));
if (it == m->attributes.end()) {
if (flop)
log_error("Module '%s' contains (* abc9_flop *) but not (* abc9_box_id=<int> *).\n", log_id(m));
continue;
}
if (m->name.begins_with("$paramod")) if (m->name.begins_with("$paramod"))
continue; continue;
auto id = it->second.as_int();
auto r = box_lookup.insert(std::make_pair(stringf("$__boxid%d", id), m->name)); auto flop = m->get_bool_attribute(ID(abc9_flop));
if (!r.second) auto it = m->attributes.find(ID(abc9_box_id));
log_error("Module '%s' has the same abc9_box_id = %d value as '%s'.\n", if (!flop) {
log_id(m), id, log_id(r.first->second)); if (it == m->attributes.end())
continue;
auto id = it->second.as_int();
auto r = box_lookup.insert(std::make_pair(stringf("$__boxid%d", id), m->name));
if (!r.second)
log_error("Module '%s' has the same abc9_box_id = %d value as '%s'.\n",
log_id(m), id, log_id(r.first->second));
}
// Make carry in the last PI, and carry out the last PO // Make carry in the last PI, and carry out the last PO
// since ABC requires it this way // since ABC requires it this way
@ -217,13 +218,11 @@ void prep_xaiger(RTLIL::Module *module, bool dff)
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"); bool abc9_flop = inst_module && inst_module->get_bool_attribute("\\abc9_flop");
bool abc9_flop = false; if (abc9_flop && !dff)
if (abc9_box) { continue;
abc9_flop = inst_module->get_bool_attribute("\\abc9_flop");
if (abc9_flop && !dff)
continue;
if ((inst_module && inst_module->attributes.count("\\abc9_box_id")) || abc9_flop) {
auto r = box_ports.insert(cell->type); auto r = box_ports.insert(cell->type);
if (r.second) { if (r.second) {
// Make carry in the last PI, and carry out the last PO // Make carry in the last PI, and carry out the last PO
@ -309,17 +308,17 @@ void prep_xaiger(RTLIL::Module *module, bool dff)
cell->attributes["\\abc9_box_seq"] = box_count++; cell->attributes["\\abc9_box_seq"] = box_count++;
IdString derived_name = box_module->derive(design, cell->parameters); IdString derived_type = box_module->derive(design, cell->parameters);
box_module = design->module(derived_name); box_module = design->module(derived_type);
auto r = cell_cache.insert(derived_name); auto r = cell_cache.insert(derived_type);
auto &holes_cell = r.first->second; auto &holes_cell = r.first->second;
if (r.second) { if (r.second) {
if (box_module->has_processes()) if (box_module->has_processes())
Pass::call_on_module(design, box_module, "proc"); Pass::call_on_module(design, box_module, "proc");
if (box_module->get_bool_attribute("\\whitebox")) { if (box_module->get_bool_attribute("\\whitebox")) {
holes_cell = holes_module->addCell(cell->name, derived_name); holes_cell = holes_module->addCell(cell->name, derived_type);
if (box_module->has_processes()) if (box_module->has_processes())
Pass::call_on_module(design, box_module, "proc"); Pass::call_on_module(design, box_module, "proc");
@ -344,7 +343,7 @@ void prep_xaiger(RTLIL::Module *module, bool dff)
} }
} }
else if (w->port_output) else if (w->port_output)
conn = holes_module->addWire(stringf("%s.%s", derived_name.c_str(), log_id(port_name)), GetSize(w)); conn = holes_module->addWire(stringf("%s.%s", derived_type.c_str(), log_id(port_name)), GetSize(w));
} }
// For flops only, create an extra 1-bit input that drives a new wire // For flops only, create an extra 1-bit input that drives a new wire
@ -387,7 +386,7 @@ void prep_delays(RTLIL::Design *design)
{ {
std::set<int> delays; std::set<int> delays;
pool<Module*> flops; pool<Module*> flops;
std::vector<Cell*> boxes; std::vector<Cell*> cells;
std::map<int,std::vector<int>> requireds; std::map<int,std::vector<int>> requireds;
for (auto module : design->selected_modules()) { for (auto module : design->selected_modules()) {
if (module->processes.size() > 0) { if (module->processes.size() > 0) {
@ -395,7 +394,7 @@ void prep_delays(RTLIL::Design *design)
continue; continue;
} }
boxes.clear(); cells.clear();
for (auto cell : module->cells()) { for (auto cell : module->cells()) {
if (cell->type.in(ID($_AND_), ID($_NOT_), ID($__ABC9_FF_), ID($__ABC9_DELAY))) if (cell->type.in(ID($_AND_), ID($_NOT_), ID($__ABC9_FF_), ID($__ABC9_DELAY)))
continue; continue;
@ -406,19 +405,21 @@ void prep_delays(RTLIL::Design *design)
if (!inst_module->get_blackbox_attribute()) if (!inst_module->get_blackbox_attribute())
continue; continue;
if (inst_module->get_bool_attribute(ID(abc9_flop))) { if (inst_module->get_bool_attribute(ID(abc9_flop))) {
IdString derived_type = inst_module->derive(design, cell->parameters);
inst_module = design->module(derived_type);
log_assert(inst_module);
flops.insert(inst_module); flops.insert(inst_module);
continue; continue; // because all flop required times
// will be captured in the flop box
} }
// All remaining boxes are combinatorial and cannot
// contain a required time
if (inst_module->attributes.count(ID(abc9_box_id))) if (inst_module->attributes.count(ID(abc9_box_id)))
continue; continue;
boxes.emplace_back(cell); cells.emplace_back(cell);
} }
delays.clear(); delays.clear();
requireds.clear(); requireds.clear();
for (auto cell : boxes) { for (auto cell : cells) {
RTLIL::Module* inst_module = module->design->module(cell->type); RTLIL::Module* inst_module = module->design->module(cell->type);
log_assert(inst_module); log_assert(inst_module);
for (auto &conn : cell->connections_) { for (auto &conn : cell->connections_) {
@ -475,13 +476,9 @@ void prep_delays(RTLIL::Design *design)
module->attributes[ID(abc9_delays)] = ss.str(); module->attributes[ID(abc9_delays)] = ss.str();
} }
int flops_id = ABC9_FLOPS_BASE_ID;
std::stringstream ss; std::stringstream ss;
for (auto flop_module : flops) { for (auto flop_module : flops) {
// Skip parameterised flop_modules for now (since we do not
// dynamically generate the abc9_box_id)
if (flop_module->name.begins_with("$paramod"))
continue;
int num_inputs = 0, num_outputs = 0; int num_inputs = 0, num_outputs = 0;
for (auto port_name : flop_module->ports) { for (auto port_name : flop_module->ports) {
auto wire = flop_module->wire(port_name); auto wire = flop_module->wire(port_name);
@ -490,7 +487,11 @@ void prep_delays(RTLIL::Design *design)
} }
log_assert(num_outputs == 1); log_assert(num_outputs == 1);
ss << log_id(flop_module) << " " << flop_module->attributes.at(ID(abc9_box_id)).as_int(); auto r = flop_module->attributes.insert(ID(abc9_box_id));
if (r.second)
r.first->second = flops_id++;
ss << log_id(flop_module) << " " << r.first->second.as_int();
ss << " 1 " << num_inputs+1 << " " << num_outputs << std::endl; ss << " 1 " << num_inputs+1 << " " << num_outputs << std::endl;
bool first = true; bool first = true;
for (auto port_name : flop_module->ports) { for (auto port_name : flop_module->ports) {
@ -550,23 +551,11 @@ void reintegrate(RTLIL::Module *module)
for (auto w : mapped_mod->wires()) for (auto w : mapped_mod->wires())
module->addWire(remap_name(w->name), GetSize(w)); module->addWire(remap_name(w->name), GetSize(w));
dict<IdString,IdString> box_lookup;
for (auto m : design->modules()) {
auto it = m->attributes.find(ID(abc9_box_id));
if (it == m->attributes.end())
continue;
if (m->name.begins_with("$paramod"))
continue;
auto id = it->second.as_int();
auto r YS_ATTRIBUTE(unused) = box_lookup.insert(std::make_pair(stringf("$__boxid%d", id), m->name));
log_assert(r.second);
}
std::vector<Cell*> boxes; std::vector<Cell*> boxes;
for (auto cell : module->cells().to_vector()) { for (auto cell : module->cells().to_vector()) {
if (cell->has_keep_attr()) if (cell->has_keep_attr())
continue; continue;
if (cell->type.in(ID($_AND_), ID($_NOT_), ID($__ABC9_FF_), ID($__ABC9_DELAY))) if (cell->type.in(ID($_AND_), ID($_NOT_), ID($__ABC9_FF_)))
module->remove(cell); module->remove(cell);
else if (cell->attributes.erase("\\abc9_box_seq")) else if (cell->attributes.erase("\\abc9_box_seq"))
boxes.emplace_back(cell); boxes.emplace_back(cell);
@ -659,26 +648,29 @@ void reintegrate(RTLIL::Module *module)
bit_drivers[i].insert(mapped_cell->name); bit_drivers[i].insert(mapped_cell->name);
} }
} }
else if (box_lookup.at(mapped_cell->type, IdString()) == ID($__ABC9_DELAY)) {
SigBit I = mapped_cell->getPort(ID(i));
SigBit O = mapped_cell->getPort(ID(o));
if (I.wire)
I.wire = module->wires_.at(remap_name(I.wire->name));
log_assert(O.wire);
O.wire = module->wires_.at(remap_name(O.wire->name));
module->connect(O, I);
continue;
}
else { else {
RTLIL::Cell *existing_cell = module->cell(mapped_cell->name); RTLIL::Cell *existing_cell = module->cell(mapped_cell->name);
if (!existing_cell) if (!existing_cell)
log_error("Cannot find existing box cell with name '%s' in original design.\n", log_id(mapped_cell)); log_error("Cannot find existing box cell with name '%s' in original design.\n", log_id(mapped_cell));
log_assert(mapped_cell->type.begins_with("$__boxid")); #ifndef NDEBUG
RTLIL::Module* box_module = design->module(existing_cell->type);
IdString derived_type = box_module->derive(design, existing_cell->parameters);
RTLIL::Module* derived_module = design->module(derived_type);
log_assert(derived_module);
log_assert(mapped_cell->type == stringf("$__boxid%d", derived_module->attributes.at("\\abc9_box_id").as_int()));
#endif
mapped_cell->type = existing_cell->type;
auto type = box_lookup.at(mapped_cell->type, IdString()); if (mapped_cell->type == ID($__ABC9_DELAY)) {
if (type == IdString()) SigBit I = mapped_cell->getPort(ID(i));
log_error("No module with abc9_box_id = %s found.\n", mapped_cell->type.c_str() + strlen("$__boxid")); SigBit O = mapped_cell->getPort(ID(o));
mapped_cell->type = type; if (I.wire)
I.wire = module->wires_.at(remap_name(I.wire->name));
log_assert(O.wire);
O.wire = module->wires_.at(remap_name(O.wire->name));
module->connect(O, I);
continue;
}
RTLIL::Cell *cell = module->addCell(remap_name(mapped_cell->name), mapped_cell->type); RTLIL::Cell *cell = module->addCell(remap_name(mapped_cell->name), mapped_cell->type);
cell->parameters = existing_cell->parameters; cell->parameters = existing_cell->parameters;
@ -694,7 +686,6 @@ void reintegrate(RTLIL::Module *module)
SigSpec outputs = std::move(it->second); SigSpec outputs = std::move(it->second);
mapped_cell->connections_.erase(it); mapped_cell->connections_.erase(it);
RTLIL::Module* box_module = design->module(mapped_cell->type);
auto abc9_flop = box_module->attributes.count("\\abc9_flop"); auto abc9_flop = box_module->attributes.count("\\abc9_flop");
if (!abc9_flop) { if (!abc9_flop) {
for (const auto &i : inputs) for (const auto &i : inputs)

57
techlibs/xilinx/cells_sim.v
View File

@ -325,17 +325,20 @@ endmodule
// Max delay from: https://github.com/SymbiFlow/prjxray-db/blob/34ea6eb08a63d21ec16264ad37a0a7b142ff6031/artix7/timings/CLBLL_L.sdf#L238-L250 // Max delay from: https://github.com/SymbiFlow/prjxray-db/blob/34ea6eb08a63d21ec16264ad37a0a7b142ff6031/artix7/timings/CLBLL_L.sdf#L238-L250
(* abc9_box_id=1100, lib_whitebox, abc9_flop *) (* abc9_flop, lib_whitebox *)
module FDRE ( module FDRE (
(* abc9_arrival=303 *) (* abc9_arrival=303 *)
output reg Q, output reg Q,
(* clkbuf_sink *) (* clkbuf_sink *)
(* invertible_pin = "IS_C_INVERTED" *) (* invertible_pin = "IS_C_INVERTED" *)
input C, input C,
(* abc9_required=109 *)
input CE, input CE,
(* invertible_pin = "IS_D_INVERTED" *) (* invertible_pin = "IS_D_INVERTED" *)
//(* abc9_required=-46 *) // Negative required times not currently supported
input D, input D,
(* invertible_pin = "IS_R_INVERTED" *) (* invertible_pin = "IS_R_INVERTED" *)
(* abc9_required=404 *)
input R input R
); );
parameter [0:0] INIT = 1'b0; parameter [0:0] INIT = 1'b0;
@ -349,30 +352,38 @@ module FDRE (
endcase endgenerate endcase endgenerate
endmodule endmodule
(* abc9_box_id=1101, lib_whitebox, abc9_flop *) (* abc9_flop, lib_whitebox *)
module FDRE_1 ( module FDRE_1 (
(* abc9_arrival=303 *) (* abc9_arrival=303 *)
output reg Q, output reg Q,
(* clkbuf_sink *) (* clkbuf_sink *)
input C, input C,
input CE, D, R (* abc9_required=109 *)
input CE,
//(* abc9_required=-46 *) // Negative required times not currently supported
input D,
(* abc9_required=404 *)
input R
); );
parameter [0:0] INIT = 1'b0; parameter [0:0] INIT = 1'b0;
initial Q <= INIT; initial Q <= INIT;
always @(negedge C) if (R) Q <= 1'b0; else if (CE) Q <= D; always @(negedge C) if (R) Q <= 1'b0; else if (CE) Q <= D;
endmodule endmodule
(* abc9_box_id=1102, lib_whitebox, abc9_flop *) (* abc9_flop, lib_whitebox *)
module FDSE ( module FDSE (
(* abc9_arrival=303 *) (* abc9_arrival=303 *)
output reg Q, output reg Q,
(* clkbuf_sink *) (* clkbuf_sink *)
(* invertible_pin = "IS_C_INVERTED" *) (* invertible_pin = "IS_C_INVERTED" *)
input C, input C,
(* abc9_required=109 *)
input CE, input CE,
(* invertible_pin = "IS_D_INVERTED" *) (* invertible_pin = "IS_D_INVERTED" *)
//(* abc9_required=-46 *) // Negative required times not currently supported
input D, input D,
(* invertible_pin = "IS_S_INVERTED" *) (* invertible_pin = "IS_S_INVERTED" *)
(* abc9_required=404 *)
input S input S
); );
parameter [0:0] INIT = 1'b1; parameter [0:0] INIT = 1'b1;
@ -386,13 +397,18 @@ module FDSE (
endcase endgenerate endcase endgenerate
endmodule endmodule
(* abc9_box_id=1103, lib_whitebox, abc9_flop *) (* abc9_flop, lib_whitebox *)
module FDSE_1 ( module FDSE_1 (
(* abc9_arrival=303 *) (* abc9_arrival=303 *)
output reg Q, output reg Q,
(* clkbuf_sink *) (* clkbuf_sink *)
input C, input C,
input CE, D, S (* abc9_required=109 *)
input CE,
//(* abc9_required=-46 *) // Negative required times not currently supported
input D,
(* abc9_required=404 *)
input S
); );
parameter [0:0] INIT = 1'b1; parameter [0:0] INIT = 1'b1;
initial Q <= INIT; initial Q <= INIT;
@ -405,6 +421,7 @@ module FDRSE (
(* invertible_pin = "IS_C_INVERTED" *) (* invertible_pin = "IS_C_INVERTED" *)
input C, input C,
(* invertible_pin = "IS_CE_INVERTED" *) (* invertible_pin = "IS_CE_INVERTED" *)
(* abc9_required=109 *)
input CE, input CE,
(* invertible_pin = "IS_D_INVERTED" *) (* invertible_pin = "IS_D_INVERTED" *)
input D, input D,
@ -434,17 +451,20 @@ module FDRSE (
Q <= d; Q <= d;
endmodule endmodule
(* abc9_box_id=1104, lib_whitebox, abc9_flop *) (* abc9_flop, lib_whitebox *)
module FDCE ( module FDCE (
(* abc9_arrival=303 *) (* abc9_arrival=303 *)
output reg Q, output reg Q,
(* clkbuf_sink *) (* clkbuf_sink *)
(* invertible_pin = "IS_C_INVERTED" *) (* invertible_pin = "IS_C_INVERTED" *)
input C, input C,
(* abc9_required=109 *)
input CE, input CE,
(* invertible_pin = "IS_CLR_INVERTED" *) (* invertible_pin = "IS_CLR_INVERTED" *)
(* abc9_required=764 *)
input CLR, input CLR,
(* invertible_pin = "IS_D_INVERTED" *) (* invertible_pin = "IS_D_INVERTED" *)
//(* abc9_required=-46 *) // Negative required times not currently supported
input D input D
); );
parameter [0:0] INIT = 1'b0; parameter [0:0] INIT = 1'b0;
@ -460,30 +480,38 @@ module FDCE (
endcase endgenerate endcase endgenerate
endmodule endmodule
(* abc9_box_id=1105, lib_whitebox, abc9_flop *) (* abc9_flop, lib_whitebox *)
module FDCE_1 ( module FDCE_1 (
(* abc9_arrival=303 *) (* abc9_arrival=303 *)
output reg Q, output reg Q,
(* clkbuf_sink *) (* clkbuf_sink *)
input C, input C,
input CE, D, CLR (* abc9_required=109 *)
input CE,
(* abc9_required=764 *)
input CLR,
//(* abc9_required=-46 *) // Negative required times not currently supported
input D
); );
parameter [0:0] INIT = 1'b0; parameter [0:0] INIT = 1'b0;
initial Q <= INIT; initial Q <= INIT;
always @(negedge C, posedge CLR) if (CLR) Q <= 1'b0; else if (CE) Q <= D; always @(negedge C, posedge CLR) if (CLR) Q <= 1'b0; else if (CE) Q <= D;
endmodule endmodule
(* abc9_box_id=1106, lib_whitebox, abc9_flop *) (* abc9_flop, lib_whitebox *)
module FDPE ( module FDPE (
(* abc9_arrival=303 *) (* abc9_arrival=303 *)
output reg Q, output reg Q,
(* clkbuf_sink *) (* clkbuf_sink *)
(* invertible_pin = "IS_C_INVERTED" *) (* invertible_pin = "IS_C_INVERTED" *)
input C, input C,
(* abc9_required=109 *)
input CE, input CE,
(* invertible_pin = "IS_D_INVERTED" *) (* invertible_pin = "IS_D_INVERTED" *)
//(* abc9_required=-46 *) // Negative required times not currently supported
input D, input D,
(* invertible_pin = "IS_PRE_INVERTED" *) (* invertible_pin = "IS_PRE_INVERTED" *)
(* abc9_required=764 *)
input PRE input PRE
); );
parameter [0:0] INIT = 1'b1; parameter [0:0] INIT = 1'b1;
@ -499,13 +527,18 @@ module FDPE (
endcase endgenerate endcase endgenerate
endmodule endmodule
(* abc9_box_id=1107, lib_whitebox, abc9_flop *) (* abc9_flop, lib_whitebox *)
module FDPE_1 ( module FDPE_1 (
(* abc9_arrival=303 *) (* abc9_arrival=303 *)
output reg Q, output reg Q,
(* clkbuf_sink *) (* clkbuf_sink *)
input C, input C,
input CE, D, PRE (* abc9_required=109 *)
input CE,
//(* abc9_required=-46 *) // Negative required times not currently supported
input D,
(* abc9_required=764 *)
input PRE
); );
parameter [0:0] INIT = 1'b1; parameter [0:0] INIT = 1'b1;
initial Q <= INIT; initial Q <= INIT;