clean up and prune deps of Spec.v

1 files changed, 223 insertions, 301 deletions

diff --git a/src/Fancy/Spec.v b/src/Fancy/Spec.v
index 01147a2a4..7ffb357cd 100644
--- a/src/Fancy/Spec.v
+++ b/src/Fancy/Spec.v
@@ -1,124 +1,45 @@
-(* TODO: prune all these dependencies *)
-Require Import Coq.ZArith.ZArith Coq.micromega.Lia.
-Require Import Coq.derive.Derive.
-Require Import Coq.Bool.Bool.
-Require Import Coq.Strings.String.
-Require Import Coq.Lists.List.
-Require Crypto.Util.Strings.String.
-Require Import Crypto.Util.Strings.Decimal.
-Require Import Crypto.Util.Strings.HexString.
-Require Import QArith.QArith_base QArith.Qround Crypto.Util.QUtil.
-Require Import Crypto.Algebra.Ring Crypto.Util.Decidable.Bool2Prop.
-Require Import Crypto.Algebra.Ring.
-Require Import Crypto.Algebra.SubsetoidRing.
-Require Import Crypto.Util.ZRange.
-Require Import Crypto.Util.ListUtil.FoldBool.
-Require Import Crypto.Util.LetIn.
-Require Import Crypto.Arithmetic.PrimeFieldTheorems.
-Require Import Crypto.Util.ZUtil.Tactics.LtbToLt.
-Require Import Crypto.Util.ZUtil.Tactics.PullPush.Modulo.
-Require Import Crypto.Util.ZUtil.Tactics.DivModToQuotRem.
-Require Import Crypto.Util.ZUtil.Tactics.ZeroBounds.
-Require Import Crypto.Util.Tactics.SplitInContext.
-Require Import Crypto.Util.Tactics.SubstEvars.
-Require Import Crypto.Util.Tactics.DestructHead.
-Require Import Crypto.Util.Tuple.
-Require Import Crypto.Util.ListUtil Coq.Lists.List.
-Require Import Crypto.Util.Equality.
-Require Import Crypto.Util.Tactics.GetGoal.
-Require Import Crypto.Util.Tactics.UniquePose.
-Require Import Crypto.Util.ZUtil.Rshi.
-Require Import Crypto.Util.Option.
+Require Import Coq.ZArith.ZArith.
+Require Import Coq.Lists.List. Import ListNotations.
 Require Import Crypto.Util.Tactics.BreakMatch.
-Require Import Crypto.Util.Tactics.SpecializeBy.
-Require Import Crypto.Util.ZUtil.Zselect.
-Require Import Crypto.Util.ZUtil.AddModulo.
-Require Import Crypto.Util.ZUtil.CC.
-Require Import Crypto.Util.ZUtil.Modulo.
-Require Import Crypto.Util.ZUtil.Notations.
-Require Import Crypto.Util.ZUtil.Tactics.RewriteModSmall.
-Require Import Crypto.Util.ZUtil.Definitions.
-Require Import Crypto.Util.ZUtil.EquivModulo.
-Require Import Crypto.Util.ZUtil.Tactics.SplitMinMax.
-Require Import Crypto.Util.ErrorT.
-Require Import Crypto.Util.Strings.Show.
-Require Import Crypto.Util.ZRange.Operations.
-Require Import Crypto.Util.ZRange.BasicLemmas.
-Require Import Crypto.Util.ZRange.Show.
-Require Import Crypto.Arithmetic.
-Require Crypto.Language.
-Require Crypto.UnderLets.
-Require Crypto.AbstractInterpretation.
-Require Crypto.AbstractInterpretationProofs.
-Require Crypto.Rewriter.
-Require Crypto.MiscCompilerPasses.
-Require Crypto.CStringification.
-Require Export Crypto.PushButtonSynthesis.
+Require Import Crypto.Util.Tuple.
 Require Import Crypto.Util.Notations.
