Add support for read_aiger -wideports

diff --git a/frontends/aiger/aigerparse.cc b/frontends/aiger/aigerparse.cc
index 9766e1aae818ccaa3df6bf62e99cb43592b1f5f5..cc4abe184010e305e7e21e60a199edb022197c43 100644 (file)
--- a/frontends/aiger/aigerparse.cc
+++ b/frontends/aiger/aigerparse.cc
@@ -33,8 +33,8 @@ YOSYS_NAMESPACE_BEGIN
 
 #define log_debug log
 
-AigerReader::AigerReader(RTLIL::Design *design, std::istream &f, RTLIL::IdString module_name, RTLIL::IdString clk_name, std::string map_filename)
-    : design(design), f(f), clk_name(clk_name), map_filename(map_filename)
+AigerReader::AigerReader(RTLIL::Design *design, std::istream &f, RTLIL::IdString module_name, RTLIL::IdString clk_name, std::string map_filename, bool wideports)
+    : design(design), f(f), clk_name(clk_name), map_filename(map_filename), wideports(wideports)
 {
     module = new RTLIL::Module;
     module->name = module_name;
@@ -223,7 +223,6 @@ void AigerReader::parse_xaiger()
             log_error("Line %u: cannot interpret first character '%c'!\n", line_count, c);
     }
 
-    bool wideports = true;
     dict<RTLIL::IdString, int> wideports_cache;
 
     if (!map_filename.empty()) {
@@ -284,7 +283,7 @@ void AigerReader::parse_xaiger()
                 wire->port_output = other_wire->port_output;
                 other_wire->port_input = false;
                 other_wire->port_output = false;
-                if (wire->port_input)
+                if (wire->port_output)
                     module->connect(other_wire, SigSpec(wire, i));
                 else
                     module->connect(SigSpec(wire, i), other_wire);
@@ -566,6 +565,10 @@ struct AigerFrontend : public Frontend {
                log("    -map <filename>\n");
                log("        read file with port and latch symbols\n");
         log("\n");
+               log("    -wideports\n");
+               log("        Merge ports that match the pattern 'name[int]' into a single\n");
+               log("        multi-bit port 'name'.\n");
+               log("\n");
     }
     void execute(std::istream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE
     {
@@ -574,6 +577,7 @@ struct AigerFrontend : public Frontend {
         RTLIL::IdString clk_name = "\\clk";
         RTLIL::IdString module_name;
         std::string map_filename;
+        bool wideports = false;
 
                size_t argidx;
                for (argidx = 1; argidx < args.size(); argidx++) {
@@ -590,6 +594,10 @@ struct AigerFrontend : public Frontend {
                                map_filename = args[++argidx];
                                continue;
                        }
+                       if (arg == "-wideports") {
+                               wideports = true;
+                               continue;
+                       }
                        break;
                }
                extra_args(f, filename, args, argidx);
@@ -602,7 +610,7 @@ struct AigerFrontend : public Frontend {
 #endif
         }
 
-        AigerReader reader(design, *f, module_name, clk_name, map_filename);
+        AigerReader reader(design, *f, module_name, clk_name, map_filename, wideports);
                reader.parse_aiger();
     }
 } AigerFrontend;

diff --git a/frontends/aiger/aigerparse.h b/frontends/aiger/aigerparse.h
index 79efe91113d3169258c900130ef5e0a76fc06299..a1d2af9c9f6da9a359c1179cfbf63b8b1727c3e8 100644 (file)
--- a/frontends/aiger/aigerparse.h
+++ b/frontends/aiger/aigerparse.h
@@ -31,6 +31,7 @@ struct AigerReader
     RTLIL::IdString clk_name;
     RTLIL::Module *module;
     std::string map_filename;
+    bool wideports;
 
     unsigned M, I, L, O, A;
     unsigned B, C, J, F; // Optional in AIGER 1.9
@@ -40,7 +41,7 @@ struct AigerReader
     std::vector<RTLIL::Wire*> latches;
     std::vector<RTLIL::Wire*> outputs;
 
-    AigerReader(RTLIL::Design *design, std::istream &f, RTLIL::IdString module_name, RTLIL::IdString clk_name, std::string map_filename);
+    AigerReader(RTLIL::Design *design, std::istream &f, RTLIL::IdString module_name, RTLIL::IdString clk_name, std::string map_filename, bool wideports);
     void parse_aiger();
     void parse_xaiger();
     void parse_aiger_ascii(bool create_and);