Implement execution of swine-z3 on SMT2 files#65
Implement execution of swine-z3 on SMT2 files#65SeRin-Yang wants to merge 43 commits intomoves-rwth:mainfrom
Conversation
Philipp15b
left a comment
There was a problem hiding this comment.
Thanks! I've left a bunch of comments.
z3rro/src/prover.rs
Outdated
| fn execute_swine(dir: &Path, file_path: &Path) { | ||
| let swine = "swine-z3"; | ||
|
|
||
| let find_output = Command::new("find") |
There was a problem hiding this comment.
I don't understand why you'd be using find here? It should be sufficient to just do the call to swine directly.
z3rro/src/prover.rs
Outdated
| .output().unwrap(); | ||
|
|
||
| if cmd_output.status.success() { | ||
| println!("{}", String::from_utf8_lossy(&cmd_output.stdout)); |
There was a problem hiding this comment.
The next step would be to parse the output of SWINE and return a SatResult.
z3rro/src/prover.rs
Outdated
| println!("{}", String::from_utf8_lossy(&cmd_output.stdout)); | ||
| break; | ||
| } else { | ||
| eprintln!("Failed to execute swine({}) command with status: {}", line, cmd_output.status); |
There was a problem hiding this comment.
Ideally, return a Result and return an error in this case.
z3rro/src/prover.rs
Outdated
| } | ||
| } | ||
| } else { | ||
| eprintln!("Find command execution failed"); |
z3rro/src/prover.rs
Outdated
| } | ||
| } | ||
|
|
||
| fn remove_lines_for_swine(input: &str) -> String { |
There was a problem hiding this comment.
Please add a doc comment saying which lines this removes.
z3rro/src/prover.rs
Outdated
| return ProveResult::Proof; | ||
| } | ||
|
|
||
| let mut smtlib = self.get_smtlib(); |
There was a problem hiding this comment.
As a next step, add an solver_type attribute of a new enum type SolverType with variants Z3 and SWINE, and then choose here whether to invoke either Z3 or SWINE.
There was a problem hiding this comment.
You can do this like we did it for SliceVerifyMethod and the SliceOptions::slice_verify_via option in main.rs.
…_proof_assuming functions
…and GetModelResponse
…utput as reason if unknown
z3rro/src/prover.rs
Outdated
| Ok((SatResult::Unsat, "".to_string())) | ||
| } else if first_line.trim().to_lowercase() == "sat" { | ||
| let _last_line = lines_buffer.pop_back().ok_or(ProverCommandError::ParseError)?; | ||
| if _last_line.contains("SHA") { |
There was a problem hiding this comment.
This looks strange and at least requires a comment why that's here.
z3rro/src/prover.rs
Outdated
| } else { | ||
| Err(ProverCommandError::ParseError) | ||
| } | ||
| } else { |
There was a problem hiding this comment.
We should only return Unknown if the SAT solver result is actually unknown. If there's a different result than we expected, we must throw an error.
z3rro/src/prover.rs
Outdated
| let mut input_buffer: VecDeque<char> = input.chars().collect(); | ||
| let mut cnt = 0; | ||
|
|
||
| while let Some(c) = input_buffer.pop_front() { |
There was a problem hiding this comment.
Maybe add a comment that you collect the full string for a (possibly multi-line) SMTLIB command by looking for the corresponding closed parenthesis, while counting nested parenthesis.
z3rro/src/prover.rs
Outdated
| self.min_level_with_provables.get_or_insert(self.level); | ||
| } | ||
|
|
||
There was a problem hiding this comment.
Be sure to have your editor automatically remove trailing spaces. cargo fmt --all should remove these as well, I think.
| } | ||
| } | ||
| SolverType::Z3 => { | ||
| let res = match &self.last_result { |
There was a problem hiding this comment.
All of this logic needs to happen for the SWINE calls as well! This includes returning cached results, checking with assumptions (where did the assumptions go when using SWINE??) and caching results afterwards.
z3rro/src/test.rs
Outdated
| ProveResult::Proof => {} | ||
| Ok(ProveResult::Unknown(reason)) => panic!("solver returned unknown ({})", reason), | ||
| Ok(ProveResult::Proof) => {}, | ||
| Err(_) => {} |
There was a problem hiding this comment.
why is the error here silently ignored?
z3rro/Cargo.toml
Outdated
| im-rc = "15" | ||
| enum-map = "2.7.3" | ||
| itertools = "0.14.0" | ||
| smtlib-lowlevel = "0.3.0" |
There was a problem hiding this comment.
Are we using this still?
|
W.r.t. the "the |
src/slicing/solver.rs
Outdated
| prover.add_assumption(&at_most_n_true); | ||
| if !slice_vars.is_empty() { | ||
| let at_most_n_true = match prover.get_smt_solver() { | ||
| SolverType::CVC5 | SolverType::YICES => at_most_k(ctx, at_most_n as i64, active_slice_vars), |
There was a problem hiding this comment.
I'd have the function at_most_k take a SolverType parameter, and have it do the decision of whether to call Bool::pb_le or your own at_most_k implementation.
src/slicing/solver.rs
Outdated
| ProveResult::Counterexample | ProveResult::Unknown(_) => None, | ||
| } | ||
| }); | ||
| let res_seed = match check_proof_seed(&all_variables, prover, limits_ref, &seed) { |
There was a problem hiding this comment.
Wait, I don't think this is the same behavior! shrink_block_unsat should call check_proof_seed as before!
src/slicing/solver.rs
Outdated
| ProveResult::Proof | ProveResult::Unknown(_) => false, | ||
| } | ||
| }); | ||
| let res_seed = match check_proof_seed(&all_variables, prover, limits_ref, &seed) { |
There was a problem hiding this comment.
Same as before, this is not the same behavior!
z3rro/src/prover.rs
Outdated
| Smtlib::from_solver(self.get_solver()) | ||
| } | ||
|
|
||
| pub fn get_smt_solver(&self) -> SolverType { |
There was a problem hiding this comment.
This should be named get_solver_type
No description provided.