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

Merge pull request #4131 from daglem/fix-initial-display 

Restore sim output from initial $display
This commit is contained in:
Martin Povišer 2024-01-14 17:21:44 +01:00 committed by GitHub
parent 1eb823bd0e acf916f654
commit 728110710e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
passes/sat/sim.cc
View File

@ -185,6 +185,7 @@ struct SimInstance
struct print_state_t struct print_state_t
{ {
bool initial_done;
Const past_trg; Const past_trg;
Const past_en; Const past_en;
Const past_args; Const past_args;
@ -350,6 +351,7 @@ struct SimInstance
print.past_trg = Const(State::Sx, cell->getPort(ID::TRG).size()); print.past_trg = Const(State::Sx, cell->getPort(ID::TRG).size());
print.past_args = Const(State::Sx, cell->getPort(ID::ARGS).size()); print.past_args = Const(State::Sx, cell->getPort(ID::ARGS).size());
print.past_en = State::Sx; print.past_en = State::Sx;
print.initial_done = false;
} }
} }
@ -852,13 +854,14 @@ struct SimInstance
bool triggered = false; bool triggered = false;
Const trg = get_state(cell->getPort(ID::TRG)); Const trg = get_state(cell->getPort(ID::TRG));
bool trg_en = cell->getParam(ID::TRG_ENABLE).as_bool();
Const en = get_state(cell->getPort(ID::EN)); Const en = get_state(cell->getPort(ID::EN));
Const args = get_state(cell->getPort(ID::ARGS)); Const args = get_state(cell->getPort(ID::ARGS));
if (!en.as_bool()) if (!en.as_bool())
goto update_print; goto update_print;
if (cell->getParam(ID::TRG_ENABLE).as_bool()) { if (trg.size() > 0 && trg_en) {
Const trg_pol = cell->getParam(ID::TRG_POLARITY); Const trg_pol = cell->getParam(ID::TRG_POLARITY);
for (int i = 0; i < trg.size(); i++) { for (int i = 0; i < trg.size(); i++) {
bool pol = trg_pol[i] == State::S1; bool pol = trg_pol[i] == State::S1;
@ -868,7 +871,12 @@ struct SimInstance
if (!pol && curr == State::S0 && past == State::S1) if (!pol && curr == State::S0 && past == State::S1)
triggered = true; triggered = true;
} }
} else if (trg_en) {
// initial $print (TRG width = 0, TRG_ENABLE = true)
if (!print.initial_done && en != print.past_en)
triggered = true;
} else { } else {
// always @(*) $print
if (args != print.past_args || en != print.past_en) if (args != print.past_args || en != print.past_en)
triggered = true; triggered = true;
} }
@ -889,6 +897,7 @@ struct SimInstance
print.past_trg = trg; print.past_trg = trg;
print.past_en = en; print.past_en = en;
print.past_args = args; print.past_args = args;
print.initial_done = true;
} }
if (check_assertions) if (check_assertions)