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

AIM file could have gaps in or between inputs and inits

This commit is contained in:
Miodrag Milanovic 2022-05-02 11:18:30 +02:00
parent c785cb7fe3
commit 3730db4b98
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
passes/sat/sim.cc
View File

@ -1798,6 +1798,7 @@ struct AIWWriter : public OutputWriter
std::ifstream mf(worker->map_filename); std::ifstream mf(worker->map_filename);
std::string type, symbol; std::string type, symbol;
int variable, index; int variable, index;
int max_input = 0;
if (mf.fail()) if (mf.fail())
log_cmd_error("Not able to read AIGER witness map file.\n"); log_cmd_error("Not able to read AIGER witness map file.\n");
while (mf >> type >> variable >> index >> symbol) { while (mf >> type >> variable >> index >> symbol) {
@ -1815,8 +1816,10 @@ struct AIWWriter : public OutputWriter
if (worker->clockn.count(escaped_s)) { if (worker->clockn.count(escaped_s)) {
clocks[variable] = false; clocks[variable] = false;
} }
max_input = max(max_input,variable);
} else if (type == "init") { } else if (type == "init") {
aiw_inits[variable] = SigBit(w,index-w->start_offset); aiw_inits[variable] = SigBit(w,index-w->start_offset);
max_input = max(max_input,variable);
} else if (type == "latch") { } else if (type == "latch") {
aiw_latches[variable] = {SigBit(w,index-w->start_offset), false}; aiw_latches[variable] = {SigBit(w,index-w->start_offset), false};
} else if (type == "invlatch") { } else if (type == "invlatch") {
@ -1863,7 +1866,7 @@ struct AIWWriter : public OutputWriter
} }
if (skip) if (skip)
continue; continue;
for (int i = 0;; i++) for (int i = 0; i <= max_input; i++)
{ {
if (aiw_inputs.count(i)) { if (aiw_inputs.count(i)) {
SigBit bit = aiw_inputs.at(i); SigBit bit = aiw_inputs.at(i);
@ -1883,9 +1886,9 @@ struct AIWWriter : public OutputWriter
aiwfile << '0'; aiwfile << '0';
continue; continue;
} }
aiwfile << '\n'; aiwfile << '0';
break;
} }
aiwfile << '\n';
} }
} }