Merge pull request #2168 from whitequark/assert-unused-exprs
[yosys.git] / passes / cmds / splitnets.cc
index accb178ba98fd17b46d25ac57bc6295a90b03390..fff8a0d3efad0e2a55c97ff9dcb9f67b0f7eece9 100644 (file)
@@ -2,11 +2,11 @@
  *  yosys -- Yosys Open SYnthesis Suite
  *
  *  Copyright (C) 2012  Clifford Wolf <clifford@clifford.at>
- *  
+ *
  *  Permission to use, copy, modify, and/or distribute this software for any
  *  purpose with or without fee is hereby granted, provided that the above
  *  copyright notice and this permission notice appear in all copies.
- *  
+ *
  *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 #include "kernel/rtlil.h"
 #include "kernel/log.h"
 
+USING_YOSYS_NAMESPACE
+PRIVATE_NAMESPACE_BEGIN
+
 struct SplitnetsWorker
 {
        std::map<RTLIL::Wire*, std::vector<RTLIL::SigBit>> splitmap;
 
        void append_wire(RTLIL::Module *module, RTLIL::Wire *wire, int offset, int width, std::string format)
        {
-               std::string new_wire_name = wire->name;
+               std::string new_wire_name = wire->name.str();
 
                if (format.size() > 0)
                        new_wire_name += format.substr(0, 1);
 
                if (width > 1) {
-                       new_wire_name += stringf("%d", offset+width-1);
+                       if (wire->upto)
+                               new_wire_name += stringf("%d", wire->start_offset+wire->width-(offset+width)-1);
+                       else
+                               new_wire_name += stringf("%d", wire->start_offset+offset+width-1);
                        if (format.size() > 2)
                                new_wire_name += format.substr(2, 1);
                        else
                                new_wire_name += ":";
                }
 
-               new_wire_name += stringf("%d", offset);
+               if (wire->upto)
+                       new_wire_name += stringf("%d", wire->start_offset+wire->width-offset-1);
+               else
+                       new_wire_name += stringf("%d", wire->start_offset+offset);
 
                if (format.size() > 1)
                        new_wire_name += format.substr(1, 1);
 
-               while (module->count_id(new_wire_name) > 0)
-                       new_wire_name += "_";
-
-               RTLIL::Wire *new_wire = module->addWire(new_wire_name, width);
-               new_wire->port_id = wire->port_id;
+               RTLIL::Wire *new_wire = module->addWire(module->uniquify(new_wire_name), width);
+               new_wire->port_id = wire->port_id ? wire->port_id + offset : 0;
                new_wire->port_input = wire->port_input;
                new_wire->port_output = wire->port_output;
+               new_wire->start_offset = wire->start_offset + offset;
+
+               auto it = wire->attributes.find(ID::src);
+               if (it != wire->attributes.end())
+                       new_wire->attributes.emplace(ID::src, it->second);
+
+               it = wire->attributes.find(ID::hdlname);
+               if (it != wire->attributes.end())
+                       new_wire->attributes.emplace(ID::hdlname, it->second);
+
+               it = wire->attributes.find(ID::keep);
+               if (it != wire->attributes.end())
+                       new_wire->attributes.emplace(ID::keep, it->second);
+
+               it = wire->attributes.find(ID::init);
+               if (it != wire->attributes.end()) {
+                       Const old_init = it->second, new_init;
+                       for (int i = offset; i < offset+width; i++)
+                               new_init.bits.push_back(i < GetSize(old_init) ? old_init.bits.at(i) : State::Sx);
+                       new_wire->attributes.emplace(ID::init, new_init);
+               }
 
                std::vector<RTLIL::SigBit> sigvec = RTLIL::SigSpec(new_wire).to_sigbit_vector();
                splitmap[wire].insert(splitmap[wire].end(), sigvec.begin(), sigvec.end());
@@ -68,7 +95,7 @@ struct SplitnetsWorker
 
 struct SplitnetsPass : public Pass {
        SplitnetsPass() : Pass("splitnets", "split up multi-bit nets") { }
-       virtual void help()
+       void help() override
        {
                //   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
                log("\n");
@@ -79,7 +106,7 @@ struct SplitnetsPass : public Pass {
                log("    -format char1[char2[char3]]\n");
                log("        the first char is inserted between the net name and the bit index, the\n");
                log("        second char is appended to the netname. e.g. -format () creates net\n");
-               log("        names like 'mysignal(42)'. the 3rd character is the range seperation\n");
+               log("        names like 'mysignal(42)'. the 3rd character is the range separation\n");
                log("        character when creating multi-bit wires. the default is '[]:'.\n");
                log("\n");
                log("    -ports\n");
@@ -90,13 +117,13 @@ struct SplitnetsPass : public Pass {
                log("        and split nets so that no driver drives only part of a net.\n");
                log("\n");
        }
-       virtual void execute(std::vector<std::string> args, RTLIL::Design *design)
+       void execute(std::vector<std::string> args, RTLIL::Design *design) override
        {
                bool flag_ports = false;
                bool flag_driver = false;
                std::string format = "[]:";
 
-               log_header("Executing SPLITNETS pass (splitting up multi-bit signals).\n");
+               log_header(design, "Executing SPLITNETS pass (splitting up multi-bit signals).\n");
 
                size_t argidx;
                for (argidx = 1; argidx < args.size(); argidx++)
@@ -117,26 +144,42 @@ struct SplitnetsPass : public Pass {
                }
                extra_args(args, argidx, design);
 
-               for (auto &mod_it : design->modules)
+               // module_ports_db[module_name][old_port_name] = new_port_name_list
+               dict<IdString, dict<IdString, vector<IdString>>> module_ports_db;
+
+               for (auto module : design->selected_modules())
                {
-                       RTLIL::Module *module = mod_it.second;
-                       if (!design->selected(module))
+                       if (module->has_processes_warn())
                                continue;
 
                        SplitnetsWorker worker;
 
+                       if (flag_ports)
+                       {
+                               int normalized_port_factor = 0;
+
+                               for (auto wire : module->wires())
+                                       if (wire->port_id != 0) {
+                                               normalized_port_factor = max(normalized_port_factor, wire->port_id+1);
+                                               normalized_port_factor = max(normalized_port_factor, GetSize(wire)+1);
+                                       }
+
+                               for (auto wire : module->wires())
+                                       wire->port_id *= normalized_port_factor;
+                       }
+
                        if (flag_driver)
                        {
                                CellTypes ct(design);
 
                                std::map<RTLIL::Wire*, std::set<int>> split_wires_at;
 
-                               for (auto &c : module->cells)
-                               for (auto &p : c.second->connections())
+                               for (auto c : module->cells())
+                               for (auto &p : c->connections())
                                {
-                                       if (!ct.cell_known(c.second->type))
+                                       if (!ct.cell_known(c->type))
                                                continue;
-                                       if (!ct.cell_output(c.second->type, p.first))
+                                       if (!ct.cell_output(c->type, p.first))
                                                continue;
 
                                        RTLIL::SigSpec sig = p.second;
@@ -163,9 +206,8 @@ struct SplitnetsPass : public Pass {
                        }
                        else
                        {
-                               for (auto &w : module->wires_) {
-                                       RTLIL::Wire *wire = w.second;
-                                       if (wire->width > 1 && (wire->port_id == 0 || flag_ports) && design->selected(module, w.second))
+                               for (auto wire : module->wires()) {
+                                       if (wire->width > 1 && (wire->port_id == 0 || flag_ports) && design->selected(module, wire))
                                                worker.splitmap[wire] = std::vector<RTLIL::SigBit>();
                                }
 
@@ -176,13 +218,69 @@ struct SplitnetsPass : public Pass {
 
                        module->rewrite_sigspecs(worker);
 
-                       std::set<RTLIL::Wire*> delete_wires;
+                       if (flag_ports)
+                       {
+                               for (auto wire : module->wires())
+                               {
+                                       if (wire->port_id == 0)
+                                               continue;
+
+                                       SigSpec sig(wire);
+                                       worker(sig);
+
+                                       if (sig == wire)
+                                               continue;
+
+                                       vector<IdString> &new_ports = module_ports_db[module->name][wire->name];
+
+                                       for (SigSpec c : sig.chunks())
+                                               new_ports.push_back(c.as_wire()->name);
+                               }
+                       }
+
+                       pool<RTLIL::Wire*> delete_wires;
                        for (auto &it : worker.splitmap)
                                delete_wires.insert(it.first);
                        module->remove(delete_wires);
 
-                       module->fixup_ports();
+                       if (flag_ports)
+                               module->fixup_ports();
+               }
+
+               if (!module_ports_db.empty())
+               {
+                       for (auto module : design->modules())
+                       for (auto cell : module->cells())
+                       {
+                               if (module_ports_db.count(cell->type) == 0)
+                                       continue;
+
+                               for (auto &it : module_ports_db.at(cell->type))
+                               {
+                                       IdString port_id = it.first;
+                                       const auto &new_port_ids = it.second;
+
+                                       if (!cell->hasPort(port_id))
+                                               continue;
+
+                                       int offset = 0;
+                                       SigSpec sig = cell->getPort(port_id);
+
+                                       for (auto nid : new_port_ids)
+                                       {
+                                               int nlen = GetSize(design->module(cell->type)->wire(nid));
+                                               if (offset + nlen > GetSize(sig))
+                                                       nlen = GetSize(sig) - offset;
+                                               if (nlen > 0)
+                                                       cell->setPort(nid, sig.extract(offset, nlen));
+                                               offset += nlen;
+                                       }
+
+                                       cell->unsetPort(port_id);
+                               }
+                       }
                }
        }
 } SplitnetsPass;
+
+PRIVATE_NAMESPACE_END