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

memory_dff: Refactor to use FfInitVals.

This commit is contained in:
Marcelina Kościelnicka 2020-07-19 02:28:55 +02:00
parent 557f81cb49
commit c9251eb26b
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
passes/memory/memory_dff.cc
View File

@ -20,6 +20,7 @@
#include <algorithm> #include <algorithm>
#include "kernel/yosys.h" #include "kernel/yosys.h"
#include "kernel/sigtools.h" #include "kernel/sigtools.h"
#include "kernel/ffinit.h"
USING_YOSYS_NAMESPACE USING_YOSYS_NAMESPACE
PRIVATE_NAMESPACE_BEGIN PRIVATE_NAMESPACE_BEGIN
@ -34,19 +35,11 @@ struct MemoryDffWorker
dict<SigBit, int> sigbit_users_count; dict<SigBit, int> sigbit_users_count;
dict<SigSpec, Cell*> mux_cells_a, mux_cells_b; dict<SigSpec, Cell*> mux_cells_a, mux_cells_b;
pool<Cell*> forward_merged_dffs, candidate_dffs; pool<Cell*> forward_merged_dffs, candidate_dffs;
pool<SigBit> init_bits; FfInitVals initvals;
MemoryDffWorker(Module *module) : module(module), sigmap(module) MemoryDffWorker(Module *module) : module(module), sigmap(module)
{ {
for (auto wire : module->wires()) { initvals.set(&sigmap, module);
if (wire->attributes.count(ID::init) == 0)
continue;
SigSpec sig = sigmap(wire);
Const initval = wire->attributes.at(ID::init);
for (int i = 0; i < GetSize(sig) && i < GetSize(initval); i++)
if (initval[i] == State::S0 || initval[i] == State::S1)
init_bits.insert(sig[i]);
}
} }
bool find_sig_before_dff(RTLIL::SigSpec &sig, RTLIL::SigSpec &clk, bool &clk_polarity) bool find_sig_before_dff(RTLIL::SigSpec &sig, RTLIL::SigSpec &clk, bool &clk_polarity)
@ -58,7 +51,7 @@ struct MemoryDffWorker
if (bit.wire == NULL) if (bit.wire == NULL)
continue; continue;
if (init_bits.count(sigmap(bit))) if (initvals(bit) != State::Sx)
return false; return false;
for (auto cell : dff_cells) for (auto cell : dff_cells)
@ -178,7 +171,7 @@ struct MemoryDffWorker
if (d.size() != 1) if (d.size() != 1)
continue; continue;
if (init_bits.count(d)) if (initvals(d) != State::Sx)
return false; return false;
bit = d; bit = d;