Skip to content

SMT2 support for unbounded integers #1779

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 7 commits into from
Feb 20, 2018
Merged

SMT2 support for unbounded integers #1779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
698ccdd
use a ranged for
Jan 29, 2018
12ae728
fixes for integers in SMT2
Jan 29, 2018
57ecf15
+ is multi-ary in SMT-LIB2
Jan 30, 2018
dea2592
treat real and integer as 'numeric' in C front-end
Feb 12, 2018
a827c77
fix: add missing integer casts and operations
polgreen Jan 30, 2018
1ebec11
get values for nondet symbols
polgreen Jan 29, 2018
897e29e
Fix CMakeLists to correctly pass test exclusion flags
chrisr-diffblue Feb 19, 2018
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
10 changes: 5 additions & 5 deletions regression/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set(test_pl_path "${CMAKE_CURRENT_SOURCE_DIR}/test.pl")
macro(add_test_pl_profile name cmdline flag profile)
add_test(
NAME "${name}-${profile}"
COMMAND ${test_pl_path} -p -c ${cmdline} ${flag}
COMMAND ${test_pl_path} -p -c ${cmdline} ${flag} ${ARGN}
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
)
set_tests_properties("${name}-${profile}" PROPERTIES
Expand All @@ -14,10 +14,10 @@ endmacro(add_test_pl_profile)
macro(add_test_pl_tests cmdline)
get_filename_component(TEST_DIR_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
message(STATUS "Adding tests in directory: ${TEST_DIR_NAME}")
add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -C CORE)
add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -T THOROUGH)
add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -F FUTURE)
add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -K KNOWNBUG)
add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -C CORE ${ARGN})
add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -T THOROUGH ${ARGN})
add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -F FUTURE ${ARGN})
add_test_pl_profile("${TEST_DIR_NAME}" "${cmdline}" -K KNOWNBUG ${ARGN})
endmacro(add_test_pl_tests)

add_subdirectory(ansi-c)
Expand Down
2 changes: 1 addition & 1 deletion regression/cbmc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
add_test_pl_tests(
"$<TARGET_FILE:cbmc>"
"$<TARGET_FILE:cbmc>" -X smt-backend
)
4 changes: 2 additions & 2 deletions regression/cbmc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
default: tests.log

test:
@../test.pl -p -c ../../../src/cbmc/cbmc
@../test.pl -p -c ../../../src/cbmc/cbmc -X smt-backend

tests.log: ../test.pl
@../test.pl -p -c ../../../src/cbmc/cbmc
@../test.pl -p -c ../../../src/cbmc/cbmc -X smt-backend

show:
@for dir in *; do \
Expand Down
9 changes: 9 additions & 0 deletions regression/cbmc/integer-assignments1/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
int main()
{
__CPROVER_integer a, b;
a=0;
b=a;
b++;
b*=100;
__CPROVER_assert(0, "");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about a test that tests the property that distinguishes integers from bitvectors:

__CPROVER_integer a, b;
b = a + 1;
__CPROVER_assert(b > a, "");

}
7 changes: 7 additions & 0 deletions regression/cbmc/integer-assignments1/test.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CORE smt-backend
main.c
--trace --smt2
^EXIT=10$
^SIGNAL=0$
^ b=100
--
4 changes: 3 additions & 1 deletion src/ansi-c/c_typecheck_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,9 @@ class c_typecheck_baset:
src.id()==ID_c_bool ||
src.id()==ID_bool ||
src.id()==ID_c_enum_tag ||
src.id()==ID_c_bit_field;
src.id()==ID_c_bit_field ||
src.id()==ID_integer ||
src.id()==ID_real;
}

