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

Merge pull request #3265 from YosysHQ/micko/sim_improvements 

Improve sim by setting proper past D and AD signals
This commit is contained in:
Miodrag Milanović 2022-04-04 09:56:56 +02:00 committed by GitHub
parent 8ca9737180 6020ba67ac
commit 75f4847689
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
passes/sat/sim.cc
View File

@ -256,6 +256,7 @@ struct SimInstance
{ {
ff_state_t &ff = it.second; ff_state_t &ff = it.second;
zinit(ff.past_d); zinit(ff.past_d);
zinit(ff.past_ad);
SigSpec qsig = it.second.data.sig_q; SigSpec qsig = it.second.data.sig_q;
Const qdata = get_state(qsig); Const qdata = get_state(qsig);
@ -778,10 +779,12 @@ struct SimInstance
child.second->register_output_step_values(data); child.second->register_output_step_values(data);
} }
void setInitState() bool setInitState()
{ {
bool did_something = false;
for (auto &it : ff_database) for (auto &it : ff_database)
{ {
ff_state_t &ff = it.second;
SigSpec qsig = it.second.data.sig_q; SigSpec qsig = it.second.data.sig_q;
if (qsig.is_wire()) { if (qsig.is_wire()) {
IdString name = qsig.as_wire()->name; IdString name = qsig.as_wire()->name;
@ -790,12 +793,16 @@ struct SimInstance
log_warning("Unable to find wire %s in input file.\n", (scope + "." + RTLIL::unescape_id(name)).c_str()); log_warning("Unable to find wire %s in input file.\n", (scope + "." + RTLIL::unescape_id(name)).c_str());
if (id!=0) { if (id!=0) {
Const fst_val = Const::from_string(shared->fst->valueOf(id)); Const fst_val = Const::from_string(shared->fst->valueOf(id));
set_state(qsig, fst_val); ff.past_d = fst_val;
if (ff.data.has_aload)
ff.past_ad = fst_val;
did_something = set_state(qsig, fst_val);
} }
} }
} }
for (auto child : children) for (auto child : children)
child.second->setInitState(); did_something |= child.second->setInitState();
return did_something;
} }
void setState(dict<int, std::pair<SigBit,bool>> bits, std::string values) void setState(dict<int, std::pair<SigBit,bool>> bits, std::string values)
@ -1110,7 +1117,7 @@ struct SimWorker : SimShared
} }
if (initial) { if (initial) {
top->setInitState(); did_something |= top->setInitState();
initial = false; initial = false;
} }
if (did_something) if (did_something)