From: Eddie Hung Date: Tue, 11 Feb 2020 16:54:13 +0000 (-0800) Subject: abc9_ops: -prep_box, to be called once X-Git-Tag: working-ls180~780^2~44 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=74f49b1f55e08c9939c9e0c8a1a5c0405f0d28c5;p=yosys.git abc9_ops: -prep_box, to be called once --- diff --git a/passes/techmap/abc9.cc b/passes/techmap/abc9.cc index 0e2ca80c7..fc82f0e5f 100644 --- a/passes/techmap/abc9.cc +++ b/passes/techmap/abc9.cc @@ -192,7 +192,7 @@ struct Abc9Pass : public ScriptPass cleanup = true; lut_mode = false; maxlut = 0; - box_file.clear(); + box_file = "(null)"; } void execute(std::vector args, RTLIL::Design *design) YS_OVERRIDE @@ -285,6 +285,10 @@ struct Abc9Pass : public ScriptPass run("abc9_ops -prep_lut ", "(skip if -lut or -luts)"); else if (!lut_mode) run(stringf("abc9_ops -prep_lut %d", maxlut)); + if (help_mode) + run("abc9_ops -prep_box [<-box>|(null)]"); + else + run(stringf("abc9_ops -prep_box %s", box_file.c_str())); run("select -set abc9_holes A:abc9_holes"); run("flatten -wb @abc9_holes"); run("techmap @abc9_holes"); @@ -299,7 +303,7 @@ struct Abc9Pass : public ScriptPass if (help_mode) { run("foreach module in selection"); run(" abc9_ops -write_lut /input.lut", "(skip if '-lut' or '-luts')"); - run(" abc9_ops -write_box [|(null)] /input.box"); + run(" abc9_ops -write_box /input.box"); run(" write_xaiger -map /input.sym /input.xaig"); run(" abc9_exe [options] -cwd [-lut /input.lut] -box /input.box"); run(" read_aiger -xaiger -wideports -module_name $abc9 -map /input.sym /output.aig"); @@ -329,10 +333,7 @@ struct Abc9Pass : public ScriptPass if (!lut_mode) run(stringf("abc9_ops -write_lut %s/input.lut", tempdir_name.c_str())); - if (box_file.empty()) - run(stringf("abc9_ops -write_box (null) %s/input.box", tempdir_name.c_str())); - else - run(stringf("abc9_ops -write_box %s %s/input.box", box_file.c_str(), tempdir_name.c_str())); + run(stringf("abc9_ops -write_box %s/input.box", tempdir_name.c_str())); run(stringf("write_xaiger -map %s/input.sym %s/input.xaig", tempdir_name.c_str(), tempdir_name.c_str())); int num_outputs = active_design->scratchpad_get_int("write_xaiger.num_outputs"); diff --git a/passes/techmap/abc9_ops.cc b/passes/techmap/abc9_ops.cc index cf6d5eabb..d08c42e3b 100644 --- a/passes/techmap/abc9_ops.cc +++ b/passes/techmap/abc9_ops.cc @@ -464,7 +464,6 @@ void prep_delays(RTLIL::Design *design) cells.emplace_back(cell); } - delays.clear(); for (auto cell : cells) { RTLIL::Module* inst_module = module->design->module(cell->type); log_assert(inst_module); @@ -515,17 +514,6 @@ void prep_delays(RTLIL::Design *design) } } } - - std::stringstream ss; - bool first = true; - for (auto d : delays) { - if (first) - first = false; - else - ss << " "; - ss << d; - } - module->attributes[ID(abc9_delays)] = ss.str(); } int flops_id = ABC9_FLOPS_BASE_ID; @@ -559,7 +547,14 @@ void prep_delays(RTLIL::Design *design) // Last input is 'abc9_ff.Q' ss << " 0" << std::endl << std::endl; } - design->scratchpad_set_string("abc9_ops.box.flops", ss.str()); + design->scratchpad_set_string("abc9_ops.box_library.flops", ss.str()); + + ss.str(""); + for (const int d : delays) { + ss << "$__ABC9_DELAY@" << d << " " << ABC9_DELAY_BASE_ID + d << " 0 1 1" << std::endl; + ss << d << std::endl; + } + design->scratchpad_set_string("abc9_ops.box_library.delays", ss.str()); } void prep_lut(RTLIL::Design *design, int maxlut) @@ -612,33 +607,31 @@ void write_lut(RTLIL::Module *module, const std::string &dst) { ofs.close(); } -void write_box(RTLIL::Module *module, const std::string &src, const std::string &dst) { - std::ofstream ofs(dst); - log_assert(ofs.is_open()); +void prep_box(RTLIL::Design *design, const std::string &src) +{ + std::stringstream ss; // Since ABC can only accept one box file, we have to copy // over the existing box file if (src != "(null)") { std::ifstream ifs(src); - ofs << ifs.rdbuf() << std::endl; + log_assert(ifs.is_open()); + ss << ifs.rdbuf() << std::endl; ifs.close(); } - ofs << module->design->scratchpad_get_string("abc9_ops.box.flops"); - - auto it = module->attributes.find(ID(abc9_delays)); - if (it != module->attributes.end()) { - for (const auto &tok : split_tokens(it->second.decode_string())) { - int d = atoi(tok.c_str()); - ofs << "$__ABC9_DELAY@" << d << " " << ABC9_DELAY_BASE_ID + d << " 0 1 1" << std::endl; - ofs << d << std::endl; - } - module->attributes.erase(it); - } + ss << design->scratchpad_get_string("abc9_ops.box_library.flops", ss.str()); + ss << design->scratchpad_get_string("abc9_ops.box_library.delays", ss.str()); + design->scratchpad_set_string("abc9_ops.box_library", ss.str()); +} +void write_box(RTLIL::Module *module, const std::string &dst) { + std::ofstream ofs(dst); + log_assert(ofs.is_open()); + ofs << module->design->scratchpad_get_string("abc9_ops.box_library"); + // ABC expects at least one box if (ofs.tellp() == 0) ofs << "(dummy) 1 0 0 0"; - ofs.close(); } @@ -1056,11 +1049,14 @@ struct Abc9OpsPass : public Pass { log(" pre-compute the lut library.\n"); log("\n"); log(" -write_lut \n"); - log(" TODO.\n"); + log(" write the pre-computed lut library to .\n"); log("\n"); - log(" -write_box (|(null)) \n"); - log(" copy the existing box file from (skip if '(null)') and append any\n"); - log(" new box definitions.\n"); + log(" -prep_box \n"); + log(" pre-compute the box library. copy the existing box file from (skip\n"); + log(" if '(null)').\n"); + log("\n"); + log(" -write_box \n"); + log(" write the pre-computed box library to .\n"); log("\n"); log(" -reintegrate\n"); log(" for each selected module, re-intergrate the module '$abc9'\n"); @@ -1082,7 +1078,7 @@ struct Abc9OpsPass : public Pass { bool dff_mode = false; std::string write_lut_dst; int maxlut = 0; - std::string write_box_src, write_box_dst; + std::string prep_box_src, write_box_dst; size_t argidx; for (argidx = 1; argidx < args.size(); argidx++) { @@ -1112,18 +1108,21 @@ struct Abc9OpsPass : public Pass { maxlut = atoi(args[++argidx].c_str()); continue; } + if (arg == "-maxlut" && argidx+1 < args.size()) { + continue; + } if (arg == "-write_lut" && argidx+1 < args.size()) { write_lut_dst = args[++argidx]; rewrite_filename(write_lut_dst); continue; } - if (arg == "-maxlut" && argidx+1 < args.size()) { + if (arg == "-prep_box" && argidx+1 < args.size()) { + prep_box_src = args[++argidx]; + rewrite_filename(prep_box_src); continue; } - if (arg == "-write_box" && argidx+2 < args.size()) { - write_box_src = args[++argidx]; + if (arg == "-write_box" && argidx+1 < args.size()) { write_box_dst = args[++argidx]; - rewrite_filename(write_box_src); rewrite_filename(write_box_dst); continue; } @@ -1139,21 +1138,20 @@ struct Abc9OpsPass : public Pass { } extra_args(args, argidx, design); - if (!(check_mode || mark_scc_mode || prep_delays_mode || prep_xaiger_mode || prep_dff_mode || prep_lut_mode || !write_lut_dst.empty() || !write_box_dst.empty() || reintegrate_mode)) - log_cmd_error("At least one of -check, -mark_scc, -prep_{delays,xaiger,dff,lut}, -write_{lut,box}, -reintegrate must be specified.\n"); + if (!(check_mode || mark_scc_mode || prep_delays_mode || prep_xaiger_mode || prep_dff_mode || prep_lut_mode || !prep_box_src.empty() || !write_lut_dst.empty() || !write_box_dst.empty() || reintegrate_mode)) + log_cmd_error("At least one of -check, -mark_scc, -prep_{delays,xaiger,dff,lut,box}, -write_{lut,box}, -reintegrate must be specified.\n"); if (dff_mode && !prep_xaiger_mode) log_cmd_error("'-dff' option is only relevant for -prep_xaiger.\n"); - if (maxlut && !write_lut_dst.empty()) - log_cmd_error("'-maxlut' option is only relevant for -prep_lut.\n"); - if (check_mode) check(design); if (prep_delays_mode) prep_delays(design); if (prep_lut_mode) prep_lut(design, maxlut); + if (!prep_box_src.empty()) + prep_box(design, prep_box_src); for (auto mod : design->selected_modules()) { if (mod->get_bool_attribute("\\abc9_holes")) @@ -1170,7 +1168,7 @@ struct Abc9OpsPass : public Pass { if (!write_lut_dst.empty()) write_lut(mod, write_lut_dst); if (!write_box_dst.empty()) - write_box(mod, write_box_src, write_box_dst); + write_box(mod, write_box_dst); if (mark_scc_mode) mark_scc(mod); if (prep_dff_mode) diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc index 4614a2bf9..db39330ae 100644 --- a/techlibs/xilinx/synth_xilinx.cc +++ b/techlibs/xilinx/synth_xilinx.cc @@ -627,7 +627,7 @@ struct SynthXilinxPass : public ScriptPass else abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k, RTLIL::constpad.at("synth_xilinx.abc9.xc7.W")).c_str()); if (nowidelut) - abc9_opts += stringf(" -maxlut %d", lut_size_s); + abc9_opts += stringf(" -maxlut %d", lut_size); if (dff_mode) abc9_opts += " -dff"; run("abc9" + abc9_opts);