diff options
author | 2017-11-07 00:43:37 -0500 | |
---|---|---|
committer | 2017-11-07 00:54:45 -0500 | |
commit | e82f495c3fcdd037e85708b23c11abc37de5d918 (patch) | |
tree | fd295022d68d4423acde70f98904d249b78feb82 /src/Specific/Framework | |
parent | b981e12340271bb066a881577d3c7dfaa8aabe25 (diff) |
Use div_cps and modulo_cps in more places
After | File Name | Before || Change | % Change
--------------------------------------------------------------------------------------------------------
10m04.41s | Total | 10m03.68s || +0m00.73s | +0.12%
--------------------------------------------------------------------------------------------------------
3m04.06s | Specific/X25519/C64/ladderstep | 3m04.00s || +0m00.06s | +0.03%
1m48.23s | Specific/NISTP256/AMD64/femul | 1m48.30s || -0m00.07s | -0.06%
0m38.59s | Arithmetic/Karatsuba | 0m38.51s || +0m00.08s | +0.20%
0m22.50s | Specific/X25519/C64/femul | 0m23.15s || -0m00.64s | -2.80%
0m21.79s | Specific/NISTP256/AMD64/fesub | 0m21.76s || +0m00.02s | +0.13%
0m19.78s | Specific/NISTP256/AMD64/feadd | 0m19.94s || -0m00.16s | -0.80%
0m18.57s | Specific/X25519/C64/freeze | 0m18.57s || +0m00.00s | +0.00%
0m17.96s | Specific/X25519/C64/fesquare | 0m18.36s || -0m00.39s | -2.17%
0m16.54s | Specific/NISTP256/AMD64/feopp | 0m16.18s || +0m00.35s | +2.22%
0m14.58s | Specific/X25519/C64/fecarry | 0m14.76s || -0m00.17s | -1.21%
0m13.80s | Specific/NISTP256/AMD64/fenz | 0m13.84s || -0m00.03s | -0.28%
0m13.34s | Specific/X25519/C64/fesub | 0m13.57s || -0m00.23s | -1.69%
0m12.72s | Arithmetic/Saturated/AddSub | 0m12.74s || -0m00.01s | -0.15%
0m12.19s | Specific/X25519/C64/feadd | 0m12.48s || -0m00.29s | -2.32%
0m10.57s | Arithmetic/Saturated/MontgomeryAPI | 0m10.36s || +0m00.21s | +2.02%
0m10.17s | Arithmetic/Saturated/Core | 0m09.92s || +0m00.25s | +2.52%
0m06.47s | Specific/NISTP256/AMD64/Synthesis | 0m06.65s || -0m00.18s | -2.70%
0m06.02s | Arithmetic/Saturated/MulSplit | 0m05.87s || +0m00.14s | +2.55%
0m05.27s | Specific/X25519/C64/Synthesis | 0m05.45s || -0m00.18s | -3.30%
0m03.70s | Arithmetic/MontgomeryReduction/WordByWord/Proofs | 0m03.65s || +0m00.05s | +1.36%
0m03.66s | Specific/Framework/ArithmeticSynthesis/Montgomery | 0m03.70s || -0m00.04s | -1.08%
0m02.93s | Specific/Framework/ArithmeticSynthesis/Defaults | 0m02.60s || +0m00.33s | +12.69%
0m02.42s | Arithmetic/Saturated/Freeze | 0m02.45s || -0m00.03s | -1.22%
0m01.57s | Arithmetic/CoreUnfolder | 0m01.52s || +0m00.05s | +3.28%
0m01.44s | Specific/Framework/ArithmeticSynthesis/HelperTactics | 0m01.11s || +0m00.32s | +29.72%
0m01.29s | Specific/Framework/ArithmeticSynthesis/Karatsuba | 0m01.21s || +0m00.08s | +6.61%
0m01.19s | Specific/Framework/ArithmeticSynthesis/Base | 0m01.00s || +0m00.18s | +18.99%
0m01.04s | Arithmetic/Saturated/CoreUnfolder | 0m01.13s || -0m00.08s | -7.96%
0m01.00s | Arithmetic/Saturated/UniformWeight | 0m00.95s || +0m00.05s | +5.26%
0m00.92s | Arithmetic/Saturated/WrappersUnfolder | 0m00.96s || -0m00.03s | -4.16%
0m00.89s | Specific/Framework/SynthesisFramework | 0m01.00s || -0m00.10s | -10.99%
0m00.87s | Specific/Framework/ReificationTypes | 0m01.00s || -0m00.13s | -13.00%
0m00.84s | Specific/Framework/MontgomeryReificationTypesPackage | 0m00.82s || +0m00.02s | +2.43%
0m00.81s | Specific/Framework/ArithmeticSynthesis/MontgomeryPackage | 0m00.72s || +0m00.09s | +12.50%
0m00.80s | Specific/Framework/ArithmeticSynthesis/Freeze | 0m00.86s || -0m00.05s | -6.97%
0m00.78s | Arithmetic/MontgomeryReduction/WordByWord/Definition | 0m00.76s || +0m00.02s | +2.63%
0m00.77s | Specific/Framework/MontgomeryReificationTypes | 0m00.80s || -0m00.03s | -3.75%
0m00.76s | Arithmetic/Saturated/MulSplitUnfolder | 0m00.80s || -0m00.04s | -5.00%
0m00.76s | Specific/Framework/ArithmeticSynthesis/DefaultsPackage | 0m00.70s || +0m00.06s | +8.57%
0m00.75s | Specific/Framework/ArithmeticSynthesis/KaratsubaPackage | 0m00.64s || +0m00.10s | +17.18%
0m00.75s | Specific/Framework/ArithmeticSynthesis/LadderstepPackage | 0m00.71s || +0m00.04s | +5.63%
0m00.74s | Arithmetic/Saturated/Wrappers | 0m00.78s || -0m00.04s | -5.12%
0m00.73s | Arithmetic/Saturated/FreezeUnfolder | 0m00.77s || -0m00.04s | -5.19%
0m00.72s | Specific/Framework/ArithmeticSynthesis/SquareFromMul | 0m00.72s || +0m00.00s | +0.00%
0m00.72s | Specific/Framework/ReificationTypesPackage | 0m00.84s || -0m00.12s | -14.28%
0m00.71s | Specific/Framework/ArithmeticSynthesis/FreezePackage | 0m00.69s || +0m00.02s | +2.89%
0m00.70s | Specific/Framework/ArithmeticSynthesis/Ladderstep | 0m00.67s || +0m00.02s | +4.47%
0m00.69s | Specific/Framework/ArithmeticSynthesis/BasePackage | 0m01.03s || -0m00.34s | -33.00%
0m00.66s | Arithmetic/Saturated/UniformWeightInstances | 0m00.67s || -0m00.01s | -1.49%
0m15.65s | Arithmetic/Core | 0m14.01s || +0m01.64s | +11.70%
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. |