typedef std::unordered_map<irep_idt, irep_idt, irep_id_hash> asm_label_mapt;
Expand Down
6 changes: 6 additions & 0 deletions src/goto-programs/goto_trace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,12 @@ std::string trace_value_binary(
{
return expr.is_true()?"1":"0";
}
else if(type.id()==ID_integer)
{
mp_integer i;
if(!to_integer(expr, i) && i>=0)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is it necessary that the result is non-negative?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise it prints a negative binary number, which is at least unusual. Conversion to two's complement (as done for signed int) isn't obvious, as there is no width.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok.

return integer2string(i, 2);
}
}
else if(expr.id()==ID_array)
{
Expand Down
156 changes: 109 additions & 47 deletions src/solvers/smt2/smt2_conv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,15 @@ exprt smt2_convt::get(const exprt &expr) const
if(it!=identifier_map.end())
return it->second.value;
}
else if(expr.id()==ID_nondet_symbol)
{
const irep_idt &id=to_nondet_symbol_expr(expr).get_identifier();

identifier_mapt::const_iterator it=identifier_map.find(id);

if(it!=identifier_map.end())
return it->second.value;
}
else if(expr.id()==ID_member)
{
const member_exprt &member_expr=to_member_expr(expr);
Expand Down Expand Up @@ -239,7 +248,15 @@ constant_exprt smt2_convt::parse_literal(
value=string2integer(s.substr(2), 16);
}
else
PARSERERROR("smt2_convt::parse_literal can't parse \""+s+"\"");
{
// Numeral
value=string2integer(s);
}
}
else if(src.get_sub().size()==2 &&
src.get_sub()[0].id()=="-") // (- 100)
{
value=-string2integer(src.get_sub()[1].id_string());
}
else if(src.get_sub().size()==3 &&
src.get_sub()[0].id()=="_" &&
Expand Down Expand Up @@ -433,6 +450,9 @@ exprt smt2_convt::parse_rec(const irept &src, const typet &_type)

if(type.id()==ID_signedbv ||
type.id()==ID_unsignedbv ||
type.id()==ID_integer ||
type.id()==ID_rational ||
type.id()==ID_real ||
type.id()==ID_bv ||
type.id()==ID_fixedbv ||
type.id()==ID_floatbv)
Expand Down Expand Up @@ -970,7 +990,9 @@ void smt2_convt::convert_expr(const exprt &expr)
{
assert(expr.operands().size()==1);

if(expr.type().id()==ID_rational)
if(expr.type().id()==ID_rational ||
expr.type().id()==ID_integer ||
expr.type().id()==ID_real)
{
out << "(- ";
convert_expr(expr.op0());
Expand Down Expand Up @@ -1816,7 +1838,8 @@ void smt2_convt::convert_typecast(const typecast_exprt &expr)
src_type.id()==ID_unsignedbv ||
src_type.id()==ID_c_bool ||
src_type.id()==ID_fixedbv ||
src_type.id()==ID_pointer)
src_type.id()==ID_pointer ||
src_type.id()==ID_integer)
{
out << "(not (= ";
convert_expr(src);
Expand Down Expand Up @@ -2261,6 +2284,17 @@ void smt2_convt::convert_typecast(const typecast_exprt &expr)
else
UNEXPECTEDCASE("Unknown typecast "+src_type.id_string()+" -> float");
}
else if(dest_type.id()==ID_integer)
{
if(src_type.id()==ID_bool)
{
out << "(ite ";
convert_expr(src);
out <<" 1 0)";
}
else
UNEXPECTEDCASE("Unknown typecast "+src_type.id_string()+" -> integer");
}
else if(dest_type.id()==ID_c_bit_field)
{
std::size_t from_width=boolbv_width(src_type);
Expand Down Expand Up @@ -2847,19 +2881,41 @@ void smt2_convt::convert_plus(const plus_exprt &expr)
{
convert_expr(expr.op0());
}
else if(expr.operands().size()==2)
else
{
if(expr.type().id()==ID_unsignedbv ||
expr.type().id()==ID_signedbv ||
expr.type().id()==ID_fixedbv)
if(expr.type().id()==ID_rational ||
expr.type().id()==ID_integer ||
expr.type().id()==ID_real)
{
// these are multi-ary in SMT-LIB2
out << "(+";

for(const auto &op : expr.operands())
{
out << ' ';
convert_expr(op);
}

out << ')';
}
else if(expr.type().id()==ID_unsignedbv ||
expr.type().id()==ID_signedbv ||
expr.type().id()==ID_fixedbv)
{
// These could be chained, i.e., need not be binary,
// but at least MathSat doesn't like that.
out << "(bvadd ";
convert_expr(expr.op0());
out << " ";
convert_expr(expr.op1());
out << ")";
if(expr.operands().size()==2)
{
out << "(bvadd ";
convert_expr(expr.op0());
out << " ";
convert_expr(expr.op1());
out << ")";
}
else
{
convert_plus(to_plus_expr(make_binary(expr)));
}
}
else if(expr.type().id()==ID_floatbv)
{
Expand All @@ -2870,41 +2926,40 @@ void smt2_convt::convert_plus(const plus_exprt &expr)
}
else if(expr.type().id()==ID_pointer)
{
exprt p=expr.op0(), i=expr.op1();
if(expr.operands().size()==2)
{
exprt p=expr.op0(), i=expr.op1();

if(p.type().id()!=ID_pointer)
p.swap(i);
if(p.type().id()!=ID_pointer)
p.swap(i);

if(p.type().id()!=ID_pointer)
INVALIDEXPR("unexpected mixture in pointer arithmetic");
if(p.type().id()!=ID_pointer)
INVALIDEXPR("unexpected mixture in pointer arithmetic");

mp_integer element_size=
pointer_offset_size(expr.type().subtype(), ns);
assert(element_size>0);
mp_integer element_size=
pointer_offset_size(expr.type().subtype(), ns);
CHECK_RETURN(element_size>0);

out << "(bvadd ";
convert_expr(p);
out << " ";
out << "(bvadd ";
convert_expr(p);
out << " ";

if(element_size>=2)
{
out << "(bvmul ";
convert_expr(i);
out << " (_ bv" << element_size
<< " " << boolbv_width(expr.type()) << "))";
if(element_size>=2)
{
out << "(bvmul ";
convert_expr(i);
out << " (_ bv" << element_size
<< " " << boolbv_width(expr.type()) << "))";
}
else
convert_expr(i);

out << ')';
}
else
convert_expr(i);

out << ")";
}
else if(expr.type().id()==ID_rational)
{
out << "(+";
convert_expr(expr.op0());
out << " ";
convert_expr(expr.op1());
out << ")";
{
convert_plus(to_plus_expr(make_binary(expr)));
}
}
else if(expr.type().id()==ID_vector)
{
Expand Down Expand Up @@ -2948,10 +3003,6 @@ void smt2_convt::convert_plus(const plus_exprt &expr)
else
UNEXPECTEDCASE("unsupported type for +: "+expr.type().id_string());
}
else
{
convert_plus(to_plus_expr(make_binary(expr)));
}
}

/// Converting a constant or symbolic rounding mode to SMT-LIB. Only called when
Expand Down Expand Up @@ -3054,7 +3105,15 @@ void smt2_convt::convert_minus(const minus_exprt &expr)
{
assert(expr.operands().size()==2);

if(expr.type().id()==ID_unsignedbv ||
if(expr.type().id()==ID_integer)
{
out << "(- ";
convert_expr(expr.op0());
out << " ";
convert_expr(expr.op1());
out << ")";
}
else if(expr.type().id()==ID_unsignedbv ||
expr.type().id()==ID_signedbv ||
expr.type().id()==ID_fixedbv)
{
Expand Down Expand Up @@ -3285,7 +3344,9 @@ void smt2_convt::convert_mult(const mult_exprt &expr)

out << "))"; // bvmul, extract
}
else if(expr.type().id()==ID_rational)
else if(expr.type().id()==ID_rational ||
expr.type().id()==ID_integer ||
expr.type().id()==ID_real)
{
out << "(*";

Expand Down Expand Up @@ -4378,7 +4439,8 @@ void smt2_convt::convert_type(const typet &type)
out << "(_ BitVec "
<< floatbv_type.get_width() << ")";
}
else if(type.id()==ID_rational)
else if(type.id()==ID_rational ||
type.id()==ID_real)
out << "Real";
else if(type.id()==ID_integer)
out << "Int";
Expand Down
11 changes: 5 additions & 6 deletions src/solvers/smt2/smt2_dec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ decision_proceduret::resultt smt2_dect::read_result(std::istream &in)
// Examples:
// ( (B0 true) )
// ( (|__CPROVER_pipe_count#1| (_ bv0 32)) )
// ( (|some_integer| 0) )
// ( (|some_integer| (- 10)) )

values[s0.id()]=s1;
}
Expand All @@ -216,14 +218,11 @@ decision_proceduret::resultt smt2_dect::read_result(std::istream &in)
}
}

for(identifier_mapt::iterator
it=identifier_map.begin();
it!=identifier_map.end();
it++)
for(auto &assignment : identifier_map)
{
std::string conv_id=convert_identifier(it->first);
std::string conv_id=convert_identifier(assignment.first);
const irept &value=values[conv_id];
it->second.value=parse_rec(value, it->second.type);
assignment.second.value=parse_rec(value, assignment.second.type);
}

// Booleans
Expand Down