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

proc_memwr: Use the v2 memwr cell.

This commit is contained in:
Marcelina Kościelnicka 2021-05-27 20:55:09 +02:00
parent fd79217763
commit 24027b5446
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
passes/proc/proc_memwr.cc
View File

@ -29,17 +29,26 @@
USING_YOSYS_NAMESPACE USING_YOSYS_NAMESPACE
PRIVATE_NAMESPACE_BEGIN PRIVATE_NAMESPACE_BEGIN
void proc_memwr(RTLIL::Module *mod, RTLIL::Process *proc, dict<IdString, int> &next_priority) void proc_memwr(RTLIL::Module *mod, RTLIL::Process *proc, dict<IdString, int> &next_port_id)
{ {
for (auto sr : proc->syncs) for (auto sr : proc->syncs)
{ {
std::vector<int> prev_port_ids;
for (auto memwr : sr->mem_write_actions) { for (auto memwr : sr->mem_write_actions) {
RTLIL::Cell *cell = mod->addCell(NEW_ID, ID($memwr)); int port_id = next_port_id[memwr.memid]++;
Const priority_mask(State::S0, port_id);
for (int i = 0; i < GetSize(prev_port_ids); i++)
if (memwr.priority_mask[i] == State::S1)
priority_mask[prev_port_ids[i]] = State::S1;
prev_port_ids.push_back(port_id);
RTLIL::Cell *cell = mod->addCell(NEW_ID, ID($memwr_v2));
cell->attributes = memwr.attributes; cell->attributes = memwr.attributes;
cell->setParam(ID::MEMID, Const(memwr.memid.str())); cell->setParam(ID::MEMID, Const(memwr.memid.str()));
cell->setParam(ID::ABITS, GetSize(memwr.address)); cell->setParam(ID::ABITS, GetSize(memwr.address));
cell->setParam(ID::WIDTH, GetSize(memwr.data)); cell->setParam(ID::WIDTH, GetSize(memwr.data));
cell->setParam(ID::PRIORITY, next_priority[memwr.memid]++); cell->setParam(ID::PORTID, port_id);
cell->setParam(ID::PRIORITY_MASK, priority_mask);
cell->setPort(ID::ADDR, memwr.address); cell->setPort(ID::ADDR, memwr.address);
cell->setPort(ID::DATA, memwr.data); cell->setPort(ID::DATA, memwr.data);
SigSpec enable = memwr.enable; SigSpec enable = memwr.enable;
@ -91,18 +100,19 @@ struct ProcMemWrPass : public Pass {
extra_args(args, 1, design); extra_args(args, 1, design);
for (auto module : design->selected_modules()) { for (auto module : design->selected_modules()) {
dict<IdString, int> next_priority; dict<IdString, int> next_port_id;
for (auto cell : module->cells()) { for (auto cell : module->cells()) {
if (cell->type == ID($memwr)) { if (cell->type.in(ID($memwr), ID($memwr_v2))) {
bool is_compat = cell->type == ID($memwr);
IdString memid = cell->parameters.at(ID::MEMID).decode_string(); IdString memid = cell->parameters.at(ID::MEMID).decode_string();
int priority = cell->parameters.at(ID::PRIORITY).as_int(); int port_id = cell->parameters.at(is_compat ? ID::PRIORITY : ID::PORTID).as_int();
if (priority >= next_priority[memid]) if (port_id >= next_port_id[memid])
next_priority[memid] = priority + 1; next_port_id[memid] = port_id + 1;
} }
} }
for (auto &proc_it : module->processes) for (auto &proc_it : module->processes)
if (design->selected(module, proc_it.second)) if (design->selected(module, proc_it.second))
proc_memwr(module, proc_it.second, next_priority); proc_memwr(module, proc_it.second, next_port_id);
} }
} }
} ProcMemWrPass; } ProcMemWrPass;

2
tests/opt/bug2765.ys
View File

@ -29,6 +29,6 @@ EOT
proc proc
opt opt
select -assert-count 2 t:$memwr select -assert-count 2 t:$memwr_v2
opt_mem opt_mem
select -assert-count 1 t:$memwr_v2 select -assert-count 1 t:$memwr_v2

8
tests/opt/opt_clean_mem.ys
View File

@ -24,25 +24,25 @@ EOT
proc proc
select -assert-count 2 t:$memrd select -assert-count 2 t:$memrd
select -assert-count 1 t:$memwr select -assert-count 1 t:$memwr_v2
select -assert-count 1 t:$meminit_v2 select -assert-count 1 t:$meminit_v2
design -save orig design -save orig
opt_clean opt_clean
select -assert-none t:$memrd select -assert-none t:$memrd
select -assert-none t:$memwr select -assert-none t:$memwr_v2
select -assert-none t:$meminit_v2 select -assert-none t:$meminit_v2
design -load orig design -load orig
expose top/rd1 expose top/rd1
opt_clean opt_clean
select -assert-count 1 t:$memrd select -assert-count 1 t:$memrd
select -assert-count 1 t:$memwr select -assert-count 1 t:$memwr_v2
select -assert-count 1 t:$meminit_v2 select -assert-count 1 t:$meminit_v2
design -load orig design -load orig
expose top/rd1 top/rd2 expose top/rd1 top/rd2
opt_clean opt_clean
select -assert-count 2 t:$memrd select -assert-count 2 t:$memrd
select -assert-count 1 t:$memwr select -assert-count 1 t:$memwr_v2
select -assert-count 1 t:$meminit_v2 select -assert-count 1 t:$meminit_v2