mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-09-14 13:41:27 +00:00
Code Activity

Update passes/memory to avoid bits()

Browse source
This commit is contained in:
Robert O'Callahan 2025-08-28 03:53:14 +00:00
parent 7c3cf9cc42
commit d4e2fa0c4f
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
passes/memory/memory_bram.cc
View file

@ -848,9 +848,9 @@ grow_read_ports:;
for (int i = 0; i < mem.width; i++) for (int i = 0; i < mem.width; i++)
if (shuffle_map[i] != -1) { if (shuffle_map[i] != -1) {
module->connect(port.data[shuffle_map[i]], new_data[i]); module->connect(port.data[shuffle_map[i]], new_data[i]);
new_init_value.bits()[i] = port.init_value[shuffle_map[i]]; new_init_value.set(i, port.init_value[shuffle_map[i]]);
new_arst_value.bits()[i] = port.arst_value[shuffle_map[i]]; new_arst_value.set(i, port.arst_value[shuffle_map[i]]);
new_srst_value.bits()[i] = port.srst_value[shuffle_map[i]]; new_srst_value.set(i, port.srst_value[shuffle_map[i]]);
} }
port.data = new_data; port.data = new_data;
port.init_value = new_init_value; port.init_value = new_init_value;
@ -887,9 +887,9 @@ grow_read_ports:;
for (int i = 0; i < init_size; i++) for (int i = 0; i < init_size; i++)
for (int j = 0; j < bram.dbits; j++) for (int j = 0; j < bram.dbits; j++)
if (init_offset+i < GetSize(initdata) && init_offset+i >= 0) if (init_offset+i < GetSize(initdata) && init_offset+i >= 0)
initparam.bits()[i*bram.dbits+j] = initdata[init_offset+i][init_shift+j]; initparam.set(i*bram.dbits+j, initdata[init_offset+i][init_shift+j]);
else else
initparam.bits()[i*bram.dbits+j] = State::Sx; initparam.set(i*bram.dbits+j, State::Sx);
c->setParam(ID::INIT, initparam); c->setParam(ID::INIT, initparam);
} }

7
passes/memory/memory_share.cc
View file

@ -60,16 +60,17 @@ struct MemoryShareWorker
bool merge_rst_value(Mem &mem, Const &res, int wide_log2, const Const &src1, int sub1, const Const &src2, int sub2) { bool merge_rst_value(Mem &mem, Const &res, int wide_log2, const Const &src1, int sub1, const Const &src2, int sub2) {
res = Const(State::Sx, mem.width << wide_log2); res = Const(State::Sx, mem.width << wide_log2);
for (int i = 0; i < GetSize(src1); i++) for (int i = 0; i < GetSize(src1); i++)
res.bits()[i + sub1 * mem.width] = src1[i]; res.set(i + sub1 * mem.width, src1[i]);
for (int i = 0; i < GetSize(src2); i++) { for (int i = 0; i < GetSize(src2); i++) {
if (src2[i] == State::Sx) if (src2[i] == State::Sx)
continue; continue;
auto &dst = res.bits()[i + sub2 * mem.width]; int idx = i + sub2 * mem.width;
RTLIL::State dst = res[idx];
if (dst == src2[i]) if (dst == src2[i])
continue; continue;
if (dst != State::Sx) if (dst != State::Sx)
return false; return false;
dst = src2[i]; res.set(idx, src2[i]);
} }
return true; return true;
} }