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

Cleanup

This commit is contained in:
Eddie Hung 2019-12-03 19:21:47 -08:00
parent d66d06b91d
commit c6ee2fb482
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
backends/aiger/xaiger.cc
View File

@ -83,7 +83,7 @@ struct XAigerWriter
dict<SigBit, pair<SigBit, SigBit>> and_map; dict<SigBit, pair<SigBit, SigBit>> and_map;
vector<std::tuple<SigBit,RTLIL::Cell*,RTLIL::IdString,int>> ci_bits; vector<std::tuple<SigBit,RTLIL::Cell*,RTLIL::IdString,int>> ci_bits;
vector<std::tuple<SigBit,RTLIL::Cell*,RTLIL::IdString,int,int>> co_bits; vector<std::tuple<SigBit,RTLIL::Cell*,RTLIL::IdString,int,int>> co_bits;
dict<SigBit, std::pair<int, RTLIL::State>> ff_bits; dict<SigBit, std::pair<int,int>> ff_bits;
dict<SigBit, float> arrival_times; dict<SigBit, float> arrival_times;
vector<pair<int, int>> aig_gates; vector<pair<int, int>> aig_gates;
@ -245,7 +245,7 @@ struct XAigerWriter
unused_bits.erase(D); unused_bits.erase(D);
undriven_bits.erase(Q); undriven_bits.erase(Q);
alias_map[Q] = D; alias_map[Q] = D;
auto r = ff_bits.insert(std::make_pair(D, std::make_pair(0, State::Sx))); auto r = ff_bits.insert(std::make_pair(D, std::make_pair(0, 2)));
log_assert(r.second); log_assert(r.second);
continue; continue;
} }
@ -369,10 +369,16 @@ struct XAigerWriter
it = cell->attributes.find(ID(abc9_init)); it = cell->attributes.find(ID(abc9_init));
log_assert(it != cell->attributes.end()); log_assert(it != cell->attributes.end());
log_assert(GetSize(it->second) == 1); log_assert(GetSize(it->second) == 1);
rhs.second = it->second[0]; if (it->second[0] == State::S1)
rhs.second = 1;
else if (it->second[0] == State::S0)
rhs.second = 0;
else {
log_assert(it->second[0] == State::Sx);
rhs.second = 0;
}
cell->attributes.erase(it); cell->attributes.erase(it);
auto arrival = r.first->second.second; auto arrival = r.first->second.second;
if (arrival) if (arrival)
arrival_times[d] = arrival; arrival_times[d] = arrival;
@ -815,13 +821,8 @@ struct XAigerWriter
int mergeability = i.second.first; int mergeability = i.second.first;
log_assert(mergeability > 0); log_assert(mergeability > 0);
write_r_buffer(mergeability); write_r_buffer(mergeability);
State init = i.second.second; int init = i.second.second;
if (init == State::S1) write_s_buffer(init);
write_s_buffer(1);
else if (init == State::S0)
write_s_buffer(0);
else
write_s_buffer(0);
write_i_buffer(arrival_times.at(bit, 0)); write_i_buffer(arrival_times.at(bit, 0));
//write_o_buffer(0); //write_o_buffer(0);
} }