mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-27 10:55:50 +00:00
Code Activity

fix #4200

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-05-03 18:10:26 -07:00
parent 6f48c9ce51
commit 2a93ac3d81
3 changed files with 33 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

23
azure-pipelines.yml
View file

@ -145,18 +145,11 @@ jobs:
- template: scripts/test-regressions.yml
- job: "WindowsLatest"
displayName: "Windows Latest build"
displayName: "Windows"
pool:
vmImage: "windows-latest"
strategy:
matrix:
x64:
arch: 'x64'
setupCmd1: ''
setupCmd2: ''
setupCmd3: ''
bindings: '-DZ3_BUILD_DOTNET_BINDINGS=True -DZ3_BUILD_JAVA_BINDINGS=True -DZ3_BUILD_PYTHON_BINDINGS=True'
runTests: 'True'
x86:
arch: 'x86'
setupCmd1: ''
@ -164,6 +157,13 @@ jobs:
setupCmd3: ''
bindings: '-DZ3_BUILD_PYTHON_BINDINGS=True'
runTests: 'False'
x64:
arch: 'x64'
setupCmd1: 'julia -e "using Pkg; Pkg.add(PackageSpec(name=\"libcxxwrap_julia_jll\", version=\"0.7.0\"))"'
setupCmd2: 'julia -e "using libcxxwrap_julia_jll; print(dirname(libcxxwrap_julia_jll.libcxxwrap_julia_path))" > tmp.env'
setupCmd3: 'set /P JlCxxDir=<tmp.env'
bindings: '-DJlCxx_DIR=%JlCxxDir%\..\lib\cmake\JlCxx -DZ3_BUILD_JULIA_BINDINGS=True -DZ3_BUILD_DOTNET_BINDINGS=True -DZ3_BUILD_JAVA_BINDINGS=True -DZ3_BUILD_PYTHON_BINDINGS=True'
runTests: 'True'
arm64:
arch: 'amd64_arm64'
setupCmd1: ''
@ -171,13 +171,6 @@ jobs:
setupCmd3: ''
bindings: ''
runTests: 'False'
Julia:
arch: 'x64'
setupCmd1: 'julia -e "using Pkg; Pkg.add(PackageSpec(name=\"libcxxwrap_julia_jll\", version=\"0.7.0\"))"'
setupCmd2: 'julia -e "using libcxxwrap_julia_jll; print(dirname(libcxxwrap_julia_jll.libcxxwrap_julia_path))" > tmp.env'
setupCmd3: 'set /P JlCxxDir=<tmp.env'
bindings: '-DJlCxx_DIR=%JlCxxDir%\..\lib\cmake\JlCxx -DZ3_BUILD_JULIA_BINDINGS=True'
runTests: 'False'
steps:
- script: md build
- script: |

2
src/model/model_evaluator.cpp
View file

@ -254,6 +254,8 @@ struct evaluator_cfg : public default_rewriter_cfg {
}
func_interp * fi = m_model.get_func_interp(g);
if (fi && (result = fi->get_array_interp(g))) {
std::cout << g->get_name() << "\n";
std::cout << result << "\n";
model_evaluator ev(m_model, m_params);
result = ev(result);
m_pinned.push_back(result);

36
src/tactic/core/reduce_args_tactic.cpp
View file

@ -18,6 +18,7 @@ Notes:
--*/
#include "tactic/tactical.h"
#include "ast/ast_smt2_pp.h"
#include "ast/array_decl_plugin.h"
#include "ast/has_free_vars.h"
#include "util/map.h"
#include "ast/rewriter/rewriter_def.h"
@ -83,12 +84,14 @@ tactic * mk_reduce_args_tactic(ast_manager & m, params_ref const & p) {
struct reduce_args_tactic::imp {
ast_manager & m_manager;
bv_util m_bv;
array_util m_ar;
ast_manager & m() const { return m_manager; }
imp(ast_manager & m):
m_manager(m),
m_bv(m) {
m_bv(m),
m_ar(m) {
}
static bool is_var_plus_offset(ast_manager& m, bv_util& bv, expr* e, expr*& base) {
@ -118,25 +121,32 @@ struct reduce_args_tactic::imp {
struct find_non_candidates_proc {
ast_manager & m_manager;
bv_util & m_bv;
obj_hashtable<func_decl> & m_non_cadidates;
array_util & m_ar;
obj_hashtable<func_decl> & m_non_candidates;
find_non_candidates_proc(ast_manager & m, bv_util & bv, obj_hashtable<func_decl> & non_cadidates):
find_non_candidates_proc(ast_manager & m, bv_util & bv, array_util& ar, obj_hashtable<func_decl> & non_candidates):
m_manager(m),
m_bv(bv),
m_non_cadidates(non_cadidates) {
m_ar(ar),
m_non_candidates(non_candidates) {
}
void operator()(var * n) {}
void operator()(quantifier * n) {}
void operator()(quantifier *n) {}
void operator()(app * n) {
func_decl * d;
if (m_ar.is_as_array(n, d)) {
m_non_candidates.insert(d);
return;
}
if (n->get_num_args() == 0)
return; // ignore constants
func_decl * d = n->get_decl();
d = n->get_decl();
if (d->get_family_id() != null_family_id)
return; // ignore interpreted symbols
if (m_non_cadidates.contains(d))
if (m_non_candidates.contains(d))
return; // it is already in the set.
unsigned j = n->get_num_args();
while (j > 0) {
@ -144,17 +154,17 @@ struct reduce_args_tactic::imp {
if (may_be_unique(m_manager, m_bv, n->get_arg(j)))
return;
}
m_non_cadidates.insert(d);
m_non_candidates.insert(d);
}
};
/**
\brief Populate the table non_cadidates with function declarations \c f
\brief Populate the table non_candidates with function declarations \c f
such that there is a function application (f t1 ... tn) where t1 ... tn are not values.
*/
void find_non_candidates(goal const & g, obj_hashtable<func_decl> & non_candidates) {
non_candidates.reset();
find_non_candidates_proc proc(m_manager, m_bv, non_candidates);
find_non_candidates_proc proc(m_manager, m_bv, m_ar, non_candidates);
expr_fast_mark1 visited;
unsigned sz = g.size();
for (unsigned i = 0; i < sz; i++) {
@ -174,12 +184,12 @@ struct reduce_args_tactic::imp {
struct populate_decl2args_proc {
ast_manager & m_manager;
bv_util & m_bv;
obj_hashtable<func_decl> & m_non_cadidates;
obj_hashtable<func_decl> & m_non_candidates;
obj_map<func_decl, bit_vector> & m_decl2args;
obj_map<func_decl, svector<expr*> > m_decl2base; // for args = base + offset
populate_decl2args_proc(ast_manager & m, bv_util & bv, obj_hashtable<func_decl> & nc, obj_map<func_decl, bit_vector> & d):
m_manager(m), m_bv(bv), m_non_cadidates(nc), m_decl2args(d) {}
m_manager(m), m_bv(bv), m_non_candidates(nc), m_decl2args(d) {}
void operator()(var * n) {}
void operator()(quantifier * n) {}
@ -189,7 +199,7 @@ struct reduce_args_tactic::imp {
func_decl * d = n->get_decl();
if (d->get_family_id() != null_family_id)
return; // ignore interpreted symbols
if (m_non_cadidates.contains(d))
if (m_non_candidates.contains(d))
return; // declaration is not a candidate
unsigned j = n->get_num_args();
obj_map<func_decl, bit_vector>::iterator it = m_decl2args.find_iterator(d);