riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1890 from boqwxp/cleanup_memory_collect 

Clean up `passes/memory/memory_collect.cc`.
This commit is contained in:
N. Engelhardt 2020-04-09 14:01:29 +02:00 committed by GitHub
parent ed738b8ddb 652050b273
commit 7f33d43e3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
passes/memory/memory_collect.cc
View File

@ -60,8 +60,7 @@ Cell *handle_memory(Module *module, RTLIL::Memory *memory)
int addr_bits = 0; int addr_bits = 0;
std::vector<Cell*> memcells; std::vector<Cell*> memcells;
for (auto &cell_it : module->cells_) { for (auto cell : module->cells())
Cell *cell = cell_it.second;
if (cell->type.in(ID($memrd), ID($memwr), ID($meminit)) && memory->name == cell->parameters[ID::MEMID].decode_string()) { 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)); SigSpec addr = sigmap(cell->getPort(ID::ADDR));
for (int i = 0; i < GetSize(addr); i++) for (int i = 0; i < GetSize(addr); i++)
@ -69,7 +68,6 @@ Cell *handle_memory(Module *module, RTLIL::Memory *memory)
addr_bits = std::max(addr_bits, i+1); addr_bits = std::max(addr_bits, i+1);
memcells.push_back(cell); memcells.push_back(cell);
} }
}
if (memory->start_offset == 0 && addr_bits < 30 && (1 << addr_bits) < memory->size) if (memory->start_offset == 0 && addr_bits < 30 && (1 << addr_bits) < memory->size)
memory->size = 1 << addr_bits; memory->size = 1 << addr_bits;
@ -260,9 +258,8 @@ struct MemoryCollectPass : public Pass {
void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE { void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE {
log_header(design, "Executing MEMORY_COLLECT pass (generating $mem cells).\n"); log_header(design, "Executing MEMORY_COLLECT pass (generating $mem cells).\n");
extra_args(args, 1, design); extra_args(args, 1, design);
for (auto &mod_it : design->modules_) for (auto module : design->selected_modules())
if (design->selected(mod_it.second)) handle_module(design, module);
handle_module(design, mod_it.second);
} }
} MemoryCollectPass; } MemoryCollectPass;