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

sim: Improved global clock handling

This commit is contained in:
Jannis Harder 2022-11-25 17:43:51 +01:00
parent 3ecf85e32c
commit 5ff69a0fe2
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
passes/sat/sim.cc
View File

@ -509,7 +509,7 @@ struct SimInstance
} }
} }
bool update_ph2() bool update_ph2(bool gclk)
{ {
bool did_something = false; bool did_something = false;
@ -567,7 +567,8 @@ struct SimInstance
} }
if (ff_data.has_gclk) { if (ff_data.has_gclk) {
// $ff // $ff
current_q = ff.past_d; if (gclk)
current_q = ff.past_d;
} }
if (set_state(ff_data.sig_q, current_q)) if (set_state(ff_data.sig_q, current_q))
did_something = true; did_something = true;
@ -616,7 +617,7 @@ struct SimInstance
} }
for (auto it : children) for (auto it : children)
if (it.second->update_ph2()) { if (it.second->update_ph2(gclk)) {
dirty_children.insert(it.second); dirty_children.insert(it.second);
did_something = true; did_something = true;
} }
@ -985,7 +986,7 @@ struct SimWorker : SimShared
writer->write(use_signal); writer->write(use_signal);
} }
void update() void update(bool gclk)
{ {
while (1) while (1)
{ {
@ -997,7 +998,7 @@ struct SimWorker : SimShared
if (debug) if (debug)
log("\n-- ph2 --\n"); log("\n-- ph2 --\n");
if (!top->update_ph2()) if (!top->update_ph2(gclk))
break; break;
} }
@ -1047,7 +1048,7 @@ struct SimWorker : SimShared
set_inports(clock, State::Sx); set_inports(clock, State::Sx);
set_inports(clockn, State::Sx); set_inports(clockn, State::Sx);
update(); update(false);
register_output_step(0); register_output_step(0);
@ -1060,7 +1061,7 @@ struct SimWorker : SimShared
set_inports(clock, State::S0); set_inports(clock, State::S0);
set_inports(clockn, State::S1); set_inports(clockn, State::S1);
update(); update(true);
register_output_step(10*cycle + 5); register_output_step(10*cycle + 5);
if (debug) if (debug)
@ -1076,7 +1077,7 @@ struct SimWorker : SimShared
set_inports(resetn, State::S1); set_inports(resetn, State::S1);
} }
update(); update(true);
register_output_step(10*cycle + 10); register_output_step(10*cycle + 10);
} }
@ -1193,7 +1194,7 @@ struct SimWorker : SimShared
initial = false; initial = false;
} }
if (did_something) if (did_something)
update(); update(true);
register_output_step(time); register_output_step(time);
bool status = top->checkSignals(); bool status = top->checkSignals();
@ -1342,12 +1343,12 @@ struct SimWorker : SimShared
set_inports(clock, State::S0); set_inports(clock, State::S0);
set_inports(clockn, State::S1); set_inports(clockn, State::S1);
} }
update(); update(true);
register_output_step(10*cycle); register_output_step(10*cycle);
if (!multiclock && cycle) { if (!multiclock && cycle) {
set_inports(clock, State::S0); set_inports(clock, State::S0);
set_inports(clockn, State::S1); set_inports(clockn, State::S1);
update(); update(true);
register_output_step(10*cycle + 5); register_output_step(10*cycle + 5);
} }
cycle++; cycle++;
@ -1419,12 +1420,12 @@ struct SimWorker : SimShared
log("Simulating cycle %d.\n", cycle); log("Simulating cycle %d.\n", cycle);
set_inports(clock, State::S1); set_inports(clock, State::S1);
set_inports(clockn, State::S0); set_inports(clockn, State::S0);
update(); update(true);
register_output_step(10*cycle+0); register_output_step(10*cycle+0);
if (!multiclock) { if (!multiclock) {
set_inports(clock, State::S0); set_inports(clock, State::S0);
set_inports(clockn, State::S1); set_inports(clockn, State::S1);
update(); update(true);
register_output_step(10*cycle+5); register_output_step(10*cycle+5);
} }
cycle++; cycle++;