-Import ListNotations. Local Open Scope Z_scope.
-
-Import Associational Positional.
-
-Import
-  Crypto.Language
-  Crypto.UnderLets
-  Crypto.AbstractInterpretation
-  Crypto.AbstractInterpretationProofs
-  Crypto.Rewriter
-  Crypto.MiscCompilerPasses
-  Crypto.CStringification.
-
-Import
-  Language.Compilers
-  UnderLets.Compilers
-  AbstractInterpretation.Compilers
-  AbstractInterpretationProofs.Compilers
-  Rewriter.Compilers
-  MiscCompilerPasses.Compilers
-  CStringification.Compilers.
-
-Import Compilers.defaults.
-Local Coercion Z.of_nat : nat >-> Z.
-Local Coercion QArith_base.inject_Z : Z >-> Q.
-(* Notation "x" := (expr.Var x) (only printing, at level 9) : expr_scope. *)
-
-Import UnsaturatedSolinas.
-
-Module Fancy.
-
-  Module CC.
-    Inductive code : Type :=
-    | C : code
-    | M : code
-    | L : code
-    | Z : code
-    .
-
-    Record state :=
-      { cc_c : bool; cc_m : bool; cc_l : bool; cc_z : bool }.
-
-    Definition code_dec (x y : code) : {x = y} + {x <> y}.
-    Proof. destruct x, y; try apply (left eq_refl); right; congruence. Defined.
-
-    Definition update (to_write : list code) (result : BinInt.Z) (cc_spec : code -> BinInt.Z -> bool) (old_state : state)
-      : state :=
-      {|
-        cc_c := if (In_dec code_dec C to_write)
-                then cc_spec C result
-                else old_state.(cc_c);
-        cc_m := if (In_dec code_dec M to_write)
-                then cc_spec M result
-                else old_state.(cc_m);
-        cc_l := if (In_dec code_dec L to_write)
-                then cc_spec L result
-                else old_state.(cc_l);
-        cc_z := if (In_dec code_dec Z to_write)
-                then cc_spec Z result
-                else old_state.(cc_z)
-      |}.
-
-  End CC.
-
+Local Open Scope Z_scope.
+
+(* Condition code flags *)
+Module CC.
+  Inductive code : Type :=
+  | C : code
+  | M : code
+  | L : code
+  | Z : code
+  .
+
+  Record state :=
+    { cc_c : bool; cc_m : bool; cc_l : bool; cc_z : bool }.
+
+  Definition code_dec (x y : code) : {x = y} + {x <> y}.
+  Proof. destruct x, y; try apply (left eq_refl); right; congruence. Defined.
+
+  Definition update (to_write : list code) (result : BinInt.Z) (cc_spec : code -> BinInt.Z -> bool) (old_state : state)
+    : state :=
+    {|
+      cc_c := if (In_dec code_dec C to_write)
+              then cc_spec C result
+              else old_state.(cc_c);
+      cc_m := if (In_dec code_dec M to_write)
+              then cc_spec M result
+              else old_state.(cc_m);
+      cc_l := if (In_dec code_dec L to_write)
+              then cc_spec L result
+              else old_state.(cc_l);
+      cc_z := if (In_dec code_dec Z to_write)
+              then cc_spec Z result
+              else old_state.(cc_z)
+    |}.
+
+End CC.
+
+Section Language.
   Record instruction :=
     {
       num_source_regs : nat;
@@ -148,29 +69,31 @@ Module Fancy.
         interp cont new_cc new_ctx
       end.
   End expr.
-
-  Section ISA.
-    Import CC.
-
-    Definition cc_spec (x : CC.code) (result : BinInt.Z) : bool :=
-      match x with
-      | CC.C => Z.testbit result 256 (* carry bit *)
-      | CC.M => Z.testbit result 255 (* most significant bit *)
-      | CC.L => Z.testbit result 0   (* least significant bit *)
-      | CC.Z => result =? 0          (* whether equal to zero *)
-      end.
-
-    Definition lower128 x := (Z.land x (Z.ones 128)).
-    Definition upper128 x := (Z.shiftr x 128).
-    Local Notation "x '[C]'" := (if x.(cc_c) then 1 else 0) (at level 20).
-    Local Notation "x '[M]'" := (if x.(cc_m) then 1 else 0) (at level 20).
-    Local Notation "x '[L]'" := (if x.(cc_l) then 1 else 0) (at level 20).
-    Local Notation "x '[Z]'" := (if x.(cc_z) then 1 else 0) (at level 20).
-    Local Notation "'int'" := (BinInt.Z).
-    Local Notation "x << y" := ((x << y) mod (2^256)) : Z_scope. (* truncating left shift *)
-
-
-    (* Note: In the specification document, argument order gets a bit
+End Language.
+
+Section Instructions.
+  Import CC.
+
+  Definition cc_spec (x : CC.code) (result : BinInt.Z) : bool :=
+    match x with
+    | C => Z.testbit result 256 (* carry bit *)
+    | M => Z.testbit result 255 (* most significant bit *)
+    | L => Z.testbit result 0   (* least significant bit *)
+    | Z => result =? 0          (* whether equal to zero *)
+    end.
+
+  Definition lower128 x := (Z.land x (Z.ones 128)).
+  Definition upper128 x := (Z.shiftr x 128).
+  Local Notation "x '[C]'" := (if x.(cc_c) then 1 else 0) (at level 20).
+  Local Notation "x '[M]'" := (if x.(cc_m) then 1 else 0) (at level 20).
+  Local Notation "x '[L]'" := (if x.(cc_l) then 1 else 0) (at level 20).
+  Local Notation "x '[Z]'" := (if x.(cc_z) then 1 else 0) (at level 20).
+  Local Notation "'int'" := (BinInt.Z).
+  Local Notation "x << y" := ((Z.shiftl x y) mod (2^256)) : Z_scope. (* truncating left shift *)
+  Local Notation "x >> y" := (Z.shiftr x y) : Z_scope.
+
+
+  (* Note: In the specification document, argument order gets a bit
     confusing. Like here, r0 is always the first argument "source 0"
     and r1 the second. But the specification of MUL128LU is:
             (R[RS1][127:0] * R[RS0][255:128])
@@ -183,166 +106,165 @@ Module Fancy.
     take the high part of the first argument r0 and the low parts of
     r1. This is also true for MUL128UL. *)
 
-    Definition ADD (imm : int) : instruction :=
-      {|
-        num_source_regs := 2;
-        writes_conditions := [C; M; L; Z];
-        spec := (fun '(r0, r1) cc =>
-                   r0 + (r1 << imm))
-      |}.
-
-    Definition ADDC (imm : int) : instruction :=
-      {|
-        num_source_regs := 2;
-        writes_conditions := [C; M; L; Z];
-        spec := (fun '(r0, r1) cc =>
-                   r0 + (r1 << imm) + cc[C])
-      |}.
-
-    Definition SUB (imm : int) : instruction :=
-      {|
-        num_source_regs := 2;
-        writes_conditions := [C; M; L; Z];
-        spec := (fun '(r0, r1) cc =>
-                   r0 - (r1 << imm))
-      |}.
-
-    Definition SUBC (imm : int) : instruction :=
-      {|
-        num_source_regs := 2;
-        writes_conditions := [C; M; L; Z];
-        spec := (fun '(r0, r1) cc =>
-                   r0 - (r1 << imm) - cc[C])
-      |}.
-
-
-    Definition MUL128LL : instruction :=
-      {|
-        num_source_regs := 2;
-        writes_conditions := [M; L; Z];
-        spec := (fun '(r0, r1) cc =>
-                   (lower128 r0) * (lower128 r1))
-      |}.
-
-    Definition MUL128LU : instruction :=
-      {|
-        num_source_regs := 2;
-        writes_conditions := [M; L; Z];
-        spec := (fun '(r0, r1) cc =>
-                   (lower128 r1) * (upper128 r0)) (* see note *)
-      |}.
-
-    Definition MUL128UL : instruction :=
-      {|
-        num_source_regs := 2;
-        writes_conditions := [M; L; Z];
-        spec := (fun '(r0, r1) cc =>
-                   (upper128 r1) * (lower128 r0)) (* see note *)
-      |}.
-
-    Definition MUL128UU : instruction :=
-      {|
-        num_source_regs := 2;
-        writes_conditions := [M; L; Z];
-        spec := (fun '(r0, r1) cc =>
-                   (upper128 r0) * (upper128 r1))
-      |}.
-
-    (* Note : Unlike the other operations, the output of RSHI is
+  Definition ADD (imm : int) : instruction :=
+    {|
+      num_source_regs := 2;
+      writes_conditions := [C; M; L; Z];
+      spec := (fun '(r0, r1) cc =>
+                 r0 + (r1 << imm))
+    |}.
+
+  Definition ADDC (imm : int) : instruction :=
+    {|
+      num_source_regs := 2;
+      writes_conditions := [C; M; L; Z];
+      spec := (fun '(r0, r1) cc =>
+                 r0 + (r1 << imm) + cc[C])
+    |}.
+
+  Definition SUB (imm : int) : instruction :=
+    {|
+      num_source_regs := 2;
+      writes_conditions := [C; M; L; Z];
+      spec := (fun '(r0, r1) cc =>
+                 r0 - (r1 << imm))
+    |}.
+
+  Definition SUBC (imm : int) : instruction :=
+    {|
+      num_source_regs := 2;
+      writes_conditions := [C; M; L; Z];
+      spec := (fun '(r0, r1) cc =>
+                 r0 - (r1 << imm) - cc[C])
+    |}.
+
+
+  Definition MUL128LL : instruction :=
+    {|
+      num_source_regs := 2;
+      writes_conditions := [M; L; Z];
+      spec := (fun '(r0, r1) cc =>
+                 (lower128 r0) * (lower128 r1))
+    |}.
+
+  Definition MUL128LU : instruction :=
+    {|
+      num_source_regs := 2;
+      writes_conditions := [M; L; Z];
+      spec := (fun '(r0, r1) cc =>
+                 (lower128 r1) * (upper128 r0)) (* see note *)
+    |}.
+
+  Definition MUL128UL : instruction :=
+    {|
+      num_source_regs := 2;
+      writes_conditions := [M; L; Z];
+      spec := (fun '(r0, r1) cc =>
+                 (upper128 r1) * (lower128 r0)) (* see note *)
+    |}.
+
+  Definition MUL128UU : instruction :=
+    {|
+      num_source_regs := 2;
+      writes_conditions := [M; L; Z];
+      spec := (fun '(r0, r1) cc =>
+                 (upper128 r0) * (upper128 r1))
+    |}.
+
+  (* Note : Unlike the other operations, the output of RSHI is
     truncated in the specification. This is not strictly necessary,
     since the interpretation function truncates the output
     anyway. However, it is useful to make the definition line up
     exactly with Z.rshi. *)
-    Definition RSHI (imm : int) : instruction :=
-      {|
-        num_source_regs := 2;
-        writes_conditions := [M; L; Z];
-        spec := (fun '(r0, r1) cc =>
-                   (((2^256 * r0) + r1) >> imm) mod (2^256))
-      |}.
-
-    Definition SELC : instruction :=
-      {|
-        num_source_regs := 2;
-        writes_conditions := [];
-        spec := (fun '(r0, r1) cc =>
-                   if cc[C] =? 1 then r0 else r1)
-      |}.
-
-    Definition SELM : instruction :=
-      {|
-        num_source_regs := 2;
-        writes_conditions := [];
-        spec := (fun '(r0, r1) cc =>
-                   if cc[M] =? 1 then r0 else r1)
-      |}.
-
-    Definition SELL : instruction :=
-      {|
-        num_source_regs := 2;
-        writes_conditions := [];
-        spec := (fun '(r0, r1) cc =>
-                   if cc[L] =? 1 then r0 else r1)
-      |}.
-
-    (* TODO : treat the MOD register specially, like CC *)
-    Definition ADDM : instruction :=
-      {|
-        num_source_regs := 3;
-        writes_conditions := [M; L; Z];
-        spec := (fun '(r0, r1, MOD) cc =>
-                   let ra := r0 + r1 in
-                   if ra >=? MOD
-                   then ra - MOD
-                   else ra)
-      |}.
-
-  End ISA.
-
-  Module Registers.
-    Inductive register : Type :=
-    | r0 : register
-    | r1 : register
-    | r2 : register
-    | r3 : register
-    | r4 : register
-    | r5 : register
-    | r6 : register
-    | r7 : register
-    | r8 : register
-    | r9 : register
-    | r10 : register
-    | r11 : register
-    | r12 : register
-    | r13 : register
-    | r14 : register
-    | r15 : register
-    | r16 : register
-    | r17 : register
-    | r18 : register
-    | r19 : register
-    | r20 : register
-    | r21 : register
-    | r22 : register
-    | r23 : register
-    | r24 : register
-    | r25 : register
-    | r26 : register
-    | r27 : register
-    | r28 : register
-    | r29 : register
-    | r30 : register
-    | RegZero : register (* r31 *)
-    | RegMod : register
-    .
-
-    Definition reg_dec (x y : register) : {x = y} + {x <> y}.
-    Proof. destruct x, y; try (apply left; congruence); right; congruence. Defined.
-    Definition reg_eqb x y := if reg_dec x y then true else false.
-
-    Lemma reg_eqb_neq x y : x <> y -> reg_eqb x y = false.
-    Proof. cbv [reg_eqb]; break_match; congruence. Qed.
-    Lemma reg_eqb_refl x : reg_eqb x x = true.
-    Proof. cbv [reg_eqb]; break_match; congruence. Qed.
-  End Registers.
-End Fancy.
+  Definition RSHI (imm : int) : instruction :=
+    {|
+      num_source_regs := 2;
+      writes_conditions := [M; L; Z];
+      spec := (fun '(r0, r1) cc =>
+                 (((2^256 * r0) + r1) >> imm) mod (2^256))
+    |}.
+
+  Definition SELC : instruction :=
+    {|
+      num_source_regs := 2;
+      writes_conditions := [];
+      spec := (fun '(r0, r1) cc =>
+                 if cc[C] =? 1 then r0 else r1)
+    |}.
+
+  Definition SELM : instruction :=
+    {|
+      num_source_regs := 2;
+      writes_conditions := [];
+      spec := (fun '(r0, r1) cc =>
+                 if cc[M] =? 1 then r0 else r1)
+    |}.
+
+  Definition SELL : instruction :=
+    {|
+      num_source_regs := 2;
+      writes_conditions := [];
+      spec := (fun '(r0, r1) cc =>
+                 if cc[L] =? 1 then r0 else r1)
+    |}.
+
+  (* TODO : treat the MOD register specially, like CC *)
+  Definition ADDM : instruction :=
+    {|
+      num_source_regs := 3;
+      writes_conditions := [M; L; Z];
+      spec := (fun '(r0, r1, MOD) cc =>
+                 let ra := r0 + r1 in
+                 if ra >=? MOD
+                 then ra - MOD
+                 else ra)
+    |}.
+
+End Instructions.
+
+Section Registers.
+  Inductive register : Type :=
+  | r0 : register
+  | r1 : register
+  | r2 : register
+  | r3 : register
+  | r4 : register
+  | r5 : register
+  | r6 : register
+  | r7 : register
+  | r8 : register
+  | r9 : register
+  | r10 : register
+  | r11 : register
+  | r12 : register
+  | r13 : register
+  | r14 : register
+  | r15 : register
+  | r16 : register
+  | r17 : register
+  | r18 : register
+  | r19 : register
+  | r20 : register
+  | r21 : register
+  | r22 : register
+  | r23 : register
+  | r24 : register
+  | r25 : register
+  | r26 : register
+  | r27 : register
+  | r28 : register
+  | r29 : register
+  | r30 : register
+  | RegZero : register (* r31 *)
+  | RegMod : register
+  .
+
+  Definition reg_dec (x y : register) : {x = y} + {x <> y}.
+  Proof. destruct x, y; try (apply left; congruence); right; congruence. Defined.
+  Definition reg_eqb x y := if reg_dec x y then true else false.
+
+  Lemma reg_eqb_neq x y : x <> y -> reg_eqb x y = false.
+  Proof. cbv [reg_eqb]; break_match; congruence. Qed.
+  Lemma reg_eqb_refl x : reg_eqb x x = true.
+  Proof. cbv [reg_eqb]; break_match; congruence. Qed.
+End Registers.
\ No newline at end of file