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

Experimental sim changes

This commit is contained in:
Claire Xenia Wolf 2022-02-25 15:50:46 +01:00
parent 08c771078f
commit ca261d3c28
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
passes/sat/sim.cc
View File

@ -801,14 +801,15 @@ struct SimInstance
child.second->setInitState(); child.second->setInitState();
} }
void setState(std::vector<std::pair<SigBit,bool>> bits, std::string values) void setState(dict<int, std::pair<SigBit,bool>> bits, std::string values)
{ {
for(size_t i=0;i<bits.size();i++) { for(auto bit : bits) {
switch(values.at(i)) { if (bit.first >= GetSize(values))
case '0' : set_state(bits.at(i).first,bits.at(i).second ? State::S1 : State::S0); break; log_error("Too few input data bits in file.\n");
case '1' : set_state(bits.at(i).first,bits.at(i).second ? State::S0 : State::S1); break; switch(values.at(bit.first)) {
default: case '0': set_state(bit.second.first, bit.second.second ? State::S1 : State::S0); break;
set_state(bits.at(i).first,State::Sx); break; case '1': set_state(bit.second.first, bit.second.second ? State::S0 : State::S1); break;
default: set_state(bit.second.first, State::Sx); break;
} }
} }
} }
@ -1124,9 +1125,10 @@ struct SimWorker : SimShared
try { try {
fst->reconstructAllAtTimes(fst_clock, startCount, stopCount, [&](uint64_t time) { fst->reconstructAllAtTimes(fst_clock, startCount, stopCount, [&](uint64_t time) {
log("Co-simulating %s %d [%lu%s].\n", (all_samples ? "sample" : "cycle"), cycle, (unsigned long)time, fst->getTimescaleString()); log("Co-simulating %s %d [%lu%s].\n", (all_samples ? "sample" : "cycle"), cycle, (unsigned long)time, fst->getTimescaleString());
bool did_something = time < stopCount; // FIXME
for(auto &item : inputs) { for(auto &item : inputs) {
std::string v = fst->valueOf(item.second); std::string v = fst->valueOf(item.second);
top->set_state(item.first, Const::from_string(v)); did_something |= top->set_state(item.first, Const::from_string(v));
} }
if (initial) { if (initial) {
@ -1134,8 +1136,11 @@ struct SimWorker : SimShared
write_output_header(); write_output_header();
initial = false; initial = false;
} }
if (did_something)
update(); update();
write_output_step(5*cycle); else
log("nothing to update.\n");
write_output_step(time);
bool status = top->checkSignals(); bool status = top->checkSignals();
if (status) if (status)
@ -1151,7 +1156,6 @@ struct SimWorker : SimShared
} catch(fst_end_of_data_exception) { } catch(fst_end_of_data_exception) {
// end of data detected // end of data detected
} }
write_output_step(5*(cycle-1)+2);
write_output_end(); write_output_end();
if (writeback) { if (writeback) {
@ -1166,8 +1170,7 @@ struct SimWorker : SimShared
std::ifstream mf(map_filename); std::ifstream mf(map_filename);
std::string type, symbol; std::string type, symbol;
int variable, index; int variable, index;
std::vector<std::pair<SigBit,bool>> inputs; dict<int, std::pair<SigBit,bool>> inputs, inits, latches;
std::vector<std::pair<SigBit,bool>> latches;
while (mf >> type >> variable >> index >> symbol) { while (mf >> type >> variable >> index >> symbol) {
RTLIL::IdString escaped_s = RTLIL::escape_id(symbol); RTLIL::IdString escaped_s = RTLIL::escape_id(symbol);
Wire *w = topmod->wire(escaped_s); Wire *w = topmod->wire(escaped_s);
@ -1176,11 +1179,13 @@ struct SimWorker : SimShared
if (index < w->start_offset || index > w->start_offset + w->width) if (index < w->start_offset || index > w->start_offset + w->width)
log_error("Index %d for wire %s is out of range\n", index, log_signal(w)); log_error("Index %d for wire %s is out of range\n", index, log_signal(w));
if (type == "input") { if (type == "input") {
inputs.emplace_back(SigBit(w,index),false); inputs[variable] = {SigBit(w,index), false};
} else if (type == "init") {
inits[variable] = {SigBit(w,index), false};
} else if (type == "latch") { } else if (type == "latch") {
latches.emplace_back(SigBit(w,index),false); latches[variable] = {SigBit(w,index), false};
} else if (type == "invlatch") { } else if (type == "invlatch") {
latches.emplace_back(SigBit(w,index),true); latches[variable] = {SigBit(w,index), true};
} }
} }
@ -1198,20 +1203,17 @@ struct SimWorker : SimShared
std::getline(f, line); std::getline(f, line);
if (line.size()==0 || line[0]=='#') continue; if (line.size()==0 || line[0]=='#') continue;
if (init) { if (init) {
if (line.size()!=latches.size())
log_error("Wrong number of initialization bits in file.\n");
write_output_header(); write_output_header();
top->setState(latches, line); top->setState(latches, line);
init = false; init = false;
} else { } else {
log("Simulating cycle %d.\n", cycle); log("Simulating cycle %d.\n", cycle);
if (line.size()!=inputs.size())
log_error("Wrong number of input data bits in file.\n");
top->setState(inputs, line); top->setState(inputs, line);
if (cycle) { if (cycle) {
set_inports(clock, State::S1); set_inports(clock, State::S1);
set_inports(clockn, State::S0); set_inports(clockn, State::S0);
} else { } else {
top->setState(inits, line);
set_inports(clock, State::S0); set_inports(clock, State::S0);
set_inports(clockn, State::S1); set_inports(clockn, State::S1);
} }