Add ScriptPass::run_nocheck and use for abc9

Signed-off-by: David Shah <dave@ds0.me>

diff --git a/kernel/register.cc b/kernel/register.cc
index e59d59654b101c691039f8b8cb3c704eff856c09..af8c1b8e83c90620c27a10aaee129c80a56faf83 100644 (file)
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -400,6 +400,18 @@ void ScriptPass::run(std::string command, std::string info)
        }
 }
 
+void ScriptPass::run_nocheck(std::string command, std::string info)
+{
+       if (active_design == nullptr) {
+               if (info.empty())
+                       log("        %s\n", command.c_str());
+               else
+                       log("        %s    %s\n", command.c_str(), info.c_str());
+       } else {
+               Pass::call(active_design, command);
+       }
+}
+
 void ScriptPass::run_script(RTLIL::Design *design, std::string run_from, std::string run_to)
 {
        help_mode = false;

diff --git a/kernel/register.h b/kernel/register.h
index 4622845b6d24d0cf8019efd2b1a85bbb9e204fbd..3d89386b7a0f7c0f72a71bff63e812ef7f8cad3c 100644 (file)
--- a/kernel/register.h
+++ b/kernel/register.h
@@ -84,6 +84,7 @@ struct ScriptPass : Pass
 
        bool check_label(std::string label, std::string info = std::string());
        void run(std::string command, std::string info = std::string());
+       void run_nocheck(std::string command, std::string info = std::string());
        void run_script(RTLIL::Design *design, std::string run_from = std::string(), std::string run_to = std::string());
        void help_script();
 };

diff --git a/passes/techmap/abc9.cc b/passes/techmap/abc9.cc
index 5e650230d3f16992351c7dfb689b2a73c3d62b9b..212e0692dc9c68c252e99e471e7b8cac6331ecb3 100644 (file)
--- a/passes/techmap/abc9.cc
+++ b/passes/techmap/abc9.cc
@@ -332,9 +332,9 @@ struct Abc9Pass : public ScriptPass
                                        tempdir_name = make_temp_dir(tempdir_name);
 
                                        if (!lut_mode)
-                                               run(stringf("abc9_ops -write_lut %s/input.lut", 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()));
+                                               run_nocheck(stringf("abc9_ops -write_lut %s/input.lut", tempdir_name.c_str()));
+                                       run_nocheck(stringf("abc9_ops -write_box %s/input.box", tempdir_name.c_str()));
+                                       run_nocheck(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");
 
@@ -350,9 +350,9 @@ struct Abc9Pass : public ScriptPass
                                                if (!lut_mode)
                                                        abc9_exe_cmd += stringf(" -lut %s/input.lut", tempdir_name.c_str());
                                                abc9_exe_cmd += stringf(" -box %s/input.box", tempdir_name.c_str());
-                                               run(abc9_exe_cmd);
-                                               run(stringf("read_aiger -xaiger -wideports -module_name %s$abc9 -map %s/input.sym %s/output.aig", log_id(mod), tempdir_name.c_str(), tempdir_name.c_str()));
-                                               run("abc9_ops -reintegrate");
+                                               run_nocheck(abc9_exe_cmd);
+                                               run_nocheck(stringf("read_aiger -xaiger -wideports -module_name %s$abc9 -map %s/input.sym %s/output.aig", log_id(mod), tempdir_name.c_str(), tempdir_name.c_str()));
+                                               run_nocheck("abc9_ops -reintegrate");
                                        }
                                        else
                                                log("Don't call ABC as there is nothing to map.\n");
@@ -361,7 +361,7 @@ struct Abc9Pass : public ScriptPass
                                                log("Removing temp directory.\n");
                                                remove_directory(tempdir_name);
                                        }
-
+                                       mod->check();
                                        active_design->selection().selected_modules.clear();
                                        log_pop();
                                }