pghs975uc
/
infer_clone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[sledge] Simplify use of solve_extract in Context.solve_for_vars

Browse Source 
Summary:
When used by the first-order solver, solve_extract may generate fresh
variables to express the solution substitutions, but when used by
quantifier elimination via solve_for_vars, fresh variables should not
be generated. This diff makes the difference between these use cases
simpler and clearer by replacing the obscure filter predicate argument
that is passed eventually to compose1 with a boolean indicating
whether fresh variables may be generated.

Reviewed By: jvillard

Differential Revision: D25756562

fbshipit-source-id: 53a35b71c
master
Josh Berdine 4 years ago committed by Facebook GitHub Bot
parent 440aed0f09
commit 01c8024a50
2 changed files with 91 additions and 57 deletions
Show Stats Download Patch File Download Diff File

118
sledge/src/fol/context.ml
Unescape View File

@ -237,12 +237,8 @@ let orient e f =
let norm (_, _, s) e = Subst.norm s e let norm (_, _, s) e = Subst.norm s e
let compose1 ?f ~var ~rep (us, xs, s) = let compose1 ~var ~rep (us, xs, s) =
let s = let s = Subst.compose1 ~key:var ~data:rep s in
match f with
| Some f when not (f var rep) -> s
| _ -> Subst.compose1 ~key:var ~data:rep s
in
Some (us, xs, s) Some (us, xs, s)
let fresh name (wrt, xs, s) = let fresh name (wrt, xs, s) =
@ -250,7 +246,7 @@ let fresh name (wrt, xs, s) =
let xs = Var.Set.add x xs in let xs = Var.Set.add x xs in
(Trm.var x, (wrt, xs, s)) (Trm.var x, (wrt, xs, s))
let solve_poly ?f p q s = let solve_poly p q s =
[%trace] [%trace]
~call:(fun {pf} -> pf "@ %a = %a" Trm.pp p Trm.pp q) ~call:(fun {pf} -> pf "@ %a = %a" Trm.pp p Trm.pp q)
~retn:(fun {pf} -> function ~retn:(fun {pf} -> function
@ -259,16 +255,16 @@ let solve_poly ?f p q s =
@@ fun () -> @@ fun () ->
match Trm.sub p q with match Trm.sub p q with
| Z z -> if Z.equal Z.zero z then Some s else None | Z z -> if Z.equal Z.zero z then Some s else None
| Var _ as var -> compose1 ?f ~var ~rep:Trm.zero s | Var _ as var -> compose1 ~var ~rep:Trm.zero s
| p_q -> ( | p_q -> (
match Trm.Arith.solve_zero_eq p_q with match Trm.Arith.solve_zero_eq p_q with
| Some (var, rep) -> | Some (var, rep) ->
compose1 ?f ~var:(Trm.arith var) ~rep:(Trm.arith rep) s compose1 ~var:(Trm.arith var) ~rep:(Trm.arith rep) s
| None -> compose1 ?f ~var:p_q ~rep:Trm.zero s ) | None -> compose1 ~var:p_q ~rep:Trm.zero s )
(* α[o,l) = β ==> l = |β| ∧ α = (⟨n,c⟩[0,o) ^ β ^ ⟨n,c⟩[o+l,n-o-l)) where n (* α[o,l) = β ==> l = |β| ∧ α = (⟨n,c⟩[0,o) ^ β ^ ⟨n,c⟩[o+l,n-o-l)) where n
= |α| and c fresh *) = |α| and c fresh *)
let rec solve_extract ?f a o l b s = let rec solve_extract ?(no_fresh = false) a o l b s =
[%trace] [%trace]
~call:(fun {pf} -> ~call:(fun {pf} ->
pf "@ %a = %a@ %a%a" Trm.pp pf "@ %a = %a@ %a%a" Trm.pp
@ -278,23 +274,25 @@ let rec solve_extract ?f a o l b s =
| Some (_, xs, s) -> pf "%a%a" Var.Set.pp_xs xs Subst.pp s | Some (_, xs, s) -> pf "%a%a" Var.Set.pp_xs xs Subst.pp s
| None -> pf "false" ) | None -> pf "false" )
@@ fun () -> @@ fun () ->
let n = Trm.seq_size_exn a in if no_fresh then Some s
let c, s = fresh "c" s in else
let n_c = Trm.sized ~siz:n ~seq:c in let n = Trm.seq_size_exn a in
let o_l = Trm.add o l in let c, s = fresh "c" s in
let n_o_l = Trm.sub n o_l in let n_c = Trm.sized ~siz:n ~seq:c in
let c0 = Trm.extract ~seq:n_c ~off:Trm.zero ~len:o in let o_l = Trm.add o l in
let c1 = Trm.extract ~seq:n_c ~off:o_l ~len:n_o_l in let n_o_l = Trm.sub n o_l in
let b, s = let c0 = Trm.extract ~seq:n_c ~off:Trm.zero ~len:o in
match Trm.seq_size b with let c1 = Trm.extract ~seq:n_c ~off:o_l ~len:n_o_l in
| None -> (Trm.sized ~siz:l ~seq:b, Some s) let b, s =
| Some m -> (b, solve_ ?f l m s) match Trm.seq_size b with
in | None -> (Trm.sized ~siz:l ~seq:b, Some s)
s >>= solve_ ?f a (Trm.concat [|c0; b; c1|]) | Some m -> (b, solve_ l m s)
in
s >>= solve_ a (Trm.concat [|c0; b; c1|])
(* α₀^…^αᵢ^αⱼ^…^αᵥ = β ==> |α₀^…^αᵥ| = |β| ∧ … ∧ αⱼ = β[n₀+…+nᵢ,nⱼ) ∧ … (* α₀^…^αᵢ^αⱼ^…^αᵥ = β ==> |α₀^…^αᵥ| = |β| ∧ … ∧ αⱼ = β[n₀+…+nᵢ,nⱼ) ∧ …
where nₓ ≡ |αₓ| and m = |β| *) where nₓ ≡ |αₓ| and m = |β| *)
and solve_concat ?f a0V b m s = and solve_concat ?no_fresh a0V b m s =
[%trace] [%trace]
~call:(fun {pf} -> ~call:(fun {pf} ->
pf "@ %a = %a@ %a%a" Trm.pp (Trm.concat a0V) Trm.pp b Var.Set.pp_xs pf "@ %a = %a@ %a%a" Trm.pp (Trm.concat a0V) Trm.pp b Var.Set.pp_xs
@ -307,12 +305,12 @@ and solve_concat ?f a0V b m s =
~f:(fun aJ (s, oI) -> ~f:(fun aJ (s, oI) ->
let nJ = Trm.seq_size_exn aJ in let nJ = Trm.seq_size_exn aJ in
let oJ = Trm.add oI nJ in let oJ = Trm.add oI nJ in
match solve_ ?f aJ (Trm.extract ~seq:b ~off:oI ~len:nJ) s with match solve_ ?no_fresh aJ (Trm.extract ~seq:b ~off:oI ~len:nJ) s with
| Some s -> `Continue (s, oJ) | Some s -> `Continue (s, oJ)
| None -> `Stop None ) | None -> `Stop None )
~finish:(fun (s, n0V) -> solve_ ?f n0V m s) ~finish:(fun (s, n0V) -> solve_ ?no_fresh n0V m s)
and solve_ ?f d e s = and solve_ ?no_fresh d e s =
[%Trace.call fun {pf} -> [%Trace.call fun {pf} ->
pf "@ %a@[%a@ %a@ %a@]" Var.Set.pp_xs (snd3 s) Trm.pp d Trm.pp e pf "@ %a@[%a@ %a@ %a@]" Var.Set.pp_xs (snd3 s) Trm.pp d Trm.pp e
Subst.pp (trd3 s)] Subst.pp (trd3 s)]
@ -327,66 +325,72 @@ and solve_ ?f d e s =
*) *)
(* ⟨0,a⟩ = β ==> a = β = ⟨⟩ *) (* ⟨0,a⟩ = β ==> a = β = ⟨⟩ *)
| Some (Sized {siz= n; seq= a}, b) when n == Trm.zero -> | Some (Sized {siz= n; seq= a}, b) when n == Trm.zero ->
s |> solve_ ?f a (Trm.concat [||]) >>= solve_ ?f b (Trm.concat [||]) s
|> solve_ ?no_fresh a (Trm.concat [||])
>>= solve_ ?no_fresh b (Trm.concat [||])
| Some (b, Sized {siz= n; seq= a}) when n == Trm.zero -> | Some (b, Sized {siz= n; seq= a}) when n == Trm.zero ->
s |> solve_ ?f a (Trm.concat [||]) >>= solve_ ?f b (Trm.concat [||]) s
|> solve_ ?no_fresh a (Trm.concat [||])
>>= solve_ ?no_fresh b (Trm.concat [||])
(* ⟨n,0⟩ = α₀^…^αᵥ ==> … ∧ αⱼ = ⟨n,0⟩[n₀+…+nᵢ,nⱼ) ∧ … *) (* ⟨n,0⟩ = α₀^…^αᵥ ==> … ∧ αⱼ = ⟨n,0⟩[n₀+…+nᵢ,nⱼ) ∧ … *)
| Some ((Sized {siz= n; seq} as b), Concat a0V) when seq == Trm.zero -> | Some ((Sized {siz= n; seq} as b), Concat a0V) when seq == Trm.zero ->
solve_concat ?f a0V b n s solve_concat ?no_fresh a0V b n s
(* ⟨n,e^⟩ = α₀^…^αᵥ ==> … ∧ αⱼ = ⟨n,e^⟩[n₀+…+nᵢ,nⱼ) ∧ … *) (* ⟨n,e^⟩ = α₀^…^αᵥ ==> … ∧ αⱼ = ⟨n,e^⟩[n₀+…+nᵢ,nⱼ) ∧ … *)
| Some ((Sized {siz= n; seq= Splat _} as b), Concat a0V) -> | Some ((Sized {siz= n; seq= Splat _} as b), Concat a0V) ->
solve_concat ?f a0V b n s solve_concat ?no_fresh a0V b n s
| Some ((Var _ as v), (Concat a0V as c)) -> | Some ((Var _ as v), (Concat a0V as c)) ->
if not (Var.Set.mem (Var.of_ v) (Trm.fv c)) then if not (Var.Set.mem (Var.of_ v) (Trm.fv c)) then
(* v = α₀^…^αᵥ ==> v ↦ α₀^…^αᵥ when v ∉ fv(α₀^…^αᵥ) *) (* v = α₀^…^αᵥ ==> v ↦ α₀^…^αᵥ when v ∉ fv(α₀^…^αᵥ) *)
compose1 ?f ~var:v ~rep:c s compose1 ~var:v ~rep:c s
else else
(* v = α₀^…^αᵥ ==> ⟨|α₀^…^αᵥ|,v⟩ = α₀^…^αᵥ when v ∈ fv(α₀^…^αᵥ) *) (* v = α₀^…^αᵥ ==> ⟨|α₀^…^αᵥ|,v⟩ = α₀^…^αᵥ when v ∈ fv(α₀^…^αᵥ) *)
let m = Trm.seq_size_exn c in let m = Trm.seq_size_exn c in
solve_concat ?f a0V (Trm.sized ~siz:m ~seq:v) m s solve_concat ?no_fresh a0V (Trm.sized ~siz:m ~seq:v) m s
(* α₀^…^αᵥ = β₀^…^βᵤ ==> … ∧ αⱼ = (β₀^…^βᵤ)[n₀+…+nᵢ,nⱼ) ∧ … *) (* α₀^…^αᵥ = β₀^…^βᵤ ==> … ∧ αⱼ = (β₀^…^βᵤ)[n₀+…+nᵢ,nⱼ) ∧ … *)
| Some (Concat a0V, (Concat _ as c)) -> | Some (Concat a0V, (Concat _ as c)) ->
solve_concat ?f a0V c (Trm.seq_size_exn c) s solve_concat ?no_fresh a0V c (Trm.seq_size_exn c) s
(* α[o,l) = α₀^…^αᵥ ==> … ∧ αⱼ = α[o,l)[n₀+…+nᵢ,nⱼ) ∧ … *) (* α[o,l) = α₀^…^αᵥ ==> … ∧ αⱼ = α[o,l)[n₀+…+nᵢ,nⱼ) ∧ … *)
| Some ((Extract {len= l} as e), Concat a0V) -> solve_concat ?f a0V e l s | Some ((Extract {len= l} as e), Concat a0V) ->
solve_concat ?no_fresh a0V e l s
(* (*
* Extract * Extract
*) *)
| Some ((Var _ as v), (Extract {len= l} as e)) -> | Some ((Var _ as v), (Extract {len= l} as e)) ->
if not (Var.Set.mem (Var.of_ v) (Trm.fv e)) then if not (Var.Set.mem (Var.of_ v) (Trm.fv e)) then
(* v = α[o,l) ==> v ↦ α[o,l) when v ∉ fv(α[o,l)) *) (* v = α[o,l) ==> v ↦ α[o,l) when v ∉ fv(α[o,l)) *)
compose1 ?f ~var:v ~rep:e s compose1 ~var:v ~rep:e s
else else
(* v = α[o,l) ==> α[o,l) ↦ ⟨l,v⟩ when v ∈ fv(α[o,l)) *) (* v = α[o,l) ==> α[o,l) ↦ ⟨l,v⟩ when v ∈ fv(α[o,l)) *)
compose1 ?f ~var:e ~rep:(Trm.sized ~siz:l ~seq:v) s compose1 ~var:e ~rep:(Trm.sized ~siz:l ~seq:v) s
(* α[o,l) = β ==> … ∧ α = _^β^_ *) (* α[o,l) = β ==> … ∧ α = _^β^_ *)
| Some (Extract {seq= a; off= o; len= l}, e) -> solve_extract ?f a o l e s | Some (Extract {seq= a; off= o; len= l}, e) ->
solve_extract ?no_fresh a o l e s
(* (*
* Sized * Sized
*) *)
(* v = ⟨n,a⟩ ==> v = a *) (* v = ⟨n,a⟩ ==> v = a *)
| Some ((Var _ as v), Sized {seq= a}) -> s |> solve_ ?f v a | Some ((Var _ as v), Sized {seq= a}) -> s |> solve_ ?no_fresh v a
(* ⟨n,a⟩ = ⟨m,b⟩ ==> n = m ∧ a = β *) (* ⟨n,a⟩ = ⟨m,b⟩ ==> n = m ∧ a = β *)
| Some (Sized {siz= n; seq= a}, Sized {siz= m; seq= b}) -> | Some (Sized {siz= n; seq= a}, Sized {siz= m; seq= b}) ->
s |> solve_ ?f n m >>= solve_ ?f a b s |> solve_ ?no_fresh n m >>= solve_ ?no_fresh a b
(* ⟨n,a⟩ = β ==> n = |β| ∧ a = β *) (* ⟨n,a⟩ = β ==> n = |β| ∧ a = β *)
| Some (Sized {siz= n; seq= a}, b) -> | Some (Sized {siz= n; seq= a}, b) ->
( match Trm.seq_size b with ( match Trm.seq_size b with
| None -> Some s | None -> Some s
| Some m -> solve_ ?f n m s ) | Some m -> solve_ ?no_fresh n m s )
>>= solve_ ?f a b >>= solve_ ?no_fresh a b
(* (*
* Splat * Splat
*) *)
(* a^ = b^ ==> a = b *) (* a^ = b^ ==> a = b *)
| Some (Splat a, Splat b) -> s |> solve_ ?f a b | Some (Splat a, Splat b) -> s |> solve_ ?no_fresh a b
(* (*
* Arithmetic * Arithmetic
*) *)
(* p = q ==> p-q = 0 *) (* p = q ==> p-q = 0 *)
| Some (((Arith _ | Z _ | Q _) as p), q | q, ((Arith _ | Z _ | Q _) as p)) | Some (((Arith _ | Z _ | Q _) as p), q | q, ((Arith _ | Z _ | Q _) as p))
-> ->
solve_poly ?f p q s solve_poly p q s
(* (*
* Uninterpreted * Uninterpreted
*) *)
@ -394,17 +398,17 @@ and solve_ ?f d e s =
| Some (rep, var) -> | Some (rep, var) ->
assert (not (is_interpreted var)) ; assert (not (is_interpreted var)) ;
assert (not (is_interpreted rep)) ; assert (not (is_interpreted rep)) ;
compose1 ?f ~var ~rep s ) compose1 ~var ~rep s )
|> |>
[%Trace.retn fun {pf} -> [%Trace.retn fun {pf} ->
function function
| Some (_, xs, s) -> pf "%a%a" Var.Set.pp_xs xs Subst.pp s | Some (_, xs, s) -> pf "%a%a" Var.Set.pp_xs xs Subst.pp s
| None -> pf "false"] | None -> pf "false"]
let solve ?f ~wrt ~xs d e = let solve ~wrt ~xs d e =
[%Trace.call fun {pf} -> pf "@ %a@ %a" Trm.pp d Trm.pp e] [%Trace.call fun {pf} -> pf "@ %a@ %a" Trm.pp d Trm.pp e]
; ;
( solve_ ?f d e (wrt, xs, Subst.empty) ( solve_ d e (wrt, xs, Subst.empty)
|>= fun (_, xs, s) -> |>= fun (_, xs, s) ->
let xs = Var.Set.inter xs (Subst.fv s) in let xs = Var.Set.inter xs (Subst.fv s) in
(xs, s) ) (xs, s) )
@ -921,7 +925,7 @@ let solve_poly_eq us p' q' subst =
let solve_seq_eq ~wrt us e' f' subst = let solve_seq_eq ~wrt us e' f' subst =
[%Trace.call fun {pf} -> pf "@ %a = %a" Trm.pp e' Trm.pp f'] [%Trace.call fun {pf} -> pf "@ %a = %a" Trm.pp e' Trm.pp f']
; ;
let f x u = let x_ito_us x u =
(not (Var.Set.subset (Trm.fv x) ~of_:us)) (not (Var.Set.subset (Trm.fv x) ~of_:us))
&& Var.Set.subset (Trm.fv u) ~of_:us && Var.Set.subset (Trm.fv u) ~of_:us
in in
@ -931,16 +935,20 @@ let solve_seq_eq ~wrt us e' f' subst =
| Some n -> (a, n) | Some n -> (a, n)
| None -> (Trm.sized ~siz:n ~seq:a, n) | None -> (Trm.sized ~siz:n ~seq:a, n)
in in
let+ _, xs, s = solve_concat ~f ms a n (wrt, Var.Set.empty, subst) in let+ _, xs, s =
assert (Var.Set.disjoint xs (Subst.fv s)) ; solve_concat ~no_fresh:true ms a n (wrt, Var.Set.empty, subst)
in
assert (Var.Set.is_empty xs) ;
s s
in in
( match ((e' : Trm.t), (f' : Trm.t)) with ( match ((e' : Trm.t), (f' : Trm.t)) with
| (Concat ms as c), a when f c a -> solve_concat ms (Trm.seq_size_exn c) a | (Concat ms as c), a when x_ito_us c a ->
| a, (Concat ms as c) when f c a -> solve_concat ms (Trm.seq_size_exn c) a solve_concat ms (Trm.seq_size_exn c) a
| (Sized {seq= Var _ as v} as m), u when f m u -> | a, (Concat ms as c) when x_ito_us c a ->
solve_concat ms (Trm.seq_size_exn c) a
| (Sized {seq= Var _ as v} as m), u when x_ito_us m u ->
Some (Subst.compose1 ~key:v ~data:u subst) Some (Subst.compose1 ~key:v ~data:u subst)
| u, (Sized {seq= Var _ as v} as m) when f m u -> | u, (Sized {seq= Var _ as v} as m) when x_ito_us m u ->
Some (Subst.compose1 ~key:v ~data:u subst) Some (Subst.compose1 ~key:v ~data:u subst)
| _ -> None ) | _ -> None )
|> |>

30
sledge/src/test/context_test.ml
Unescape View File

@ -15,7 +15,10 @@ let%test_module _ =
(* let () = (* let () =
* Trace.init ~margin:160 * Trace.init ~margin:160
* ~config:(Result.get_ok (Trace.parse "+Equality")) * ~config:
* (Result.get_ok
* (Trace.parse
* "+Context-Context.canon-Context.canon_f-Context.norm"))
* () *) * () *)
[@@@warning "-32"] [@@@warning "-32"]
@ -60,7 +63,7 @@ let%test_module _ =
{| {|
%t_1 = g(%y_6, %z_7) = g(%y_6, %v_3) = %z_7 = %x_5 = %w_4 = %v_3 %t_1 = g(%y_6, %z_7) = g(%y_6, %v_3) = %z_7 = %x_5 = %w_4 = %v_3
= %u_2 = %u_2
{sat= true; {sat= true;
rep= [[%t_1 ↦ ]; rep= [[%t_1 ↦ ];
[%u_2 ↦ %t_1]; [%u_2 ↦ %t_1];
@ -84,4 +87,27 @@ let%test_module _ =
let%test _ = implies_eq r15 (Term.neg b) (Term.apply (Signed 1) [|!1|]) let%test _ = implies_eq r15 (Term.neg b) (Term.apply (Signed 1) [|!1|])
let%test _ = implies_eq r15 (Term.apply (Unsigned 1) [|b|]) !1 let%test _ = implies_eq r15 (Term.apply (Unsigned 1) [|b|]) !1
let%expect_test _ =
replay
{|(Solve_for_vars
(((Var (id 0) (name 2)) (Var (id 0) (name 6)) (Var (id 0) (name 8)))
((Var (id 5) (name a0)) (Var (id 6) (name b)) (Var (id 7) (name m))
(Var (id 8) (name a)) (Var (id 9) (name a0))))
((xs ()) (sat true)
(rep
(((Var (id 9) (name a0)) (Var (id 5) (name a0)))
((Var (id 8) (name a))
(Concat
((Sized (seq (Var (id 5) (name a0))) (siz (Z 4)))
(Sized (seq (Z 0)) (siz (Z 4))))))
((Var (id 7) (name m)) (Z 8))
((Var (id 6) (name b)) (Var (id 0) (name 2)))
((Var (id 5) (name a0)) (Var (id 5) (name a0)))
((Var (id 0) (name 6))
(Concat
((Sized (seq (Var (id 5) (name a0))) (siz (Z 4)))
(Sized (seq (Z 0)) (siz (Z 4))))))
((Var (id 0) (name 2)) (Var (id 0) (name 2)))))))|} ;
[%expect {| |}]
end ) end )

Write Preview
Loading…
Cancel
Save