Skip to content

Fall back to checking equality of expressions in sim #997

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

Draft
oskgo wants to merge 2 commits into
base: main
Choose a base branch
from
+22 −15
Draft

Fall back to checking equality of expressions in sim #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8057bfa
Check equality of expressions up to convertibility
oskgo May 7, 2026
1c7b455
fall back to checking equality of expressions in `sim`
oskgo May 7, 2026
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
5 changes: 5 additions & 0 deletions src/ecPV.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,6 +1127,11 @@ module Mpv2 = struct
when EcReduction.EqTest.for_type env ty1 ty2
&& EcReduction.EqTest.for_type env b1.e_ty b2.e_ty ->
List.fold_left2 (add_eqs_loc env local) eqs (b1::es1) (b2::es2)
| _, _ when EcReduction.EqTest.for_expr env e1 e2 ->
let fv1 = e_read env e1 in
let fv2 = e_read env e2 in
union eqs (eq_refl (PV.union fv1 fv2))

| _, _ -> raise EqObsInError

let add_eqs env e1 e2 eqs = add_eqs_loc env Mid.empty eqs e1 e2
Expand Down
32 changes: 17 additions & 15 deletions src/ecReduction.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1864,26 +1864,28 @@ let hs_inv_alpha_eq hyps (inv1 : hs_inv) (inv2 : hs_inv) =
module EqTest = struct
include EqTest_base

include EqMod_base(struct
let for_expr env ~norm:_ alpha e1 e2 =
let convert e =
let f = (ss_inv_of_expr (EcIdent.create "&dummy") e).inv in
let for_expr env ~norm:_ alpha e1 e2 =
let convert e =
let f = (ss_inv_of_expr (EcIdent.create "&dummy") e).inv in

if Mid.is_empty alpha then f else

if Mid.is_empty alpha then f else
let subst =
Mid.fold
(fun x (y, ty) subst ->
Fsubst.f_bind_local subst x (f_local y ty))
alpha Fsubst.f_subst_id

let subst =
Mid.fold
(fun x (y, ty) subst ->
Fsubst.f_bind_local subst x (f_local y ty))
alpha Fsubst.f_subst_id
in Fsubst.f_subst subst f in

in Fsubst.f_subst subst f in
let f1 = convert e1 in
let f2 = convert e2 in

let f1 = convert e1 in
let f2 = convert e2 in
is_conv (LDecl.init env []) f1 f2

is_conv (LDecl.init env []) f1 f2
end)
include EqMod_base(struct
let for_expr = for_expr
end)

let for_pv = fun env ?(norm = true) -> for_pv env ~norm
let for_lv = fun env ?(norm = true) -> for_lv env ~norm
Expand Down
Loading