diff options
Diffstat (limited to 'src/Specific/Framework')
| -rw-r--r-- | src/Specific/Framework/ArithmeticSynthesis/Base.v | 4 | ||||
| -rw-r--r-- | src/Specific/Framework/ArithmeticSynthesis/Defaults.v | 11 | ||||
| -rw-r--r-- | src/Specific/Framework/ArithmeticSynthesis/HelperTactics.v | 16 |
3 files changed, 17 insertions, 14 deletions
diff --git a/src/Specific/Framework/ArithmeticSynthesis/Base.v b/src/Specific/Framework/ArithmeticSynthesis/Base.v index a3ed3dfef..490ff35c7 100644 --- a/src/Specific/Framework/ArithmeticSynthesis/Base.v +++ b/src/Specific/Framework/ArithmeticSynthesis/Base.v @@ -49,7 +49,7 @@ Section gen. Definition half_sz' := (sz / 2)%nat. Definition m_enc' - := Positional.encode (modulo:=modulo) (div:=div) (n:=sz) wt (Z.pos m). + := Positional.encode (modulo_cps:=@modulo_cps) (div_cps:=@div_cps) (n:=sz) wt (Z.pos m). Lemma sz2'_nonzero (sz_nonzero : sz <> 0%nat) @@ -152,7 +152,7 @@ Section gen. destruct (Nat.eq_dec sz 0). { subst; reflexivity. } { repeat autounfold; autorewrite with uncps push_id push_basesystem_eval. - rewrite Positional.eval_encode by auto. + rewrite Positional.eval_encode by (intros; autorewrite with uncps; unfold id; auto). cbv [mod_eq] in *. push_Zmod; rewrite Hv'; pull_Zmod. reflexivity. } diff --git a/src/Specific/Framework/ArithmeticSynthesis/Defaults.v b/src/Specific/Framework/ArithmeticSynthesis/Defaults.v index 023d0821d..75360a92d 100644 --- a/src/Specific/Framework/ArithmeticSynthesis/Defaults.v +++ b/src/Specific/Framework/ArithmeticSynthesis/Defaults.v @@ -28,7 +28,7 @@ Local Ltac solve_constant_local_sig := idtac; lazymatch goal with | [ |- { c : Z^?sz | Positional.Fdecode (m:=?M) ?wt c = ?v } ] - => (exists (Positional.encode (n:=sz) (modulo:=modulo) (div:=div) wt (F.to_Z (m:=M) v))); + => (exists (Positional.encode (n:=sz) (modulo_cps:=@modulo_cps) (div_cps:=@div_cps) wt (F.to_Z (m:=M) v))); lazymatch goal with | [ sz_nonzero : sz <> 0%nat, base_pos : (1 <= _)%Q |- _ ] => clear -base_pos sz_nonzero @@ -37,7 +37,8 @@ Local Ltac solve_constant_local_sig := abstract ( setoid_rewrite Positional.Fdecode_Fencode_id; [ reflexivity - | auto using wt_gen0_1, wt_gen_nonzero, wt_gen_divides', div_mod.. ] + | auto using wt_gen0_1, wt_gen_nonzero, wt_gen_divides', div_mod; + intros; autorewrite with uncps push_id; auto using div_mod.. ] ). Section gen. @@ -118,8 +119,7 @@ Section gen. unfold chained_carries'. rewrite IHcarry_chains by auto. repeat autounfold; autorewrite with uncps push_id push_basesystem_eval. - rewrite Positional.eval_carry by auto. - rewrite Positional.eval_chained_carries by auto; reflexivity. } } + reflexivity. } } Defined. Definition constant_sig' v @@ -264,6 +264,7 @@ Section gen. | [ |- context[@proj1_sig ?A ?P ?x] ] => pattern (@proj1_sig A P x); exact (@proj2_sig A P x) + | _ => eauto using @Core.modulo_id, @Core.div_id with nocore end. Defined. @@ -403,6 +404,8 @@ Ltac pose_ring sz m wt wt_divides' sz_nonzero wt_nonzero zero_sig one_sig opp_si (Positional.Fdecode_Fencode_id (sz_nonzero := sz_nonzero) (div_mod := div_mod) + (modulo_cps_id:=@Core.modulo_id) + (div_cps_id:=@Core.div_id) wt eq_refl wt_nonzero wt_divides') (Positional.eq_Feq_iff wt) (proj2_sig add_sig) diff --git a/src/Specific/Framework/ArithmeticSynthesis/HelperTactics.v b/src/Specific/Framework/ArithmeticSynthesis/HelperTactics.v index e777fe23e..0b8c649a0 100644 --- a/src/Specific/Framework/ArithmeticSynthesis/HelperTactics.v +++ b/src/Specific/Framework/ArithmeticSynthesis/HelperTactics.v @@ -77,11 +77,11 @@ Section chained_carries_cps'. | nil => f a | carry_chain :: nil => Positional.chained_carries_cps - (n:=sz) (div:=div) (modulo:=modulo) wt a carry_chain f + (n:=sz) (div_cps:=@div_cps) (modulo_cps:=@modulo_cps) wt a carry_chain f | carry_chain :: carry_chains => Positional.chained_carries_cps - (n:=sz) (div:=div) (modulo:=modulo) wt a carry_chain - (fun r => Positional.carry_reduce_cps (n:=sz) (div:=div) (modulo:=modulo) wt s c r + (n:=sz) (div_cps:=@div_cps) (modulo_cps:=@modulo_cps) wt a carry_chain + (fun r => Positional.carry_reduce_cps (n:=sz) (div_cps:=@div_cps) (modulo_cps:=@modulo_cps) wt s c r (fun r' => chained_carries_cps' r' carry_chains f)) end. Fixpoint chained_carries_cps' (a : Tuple.tuple Z sz) (carry_chains : list (list nat)) @@ -93,11 +93,11 @@ Section chained_carries_cps'. : chained_carries_cps' a (carry_chain :: carry_chains) f = match length carry_chains with | O => Positional.chained_carries_cps - (n:=sz) (div:=div) (modulo:=modulo) wt a carry_chain f + (n:=sz) (div_cps:=@div_cps) (modulo_cps:=@modulo_cps) wt a carry_chain f | S _ => Positional.chained_carries_cps - (n:=sz) (div:=div) (modulo:=modulo) wt a carry_chain - (fun r => Positional.carry_reduce_cps (n:=sz) (div:=div) (modulo:=modulo) wt s c r + (n:=sz) (div_cps:=@div_cps) (modulo_cps:=@modulo_cps) wt a carry_chain + (fun r => Positional.carry_reduce_cps (n:=sz) (div_cps:=@div_cps) (modulo_cps:=@modulo_cps) wt s c r (fun r' => chained_carries_cps' r' carry_chains f)) end. Proof. @@ -114,7 +114,7 @@ Section chained_carries_cps'. destruct carry_chains as [|carry_chain carry_chains]; [ reflexivity | ]. cbv [chained_carries']. revert a carry_chain; induction carry_chains as [|? carry_chains IHcarry_chains]; intros. - { simpl; repeat autounfold; autorewrite with uncps; reflexivity. } + { simpl; repeat autounfold; autorewrite with uncps. reflexivity. } { rewrite !step_chained_carries_cps'. simpl @length; cbv iota beta. repeat autounfold; autorewrite with uncps. @@ -179,6 +179,6 @@ Ltac solve_constant_sig := lazymatch goal with | [ |- { c : Z^?sz | Positional.Fdecode (m:=?M) ?wt c = ?v } ] => let t := (eval vm_compute in - (Positional.encode (n:=sz) (modulo:=modulo) (div:=div) wt (F.to_Z (m:=M) v))) in + (Positional.encode (n:=sz) (modulo_cps:=@modulo_cps) (div_cps:=@div_cps) wt (F.to_Z (m:=M) v))) in (exists t; vm_decide) end. |