diff --git a/passes/techmap/abc9.cc b/passes/techmap/abc9.cc index 16df82bb6..7629ad71f 100644 --- a/passes/techmap/abc9.cc +++ b/passes/techmap/abc9.cc @@ -131,10 +131,6 @@ struct Abc9Pass : public ScriptPass log(" replaced by this option when used, and an empty string otherwise\n"); log(" (indicating best possible delay).\n"); log("\n"); -// log(" -S \n"); -// log(" maximum number of LUT inputs shared.\n"); -// log(" (replaces {S} in the default scripts above, default: -S 1)\n"); -// log("\n"); log(" -lut \n"); log(" generate netlist using luts of (max) the specified width.\n"); log("\n"); @@ -226,8 +222,7 @@ struct Abc9Pass : public ScriptPass exe_cmd << " " << arg << " " << args[++argidx]; continue; } - if (arg == "-fast" || /* arg == "-dff" || */ - /* arg == "-nocleanup" || */ arg == "-showtmp") { + if (arg == "-fast" || arg == "-showtmp") { exe_cmd << " " << arg; continue; } diff --git a/passes/techmap/abc9_exe.cc b/passes/techmap/abc9_exe.cc index 7b3b65388..74c555652 100644 --- a/passes/techmap/abc9_exe.cc +++ b/passes/techmap/abc9_exe.cc @@ -165,7 +165,7 @@ struct abc9_output_filter }; void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe_file, - vector lut_costs, bool dff_mode, std::string delay_target, std::string /*lutin_shared*/, bool fast_mode, + vector lut_costs, bool dff_mode, std::string delay_target, bool fast_mode, bool show_tempdir, std::string box_file, std::string lut_file, std::vector liberty_files, std::string wire_delay, std::string tempdir_name, std::string constr_file, std::vector dont_use_cells, std::vector genlib_files) @@ -218,9 +218,6 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe for (size_t pos = abc9_script.find("{D}"); pos != std::string::npos; pos = abc9_script.find("{D}", pos)) abc9_script = abc9_script.substr(0, pos) + delay_target + abc9_script.substr(pos+3); - //for (size_t pos = abc9_script.find("{S}"); pos != std::string::npos; pos = abc9_script.find("{S}", pos)) - // abc9_script = abc9_script.substr(0, pos) + lutin_shared + abc9_script.substr(pos+3); - for (size_t pos = abc9_script.find("{W}"); pos != std::string::npos; pos = abc9_script.find("{W}", pos)) abc9_script = abc9_script.substr(0, pos) + wire_delay + abc9_script.substr(pos+3); @@ -453,7 +450,7 @@ struct Abc9ExePass : public Pass { std::string exe_file = yosys_abc_executable; std::string script_file, clk_str, box_file, lut_file, constr_file; std::vector liberty_files, genlib_files, dont_use_cells; - std::string delay_target, lutin_shared = "-S 1", wire_delay; + std::string delay_target, wire_delay; std::string tempdir_name; bool fast_mode = false, dff_mode = false; bool show_tempdir = false; @@ -504,10 +501,6 @@ struct Abc9ExePass : public Pass { delay_target = "-D " + args[++argidx]; continue; } - //if (arg == "-S" && argidx+1 < args.size()) { - // lutin_shared = "-S " + args[++argidx]; - // continue; - //} if (arg == "-lut" && argidx+1 < args.size()) { lut_arg = args[++argidx]; continue; @@ -622,7 +615,7 @@ struct Abc9ExePass : public Pass { log_cmd_error("abc9_exe '-genlib' is incompatible with '-dont_use'.\n"); abc9_module(design, script_file, exe_file, lut_costs, dff_mode, - delay_target, lutin_shared, fast_mode, show_tempdir, + delay_target, fast_mode, show_tempdir, box_file, lut_file, liberty_files, wire_delay, tempdir_name, constr_file, dont_use_cells, genlib_files); } diff --git a/passes/techmap/abc9_ops.cc b/passes/techmap/abc9_ops.cc index 0fb09d5e2..dda3858da 100644 --- a/passes/techmap/abc9_ops.cc +++ b/passes/techmap/abc9_ops.cc @@ -1620,7 +1620,6 @@ clone_lut: } } - //log("ABC RESULTS: internal signals: %8d\n", int(signal_list.size()) - in_wires - out_wires); log("ABC RESULTS: input signals: %8d\n", in_wires); log("ABC RESULTS: output signals: %8d\n", out_wires);