Revert "write_xaiger: only instantiate each whitebox cell type once"

diff --git a/backends/aiger/xaiger.cc b/backends/aiger/xaiger.cc
index 5729f045a3b79daf9b384a1906a6b8e648b8be1a..627133314e47af23a7751ca7859dcf83d3cc6d33 100644 (file)
--- a/backends/aiger/xaiger.cc
+++ b/backends/aiger/xaiger.cc
@@ -605,25 +605,15 @@ struct XAigerWriter
                        RTLIL::Module *holes_module = module->design->addModule("$__holes__");
                        log_assert(holes_module);
 
-                       dict<IdString, Cell*> cell_cache;
-
                        int port_id = 1;
                        int box_count = 0;
                        for (auto cell : box_list) {
                                RTLIL::Module* box_module = module->design->module(cell->type);
-                               log_assert(box_module);
-                               IdString derived_name = box_module->derive(module->design, cell->parameters);
-                               box_module = module->design->module(derived_name);
-                               if (box_module->has_processes())
-                                       log_error("ABC9 box '%s' contains processes!\n", box_module->name.c_str());
-
                                int box_inputs = 0, box_outputs = 0;
-                               auto r = cell_cache.insert(std::make_pair(derived_name, nullptr));
-                               Cell *holes_cell = r.first->second;
-                               if (r.second && !holes_cell && box_module->get_bool_attribute("\\whitebox")) {
+                               Cell *holes_cell = nullptr;
+                               if (box_module->get_bool_attribute("\\whitebox")) {
                                        holes_cell = holes_module->addCell(cell->name, cell->type);
                                        holes_cell->parameters = cell->parameters;
-                                       r.first->second = holes_cell;
                                }
 
                                // NB: Assume box_module->ports are sorted alphabetically
@@ -632,8 +622,8 @@ struct XAigerWriter
                                        RTLIL::Wire *w = box_module->wire(port_name);
                                        log_assert(w);
                                        RTLIL::Wire *holes_wire;
-                                       RTLIL::SigSpec port_sig;
-                                       if (w->port_input)
+                                       RTLIL::SigSpec port_wire;
+                                       if (w->port_input) {
                                                for (int i = 0; i < GetSize(w); i++) {
                                                        box_inputs++;
                                                        holes_wire = holes_module->wire(stringf("\\i%d", box_inputs));
@@ -644,29 +634,28 @@ struct XAigerWriter
                                                                holes_module->ports.push_back(holes_wire->name);
                                                        }
                                                        if (holes_cell)
-                                                               port_sig.append(holes_wire);
+                                                               port_wire.append(holes_wire);
                                                }
+                                               if (!port_wire.empty())
+                                                       holes_cell->setPort(w->name, port_wire);
+                                       }
                                        if (w->port_output) {
                                                box_outputs += GetSize(w);
                                                for (int i = 0; i < GetSize(w); i++) {
                                                        if (GetSize(w) == 1)
-                                                               holes_wire = holes_module->addWire(stringf("%s.%s", cell->name.c_str(), log_id(w->name)));
+                                                               holes_wire = holes_module->addWire(stringf("%s.%s", cell->name.c_str(), w->name.c_str()));
                                                        else
-                                                               holes_wire = holes_module->addWire(stringf("%s.%s[%d]", cell->name.c_str(), log_id(w->name), i));
+                                                               holes_wire = holes_module->addWire(stringf("%s.%s[%d]", cell->name.c_str(), w->name.c_str(), i));
                                                        holes_wire->port_output = true;
                                                        holes_wire->port_id = port_id++;
                                                        holes_module->ports.push_back(holes_wire->name);
                                                        if (holes_cell)
-                                                               port_sig.append(holes_wire);
+                                                               port_wire.append(holes_wire);
                                                        else
                                                                holes_module->connect(holes_wire, State::S0);
                                                }
-                                       }
-                                       if (!port_sig.empty()) {
-                                               if (r.second)
-                                                       holes_cell->setPort(w->name, port_sig);
-                                               else
-                                                       holes_module->connect(holes_cell->getPort(w->name), port_sig);
+                                               if (!port_wire.empty())
+                                                       holes_cell->setPort(w->name, port_wire);
                                        }
                                }
 
@@ -696,11 +685,14 @@ struct XAigerWriter
                                RTLIL::Selection& sel = holes_module->design->selection_stack.back();
                                sel.select(holes_module);
 
+                               // TODO: Should not need to opt_merge if we only instantiate
+                               //       each box type once...
+                               Pass::call(holes_module->design, "opt_merge -share_all");
+
                                Pass::call(holes_module->design, "flatten -wb");
 
-                               // Cannot techmap/aigmap/check all lib_whitebox-es outside of write_xaiger
-                               //   since boxes may contain parameters in which case `flatten` would have
-                               //   created a new $paramod ...
+                               // TODO: Should techmap/aigmap/check all lib_whitebox-es just once,
+                               //       instead of per write_xaiger call
                                Pass::call(holes_module->design, "techmap");
                                Pass::call(holes_module->design, "aigmap");
                                for (auto cell : holes_module->cells())