From bbdf7d9c66359fa4210477fd998a534fc9900392 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Fri, 18 Aug 2017 12:54:17 +0200 Subject: Add "sim -zinit -rstlen" --- passes/sat/sim.cc | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) (limited to 'passes') diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc index a80d89a81..966510776 100644 --- a/passes/sat/sim.cc +++ b/passes/sat/sim.cc @@ -29,8 +29,22 @@ struct SimShared bool debug = false; bool hide_internal = true; bool writeback = false; + bool zinit = false; + int rstlen = 1; }; +void zinit(State &v) +{ + if (v != State::S1) + v = State::S0; +} + +void zinit(Const &v) +{ + for (auto &bit : v.bits) + zinit(bit); +} + struct SimInstance { SimShared *shared; @@ -148,6 +162,27 @@ struct SimInstance formal_database.insert(cell); } } + + if (shared->zinit) + { + for (auto &it : ff_database) + { + Cell *cell = it.first; + ff_state_t &ff = it.second; + zinit(ff.past_d); + + SigSpec qsig = cell->getPort("\\Q"); + Const qdata = get_state(qsig); + zinit(qdata); + set_state(qsig, qdata); + } + + for (auto &it : mem_database) { + mem_state_t &mem = it.second; + zinit(mem.past_wr_en); + zinit(mem.data); + } + } } ~SimInstance() @@ -663,6 +698,9 @@ struct SimWorker : SimShared set_inports(reset, State::S1); set_inports(resetn, State::S0); + set_inports(clock, State::Sx); + set_inports(clockn, State::Sx); + update(); write_vcd_header(); @@ -687,7 +725,7 @@ struct SimWorker : SimShared set_inports(clock, State::S1); set_inports(clockn, State::S0); - if (cycle == 0) { + if (cycle+1 == rstlen) { set_inports(reset, State::S0); set_inports(resetn, State::S1); } @@ -730,6 +768,12 @@ struct SimPass : public Pass { log(" -resetn \n"); log(" name of top-level inverted reset input (active low)\n"); log("\n"); + log(" -rstlen \n"); + log(" number of cycles reset should stay active (default: 1)\n"); + log("\n"); + log(" -zinit\n"); + log(" zero-initialize all uninitialized regs and memories\n"); + log("\n"); log(" -n \n"); log(" number of cycles to simulate (default: 20)\n"); log("\n"); @@ -760,6 +804,10 @@ struct SimPass : public Pass { numcycles = atoi(args[++argidx].c_str()); continue; } + if (args[argidx] == "-rstlen" && argidx+1 < args.size()) { + worker.rstlen = atoi(args[++argidx].c_str()); + continue; + } if (args[argidx] == "-clock" && argidx+1 < args.size()) { worker.clock.insert(RTLIL::escape_id(args[++argidx])); continue; @@ -788,6 +836,10 @@ struct SimPass : public Pass { worker.writeback = true; continue; } + if (args[argidx] == "-zinit") { + worker.zinit = true; + continue; + } break; } extra_args(args, argidx, design); -- cgit v1.2.3