Skip to content

make the aig_prop_constraintt a member convert_trans_to_netlistt #1100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2025
Merged

make the aig_prop_constraintt a member convert_trans_to_netlistt #1100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 36 additions & 40 deletions src/trans-netlist/trans_to_netlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ class convert_trans_to_netlistt:public messaget
: messaget(_message_handler),
symbol_table(_symbol_table),
ns(_symbol_table),
dest(_dest)
dest(_dest),
aig_prop(dest, _message_handler)
{
}

Expand All @@ -59,7 +60,8 @@ class convert_trans_to_netlistt:public messaget
symbol_table_baset &symbol_table;
const namespacet ns;
netlistt &dest;

aig_prop_constraintt aig_prop;

literalt new_input();
std::size_t input_counter = 0;
irep_idt mode;
Expand Down Expand Up @@ -132,17 +134,13 @@ class convert_trans_to_netlistt:public messaget
std::size_t lhs_from, std::size_t lhs_to,
rhs_entryt &rhs_entry);

literalt convert_rhs(const rhst &rhs, propt &prop);
literalt convert_rhs(const rhst &);

void finalize_lhs(lhs_mapt::iterator, propt &prop);
void finalize_lhs(lhs_mapt::iterator);

void convert_lhs_rec(
const exprt &expr,
std::size_t from,
std::size_t to,
propt &prop);
void convert_lhs_rec(const exprt &expr, std::size_t from, std::size_t to);

void convert_constraints(propt &prop);
void convert_constraints();

void map_vars(
const irep_idt &module,
Expand Down Expand Up @@ -294,9 +292,6 @@ void convert_trans_to_netlistt::operator()(

mode = ns.lookup(module).mode;

// build the net-list
aig_prop_constraintt aig_prop(dest, get_message_handler());

// extract constraints from transition relation
add_constraint(trans.invar());
add_constraint(trans.trans());
Expand All @@ -306,13 +301,15 @@ void convert_trans_to_netlistt::operator()(
it=lhs_map.begin();
it!=lhs_map.end();
it++)
finalize_lhs(it, aig_prop);

{
finalize_lhs(it);
}

// finish the var_map
dest.var_map.build_reverse_map();

// do the remaining transition constraints
convert_constraints(aig_prop);
convert_constraints();

dest.constraints.insert(
dest.constraints.end(), invar_constraints.begin(), invar_constraints.end());
Expand Down Expand Up @@ -370,7 +367,7 @@ Function: convert_trans_to_netlistt::convert_constraints

\*******************************************************************/

void convert_trans_to_netlistt::convert_constraints(propt &prop)
void convert_trans_to_netlistt::convert_constraints()
{
invar_constraints.reserve(
transition_constraints.size() + constraint_list.size());
Expand All @@ -383,8 +380,8 @@ void convert_trans_to_netlistt::convert_constraints(propt &prop)
it!=constraint_list.end();
it++)
{
literalt l=
instantiate_convert(prop, dest.var_map, *it, ns, get_message_handler());
literalt l = instantiate_convert(
aig_prop, dest.var_map, *it, ns, get_message_handler());

if(has_subexpr(*it, ID_next_symbol))
transition_constraints.push_back(l);
Expand All @@ -405,9 +402,7 @@ Function: convert_trans_to_netlistt::finalize_lhs

\*******************************************************************/

void convert_trans_to_netlistt::finalize_lhs(
lhs_mapt::iterator lhs_it,
propt &prop)
void convert_trans_to_netlistt::finalize_lhs(lhs_mapt::iterator lhs_it)
{
lhs_entryt &lhs=lhs_it->second;

Expand Down Expand Up @@ -437,7 +432,7 @@ void convert_trans_to_netlistt::finalize_lhs(
// do first one by setting the node appropriately

lhs.in_progress=true;
lhs.l=convert_rhs(lhs.equal_to.front(), prop);
lhs.l = convert_rhs(lhs.equal_to.front());

if(lhs.var->is_latch())
lhs.bit->next=lhs.l;
Expand All @@ -456,10 +451,9 @@ void convert_trans_to_netlistt::finalize_lhs(
{
// first one? -- already done
if(it==lhs.equal_to.begin()) continue;

literalt l_rhs=convert_rhs(*it, prop);
transition_constraints.push_back(
prop.lequal(lhs.l, l_rhs));

literalt l_rhs = convert_rhs(*it);
transition_constraints.push_back(aig_prop.lequal(lhs.l, l_rhs));
}
}

Expand All @@ -477,8 +471,8 @@ Function: convert_trans_to_netlistt::convert_lhs_rec

void convert_trans_to_netlistt::convert_lhs_rec(
const exprt &expr,
std::size_t from, std::size_t to,
propt &prop)
std::size_t from,
std::size_t to)
{
PRECONDITION(from <= to);

Expand All @@ -499,8 +493,8 @@ void convert_trans_to_netlistt::convert_lhs_rec(

// we only need to do wires
if(!it->second.var->is_wire()) return;
finalize_lhs(it, prop);

finalize_lhs(it);
}

return;
Expand All @@ -512,7 +506,7 @@ void convert_trans_to_netlistt::convert_lhs_rec(
to_extractbit_expr(expr).index(), i)) // constant?
{
from = i.to_ulong();
convert_lhs_rec(to_extractbit_expr(expr).src(), from, from, prop);
convert_lhs_rec(to_extractbit_expr(expr).src(), from, from);
return;
}
}
Expand All @@ -528,7 +522,7 @@ void convert_trans_to_netlistt::convert_lhs_rec(
from = new_from.to_ulong();
to = new_to.to_ulong();

convert_lhs_rec(to_extractbits_expr(expr).src(), from, to, prop);
convert_lhs_rec(to_extractbits_expr(expr).src(), from, to);
return;
}
}
Expand All @@ -548,7 +542,7 @@ void convert_trans_to_netlistt::convert_lhs_rec(
if(width==0)
continue;

convert_lhs_rec(*it, 0, width-1, prop);
convert_lhs_rec(*it, 0, width - 1);
}
}

Expand All @@ -564,24 +558,26 @@ Function: convert_trans_to_netlistt::convert_rhs

\*******************************************************************/

literalt convert_trans_to_netlistt::convert_rhs(
const rhst &rhs,
propt &prop)
literalt convert_trans_to_netlistt::convert_rhs(const rhst &rhs)
{
rhs_entryt &rhs_entry=*rhs.entry;

// done already?
if(!rhs_entry.converted)
{
// get all lhs symbols this depends on
convert_lhs_rec(rhs_entry.expr, 0, rhs_entry.width-1, prop);
convert_lhs_rec(rhs_entry.expr, 0, rhs_entry.width - 1);

rhs_entry.converted=true;

// now we can convert
instantiate_convert(
prop, dest.var_map, rhs_entry.expr, ns,
get_message_handler(), rhs_entry.bv);
aig_prop,
dest.var_map,
rhs_entry.expr,
ns,
get_message_handler(),
rhs_entry.bv);

DATA_INVARIANT(rhs_entry.bv.size() == rhs_entry.width, "bit-width match");
}
Expand Down
Loading