mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-13 04:28:18 +00:00
Code Activity

abc9: use (* abc9_keep *) instead of (* abc9_scc *); apply to $_DFF_?_

Browse source 
instead of moving them to $__ prefix
This commit is contained in:
Eddie Hung 2020-05-14 16:44:35 -07:00
parent 02df0198b6
commit 67fc0c3698
5 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
backends/aiger/xaiger.cc
View file

@ -177,12 +177,12 @@ struct XAigerWriter
undriven_bits.insert(bit); undriven_bits.insert(bit);
unused_bits.insert(bit); unused_bits.insert(bit);
bool scc = wire->attributes.count(ID::abc9_scc); bool keep = wire->get_bool_attribute(ID::abc9_keep);
if (wire->port_input || scc) if (wire->port_input || keep)
input_bits.insert(bit); input_bits.insert(bit);
bool keep = wire->get_bool_attribute(ID::keep); keep = keep || wire->get_bool_attribute(ID::keep);
if (wire->port_output || keep || scc) { if (wire->port_output || keep) {
if (bit != wirebit) if (bit != wirebit)
alias_map[wirebit] = bit; alias_map[wirebit] = bit;
output_bits.insert(wirebit); output_bits.insert(wirebit);
@ -225,7 +225,7 @@ struct XAigerWriter
continue; continue;
} }
if (dff_mode && cell->type.in(ID($_DFF_N_), ID($_DFF_P_))) if (dff_mode && cell->type.in(ID($_DFF_N_), ID($_DFF_P_)) && !cell->get_bool_attribute(ID::abc9_keep))
{ {
SigBit D = sigmap(cell->getPort(ID::D).as_bit()); SigBit D = sigmap(cell->getPort(ID::D).as_bit());
SigBit Q = sigmap(cell->getPort(ID::Q).as_bit()); SigBit Q = sigmap(cell->getPort(ID::Q).as_bit());

2
kernel/constids.inc
View file

@ -5,9 +5,9 @@ X(abc9_box_seq)
X(abc9_bypass) X(abc9_bypass)
X(abc9_carry) X(abc9_carry)
X(abc9_flop) X(abc9_flop)
X(abc9_keep)
X(abc9_lut) X(abc9_lut)
X(abc9_mergeability) X(abc9_mergeability)
X(abc9_scc)
X(abc9_scc_id) X(abc9_scc_id)
X(abcgroup) X(abcgroup)
X(ABITS) X(ABITS)

6
passes/techmap/abc9_ops.cc
View file

@ -563,7 +563,7 @@ void mark_scc(RTLIL::Module *module)
if (c.second.is_fully_const()) continue; if (c.second.is_fully_const()) continue;
if (cell->output(c.first)) { if (cell->output(c.first)) {
Wire *w = module->addWire(NEW_ID, GetSize(c.second)); Wire *w = module->addWire(NEW_ID, GetSize(c.second));
w->set_bool_attribute(ID::abc9_scc); w->set_bool_attribute(ID::abc9_keep);
module->connect(w, c.second); module->connect(w, c.second);
c.second = w; c.second = w;
} }
@ -1154,7 +1154,7 @@ void reintegrate(RTLIL::Module *module, bool dff_mode)
// Short out $_DFF_[NP]_ cells since the flop box already has // Short out $_DFF_[NP]_ cells since the flop box already has
// all the information we need to reconstruct cell // all the information we need to reconstruct cell
if (dff_mode && cell->type.in(ID($_DFF_N_), ID($_DFF_P_))) { if (dff_mode && cell->type.in(ID($_DFF_N_), ID($_DFF_P_)) && !cell->get_bool_attribute(ID::abc9_keep)) {
module->connect(cell->getPort(ID::Q), cell->getPort(ID::D)); module->connect(cell->getPort(ID::Q), cell->getPort(ID::D));
module->remove(cell); module->remove(cell);
} }
@ -1373,7 +1373,7 @@ void reintegrate(RTLIL::Module *module, bool dff_mode)
RTLIL::Wire *mapped_wire = mapped_mod->wire(port); RTLIL::Wire *mapped_wire = mapped_mod->wire(port);
RTLIL::Wire *wire = module->wire(port); RTLIL::Wire *wire = module->wire(port);
log_assert(wire); log_assert(wire);
wire->attributes.erase(ID::abc9_scc); wire->attributes.erase(ID::abc9_keep);
RTLIL::Wire *remap_wire = module->wire(remap_name(port)); RTLIL::Wire *remap_wire = module->wire(remap_name(port));
RTLIL::SigSpec signal(wire, remap_wire->start_offset-wire->start_offset, GetSize(remap_wire)); RTLIL::SigSpec signal(wire, remap_wire->start_offset-wire->start_offset, GetSize(remap_wire));

4
techlibs/common/abc9_map.v
View file

@ -10,7 +10,7 @@ module $_DFF_x_(input C, D, output Q);
$_DFF_N_ ff (.C(C), .D(D_), .Q(Q)); $_DFF_N_ ff (.C(C), .D(D_), .Q(Q));
end end
else else
$__DFF_N_ _TECHMAP_REPLACE_ (.C(C), .D(D), .Q(Q)); // hide from abc9 using $__ prefix (* abc9_keep *) $_DFF_N_ _TECHMAP_REPLACE_ (.C(C), .D(D), .Q(Q));
end end
else if (_TECHMAP_CELLTYPE_ == "$_DFF_P_") begin else if (_TECHMAP_CELLTYPE_ == "$_DFF_P_") begin
if (_TECHMAP_WIREINIT_Q_ === 1'b0) begin if (_TECHMAP_WIREINIT_Q_ === 1'b0) begin
@ -18,7 +18,7 @@ module $_DFF_x_(input C, D, output Q);
$_DFF_P_ ff (.C(C), .D(D_), .Q(Q)); $_DFF_P_ ff (.C(C), .D(D_), .Q(Q));
end end
else else
$__DFF_P_ _TECHMAP_REPLACE_ (.C(C), .D(D), .Q(Q)); // hide from abc9 using $__ prefix (* abc9_keep *) $_DFF_P_ _TECHMAP_REPLACE_ (.C(C), .D(D), .Q(Q));
end end
else if (_TECHMAP_CELLTYPE_ != "") else if (_TECHMAP_CELLTYPE_ != "")
$error("Unrecognised _TECHMAP_CELLTYPE_"); $error("Unrecognised _TECHMAP_CELLTYPE_");

12
techlibs/common/abc9_unmap.v
View file

@ -9,15 +9,3 @@ module $__DFF_x__$abc9_flop (input C, D, Q, output n1);
$error("Unrecognised _TECHMAP_CELLTYPE_"); $error("Unrecognised _TECHMAP_CELLTYPE_");
endgenerate endgenerate
endmodule endmodule
(* techmap_celltype = "$__DFF_N_ $__DFF_P_" *)
module $__DFF_x_ (input C, D, output Q);
parameter _TECHMAP_CELLTYPE_ = "";
generate if (_TECHMAP_CELLTYPE_ == "$__DFF_N_")
$_DFF_N_ _TECHMAP_REPLACE_ (.C(C), .D(D), .Q(Q));
else if (_TECHMAP_CELLTYPE_ == "$__DFF_P_")
$_DFF_P_ _TECHMAP_REPLACE_ (.C(C), .D(D), .Q(Q));
else if (_TECHMAP_CELLTYPE_ != "")
$error("Unrecognised _TECHMAP_CELLTYPE_");
endgenerate
endmodule