memory_collect: Use Mem helpers.
authorMarcelina Kościelnicka <mwk@0x04.net>
Sat, 17 Oct 2020 20:20:24 +0000 (22:20 +0200)
committerMarcelina Kościelnicka <mwk@0x04.net>
Wed, 21 Oct 2020 15:51:20 +0000 (17:51 +0200)
passes/memory/memory_collect.cc

index 7e82f47dc79e1457cc76c91f76b7e52a3d4d5290..ede6ca6a19d7edae30bd67da5ebf78b4549c70c9 100644 (file)
  */
 
 #include "kernel/yosys.h"
-#include "kernel/sigtools.h"
+#include "kernel/mem.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
-bool memcells_cmp(Cell *a, Cell *b)
-{
-       if (a->type == ID($memrd) && b->type == ID($memrd))
-               return a->name < b->name;
-       if (a->type == ID($memrd) || b->type == ID($memrd))
-               return (a->type == ID($memrd)) < (b->type == ID($memrd));
-       return a->parameters.at(ID::PRIORITY).as_int() < b->parameters.at(ID::PRIORITY).as_int();
-}
-
-Cell *handle_memory(Module *module, RTLIL::Memory *memory)
-{
-       log("Collecting $memrd, $memwr and $meminit for memory `%s' in module `%s':\n",
-                       memory->name.c_str(), module->name.c_str());
-
-       Const init_data(State::Sx, memory->size * memory->width);
-       SigMap sigmap(module);
-
-       int wr_ports = 0;
-       SigSpec sig_wr_clk;
-       SigSpec sig_wr_clk_enable;
-       SigSpec sig_wr_clk_polarity;
-       SigSpec sig_wr_addr;
-       SigSpec sig_wr_data;
-       SigSpec sig_wr_en;
-
-       int rd_ports = 0;
-       SigSpec sig_rd_clk;
-       SigSpec sig_rd_clk_enable;
-       SigSpec sig_rd_clk_polarity;
-       SigSpec sig_rd_transparent;
-       SigSpec sig_rd_addr;
-       SigSpec sig_rd_data;
-       SigSpec sig_rd_en;
-
-       int addr_bits = 0;
-       std::vector<Cell*> memcells;
-
-       for (auto cell : module->cells())
-               if (cell->type.in(ID($memrd), ID($memwr), ID($meminit)) && memory->name == cell->parameters[ID::MEMID].decode_string()) {
-                       SigSpec addr = sigmap(cell->getPort(ID::ADDR));
-                       for (int i = 0; i < GetSize(addr); i++)
-                               if (addr[i] != State::S0)
-                                       addr_bits = std::max(addr_bits, i+1);
-                       memcells.push_back(cell);
-               }
-
-       if (memory->start_offset == 0 && addr_bits < 30 && (1 << addr_bits) < memory->size)
-               memory->size = 1 << addr_bits;
-
-       if (memory->start_offset >= 0)
-               addr_bits = std::min(addr_bits, ceil_log2(memory->size + memory->start_offset));
-
-       addr_bits = std::max(addr_bits, 1);
-
-       if (memcells.empty()) {
-               log("  no cells found. removing memory.\n");
-               return nullptr;
-       }
-
-       std::sort(memcells.begin(), memcells.end(), memcells_cmp);
-
-       for (auto cell : memcells)
-       {
-               log("  %s (%s)\n", log_id(cell), log_id(cell->type));
-
-               if (cell->type == ID($meminit))
-               {
-                       SigSpec addr = sigmap(cell->getPort(ID::ADDR));
-                       SigSpec data = sigmap(cell->getPort(ID::DATA));
-
-                       if (!addr.is_fully_const())
-                               log_error("Non-constant address %s in memory initialization %s.\n", log_signal(addr), log_id(cell));
-                       if (!data.is_fully_const())
-                               log_error("Non-constant data %s in memory initialization %s.\n", log_signal(data), log_id(cell));
-
-                       int offset = (addr.as_int() - memory->start_offset) * memory->width;
-
-                       if (offset < 0 || offset + GetSize(data) > GetSize(init_data))
-                               log_warning("Address %s in memory initialization %s is out-of-bounds.\n", log_signal(addr), log_id(cell));
-
-                       for (int i = 0; i < GetSize(data); i++)
-                               if (0 <= i+offset && i+offset < GetSize(init_data))
-                                       init_data.bits[i+offset] = data[i].data;
-
-                       continue;
-               }
-
-               if (cell->type == ID($memwr))
-               {
-                       SigSpec clk = sigmap(cell->getPort(ID::CLK));
-                       SigSpec clk_enable = SigSpec(cell->parameters[ID::CLK_ENABLE]);
-                       SigSpec clk_polarity = SigSpec(cell->parameters[ID::CLK_POLARITY]);
-                       SigSpec addr = sigmap(cell->getPort(ID::ADDR));
-                       SigSpec data = sigmap(cell->getPort(ID::DATA));
-                       SigSpec en = sigmap(cell->getPort(ID::EN));
-
-                       if (!en.is_fully_zero())
-                       {
-                               clk.extend_u0(1, false);
-                               clk_enable.extend_u0(1, false);
-                               clk_polarity.extend_u0(1, false);
-                               addr.extend_u0(addr_bits, false);
-                               data.extend_u0(memory->width, false);
-                               en.extend_u0(memory->width, false);
-
-                               sig_wr_clk.append(clk);
-                               sig_wr_clk_enable.append(clk_enable);
-                               sig_wr_clk_polarity.append(clk_polarity);
-                               sig_wr_addr.append(addr);
-                               sig_wr_data.append(data);
-                               sig_wr_en.append(en);
-
-                               wr_ports++;
-                       }
-                       continue;
-               }
-
-               if (cell->type == ID($memrd))
-               {
-                       SigSpec clk = sigmap(cell->getPort(ID::CLK));
-                       SigSpec clk_enable = SigSpec(cell->parameters[ID::CLK_ENABLE]);
-                       SigSpec clk_polarity = SigSpec(cell->parameters[ID::CLK_POLARITY]);
-                       SigSpec transparent = SigSpec(cell->parameters[ID::TRANSPARENT]);
-                       SigSpec addr = sigmap(cell->getPort(ID::ADDR));
-                       SigSpec data = sigmap(cell->getPort(ID::DATA));
-                       SigSpec en = sigmap(cell->getPort(ID::EN));
-
-                       if (!en.is_fully_zero())
-                       {
-                               clk.extend_u0(1, false);
-                               clk_enable.extend_u0(1, false);
-                               clk_polarity.extend_u0(1, false);
-                               transparent.extend_u0(1, false);
-                               addr.extend_u0(addr_bits, false);
-                               data.extend_u0(memory->width, false);
-
-                               sig_rd_clk.append(clk);
-                               sig_rd_clk_enable.append(clk_enable);
-                               sig_rd_clk_polarity.append(clk_polarity);
-                               sig_rd_transparent.append(transparent);
-                               sig_rd_addr.append(addr);
-                               sig_rd_data.append(data);
-                               sig_rd_en.append(en);
-
-                               rd_ports++;
-                       }
-                       continue;
-               }
-       }
-
-       std::stringstream sstr;
-       sstr << "$mem$" << memory->name.str() << "$" << (autoidx++);
-
-       Cell *mem = module->addCell(sstr.str(), ID($mem));
-       mem->parameters[ID::MEMID] = Const(memory->name.str());
-       mem->parameters[ID::WIDTH] = Const(memory->width);
-       mem->parameters[ID::OFFSET] = Const(memory->start_offset);
-       mem->parameters[ID::SIZE] = Const(memory->size);
-       mem->parameters[ID::ABITS] = Const(addr_bits);
-       mem->parameters[ID::INIT] = init_data;
-
-       log_assert(sig_wr_clk.size() == wr_ports);
-       log_assert(sig_wr_clk_enable.size() == wr_ports && sig_wr_clk_enable.is_fully_const());
-       log_assert(sig_wr_clk_polarity.size() == wr_ports && sig_wr_clk_polarity.is_fully_const());
-       log_assert(sig_wr_addr.size() == wr_ports * addr_bits);
-       log_assert(sig_wr_data.size() == wr_ports * memory->width);
-       log_assert(sig_wr_en.size() == wr_ports * memory->width);
-
-       mem->parameters[ID::WR_PORTS] = Const(wr_ports);
-       mem->parameters[ID::WR_CLK_ENABLE] = wr_ports ? sig_wr_clk_enable.as_const() : State::S0;
-       mem->parameters[ID::WR_CLK_POLARITY] = wr_ports ? sig_wr_clk_polarity.as_const() : State::S0;
-
-       mem->setPort(ID::WR_CLK, sig_wr_clk);
-       mem->setPort(ID::WR_ADDR, sig_wr_addr);
-       mem->setPort(ID::WR_DATA, sig_wr_data);
-       mem->setPort(ID::WR_EN, sig_wr_en);
-
-       log_assert(sig_rd_clk.size() == rd_ports);
-       log_assert(sig_rd_clk_enable.size() == rd_ports && sig_rd_clk_enable.is_fully_const());
-       log_assert(sig_rd_clk_polarity.size() == rd_ports && sig_rd_clk_polarity.is_fully_const());
-       log_assert(sig_rd_addr.size() == rd_ports * addr_bits);
-       log_assert(sig_rd_data.size() == rd_ports * memory->width);
-
-       mem->parameters[ID::RD_PORTS] = Const(rd_ports);
-       mem->parameters[ID::RD_CLK_ENABLE] = rd_ports ? sig_rd_clk_enable.as_const() : State::S0;
-       mem->parameters[ID::RD_CLK_POLARITY] = rd_ports ? sig_rd_clk_polarity.as_const() : State::S0;
-       mem->parameters[ID::RD_TRANSPARENT] = rd_ports ? sig_rd_transparent.as_const() : State::S0;
-
-       mem->setPort(ID::RD_CLK, sig_rd_clk);
-       mem->setPort(ID::RD_ADDR, sig_rd_addr);
-       mem->setPort(ID::RD_DATA, sig_rd_data);
-       mem->setPort(ID::RD_EN, sig_rd_en);
-
-       // Copy attributes from RTLIL memory to $mem
-       for (auto attr : memory->attributes)
-               mem->attributes[attr.first] = attr.second;
-
-       for (auto c : memcells)
-               module->remove(c);
-
-       return mem;
-}
-
-static void handle_module(Design *design, Module *module)
-{
-       std::vector<pair<Cell*, IdString>> finqueue;
-
-       for (auto &mem_it : module->memories)
-               if (design->selected(module, mem_it.second)) {
-                       Cell *c = handle_memory(module, mem_it.second);
-                       finqueue.push_back(pair<Cell*, IdString>(c, mem_it.first));
-               }
-       for (auto &it : finqueue) {
-               delete module->memories.at(it.second);
-               module->memories.erase(it.second);
-               if (it.first)
-                       module->rename(it.first, it.second);
-       }
-}
-
 struct MemoryCollectPass : public Pass {
        MemoryCollectPass() : Pass("memory_collect", "creating multi-port memory cells") { }
        void help() override
@@ -258,8 +38,14 @@ struct MemoryCollectPass : public Pass {
        void execute(std::vector<std::string> args, RTLIL::Design *design) override {
                log_header(design, "Executing MEMORY_COLLECT pass (generating $mem cells).\n");
                extra_args(args, 1, design);
-               for (auto module : design->selected_modules())
-                       handle_module(design, module);
+               for (auto module : design->selected_modules()) {
+                       for (auto &mem : Mem::get_selected_memories(module)) {
+                               if (!mem.packed) {
+                                       mem.packed = true;
+                                       mem.emit();
+                               }
+                       }
+               }
        }
 } MemoryCollectPass;