Updated ABC and some related changes

diff --git a/Makefile b/Makefile
index 9a8a277a506a34cf10eb35c567cedf4c49a765e7..72bd6d1eef7fe773a7a353012eaa2233f21ae88a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ OBJS = kernel/version_$(GIT_REV).o
 # is just a symlink to your actual ABC working directory, as 'make mrproper'
 # will remove the 'abc' directory and you do not want to accidentally
 # delete your work on ABC..
-ABCREV = e97a6e1d59b9
+ABCREV = d7d412483aa9
 ABCPULL = 1
 
 -include Makefile.conf

diff --git a/passes/abc/abc.cc b/passes/abc/abc.cc
index e6b7a72d863587aee3c1cd27cb5d16f216c76f77..1115bdc7be8a23a9ac465d8d9bbb33f40e1462fd 100644 (file)
--- a/passes/abc/abc.cc
+++ b/passes/abc/abc.cc
@@ -29,10 +29,10 @@
 // Kahn, Arthur B. (1962), "Topological sorting of large networks", Communications of the ACM 5 (11): 558–562, doi:10.1145/368996.369025
 // http://en.wikipedia.org/wiki/Topological_sorting
 
-#define ABC_COMMAND_LIB "strash; ifraig -v; retime -v; balance -v; dch -vf; scorr -v; map -v;"
-#define ABC_COMMAND_CTR "strash; ifraig -v; retime -v; balance -v; dch -vf; scorr -v; map -v; buffer -v; upsize -v; dnsize -v; stime -p"
-#define ABC_COMMAND_LUT "strash; ifraig -v; retime -v; balance -v; dch -vf; scorr -v; if -v"
-#define ABC_COMMAND_DFL "strash; ifraig -v; retime -v; balance -v; dch -vf; scorr -v; map -v"
+#define ABC_COMMAND_LIB "strash; ifraig -v; retime -v; balance -v; scorr -v;  dch -vf; map -v;"
+#define ABC_COMMAND_CTR "strash; ifraig -v; retime -v; balance -v; scorr -v;  dch -vf; map -v; buffer -v; upsize -v; dnsize -v; stime -p"
+#define ABC_COMMAND_LUT "strash; ifraig -v; retime -v; balance -v; scorr -v;  dch -vf; if -v"
+#define ABC_COMMAND_DFL "strash; ifraig -v; retime -v; balance -v; scorr -v;  dch -vf; map -v"
 
 #include "kernel/register.h"
 #include "kernel/sigtools.h"
@@ -383,6 +383,25 @@ static std::string add_echos_to_abc_cmd(std::string str)
        return new_str;
 }
 
+static std::string fold_abc_cmd(std::string str)
+{
+       std::string token, new_str = "          ";
+       int char_counter = 10;
+
+       for (size_t i = 0; i <= str.size(); i++) {
+               if (i < str.size())
+                       token += str[i];
+               if (i == str.size() || str[i] == ';') {
+                       if (char_counter + token.size() > 75)
+                               new_str += "\n              ", char_counter = 14;
+                       new_str += token, char_counter += token.size();
+                       token.clear();
+               }
+       }
+
+       return new_str;
+}
+
 static void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std::string script_file, std::string exe_file,
                std::string liberty_file, std::string constr_file, bool cleanup, int lut_mode, bool dff_mode, std::string clk_str)
 {
@@ -508,6 +527,8 @@ static void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std
                fprintf(f, " n%d", si.id);
                count_input++;
        }
+       if (count_input == 0)
+               fprintf(f, " dummy_input\n");
        fprintf(f, "\n");
 
        int count_output = 0;
@@ -857,16 +878,16 @@ struct AbcPass : public Pass {
                log("        if no -script parameter is given, the following scripts are used:\n");
                log("\n");
                log("        for -liberty without -constr:\n");
-               log("          %s\n", ABC_COMMAND_LIB);
+               log("%s\n", fold_abc_cmd(ABC_COMMAND_LIB).c_str());
                log("\n");
                log("        for -liberty with -constr:\n");
-               log("          %s\n", ABC_COMMAND_CTR);
+               log("%s\n", fold_abc_cmd(ABC_COMMAND_CTR).c_str());
                log("\n");
                log("        for -lut:\n");
-               log("          %s\n", ABC_COMMAND_LUT);
+               log("%s\n", fold_abc_cmd(ABC_COMMAND_LUT).c_str());
                log("\n");
                log("        otherwise:\n");
-               log("          %s\n", ABC_COMMAND_DFL);
+               log("%s\n", fold_abc_cmd(ABC_COMMAND_DFL).c_str());
                log("\n");
                log("    -liberty <file>\n");
                log("        generate netlists for the specified cell library (using the liberty\n");
@@ -880,8 +901,8 @@ struct AbcPass : public Pass {
                log("            set_load <floating_point_number>\n");
                log("\n");
                log("        the set_driving_cell statement defines which cell type is assumed to\n");
-               log("        drive the primary inputs and the set_load statement sets the number of\n");
-               log("        flip-flops driven by each primary output.\n");
+               log("        drive the primary inputs and the set_load statement sets the load in\n");
+               log("        femtofarads for each primary output.\n");
                log("\n");
                log("    -lut <width>\n");
                log("        generate netlist using luts of (max) the specified width.\n");

diff --git a/tests/tools/autotest.sh b/tests/tools/autotest.sh
index b7ec8b8fe71d0fd910c7c48bdc1eed8e7889b5ec..7bccd9a5abf360bcf9cf26c1c2f8cd0ab32fb8ac 100755 (executable)
--- a/tests/tools/autotest.sh
+++ b/tests/tools/autotest.sh
@@ -114,8 +114,7 @@ do
                        test_passes -p "$scriptopt"
                else
                        test_passes -p "hierarchy; proc; opt; memory; opt; fsm; opt"
-                       # test_passes -p "hierarchy; proc; opt; memory; opt; fsm; opt; techmap; opt; abc -dff; opt"
-                       test_passes -p "hierarchy; proc; opt; memory; opt; fsm; opt; techmap; opt; abc; opt"
+                       test_passes -p "hierarchy; proc; opt; memory; opt; fsm; opt; techmap; opt; abc -dff; opt"
                fi
                touch ../${bn}.log
        }