mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-14 18:06:16 +00:00
Code Activity

Use new -wb flag for ABC flow

Browse source
This commit is contained in:
Eddie Hung 2019-04-18 10:32:41 -07:00
parent 79881141e2
commit 4c327cf316
4 changed files with 36 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

10
backends/aiger/xaiger.cc
View file

@ -103,7 +103,7 @@ struct XAigerWriter
return aig_map.at(bit); return aig_map.at(bit);
} }
XAigerWriter(Module *module, bool zinit_mode, bool imode, bool omode, bool bmode) : module(module), zinit_mode(zinit_mode), sigmap(module) XAigerWriter(Module *module, bool zinit_mode, bool imode, bool omode, bool bmode, bool ignore_boxes=false) : module(module), zinit_mode(zinit_mode), sigmap(module)
{ {
pool<SigBit> undriven_bits; pool<SigBit> undriven_bits;
pool<SigBit> unused_bits; pool<SigBit> unused_bits;
@ -177,6 +177,7 @@ struct XAigerWriter
for (auto cell : module->cells()) for (auto cell : module->cells())
{ {
if (!ignore_boxes) {
toposort.node(cell->name); toposort.node(cell->name);
for (const auto &conn : cell->connections()) for (const auto &conn : cell->connections())
{ {
@ -208,6 +209,7 @@ struct XAigerWriter
for (auto bit : sigmap(conn.second)) for (auto bit : sigmap(conn.second))
bit_drivers[bit].insert(cell->name); bit_drivers[bit].insert(cell->name);
} }
}
if (cell->type == "$_NOT_") if (cell->type == "$_NOT_")
{ {
@ -249,7 +251,7 @@ struct XAigerWriter
// continue; // continue;
//} //}
RTLIL::Module* box_module = module->design->module(cell->type); RTLIL::Module* box_module = !ignore_boxes ? module->design->module(cell->type) : nullptr;
if (!box_module || !box_module->attributes.count("\\abc_box_id")) { if (!box_module || !box_module->attributes.count("\\abc_box_id")) {
for (const auto &c : cell->connections()) { for (const auto &c : cell->connections()) {
if (c.second.is_fully_const()) continue; if (c.second.is_fully_const()) continue;
@ -705,12 +707,12 @@ struct XAigerWriter
RTLIL::Selection& sel = holes_module->design->selection_stack.back(); RTLIL::Selection& sel = holes_module->design->selection_stack.back();
sel.select(holes_module); sel.select(holes_module);
Pass::call(holes_module->design, "flatten; aigmap"); Pass::call(holes_module->design, "flatten -wb; aigmap");
holes_module->design->selection_stack.pop_back(); holes_module->design->selection_stack.pop_back();
std::stringstream a_buffer; std::stringstream a_buffer;
XAigerWriter writer(holes_module, false /*zinit_mode*/, false /*imode*/, false /*omode*/, false /*bmode*/); XAigerWriter writer(holes_module, false /*zinit_mode*/, false /*imode*/, false /*omode*/, false /*bmode*/, true /* ignore_boxes */);
writer.write_aiger(a_buffer, false /*ascii_mode*/, false /*miter_mode*/, false /*symbols_mode*/, false /*omode*/); writer.write_aiger(a_buffer, false /*ascii_mode*/, false /*miter_mode*/, false /*symbols_mode*/, false /*omode*/);
f << "a"; f << "a";

12
techlibs/ice40/abc.v
View file

@ -1,12 +0,0 @@
(* abc_box_id = 1 *)
module SB_CARRY (output CO, input CI, I0, I1);
assign CO = (I0 && I1) || ((I0 || I1) && CI);
endmodule
(* abc_box_id = 2 *)
module SB_LUT4 (output O, input I0, I1, I2, I3);
parameter [15:0] LUT_INIT = 0;
// Indicate this is a black-box
assign O = 1'b0;
endmodule

2
techlibs/ice40/cells_sim.v
View file

@ -118,6 +118,7 @@ endmodule
// SiliconBlue Logic Cells // SiliconBlue Logic Cells
(* abc_box_id = 2 *)
module SB_LUT4 (output O, input I0, I1, I2, I3); module SB_LUT4 (output O, input I0, I1, I2, I3);
parameter [15:0] LUT_INIT = 0; parameter [15:0] LUT_INIT = 0;
wire [7:0] s3 = I3 ? LUT_INIT[15:8] : LUT_INIT[7:0]; wire [7:0] s3 = I3 ? LUT_INIT[15:8] : LUT_INIT[7:0];
@ -126,6 +127,7 @@ module SB_LUT4 (output O, input I0, I1, I2, I3);
assign O = I0 ? s1[1] : s1[0]; assign O = I0 ? s1[1] : s1[0];
endmodule endmodule
(* abc_box_id = 1, whitebox *)
module SB_CARRY (output CO, input I0, I1, CI); module SB_CARRY (output CO, input I0, I1, CI);
assign CO = (I0 && I1) || ((I0 || I1) && CI); assign CO = (I0 && I1) || ((I0 || I1) && CI);
endmodule endmodule

10
techlibs/ice40/synth_ice40.cc
View file

@ -240,7 +240,7 @@ struct SynthIce40Pass : public ScriptPass
{ {
if (check_label("begin")) if (check_label("begin"))
{ {
run("read_verilog -lib +/ice40/cells_sim.v"); run("read_verilog -wb +/ice40/cells_sim.v");
run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str())); run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
run("proc"); run("proc");
} }
@ -327,12 +327,8 @@ struct SynthIce40Pass : public ScriptPass
run("techmap -map +/gate2lut.v -D LUT_WIDTH=4", "(only if -noabc)"); run("techmap -map +/gate2lut.v -D LUT_WIDTH=4", "(only if -noabc)");
} }
if (!noabc) { if (!noabc) {
if (abc == "abc9") { if (abc == "abc9")
run("read_verilog +/ice40/abc.v"); run(abc + stringf(" -dress -lut +/ice40/abc_%s.lut -box +/ice40/abc_%s.box", device_opt.c_str(), device_opt.c_str()), "(skip if -noabc)");
run("techmap -map +/techmap.v A:abc_box_id");
run(abc + stringf(" -dress -lut +/ice40/%s.lut -box +/ice40/%s.box", device_opt.c_str(), device_opt.c_str()), "(skip if -noabc)");
run("blackbox A:abc_box_id");
}
else else
run(abc + " -lut 4", "(skip if -noabc)"); run(abc + " -lut 4", "(skip if -noabc)");
} }