aboutsummaryrefslogtreecommitdiff
path: root/src/Specific/solinas32_2e322m2e161m1_12limbs
diff options
context:
space:
mode:
Diffstat (limited to 'src/Specific/solinas32_2e322m2e161m1_12limbs')
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/CurveParameters.v39
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/Synthesis.v9
-rwxr-xr-xsrc/Specific/solinas32_2e322m2e161m1_12limbs/compiler.sh4
-rwxr-xr-xsrc/Specific/solinas32_2e322m2e161m1_12limbs/compilerxx.sh4
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/feadd.c39
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/feadd.v14
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/feaddDisplay.log7
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/feaddDisplay.v4
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/fecarry.v14
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/fecarryDisplay.v4
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/femul.c113
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/femul.v14
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/femulDisplay.log81
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/femulDisplay.v4
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/fesquare.c101
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/fesquare.v14
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/fesquareDisplay.log81
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/fesquareDisplay.v4
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/fesub.c39
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/fesub.v14
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/fesubDisplay.log7
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/fesubDisplay.v4
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/freeze.c64
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/freeze.v14
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/freezeDisplay.log44
-rw-r--r--src/Specific/solinas32_2e322m2e161m1_12limbs/freezeDisplay.v4
-rwxr-xr-xsrc/Specific/solinas32_2e322m2e161m1_12limbs/py_interpreter.sh4
27 files changed, 0 insertions, 744 deletions
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/CurveParameters.v b/src/Specific/solinas32_2e322m2e161m1_12limbs/CurveParameters.v
deleted file mode 100644
index 3e63b7416..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/CurveParameters.v
+++ /dev/null
@@ -1,39 +0,0 @@
-Require Import Crypto.Specific.Framework.RawCurveParameters.
-Require Import Crypto.Util.LetIn.
-
-(***
-Modulus : 2^322 - 2^161 - 1
-Base: 26 + 5/6
-***)
-
-Definition curve : CurveParameters :=
- {|
- sz := 12%nat;
- base := 26 + 5/6;
- bitwidth := 32;
- s := 2^322;
- c := [(1, 1); (2^161, 1)];
- carry_chains := Some [[5; 11]; [6; 0; 7; 1; 8; 2; 9; 3; 10; 4; 11; 5]; [6; 0]]%nat;
-
- a24 := None;
- coef_div_modulus := Some 2%nat;
-
- goldilocks := Some true;
- karatsuba := None;
- montgomery := false;
- freeze := Some true;
- ladderstep := false;
-
- mul_code := None;
-
- square_code := None;
-
- upper_bound_of_exponent_loose := None;
- upper_bound_of_exponent_tight := None;
- allowable_bit_widths := None;
- freeze_extra_allowable_bit_widths := None;
- modinv_fuel := None
- |}.
-
-Ltac extra_prove_mul_eq _ := idtac.
-Ltac extra_prove_square_eq _ := idtac.
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/Synthesis.v b/src/Specific/solinas32_2e322m2e161m1_12limbs/Synthesis.v
deleted file mode 100644
index c4113abe7..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/Synthesis.v
+++ /dev/null
@@ -1,9 +0,0 @@
-Require Import Crypto.Specific.Framework.SynthesisFramework.
-Require Import Crypto.Specific.solinas32_2e322m2e161m1_12limbs.CurveParameters.
-
-Module P <: PrePackage.
- Definition package : Tag.Context.
- Proof. make_Synthesis_package curve extra_prove_mul_eq extra_prove_square_eq. Defined.
-End P.
-
-Module Export S := PackageSynthesis P.
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/compiler.sh b/src/Specific/solinas32_2e322m2e161m1_12limbs/compiler.sh
deleted file mode 100755
index 90f9ebcd0..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/compiler.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -eu
-
-clang -fbracket-depth=999999 -march=native -mbmi2 -mtune=native -std=gnu11 -O3 -flto -fuse-ld=lld -fomit-frame-pointer -fwrapv -Wno-attributes -fno-strict-aliasing -Da24_hex='0x3039' -Da24_val='12345' -Da_minus_two_over_four_array='{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x39}' -Dbitwidth='32' -Dlimb_weight_gaps_array='{27,27,27,27,27,26,27,27,27,27,27,26}' -Dmodulus_array='{0x03,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}' -Dmodulus_bytes_val='41' -Dmodulus_limbs='12' -Dq_mpz='(1_mpz<<322) - (1_mpz<<161) - 1' "$@"
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/compilerxx.sh b/src/Specific/solinas32_2e322m2e161m1_12limbs/compilerxx.sh
deleted file mode 100755
index 8c76c4025..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/compilerxx.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -eu
-
-clang++ -fbracket-depth=999999 -march=native -mbmi2 -mtune=native -std=gnu++11 -O3 -flto -fuse-ld=lld -fomit-frame-pointer -fwrapv -Wno-attributes -fno-strict-aliasing -Da24_hex='0x3039' -Da24_val='12345' -Da_minus_two_over_four_array='{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x39}' -Dbitwidth='32' -Dlimb_weight_gaps_array='{27,27,27,27,27,26,27,27,27,27,27,26}' -Dmodulus_array='{0x03,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}' -Dmodulus_bytes_val='41' -Dmodulus_limbs='12' -Dq_mpz='(1_mpz<<322) - (1_mpz<<161) - 1' "$@"
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/feadd.c b/src/Specific/solinas32_2e322m2e161m1_12limbs/feadd.c
deleted file mode 100644
index 68eccd2bc..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/feadd.c
+++ /dev/null
@@ -1,39 +0,0 @@
-static void feadd(uint32_t out[12], const uint32_t in1[12], const uint32_t in2[12]) {
- { const uint32_t x24 = in1[11];
- { const uint32_t x25 = in1[10];
- { const uint32_t x23 = in1[9];
- { const uint32_t x21 = in1[8];
- { const uint32_t x19 = in1[7];
- { const uint32_t x17 = in1[6];
- { const uint32_t x15 = in1[5];
- { const uint32_t x13 = in1[4];
- { const uint32_t x11 = in1[3];
- { const uint32_t x9 = in1[2];
- { const uint32_t x7 = in1[1];
- { const uint32_t x5 = in1[0];
- { const uint32_t x46 = in2[11];
- { const uint32_t x47 = in2[10];
- { const uint32_t x45 = in2[9];
- { const uint32_t x43 = in2[8];
- { const uint32_t x41 = in2[7];
- { const uint32_t x39 = in2[6];
- { const uint32_t x37 = in2[5];
- { const uint32_t x35 = in2[4];
- { const uint32_t x33 = in2[3];
- { const uint32_t x31 = in2[2];
- { const uint32_t x29 = in2[1];
- { const uint32_t x27 = in2[0];
- out[0] = (x5 + x27);
- out[1] = (x7 + x29);
- out[2] = (x9 + x31);
- out[3] = (x11 + x33);
- out[4] = (x13 + x35);
- out[5] = (x15 + x37);
- out[6] = (x17 + x39);
- out[7] = (x19 + x41);
- out[8] = (x21 + x43);
- out[9] = (x23 + x45);
- out[10] = (x25 + x47);
- out[11] = (x24 + x46);
- }}}}}}}}}}}}}}}}}}}}}}}}
-}
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/feadd.v b/src/Specific/solinas32_2e322m2e161m1_12limbs/feadd.v
deleted file mode 100644
index 38da53e96..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/feadd.v
+++ /dev/null
@@ -1,14 +0,0 @@
-Require Import Crypto.Arithmetic.PrimeFieldTheorems.
-Require Import Crypto.Specific.solinas32_2e322m2e161m1_12limbs.Synthesis.
-
-(* TODO : change this to field once field isomorphism happens *)
-Definition add :
- { add : feBW_tight -> feBW_tight -> feBW_loose
- | forall a b, phiBW_loose (add a b) = F.add (phiBW_tight a) (phiBW_tight b) }.
-Proof.
- Set Ltac Profiling.
- Time synthesize_add ().
- Show Ltac Profile.
-Time Defined.
-
-Print Assumptions add.
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/feaddDisplay.log b/src/Specific/solinas32_2e322m2e161m1_12limbs/feaddDisplay.log
deleted file mode 100644
index 4109af59c..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/feaddDisplay.log
+++ /dev/null
@@ -1,7 +0,0 @@
-λ x x0 : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32,
-Interp-η
-(λ var : Syntax.base_type → Type,
- λ '(x24, x25, x23, x21, x19, x17, x15, x13, x11, x9, x7, x5, (x46, x47, x45, x43, x41, x39, x37, x35, x33, x31, x29, x27))%core,
- ((x24 + x46), (x25 + x47), (x23 + x45), (x21 + x43), (x19 + x41), (x17 + x39), (x15 + x37), (x13 + x35), (x11 + x33), (x9 + x31), (x7 + x29), (x5 + x27)))
-(x, x0)%core
- : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/feaddDisplay.v b/src/Specific/solinas32_2e322m2e161m1_12limbs/feaddDisplay.v
deleted file mode 100644
index 96e8095d6..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/feaddDisplay.v
+++ /dev/null
@@ -1,4 +0,0 @@
-Require Import Crypto.Specific.solinas32_2e322m2e161m1_12limbs.feadd.
-Require Import Crypto.Specific.Framework.IntegrationTestDisplayCommon.
-
-Check display add.
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/fecarry.v b/src/Specific/solinas32_2e322m2e161m1_12limbs/fecarry.v
deleted file mode 100644
index a13a9c768..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/fecarry.v
+++ /dev/null
@@ -1,14 +0,0 @@
-Require Import Crypto.Arithmetic.PrimeFieldTheorems.
-Require Import Crypto.Specific.solinas32_2e322m2e161m1_12limbs.Synthesis.
-
-(* TODO : change this to field once field isomorphism happens *)
-Definition carry :
- { carry : feBW_loose -> feBW_tight
- | forall a, phiBW_tight (carry a) = (phiBW_loose a) }.
-Proof.
- Set Ltac Profiling.
- Time synthesize_carry ().
- Show Ltac Profile.
-Time Defined.
-
-Print Assumptions carry.
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/fecarryDisplay.v b/src/Specific/solinas32_2e322m2e161m1_12limbs/fecarryDisplay.v
deleted file mode 100644
index 94f2519b0..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/fecarryDisplay.v
+++ /dev/null
@@ -1,4 +0,0 @@
-Require Import Crypto.Specific.solinas32_2e322m2e161m1_12limbs.fecarry.
-Require Import Crypto.Specific.Framework.IntegrationTestDisplayCommon.
-
-Check display carry.
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/femul.c b/src/Specific/solinas32_2e322m2e161m1_12limbs/femul.c
deleted file mode 100644
index 842945eca..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/femul.c
+++ /dev/null
@@ -1,113 +0,0 @@
-static void femul(uint32_t out[12], const uint32_t in1[12], const uint32_t in2[12]) {
- { const uint32_t x24 = in1[11];
- { const uint32_t x25 = in1[10];
- { const uint32_t x23 = in1[9];
- { const uint32_t x21 = in1[8];
- { const uint32_t x19 = in1[7];
- { const uint32_t x17 = in1[6];
- { const uint32_t x15 = in1[5];
- { const uint32_t x13 = in1[4];
- { const uint32_t x11 = in1[3];
- { const uint32_t x9 = in1[2];
- { const uint32_t x7 = in1[1];
- { const uint32_t x5 = in1[0];
- { const uint32_t x46 = in2[11];
- { const uint32_t x47 = in2[10];
- { const uint32_t x45 = in2[9];
- { const uint32_t x43 = in2[8];
- { const uint32_t x41 = in2[7];
- { const uint32_t x39 = in2[6];
- { const uint32_t x37 = in2[5];
- { const uint32_t x35 = in2[4];
- { const uint32_t x33 = in2[3];
- { const uint32_t x31 = in2[2];
- { const uint32_t x29 = in2[1];
- { const uint32_t x27 = in2[0];
- { uint64_t x48 = ((0x2 * ((uint64_t)(x15 + x24) * (x37 + x46))) - (0x2 * ((uint64_t)x15 * x37)));
- { uint64_t x49 = (((0x2 * ((uint64_t)(x13 + x25) * (x37 + x46))) + (0x2 * ((uint64_t)(x15 + x24) * (x35 + x47)))) - ((0x2 * ((uint64_t)x13 * x37)) + (0x2 * ((uint64_t)x15 * x35))));
- { uint64_t x50 = (((0x2 * ((uint64_t)(x11 + x23) * (x37 + x46))) + ((0x2 * ((uint64_t)(x13 + x25) * (x35 + x47))) + (0x2 * ((uint64_t)(x15 + x24) * (x33 + x45))))) - ((0x2 * ((uint64_t)x11 * x37)) + ((0x2 * ((uint64_t)x13 * x35)) + (0x2 * ((uint64_t)x15 * x33)))));
- { uint64_t x51 = (((0x2 * ((uint64_t)(x9 + x21) * (x37 + x46))) + ((0x2 * ((uint64_t)(x11 + x23) * (x35 + x47))) + ((0x2 * ((uint64_t)(x13 + x25) * (x33 + x45))) + (0x2 * ((uint64_t)(x15 + x24) * (x31 + x43)))))) - ((0x2 * ((uint64_t)x9 * x37)) + ((0x2 * ((uint64_t)x11 * x35)) + ((0x2 * ((uint64_t)x13 * x33)) + (0x2 * ((uint64_t)x15 * x31))))));
- { uint64_t x52 = (((0x2 * ((uint64_t)(x7 + x19) * (x37 + x46))) + ((0x2 * ((uint64_t)(x9 + x21) * (x35 + x47))) + ((0x2 * ((uint64_t)(x11 + x23) * (x33 + x45))) + ((0x2 * ((uint64_t)(x13 + x25) * (x31 + x43))) + (0x2 * ((uint64_t)(x15 + x24) * (x29 + x41))))))) - ((0x2 * ((uint64_t)x7 * x37)) + ((0x2 * ((uint64_t)x9 * x35)) + ((0x2 * ((uint64_t)x11 * x33)) + ((0x2 * ((uint64_t)x13 * x31)) + (0x2 * ((uint64_t)x15 * x29)))))));
- { uint64_t x53 = ((((uint64_t)(x5 + x17) * (x37 + x46)) + (((uint64_t)(x7 + x19) * (x35 + x47)) + (((uint64_t)(x9 + x21) * (x33 + x45)) + (((uint64_t)(x11 + x23) * (x31 + x43)) + (((uint64_t)(x13 + x25) * (x29 + x41)) + ((uint64_t)(x15 + x24) * (x27 + x39))))))) - (((uint64_t)x5 * x37) + (((uint64_t)x7 * x35) + (((uint64_t)x9 * x33) + (((uint64_t)x11 * x31) + (((uint64_t)x13 * x29) + ((uint64_t)x15 * x27)))))));
- { uint64_t x54 = ((((uint64_t)(x5 + x17) * (x35 + x47)) + (((uint64_t)(x7 + x19) * (x33 + x45)) + (((uint64_t)(x9 + x21) * (x31 + x43)) + (((uint64_t)(x11 + x23) * (x29 + x41)) + ((uint64_t)(x13 + x25) * (x27 + x39)))))) - (((uint64_t)x5 * x35) + (((uint64_t)x7 * x33) + (((uint64_t)x9 * x31) + (((uint64_t)x11 * x29) + ((uint64_t)x13 * x27))))));
- { uint64_t x55 = ((((uint64_t)(x5 + x17) * (x33 + x45)) + (((uint64_t)(x7 + x19) * (x31 + x43)) + (((uint64_t)(x9 + x21) * (x29 + x41)) + ((uint64_t)(x11 + x23) * (x27 + x39))))) - (((uint64_t)x5 * x33) + (((uint64_t)x7 * x31) + (((uint64_t)x9 * x29) + ((uint64_t)x11 * x27)))));
- { uint64_t x56 = ((((uint64_t)(x5 + x17) * (x31 + x43)) + (((uint64_t)(x7 + x19) * (x29 + x41)) + ((uint64_t)(x9 + x21) * (x27 + x39)))) - (((uint64_t)x5 * x31) + (((uint64_t)x7 * x29) + ((uint64_t)x9 * x27))));
- { uint64_t x57 = ((((uint64_t)(x5 + x17) * (x29 + x41)) + ((uint64_t)(x7 + x19) * (x27 + x39))) - (((uint64_t)x5 * x29) + ((uint64_t)x7 * x27)));
- { uint64_t x58 = (((uint64_t)(x5 + x17) * (x27 + x39)) - ((uint64_t)x5 * x27));
- { uint64_t x59 = ((((0x2 * ((uint64_t)x15 * x37)) + (0x2 * ((uint64_t)x24 * x46))) + x54) + x48);
- { uint64_t x60 = (((((0x2 * ((uint64_t)x13 * x37)) + (0x2 * ((uint64_t)x15 * x35))) + ((0x2 * ((uint64_t)x25 * x46)) + (0x2 * ((uint64_t)x24 * x47)))) + x55) + x49);
- { uint64_t x61 = (((((0x2 * ((uint64_t)x11 * x37)) + ((0x2 * ((uint64_t)x13 * x35)) + (0x2 * ((uint64_t)x15 * x33)))) + ((0x2 * ((uint64_t)x23 * x46)) + ((0x2 * ((uint64_t)x25 * x47)) + (0x2 * ((uint64_t)x24 * x45))))) + x56) + x50);
- { uint64_t x62 = (((((0x2 * ((uint64_t)x9 * x37)) + ((0x2 * ((uint64_t)x11 * x35)) + ((0x2 * ((uint64_t)x13 * x33)) + (0x2 * ((uint64_t)x15 * x31))))) + ((0x2 * ((uint64_t)x21 * x46)) + ((0x2 * ((uint64_t)x23 * x47)) + ((0x2 * ((uint64_t)x25 * x45)) + (0x2 * ((uint64_t)x24 * x43)))))) + x57) + x51);
- { uint64_t x63 = (((((0x2 * ((uint64_t)x7 * x37)) + ((0x2 * ((uint64_t)x9 * x35)) + ((0x2 * ((uint64_t)x11 * x33)) + ((0x2 * ((uint64_t)x13 * x31)) + (0x2 * ((uint64_t)x15 * x29)))))) + ((0x2 * ((uint64_t)x19 * x46)) + ((0x2 * ((uint64_t)x21 * x47)) + ((0x2 * ((uint64_t)x23 * x45)) + ((0x2 * ((uint64_t)x25 * x43)) + (0x2 * ((uint64_t)x24 * x41))))))) + x58) + x52);
- { uint64_t x64 = ((((uint64_t)x5 * x37) + (((uint64_t)x7 * x35) + (((uint64_t)x9 * x33) + (((uint64_t)x11 * x31) + (((uint64_t)x13 * x29) + ((uint64_t)x15 * x27)))))) + (((uint64_t)x17 * x46) + (((uint64_t)x19 * x47) + (((uint64_t)x21 * x45) + (((uint64_t)x23 * x43) + (((uint64_t)x25 * x41) + ((uint64_t)x24 * x39)))))));
- { uint64_t x65 = (((((uint64_t)x5 * x35) + (((uint64_t)x7 * x33) + (((uint64_t)x9 * x31) + (((uint64_t)x11 * x29) + ((uint64_t)x13 * x27))))) + (((uint64_t)x17 * x47) + (((uint64_t)x19 * x45) + (((uint64_t)x21 * x43) + (((uint64_t)x23 * x41) + ((uint64_t)x25 * x39)))))) + x48);
- { uint64_t x66 = (((((uint64_t)x5 * x33) + (((uint64_t)x7 * x31) + (((uint64_t)x9 * x29) + ((uint64_t)x11 * x27)))) + (((uint64_t)x17 * x45) + (((uint64_t)x19 * x43) + (((uint64_t)x21 * x41) + ((uint64_t)x23 * x39))))) + x49);
- { uint64_t x67 = (((((uint64_t)x5 * x31) + (((uint64_t)x7 * x29) + ((uint64_t)x9 * x27))) + (((uint64_t)x17 * x43) + (((uint64_t)x19 * x41) + ((uint64_t)x21 * x39)))) + x50);
- { uint64_t x68 = (((((uint64_t)x5 * x29) + ((uint64_t)x7 * x27)) + (((uint64_t)x17 * x41) + ((uint64_t)x19 * x39))) + x51);
- { uint64_t x69 = ((((uint64_t)x5 * x27) + ((uint64_t)x17 * x39)) + x52);
- { uint64_t x70 = (x64 >> 0x1a);
- { uint32_t x71 = ((uint32_t)x64 & 0x3ffffff);
- { uint64_t x72 = (x53 >> 0x1a);
- { uint32_t x73 = ((uint32_t)x53 & 0x3ffffff);
- { uint64_t x74 = ((0x4000000 * x72) + x73);
- { uint64_t x75 = (x74 >> 0x1a);
- { uint32_t x76 = ((uint32_t)x74 & 0x3ffffff);
- { uint64_t x77 = ((x70 + x63) + x75);
- { uint64_t x78 = (x77 >> 0x1b);
- { uint32_t x79 = ((uint32_t)x77 & 0x7ffffff);
- { uint64_t x80 = (x69 + x75);
- { uint64_t x81 = (x80 >> 0x1b);
- { uint32_t x82 = ((uint32_t)x80 & 0x7ffffff);
- { uint64_t x83 = (x78 + x62);
- { uint64_t x84 = (x83 >> 0x1b);
- { uint32_t x85 = ((uint32_t)x83 & 0x7ffffff);
- { uint64_t x86 = (x81 + x68);
- { uint64_t x87 = (x86 >> 0x1b);
- { uint32_t x88 = ((uint32_t)x86 & 0x7ffffff);
- { uint64_t x89 = (x84 + x61);
- { uint64_t x90 = (x89 >> 0x1b);
- { uint32_t x91 = ((uint32_t)x89 & 0x7ffffff);
- { uint64_t x92 = (x87 + x67);
- { uint64_t x93 = (x92 >> 0x1b);
- { uint32_t x94 = ((uint32_t)x92 & 0x7ffffff);
- { uint64_t x95 = (x90 + x60);
- { uint64_t x96 = (x95 >> 0x1b);
- { uint32_t x97 = ((uint32_t)x95 & 0x7ffffff);
- { uint64_t x98 = (x93 + x66);
- { uint64_t x99 = (x98 >> 0x1b);
- { uint32_t x100 = ((uint32_t)x98 & 0x7ffffff);
- { uint64_t x101 = (x96 + x59);
- { uint64_t x102 = (x101 >> 0x1b);
- { uint32_t x103 = ((uint32_t)x101 & 0x7ffffff);
- { uint64_t x104 = (x99 + x65);
- { uint64_t x105 = (x104 >> 0x1b);
- { uint32_t x106 = ((uint32_t)x104 & 0x7ffffff);
- { uint64_t x107 = (x102 + x76);
- { uint32_t x108 = (uint32_t) (x107 >> 0x1a);
- { uint32_t x109 = ((uint32_t)x107 & 0x3ffffff);
- { uint64_t x110 = (x105 + x71);
- { uint32_t x111 = (uint32_t) (x110 >> 0x1a);
- { uint32_t x112 = ((uint32_t)x110 & 0x3ffffff);
- { uint64_t x113 = (((uint64_t)0x4000000 * x108) + x109);
- { uint32_t x114 = (uint32_t) (x113 >> 0x1a);
- { uint32_t x115 = ((uint32_t)x113 & 0x3ffffff);
- { uint32_t x116 = ((x111 + x79) + x114);
- { uint32_t x117 = (x116 >> 0x1b);
- { uint32_t x118 = (x116 & 0x7ffffff);
- { uint32_t x119 = (x82 + x114);
- { uint32_t x120 = (x119 >> 0x1b);
- { uint32_t x121 = (x119 & 0x7ffffff);
- out[0] = x121;
- out[1] = (x120 + x88);
- out[2] = x94;
- out[3] = x100;
- out[4] = x106;
- out[5] = x112;
- out[6] = x118;
- out[7] = (x117 + x85);
- out[8] = x91;
- out[9] = x97;
- out[10] = x103;
- out[11] = x115;
- }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
-}
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/femul.v b/src/Specific/solinas32_2e322m2e161m1_12limbs/femul.v
deleted file mode 100644
index 727d23158..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/femul.v
+++ /dev/null
@@ -1,14 +0,0 @@
-Require Import Crypto.Arithmetic.PrimeFieldTheorems.
-Require Import Crypto.Specific.solinas32_2e322m2e161m1_12limbs.Synthesis.
-
-(* TODO : change this to field once field isomorphism happens *)
-Definition mul :
- { mul : feBW_loose -> feBW_loose -> feBW_tight
- | forall a b, phiBW_tight (mul a b) = F.mul (phiBW_loose a) (phiBW_loose b) }.
-Proof.
- Set Ltac Profiling.
- Time synthesize_mul ().
- Show Ltac Profile.
-Time Defined.
-
-Print Assumptions mul.
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/femulDisplay.log b/src/Specific/solinas32_2e322m2e161m1_12limbs/femulDisplay.log
deleted file mode 100644
index 19439716d..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/femulDisplay.log
+++ /dev/null
@@ -1,81 +0,0 @@
-λ x x0 : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32,
-Interp-η
-(λ var : Syntax.base_type → Type,
- λ '(x24, x25, x23, x21, x19, x17, x15, x13, x11, x9, x7, x5, (x46, x47, x45, x43, x41, x39, x37, x35, x33, x31, x29, x27))%core,
- uint64_t x48 = ((0x2 * ((uint64_t)(x15 + x24) * (x37 + x46))) - (0x2 * ((uint64_t)x15 * x37)));
- uint64_t x49 = (((0x2 * ((uint64_t)(x13 + x25) * (x37 + x46))) + (0x2 * ((uint64_t)(x15 + x24) * (x35 + x47)))) - ((0x2 * ((uint64_t)x13 * x37)) + (0x2 * ((uint64_t)x15 * x35))));
- uint64_t x50 = (((0x2 * ((uint64_t)(x11 + x23) * (x37 + x46))) + ((0x2 * ((uint64_t)(x13 + x25) * (x35 + x47))) + (0x2 * ((uint64_t)(x15 + x24) * (x33 + x45))))) - ((0x2 * ((uint64_t)x11 * x37)) + ((0x2 * ((uint64_t)x13 * x35)) + (0x2 * ((uint64_t)x15 * x33)))));
- uint64_t x51 = (((0x2 * ((uint64_t)(x9 + x21) * (x37 + x46))) + ((0x2 * ((uint64_t)(x11 + x23) * (x35 + x47))) + ((0x2 * ((uint64_t)(x13 + x25) * (x33 + x45))) + (0x2 * ((uint64_t)(x15 + x24) * (x31 + x43)))))) - ((0x2 * ((uint64_t)x9 * x37)) + ((0x2 * ((uint64_t)x11 * x35)) + ((0x2 * ((uint64_t)x13 * x33)) + (0x2 * ((uint64_t)x15 * x31))))));
- uint64_t x52 = (((0x2 * ((uint64_t)(x7 + x19) * (x37 + x46))) + ((0x2 * ((uint64_t)(x9 + x21) * (x35 + x47))) + ((0x2 * ((uint64_t)(x11 + x23) * (x33 + x45))) + ((0x2 * ((uint64_t)(x13 + x25) * (x31 + x43))) + (0x2 * ((uint64_t)(x15 + x24) * (x29 + x41))))))) - ((0x2 * ((uint64_t)x7 * x37)) + ((0x2 * ((uint64_t)x9 * x35)) + ((0x2 * ((uint64_t)x11 * x33)) + ((0x2 * ((uint64_t)x13 * x31)) + (0x2 * ((uint64_t)x15 * x29)))))));
- uint64_t x53 = ((((uint64_t)(x5 + x17) * (x37 + x46)) + (((uint64_t)(x7 + x19) * (x35 + x47)) + (((uint64_t)(x9 + x21) * (x33 + x45)) + (((uint64_t)(x11 + x23) * (x31 + x43)) + (((uint64_t)(x13 + x25) * (x29 + x41)) + ((uint64_t)(x15 + x24) * (x27 + x39))))))) - (((uint64_t)x5 * x37) + (((uint64_t)x7 * x35) + (((uint64_t)x9 * x33) + (((uint64_t)x11 * x31) + (((uint64_t)x13 * x29) + ((uint64_t)x15 * x27)))))));
- uint64_t x54 = ((((uint64_t)(x5 + x17) * (x35 + x47)) + (((uint64_t)(x7 + x19) * (x33 + x45)) + (((uint64_t)(x9 + x21) * (x31 + x43)) + (((uint64_t)(x11 + x23) * (x29 + x41)) + ((uint64_t)(x13 + x25) * (x27 + x39)))))) - (((uint64_t)x5 * x35) + (((uint64_t)x7 * x33) + (((uint64_t)x9 * x31) + (((uint64_t)x11 * x29) + ((uint64_t)x13 * x27))))));
- uint64_t x55 = ((((uint64_t)(x5 + x17) * (x33 + x45)) + (((uint64_t)(x7 + x19) * (x31 + x43)) + (((uint64_t)(x9 + x21) * (x29 + x41)) + ((uint64_t)(x11 + x23) * (x27 + x39))))) - (((uint64_t)x5 * x33) + (((uint64_t)x7 * x31) + (((uint64_t)x9 * x29) + ((uint64_t)x11 * x27)))));
- uint64_t x56 = ((((uint64_t)(x5 + x17) * (x31 + x43)) + (((uint64_t)(x7 + x19) * (x29 + x41)) + ((uint64_t)(x9 + x21) * (x27 + x39)))) - (((uint64_t)x5 * x31) + (((uint64_t)x7 * x29) + ((uint64_t)x9 * x27))));
- uint64_t x57 = ((((uint64_t)(x5 + x17) * (x29 + x41)) + ((uint64_t)(x7 + x19) * (x27 + x39))) - (((uint64_t)x5 * x29) + ((uint64_t)x7 * x27)));
- uint64_t x58 = (((uint64_t)(x5 + x17) * (x27 + x39)) - ((uint64_t)x5 * x27));
- uint64_t x59 = ((((0x2 * ((uint64_t)x15 * x37)) + (0x2 * ((uint64_t)x24 * x46))) + x54) + x48);
- uint64_t x60 = (((((0x2 * ((uint64_t)x13 * x37)) + (0x2 * ((uint64_t)x15 * x35))) + ((0x2 * ((uint64_t)x25 * x46)) + (0x2 * ((uint64_t)x24 * x47)))) + x55) + x49);
- uint64_t x61 = (((((0x2 * ((uint64_t)x11 * x37)) + ((0x2 * ((uint64_t)x13 * x35)) + (0x2 * ((uint64_t)x15 * x33)))) + ((0x2 * ((uint64_t)x23 * x46)) + ((0x2 * ((uint64_t)x25 * x47)) + (0x2 * ((uint64_t)x24 * x45))))) + x56) + x50);
- uint64_t x62 = (((((0x2 * ((uint64_t)x9 * x37)) + ((0x2 * ((uint64_t)x11 * x35)) + ((0x2 * ((uint64_t)x13 * x33)) + (0x2 * ((uint64_t)x15 * x31))))) + ((0x2 * ((uint64_t)x21 * x46)) + ((0x2 * ((uint64_t)x23 * x47)) + ((0x2 * ((uint64_t)x25 * x45)) + (0x2 * ((uint64_t)x24 * x43)))))) + x57) + x51);
- uint64_t x63 = (((((0x2 * ((uint64_t)x7 * x37)) + ((0x2 * ((uint64_t)x9 * x35)) + ((0x2 * ((uint64_t)x11 * x33)) + ((0x2 * ((uint64_t)x13 * x31)) + (0x2 * ((uint64_t)x15 * x29)))))) + ((0x2 * ((uint64_t)x19 * x46)) + ((0x2 * ((uint64_t)x21 * x47)) + ((0x2 * ((uint64_t)x23 * x45)) + ((0x2 * ((uint64_t)x25 * x43)) + (0x2 * ((uint64_t)x24 * x41))))))) + x58) + x52);
- uint64_t x64 = ((((uint64_t)x5 * x37) + (((uint64_t)x7 * x35) + (((uint64_t)x9 * x33) + (((uint64_t)x11 * x31) + (((uint64_t)x13 * x29) + ((uint64_t)x15 * x27)))))) + (((uint64_t)x17 * x46) + (((uint64_t)x19 * x47) + (((uint64_t)x21 * x45) + (((uint64_t)x23 * x43) + (((uint64_t)x25 * x41) + ((uint64_t)x24 * x39)))))));
- uint64_t x65 = (((((uint64_t)x5 * x35) + (((uint64_t)x7 * x33) + (((uint64_t)x9 * x31) + (((uint64_t)x11 * x29) + ((uint64_t)x13 * x27))))) + (((uint64_t)x17 * x47) + (((uint64_t)x19 * x45) + (((uint64_t)x21 * x43) + (((uint64_t)x23 * x41) + ((uint64_t)x25 * x39)))))) + x48);
- uint64_t x66 = (((((uint64_t)x5 * x33) + (((uint64_t)x7 * x31) + (((uint64_t)x9 * x29) + ((uint64_t)x11 * x27)))) + (((uint64_t)x17 * x45) + (((uint64_t)x19 * x43) + (((uint64_t)x21 * x41) + ((uint64_t)x23 * x39))))) + x49);
- uint64_t x67 = (((((uint64_t)x5 * x31) + (((uint64_t)x7 * x29) + ((uint64_t)x9 * x27))) + (((uint64_t)x17 * x43) + (((uint64_t)x19 * x41) + ((uint64_t)x21 * x39)))) + x50);
- uint64_t x68 = (((((uint64_t)x5 * x29) + ((uint64_t)x7 * x27)) + (((uint64_t)x17 * x41) + ((uint64_t)x19 * x39))) + x51);
- uint64_t x69 = ((((uint64_t)x5 * x27) + ((uint64_t)x17 * x39)) + x52);
- uint64_t x70 = (x64 >> 0x1a);
- uint32_t x71 = ((uint32_t)x64 & 0x3ffffff);
- uint64_t x72 = (x53 >> 0x1a);
- uint32_t x73 = ((uint32_t)x53 & 0x3ffffff);
- uint64_t x74 = ((0x4000000 * x72) + x73);
- uint64_t x75 = (x74 >> 0x1a);
- uint32_t x76 = ((uint32_t)x74 & 0x3ffffff);
- uint64_t x77 = ((x70 + x63) + x75);
- uint64_t x78 = (x77 >> 0x1b);
- uint32_t x79 = ((uint32_t)x77 & 0x7ffffff);
- uint64_t x80 = (x69 + x75);
- uint64_t x81 = (x80 >> 0x1b);
- uint32_t x82 = ((uint32_t)x80 & 0x7ffffff);
- uint64_t x83 = (x78 + x62);
- uint64_t x84 = (x83 >> 0x1b);
- uint32_t x85 = ((uint32_t)x83 & 0x7ffffff);
- uint64_t x86 = (x81 + x68);
- uint64_t x87 = (x86 >> 0x1b);
- uint32_t x88 = ((uint32_t)x86 & 0x7ffffff);
- uint64_t x89 = (x84 + x61);
- uint64_t x90 = (x89 >> 0x1b);
- uint32_t x91 = ((uint32_t)x89 & 0x7ffffff);
- uint64_t x92 = (x87 + x67);
- uint64_t x93 = (x92 >> 0x1b);
- uint32_t x94 = ((uint32_t)x92 & 0x7ffffff);
- uint64_t x95 = (x90 + x60);
- uint64_t x96 = (x95 >> 0x1b);
- uint32_t x97 = ((uint32_t)x95 & 0x7ffffff);
- uint64_t x98 = (x93 + x66);
- uint64_t x99 = (x98 >> 0x1b);
- uint32_t x100 = ((uint32_t)x98 & 0x7ffffff);
- uint64_t x101 = (x96 + x59);
- uint64_t x102 = (x101 >> 0x1b);
- uint32_t x103 = ((uint32_t)x101 & 0x7ffffff);
- uint64_t x104 = (x99 + x65);
- uint64_t x105 = (x104 >> 0x1b);
- uint32_t x106 = ((uint32_t)x104 & 0x7ffffff);
- uint64_t x107 = (x102 + x76);
- uint32_t x108 = (uint32_t) (x107 >> 0x1a);
- uint32_t x109 = ((uint32_t)x107 & 0x3ffffff);
- uint64_t x110 = (x105 + x71);
- uint32_t x111 = (uint32_t) (x110 >> 0x1a);
- uint32_t x112 = ((uint32_t)x110 & 0x3ffffff);
- uint64_t x113 = (((uint64_t)0x4000000 * x108) + x109);
- uint32_t x114 = (uint32_t) (x113 >> 0x1a);
- uint32_t x115 = ((uint32_t)x113 & 0x3ffffff);
- uint32_t x116 = ((x111 + x79) + x114);
- uint32_t x117 = (x116 >> 0x1b);
- uint32_t x118 = (x116 & 0x7ffffff);
- uint32_t x119 = (x82 + x114);
- uint32_t x120 = (x119 >> 0x1b);
- uint32_t x121 = (x119 & 0x7ffffff);
- return (Return x115, Return x103, Return x97, Return x91, (x117 + x85), Return x118, Return x112, Return x106, Return x100, Return x94, (x120 + x88), Return x121))
-(x, x0)%core
- : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/femulDisplay.v b/src/Specific/solinas32_2e322m2e161m1_12limbs/femulDisplay.v
deleted file mode 100644
index 2072b2fd1..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/femulDisplay.v
+++ /dev/null
@@ -1,4 +0,0 @@
-Require Import Crypto.Specific.solinas32_2e322m2e161m1_12limbs.femul.
-Require Import Crypto.Specific.Framework.IntegrationTestDisplayCommon.
-
-Check display mul.
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesquare.c b/src/Specific/solinas32_2e322m2e161m1_12limbs/fesquare.c
deleted file mode 100644
index 239276ce9..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesquare.c
+++ /dev/null
@@ -1,101 +0,0 @@
-static void fesquare(uint32_t out[12], const uint32_t in1[12]) {
- { const uint32_t x21 = in1[11];
- { const uint32_t x22 = in1[10];
- { const uint32_t x20 = in1[9];
- { const uint32_t x18 = in1[8];
- { const uint32_t x16 = in1[7];
- { const uint32_t x14 = in1[6];
- { const uint32_t x12 = in1[5];
- { const uint32_t x10 = in1[4];
- { const uint32_t x8 = in1[3];
- { const uint32_t x6 = in1[2];
- { const uint32_t x4 = in1[1];
- { const uint32_t x2 = in1[0];
- { uint64_t x23 = ((0x2 * ((uint64_t)(x12 + x21) * (x12 + x21))) - (0x2 * ((uint64_t)x12 * x12)));
- { uint64_t x24 = (((0x2 * ((uint64_t)(x10 + x22) * (x12 + x21))) + (0x2 * ((uint64_t)(x12 + x21) * (x10 + x22)))) - ((0x2 * ((uint64_t)x10 * x12)) + (0x2 * ((uint64_t)x12 * x10))));
- { uint64_t x25 = (((0x2 * ((uint64_t)(x8 + x20) * (x12 + x21))) + ((0x2 * ((uint64_t)(x10 + x22) * (x10 + x22))) + (0x2 * ((uint64_t)(x12 + x21) * (x8 + x20))))) - ((0x2 * ((uint64_t)x8 * x12)) + ((0x2 * ((uint64_t)x10 * x10)) + (0x2 * ((uint64_t)x12 * x8)))));
- { uint64_t x26 = (((0x2 * ((uint64_t)(x6 + x18) * (x12 + x21))) + ((0x2 * ((uint64_t)(x8 + x20) * (x10 + x22))) + ((0x2 * ((uint64_t)(x10 + x22) * (x8 + x20))) + (0x2 * ((uint64_t)(x12 + x21) * (x6 + x18)))))) - ((0x2 * ((uint64_t)x6 * x12)) + ((0x2 * ((uint64_t)x8 * x10)) + ((0x2 * ((uint64_t)x10 * x8)) + (0x2 * ((uint64_t)x12 * x6))))));
- { uint64_t x27 = (((0x2 * ((uint64_t)(x4 + x16) * (x12 + x21))) + ((0x2 * ((uint64_t)(x6 + x18) * (x10 + x22))) + ((0x2 * ((uint64_t)(x8 + x20) * (x8 + x20))) + ((0x2 * ((uint64_t)(x10 + x22) * (x6 + x18))) + (0x2 * ((uint64_t)(x12 + x21) * (x4 + x16))))))) - ((0x2 * ((uint64_t)x4 * x12)) + ((0x2 * ((uint64_t)x6 * x10)) + ((0x2 * ((uint64_t)x8 * x8)) + ((0x2 * ((uint64_t)x10 * x6)) + (0x2 * ((uint64_t)x12 * x4)))))));
- { uint64_t x28 = ((((uint64_t)(x2 + x14) * (x12 + x21)) + (((uint64_t)(x4 + x16) * (x10 + x22)) + (((uint64_t)(x6 + x18) * (x8 + x20)) + (((uint64_t)(x8 + x20) * (x6 + x18)) + (((uint64_t)(x10 + x22) * (x4 + x16)) + ((uint64_t)(x12 + x21) * (x2 + x14))))))) - (((uint64_t)x2 * x12) + (((uint64_t)x4 * x10) + (((uint64_t)x6 * x8) + (((uint64_t)x8 * x6) + (((uint64_t)x10 * x4) + ((uint64_t)x12 * x2)))))));
- { uint64_t x29 = ((((uint64_t)(x2 + x14) * (x10 + x22)) + (((uint64_t)(x4 + x16) * (x8 + x20)) + (((uint64_t)(x6 + x18) * (x6 + x18)) + (((uint64_t)(x8 + x20) * (x4 + x16)) + ((uint64_t)(x10 + x22) * (x2 + x14)))))) - (((uint64_t)x2 * x10) + (((uint64_t)x4 * x8) + (((uint64_t)x6 * x6) + (((uint64_t)x8 * x4) + ((uint64_t)x10 * x2))))));
- { uint64_t x30 = ((((uint64_t)(x2 + x14) * (x8 + x20)) + (((uint64_t)(x4 + x16) * (x6 + x18)) + (((uint64_t)(x6 + x18) * (x4 + x16)) + ((uint64_t)(x8 + x20) * (x2 + x14))))) - (((uint64_t)x2 * x8) + (((uint64_t)x4 * x6) + (((uint64_t)x6 * x4) + ((uint64_t)x8 * x2)))));
- { uint64_t x31 = ((((uint64_t)(x2 + x14) * (x6 + x18)) + (((uint64_t)(x4 + x16) * (x4 + x16)) + ((uint64_t)(x6 + x18) * (x2 + x14)))) - (((uint64_t)x2 * x6) + (((uint64_t)x4 * x4) + ((uint64_t)x6 * x2))));
- { uint64_t x32 = ((((uint64_t)(x2 + x14) * (x4 + x16)) + ((uint64_t)(x4 + x16) * (x2 + x14))) - (((uint64_t)x2 * x4) + ((uint64_t)x4 * x2)));
- { uint64_t x33 = (((uint64_t)(x2 + x14) * (x2 + x14)) - ((uint64_t)x2 * x2));
- { uint64_t x34 = ((((0x2 * ((uint64_t)x12 * x12)) + (0x2 * ((uint64_t)x21 * x21))) + x29) + x23);
- { uint64_t x35 = (((((0x2 * ((uint64_t)x10 * x12)) + (0x2 * ((uint64_t)x12 * x10))) + ((0x2 * ((uint64_t)x22 * x21)) + (0x2 * ((uint64_t)x21 * x22)))) + x30) + x24);
- { uint64_t x36 = (((((0x2 * ((uint64_t)x8 * x12)) + ((0x2 * ((uint64_t)x10 * x10)) + (0x2 * ((uint64_t)x12 * x8)))) + ((0x2 * ((uint64_t)x20 * x21)) + ((0x2 * ((uint64_t)x22 * x22)) + (0x2 * ((uint64_t)x21 * x20))))) + x31) + x25);
- { uint64_t x37 = (((((0x2 * ((uint64_t)x6 * x12)) + ((0x2 * ((uint64_t)x8 * x10)) + ((0x2 * ((uint64_t)x10 * x8)) + (0x2 * ((uint64_t)x12 * x6))))) + ((0x2 * ((uint64_t)x18 * x21)) + ((0x2 * ((uint64_t)x20 * x22)) + ((0x2 * ((uint64_t)x22 * x20)) + (0x2 * ((uint64_t)x21 * x18)))))) + x32) + x26);
- { uint64_t x38 = (((((0x2 * ((uint64_t)x4 * x12)) + ((0x2 * ((uint64_t)x6 * x10)) + ((0x2 * ((uint64_t)x8 * x8)) + ((0x2 * ((uint64_t)x10 * x6)) + (0x2 * ((uint64_t)x12 * x4)))))) + ((0x2 * ((uint64_t)x16 * x21)) + ((0x2 * ((uint64_t)x18 * x22)) + ((0x2 * ((uint64_t)x20 * x20)) + ((0x2 * ((uint64_t)x22 * x18)) + (0x2 * ((uint64_t)x21 * x16))))))) + x33) + x27);
- { uint64_t x39 = ((((uint64_t)x2 * x12) + (((uint64_t)x4 * x10) + (((uint64_t)x6 * x8) + (((uint64_t)x8 * x6) + (((uint64_t)x10 * x4) + ((uint64_t)x12 * x2)))))) + (((uint64_t)x14 * x21) + (((uint64_t)x16 * x22) + (((uint64_t)x18 * x20) + (((uint64_t)x20 * x18) + (((uint64_t)x22 * x16) + ((uint64_t)x21 * x14)))))));
- { uint64_t x40 = (((((uint64_t)x2 * x10) + (((uint64_t)x4 * x8) + (((uint64_t)x6 * x6) + (((uint64_t)x8 * x4) + ((uint64_t)x10 * x2))))) + (((uint64_t)x14 * x22) + (((uint64_t)x16 * x20) + (((uint64_t)x18 * x18) + (((uint64_t)x20 * x16) + ((uint64_t)x22 * x14)))))) + x23);
- { uint64_t x41 = (((((uint64_t)x2 * x8) + (((uint64_t)x4 * x6) + (((uint64_t)x6 * x4) + ((uint64_t)x8 * x2)))) + (((uint64_t)x14 * x20) + (((uint64_t)x16 * x18) + (((uint64_t)x18 * x16) + ((uint64_t)x20 * x14))))) + x24);
- { uint64_t x42 = (((((uint64_t)x2 * x6) + (((uint64_t)x4 * x4) + ((uint64_t)x6 * x2))) + (((uint64_t)x14 * x18) + (((uint64_t)x16 * x16) + ((uint64_t)x18 * x14)))) + x25);
- { uint64_t x43 = (((((uint64_t)x2 * x4) + ((uint64_t)x4 * x2)) + (((uint64_t)x14 * x16) + ((uint64_t)x16 * x14))) + x26);
- { uint64_t x44 = ((((uint64_t)x2 * x2) + ((uint64_t)x14 * x14)) + x27);
- { uint64_t x45 = (x39 >> 0x1a);
- { uint32_t x46 = ((uint32_t)x39 & 0x3ffffff);
- { uint64_t x47 = (x28 >> 0x1a);
- { uint32_t x48 = ((uint32_t)x28 & 0x3ffffff);
- { uint64_t x49 = ((0x4000000 * x47) + x48);
- { uint64_t x50 = (x49 >> 0x1a);
- { uint32_t x51 = ((uint32_t)x49 & 0x3ffffff);
- { uint64_t x52 = ((x45 + x38) + x50);
- { uint64_t x53 = (x52 >> 0x1b);
- { uint32_t x54 = ((uint32_t)x52 & 0x7ffffff);
- { uint64_t x55 = (x44 + x50);
- { uint64_t x56 = (x55 >> 0x1b);
- { uint32_t x57 = ((uint32_t)x55 & 0x7ffffff);
- { uint64_t x58 = (x53 + x37);
- { uint64_t x59 = (x58 >> 0x1b);
- { uint32_t x60 = ((uint32_t)x58 & 0x7ffffff);
- { uint64_t x61 = (x56 + x43);
- { uint64_t x62 = (x61 >> 0x1b);
- { uint32_t x63 = ((uint32_t)x61 & 0x7ffffff);
- { uint64_t x64 = (x59 + x36);
- { uint64_t x65 = (x64 >> 0x1b);
- { uint32_t x66 = ((uint32_t)x64 & 0x7ffffff);
- { uint64_t x67 = (x62 + x42);
- { uint64_t x68 = (x67 >> 0x1b);
- { uint32_t x69 = ((uint32_t)x67 & 0x7ffffff);
- { uint64_t x70 = (x65 + x35);
- { uint64_t x71 = (x70 >> 0x1b);
- { uint32_t x72 = ((uint32_t)x70 & 0x7ffffff);
- { uint64_t x73 = (x68 + x41);
- { uint64_t x74 = (x73 >> 0x1b);
- { uint32_t x75 = ((uint32_t)x73 & 0x7ffffff);
- { uint64_t x76 = (x71 + x34);
- { uint64_t x77 = (x76 >> 0x1b);
- { uint32_t x78 = ((uint32_t)x76 & 0x7ffffff);
- { uint64_t x79 = (x74 + x40);
- { uint64_t x80 = (x79 >> 0x1b);
- { uint32_t x81 = ((uint32_t)x79 & 0x7ffffff);
- { uint64_t x82 = (x77 + x51);
- { uint32_t x83 = (uint32_t) (x82 >> 0x1a);
- { uint32_t x84 = ((uint32_t)x82 & 0x3ffffff);
- { uint64_t x85 = (x80 + x46);
- { uint32_t x86 = (uint32_t) (x85 >> 0x1a);
- { uint32_t x87 = ((uint32_t)x85 & 0x3ffffff);
- { uint64_t x88 = (((uint64_t)0x4000000 * x83) + x84);
- { uint32_t x89 = (uint32_t) (x88 >> 0x1a);
- { uint32_t x90 = ((uint32_t)x88 & 0x3ffffff);
- { uint32_t x91 = ((x86 + x54) + x89);
- { uint32_t x92 = (x91 >> 0x1b);
- { uint32_t x93 = (x91 & 0x7ffffff);
- { uint32_t x94 = (x57 + x89);
- { uint32_t x95 = (x94 >> 0x1b);
- { uint32_t x96 = (x94 & 0x7ffffff);
- out[0] = x96;
- out[1] = (x95 + x63);
- out[2] = x69;
- out[3] = x75;
- out[4] = x81;
- out[5] = x87;
- out[6] = x93;
- out[7] = (x92 + x60);
- out[8] = x66;
- out[9] = x72;
- out[10] = x78;
- out[11] = x90;
- }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
-}
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesquare.v b/src/Specific/solinas32_2e322m2e161m1_12limbs/fesquare.v
deleted file mode 100644
index cc5758279..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesquare.v
+++ /dev/null
@@ -1,14 +0,0 @@
-Require Import Crypto.Arithmetic.PrimeFieldTheorems.
-Require Import Crypto.Specific.solinas32_2e322m2e161m1_12limbs.Synthesis.
-
-(* TODO : change this to field once field isomorphism happens *)
-Definition square :
- { square : feBW_loose -> feBW_tight
- | forall a, phiBW_tight (square a) = F.mul (phiBW_loose a) (phiBW_loose a) }.
-Proof.
- Set Ltac Profiling.
- Time synthesize_square ().
- Show Ltac Profile.
-Time Defined.
-
-Print Assumptions square.
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesquareDisplay.log b/src/Specific/solinas32_2e322m2e161m1_12limbs/fesquareDisplay.log
deleted file mode 100644
index dd9b17663..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesquareDisplay.log
+++ /dev/null
@@ -1,81 +0,0 @@
-λ x : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32,
-Interp-η
-(λ var : Syntax.base_type → Type,
- λ '(x21, x22, x20, x18, x16, x14, x12, x10, x8, x6, x4, x2)%core,
- uint64_t x23 = ((0x2 * ((uint64_t)(x12 + x21) * (x12 + x21))) - (0x2 * ((uint64_t)x12 * x12)));
- uint64_t x24 = (((0x2 * ((uint64_t)(x10 + x22) * (x12 + x21))) + (0x2 * ((uint64_t)(x12 + x21) * (x10 + x22)))) - ((0x2 * ((uint64_t)x10 * x12)) + (0x2 * ((uint64_t)x12 * x10))));
- uint64_t x25 = (((0x2 * ((uint64_t)(x8 + x20) * (x12 + x21))) + ((0x2 * ((uint64_t)(x10 + x22) * (x10 + x22))) + (0x2 * ((uint64_t)(x12 + x21) * (x8 + x20))))) - ((0x2 * ((uint64_t)x8 * x12)) + ((0x2 * ((uint64_t)x10 * x10)) + (0x2 * ((uint64_t)x12 * x8)))));
- uint64_t x26 = (((0x2 * ((uint64_t)(x6 + x18) * (x12 + x21))) + ((0x2 * ((uint64_t)(x8 + x20) * (x10 + x22))) + ((0x2 * ((uint64_t)(x10 + x22) * (x8 + x20))) + (0x2 * ((uint64_t)(x12 + x21) * (x6 + x18)))))) - ((0x2 * ((uint64_t)x6 * x12)) + ((0x2 * ((uint64_t)x8 * x10)) + ((0x2 * ((uint64_t)x10 * x8)) + (0x2 * ((uint64_t)x12 * x6))))));
- uint64_t x27 = (((0x2 * ((uint64_t)(x4 + x16) * (x12 + x21))) + ((0x2 * ((uint64_t)(x6 + x18) * (x10 + x22))) + ((0x2 * ((uint64_t)(x8 + x20) * (x8 + x20))) + ((0x2 * ((uint64_t)(x10 + x22) * (x6 + x18))) + (0x2 * ((uint64_t)(x12 + x21) * (x4 + x16))))))) - ((0x2 * ((uint64_t)x4 * x12)) + ((0x2 * ((uint64_t)x6 * x10)) + ((0x2 * ((uint64_t)x8 * x8)) + ((0x2 * ((uint64_t)x10 * x6)) + (0x2 * ((uint64_t)x12 * x4)))))));
- uint64_t x28 = ((((uint64_t)(x2 + x14) * (x12 + x21)) + (((uint64_t)(x4 + x16) * (x10 + x22)) + (((uint64_t)(x6 + x18) * (x8 + x20)) + (((uint64_t)(x8 + x20) * (x6 + x18)) + (((uint64_t)(x10 + x22) * (x4 + x16)) + ((uint64_t)(x12 + x21) * (x2 + x14))))))) - (((uint64_t)x2 * x12) + (((uint64_t)x4 * x10) + (((uint64_t)x6 * x8) + (((uint64_t)x8 * x6) + (((uint64_t)x10 * x4) + ((uint64_t)x12 * x2)))))));
- uint64_t x29 = ((((uint64_t)(x2 + x14) * (x10 + x22)) + (((uint64_t)(x4 + x16) * (x8 + x20)) + (((uint64_t)(x6 + x18) * (x6 + x18)) + (((uint64_t)(x8 + x20) * (x4 + x16)) + ((uint64_t)(x10 + x22) * (x2 + x14)))))) - (((uint64_t)x2 * x10) + (((uint64_t)x4 * x8) + (((uint64_t)x6 * x6) + (((uint64_t)x8 * x4) + ((uint64_t)x10 * x2))))));
- uint64_t x30 = ((((uint64_t)(x2 + x14) * (x8 + x20)) + (((uint64_t)(x4 + x16) * (x6 + x18)) + (((uint64_t)(x6 + x18) * (x4 + x16)) + ((uint64_t)(x8 + x20) * (x2 + x14))))) - (((uint64_t)x2 * x8) + (((uint64_t)x4 * x6) + (((uint64_t)x6 * x4) + ((uint64_t)x8 * x2)))));
- uint64_t x31 = ((((uint64_t)(x2 + x14) * (x6 + x18)) + (((uint64_t)(x4 + x16) * (x4 + x16)) + ((uint64_t)(x6 + x18) * (x2 + x14)))) - (((uint64_t)x2 * x6) + (((uint64_t)x4 * x4) + ((uint64_t)x6 * x2))));
- uint64_t x32 = ((((uint64_t)(x2 + x14) * (x4 + x16)) + ((uint64_t)(x4 + x16) * (x2 + x14))) - (((uint64_t)x2 * x4) + ((uint64_t)x4 * x2)));
- uint64_t x33 = (((uint64_t)(x2 + x14) * (x2 + x14)) - ((uint64_t)x2 * x2));
- uint64_t x34 = ((((0x2 * ((uint64_t)x12 * x12)) + (0x2 * ((uint64_t)x21 * x21))) + x29) + x23);
- uint64_t x35 = (((((0x2 * ((uint64_t)x10 * x12)) + (0x2 * ((uint64_t)x12 * x10))) + ((0x2 * ((uint64_t)x22 * x21)) + (0x2 * ((uint64_t)x21 * x22)))) + x30) + x24);
- uint64_t x36 = (((((0x2 * ((uint64_t)x8 * x12)) + ((0x2 * ((uint64_t)x10 * x10)) + (0x2 * ((uint64_t)x12 * x8)))) + ((0x2 * ((uint64_t)x20 * x21)) + ((0x2 * ((uint64_t)x22 * x22)) + (0x2 * ((uint64_t)x21 * x20))))) + x31) + x25);
- uint64_t x37 = (((((0x2 * ((uint64_t)x6 * x12)) + ((0x2 * ((uint64_t)x8 * x10)) + ((0x2 * ((uint64_t)x10 * x8)) + (0x2 * ((uint64_t)x12 * x6))))) + ((0x2 * ((uint64_t)x18 * x21)) + ((0x2 * ((uint64_t)x20 * x22)) + ((0x2 * ((uint64_t)x22 * x20)) + (0x2 * ((uint64_t)x21 * x18)))))) + x32) + x26);
- uint64_t x38 = (((((0x2 * ((uint64_t)x4 * x12)) + ((0x2 * ((uint64_t)x6 * x10)) + ((0x2 * ((uint64_t)x8 * x8)) + ((0x2 * ((uint64_t)x10 * x6)) + (0x2 * ((uint64_t)x12 * x4)))))) + ((0x2 * ((uint64_t)x16 * x21)) + ((0x2 * ((uint64_t)x18 * x22)) + ((0x2 * ((uint64_t)x20 * x20)) + ((0x2 * ((uint64_t)x22 * x18)) + (0x2 * ((uint64_t)x21 * x16))))))) + x33) + x27);
- uint64_t x39 = ((((uint64_t)x2 * x12) + (((uint64_t)x4 * x10) + (((uint64_t)x6 * x8) + (((uint64_t)x8 * x6) + (((uint64_t)x10 * x4) + ((uint64_t)x12 * x2)))))) + (((uint64_t)x14 * x21) + (((uint64_t)x16 * x22) + (((uint64_t)x18 * x20) + (((uint64_t)x20 * x18) + (((uint64_t)x22 * x16) + ((uint64_t)x21 * x14)))))));
- uint64_t x40 = (((((uint64_t)x2 * x10) + (((uint64_t)x4 * x8) + (((uint64_t)x6 * x6) + (((uint64_t)x8 * x4) + ((uint64_t)x10 * x2))))) + (((uint64_t)x14 * x22) + (((uint64_t)x16 * x20) + (((uint64_t)x18 * x18) + (((uint64_t)x20 * x16) + ((uint64_t)x22 * x14)))))) + x23);
- uint64_t x41 = (((((uint64_t)x2 * x8) + (((uint64_t)x4 * x6) + (((uint64_t)x6 * x4) + ((uint64_t)x8 * x2)))) + (((uint64_t)x14 * x20) + (((uint64_t)x16 * x18) + (((uint64_t)x18 * x16) + ((uint64_t)x20 * x14))))) + x24);
- uint64_t x42 = (((((uint64_t)x2 * x6) + (((uint64_t)x4 * x4) + ((uint64_t)x6 * x2))) + (((uint64_t)x14 * x18) + (((uint64_t)x16 * x16) + ((uint64_t)x18 * x14)))) + x25);
- uint64_t x43 = (((((uint64_t)x2 * x4) + ((uint64_t)x4 * x2)) + (((uint64_t)x14 * x16) + ((uint64_t)x16 * x14))) + x26);
- uint64_t x44 = ((((uint64_t)x2 * x2) + ((uint64_t)x14 * x14)) + x27);
- uint64_t x45 = (x39 >> 0x1a);
- uint32_t x46 = ((uint32_t)x39 & 0x3ffffff);
- uint64_t x47 = (x28 >> 0x1a);
- uint32_t x48 = ((uint32_t)x28 & 0x3ffffff);
- uint64_t x49 = ((0x4000000 * x47) + x48);
- uint64_t x50 = (x49 >> 0x1a);
- uint32_t x51 = ((uint32_t)x49 & 0x3ffffff);
- uint64_t x52 = ((x45 + x38) + x50);
- uint64_t x53 = (x52 >> 0x1b);
- uint32_t x54 = ((uint32_t)x52 & 0x7ffffff);
- uint64_t x55 = (x44 + x50);
- uint64_t x56 = (x55 >> 0x1b);
- uint32_t x57 = ((uint32_t)x55 & 0x7ffffff);
- uint64_t x58 = (x53 + x37);
- uint64_t x59 = (x58 >> 0x1b);
- uint32_t x60 = ((uint32_t)x58 & 0x7ffffff);
- uint64_t x61 = (x56 + x43);
- uint64_t x62 = (x61 >> 0x1b);
- uint32_t x63 = ((uint32_t)x61 & 0x7ffffff);
- uint64_t x64 = (x59 + x36);
- uint64_t x65 = (x64 >> 0x1b);
- uint32_t x66 = ((uint32_t)x64 & 0x7ffffff);
- uint64_t x67 = (x62 + x42);
- uint64_t x68 = (x67 >> 0x1b);
- uint32_t x69 = ((uint32_t)x67 & 0x7ffffff);
- uint64_t x70 = (x65 + x35);
- uint64_t x71 = (x70 >> 0x1b);
- uint32_t x72 = ((uint32_t)x70 & 0x7ffffff);
- uint64_t x73 = (x68 + x41);
- uint64_t x74 = (x73 >> 0x1b);
- uint32_t x75 = ((uint32_t)x73 & 0x7ffffff);
- uint64_t x76 = (x71 + x34);
- uint64_t x77 = (x76 >> 0x1b);
- uint32_t x78 = ((uint32_t)x76 & 0x7ffffff);
- uint64_t x79 = (x74 + x40);
- uint64_t x80 = (x79 >> 0x1b);
- uint32_t x81 = ((uint32_t)x79 & 0x7ffffff);
- uint64_t x82 = (x77 + x51);
- uint32_t x83 = (uint32_t) (x82 >> 0x1a);
- uint32_t x84 = ((uint32_t)x82 & 0x3ffffff);
- uint64_t x85 = (x80 + x46);
- uint32_t x86 = (uint32_t) (x85 >> 0x1a);
- uint32_t x87 = ((uint32_t)x85 & 0x3ffffff);
- uint64_t x88 = (((uint64_t)0x4000000 * x83) + x84);
- uint32_t x89 = (uint32_t) (x88 >> 0x1a);
- uint32_t x90 = ((uint32_t)x88 & 0x3ffffff);
- uint32_t x91 = ((x86 + x54) + x89);
- uint32_t x92 = (x91 >> 0x1b);
- uint32_t x93 = (x91 & 0x7ffffff);
- uint32_t x94 = (x57 + x89);
- uint32_t x95 = (x94 >> 0x1b);
- uint32_t x96 = (x94 & 0x7ffffff);
- return (Return x90, Return x78, Return x72, Return x66, (x92 + x60), Return x93, Return x87, Return x81, Return x75, Return x69, (x95 + x63), Return x96))
-x
- : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesquareDisplay.v b/src/Specific/solinas32_2e322m2e161m1_12limbs/fesquareDisplay.v
deleted file mode 100644
index 65f89f463..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesquareDisplay.v
+++ /dev/null
@@ -1,4 +0,0 @@
-Require Import Crypto.Specific.solinas32_2e322m2e161m1_12limbs.fesquare.
-Require Import Crypto.Specific.Framework.IntegrationTestDisplayCommon.
-
-Check display square.
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesub.c b/src/Specific/solinas32_2e322m2e161m1_12limbs/fesub.c
deleted file mode 100644
index 009fc98df..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesub.c
+++ /dev/null
@@ -1,39 +0,0 @@
-static void fesub(uint32_t out[12], const uint32_t in1[12], const uint32_t in2[12]) {
- { const uint32_t x24 = in1[11];
- { const uint32_t x25 = in1[10];
- { const uint32_t x23 = in1[9];
- { const uint32_t x21 = in1[8];
- { const uint32_t x19 = in1[7];
- { const uint32_t x17 = in1[6];
- { const uint32_t x15 = in1[5];
- { const uint32_t x13 = in1[4];
- { const uint32_t x11 = in1[3];
- { const uint32_t x9 = in1[2];
- { const uint32_t x7 = in1[1];
- { const uint32_t x5 = in1[0];
- { const uint32_t x46 = in2[11];
- { const uint32_t x47 = in2[10];
- { const uint32_t x45 = in2[9];
- { const uint32_t x43 = in2[8];
- { const uint32_t x41 = in2[7];
- { const uint32_t x39 = in2[6];
- { const uint32_t x37 = in2[5];
- { const uint32_t x35 = in2[4];
- { const uint32_t x33 = in2[3];
- { const uint32_t x31 = in2[2];
- { const uint32_t x29 = in2[1];
- { const uint32_t x27 = in2[0];
- out[0] = ((0xffffffe + x5) - x27);
- out[1] = ((0xffffffe + x7) - x29);
- out[2] = ((0xffffffe + x9) - x31);
- out[3] = ((0xffffffe + x11) - x33);
- out[4] = ((0xffffffe + x13) - x35);
- out[5] = ((0x7fffffe + x15) - x37);
- out[6] = ((0xffffffc + x17) - x39);
- out[7] = ((0xffffffe + x19) - x41);
- out[8] = ((0xffffffe + x21) - x43);
- out[9] = ((0xffffffe + x23) - x45);
- out[10] = ((0xffffffe + x25) - x47);
- out[11] = ((0x7fffffe + x24) - x46);
- }}}}}}}}}}}}}}}}}}}}}}}}
-}
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesub.v b/src/Specific/solinas32_2e322m2e161m1_12limbs/fesub.v
deleted file mode 100644
index b364837f1..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesub.v
+++ /dev/null
@@ -1,14 +0,0 @@
-Require Import Crypto.Arithmetic.PrimeFieldTheorems.
-Require Import Crypto.Specific.solinas32_2e322m2e161m1_12limbs.Synthesis.
-
-(* TODO : change this to field once field isomorphism happens *)
-Definition sub :
- { sub : feBW_tight -> feBW_tight -> feBW_loose
- | forall a b, phiBW_loose (sub a b) = F.sub (phiBW_tight a) (phiBW_tight b) }.
-Proof.
- Set Ltac Profiling.
- Time synthesize_sub ().
- Show Ltac Profile.
-Time Defined.
-
-Print Assumptions sub.
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesubDisplay.log b/src/Specific/solinas32_2e322m2e161m1_12limbs/fesubDisplay.log
deleted file mode 100644
index 2374544c9..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesubDisplay.log
+++ /dev/null
@@ -1,7 +0,0 @@
-λ x x0 : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32,
-Interp-η
-(λ var : Syntax.base_type → Type,
- λ '(x24, x25, x23, x21, x19, x17, x15, x13, x11, x9, x7, x5, (x46, x47, x45, x43, x41, x39, x37, x35, x33, x31, x29, x27))%core,
- (((0x7fffffe + x24) - x46), ((0xffffffe + x25) - x47), ((0xffffffe + x23) - x45), ((0xffffffe + x21) - x43), ((0xffffffe + x19) - x41), ((0xffffffc + x17) - x39), ((0x7fffffe + x15) - x37), ((0xffffffe + x13) - x35), ((0xffffffe + x11) - x33), ((0xffffffe + x9) - x31), ((0xffffffe + x7) - x29), ((0xffffffe + x5) - x27)))
-(x, x0)%core
- : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesubDisplay.v b/src/Specific/solinas32_2e322m2e161m1_12limbs/fesubDisplay.v
deleted file mode 100644
index 832850c1c..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/fesubDisplay.v
+++ /dev/null
@@ -1,4 +0,0 @@
-Require Import Crypto.Specific.solinas32_2e322m2e161m1_12limbs.fesub.
-Require Import Crypto.Specific.Framework.IntegrationTestDisplayCommon.
-
-Check display sub.
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/freeze.c b/src/Specific/solinas32_2e322m2e161m1_12limbs/freeze.c
deleted file mode 100644
index 6c821d00d..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/freeze.c
+++ /dev/null
@@ -1,64 +0,0 @@
-static void freeze(uint32_t out[12], const uint32_t in1[12]) {
- { const uint32_t x21 = in1[11];
- { const uint32_t x22 = in1[10];
- { const uint32_t x20 = in1[9];
- { const uint32_t x18 = in1[8];
- { const uint32_t x16 = in1[7];
- { const uint32_t x14 = in1[6];
- { const uint32_t x12 = in1[5];
- { const uint32_t x10 = in1[4];
- { const uint32_t x8 = in1[3];
- { const uint32_t x6 = in1[2];
- { const uint32_t x4 = in1[1];
- { const uint32_t x2 = in1[0];
- { uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x2, 0x7ffffff);
- { uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x4, 0x7ffffff);
- { uint32_t x30, uint8_t x31 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x28, Return x6, 0x7ffffff);
- { uint32_t x33, uint8_t x34 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x31, Return x8, 0x7ffffff);
- { uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x10, 0x7ffffff);
- { uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x12, 0x3ffffff);
- { uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x14, 0x7fffffe);
- { uint32_t x45, uint8_t x46 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x43, Return x16, 0x7ffffff);
- { uint32_t x48, uint8_t x49 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x46, Return x18, 0x7ffffff);
- { uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0x7ffffff);
- { uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x7ffffff);
- { uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x3ffffff);
- { uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
- { uint32_t x60 = (x59 & 0x7ffffff);
- { uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
- { uint32_t x64 = (x59 & 0x7ffffff);
- { uint32_t x66, uint8_t x67 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x63, Return x27, Return x64);
- { uint32_t x68 = (x59 & 0x7ffffff);
- { uint32_t x70, uint8_t x71 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x67, Return x30, Return x68);
- { uint32_t x72 = (x59 & 0x7ffffff);
- { uint32_t x74, uint8_t x75 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x71, Return x33, Return x72);
- { uint32_t x76 = (x59 & 0x7ffffff);
- { uint32_t x78, uint8_t x79 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x36, Return x76);
- { uint32_t x80 = (x59 & 0x3ffffff);
- { uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x79, Return x39, Return x80);
- { uint32_t x84 = (x59 & 0x7fffffe);
- { uint32_t x86, uint8_t x87 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x83, Return x42, Return x84);
- { uint32_t x88 = (x59 & 0x7ffffff);
- { uint32_t x90, uint8_t x91 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x87, Return x45, Return x88);
- { uint32_t x92 = (x59 & 0x7ffffff);
- { uint32_t x94, uint8_t x95 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x91, Return x48, Return x92);
- { uint32_t x96 = (x59 & 0x7ffffff);
- { uint32_t x98, uint8_t x99 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x95, Return x51, Return x96);
- { uint32_t x100 = (x59 & 0x7ffffff);
- { uint32_t x102, uint8_t x103 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x99, Return x54, Return x100);
- { uint32_t x104 = (x59 & 0x3ffffff);
- { uint32_t x106, uint8_t _ = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x103, Return x57, Return x104);
- out[0] = x62;
- out[1] = x66;
- out[2] = x70;
- out[3] = x74;
- out[4] = x78;
- out[5] = x82;
- out[6] = x86;
- out[7] = x90;
- out[8] = x94;
- out[9] = x98;
- out[10] = x102;
- out[11] = x106;
- }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
-}
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/freeze.v b/src/Specific/solinas32_2e322m2e161m1_12limbs/freeze.v
deleted file mode 100644
index 1e640ae0a..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/freeze.v
+++ /dev/null
@@ -1,14 +0,0 @@
-Require Import Crypto.Arithmetic.PrimeFieldTheorems.
-Require Import Crypto.Specific.solinas32_2e322m2e161m1_12limbs.Synthesis.
-
-(* TODO : change this to field once field isomorphism happens *)
-Definition freeze :
- { freeze : feBW_tight -> feBW_limbwidths
- | forall a, phiBW_limbwidths (freeze a) = phiBW_tight a }.
-Proof.
- Set Ltac Profiling.
- Time synthesize_freeze ().
- Show Ltac Profile.
-Time Defined.
-
-Print Assumptions freeze.
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/freezeDisplay.log b/src/Specific/solinas32_2e322m2e161m1_12limbs/freezeDisplay.log
deleted file mode 100644
index 30671ff93..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/freezeDisplay.log
+++ /dev/null
@@ -1,44 +0,0 @@
-λ x : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32,
-Interp-η
-(λ var : Syntax.base_type → Type,
- λ '(x21, x22, x20, x18, x16, x14, x12, x10, x8, x6, x4, x2)%core,
- uint32_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x2, 0x7ffffff);
- uint32_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x25, Return x4, 0x7ffffff);
- uint32_t x30, uint8_t x31 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x28, Return x6, 0x7ffffff);
- uint32_t x33, uint8_t x34 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x31, Return x8, 0x7ffffff);
- uint32_t x36, uint8_t x37 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x34, Return x10, 0x7ffffff);
- uint32_t x39, uint8_t x40 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x37, Return x12, 0x3ffffff);
- uint32_t x42, uint8_t x43 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x40, Return x14, 0x7fffffe);
- uint32_t x45, uint8_t x46 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x43, Return x16, 0x7ffffff);
- uint32_t x48, uint8_t x49 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x46, Return x18, 0x7ffffff);
- uint32_t x51, uint8_t x52 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x49, Return x20, 0x7ffffff);
- uint32_t x54, uint8_t x55 = Op (Syntax.SubWithGetBorrow 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x52, Return x22, 0x7ffffff);
- uint32_t x57, uint8_t x58 = Op (Syntax.SubWithGetBorrow 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x21, 0x3ffffff);
- uint32_t x59 = cmovznz32(x58, 0x0, 0xffffffff);
- uint32_t x60 = (x59 & 0x7ffffff);
- uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x24, Return x60);
- uint32_t x64 = (x59 & 0x7ffffff);
- uint32_t x66, uint8_t x67 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x63, Return x27, Return x64);
- uint32_t x68 = (x59 & 0x7ffffff);
- uint32_t x70, uint8_t x71 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x67, Return x30, Return x68);
- uint32_t x72 = (x59 & 0x7ffffff);
- uint32_t x74, uint8_t x75 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x71, Return x33, Return x72);
- uint32_t x76 = (x59 & 0x7ffffff);
- uint32_t x78, uint8_t x79 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x75, Return x36, Return x76);
- uint32_t x80 = (x59 & 0x3ffffff);
- uint32_t x82, uint8_t x83 = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x79, Return x39, Return x80);
- uint32_t x84 = (x59 & 0x7fffffe);
- uint32_t x86, uint8_t x87 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x83, Return x42, Return x84);
- uint32_t x88 = (x59 & 0x7ffffff);
- uint32_t x90, uint8_t x91 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x87, Return x45, Return x88);
- uint32_t x92 = (x59 & 0x7ffffff);
- uint32_t x94, uint8_t x95 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x91, Return x48, Return x92);
- uint32_t x96 = (x59 & 0x7ffffff);
- uint32_t x98, uint8_t x99 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x95, Return x51, Return x96);
- uint32_t x100 = (x59 & 0x7ffffff);
- uint32_t x102, uint8_t x103 = Op (Syntax.AddWithGetCarry 27 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x99, Return x54, Return x100);
- uint32_t x104 = (x59 & 0x3ffffff);
- uint32_t x106, uint8_t _ = Op (Syntax.AddWithGetCarry 26 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x103, Return x57, Return x104);
- (Return x106, Return x102, Return x98, Return x94, Return x90, Return x86, Return x82, Return x78, Return x74, Return x70, Return x66, Return x62))
-x
- : word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/freezeDisplay.v b/src/Specific/solinas32_2e322m2e161m1_12limbs/freezeDisplay.v
deleted file mode 100644
index f1f929149..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/freezeDisplay.v
+++ /dev/null
@@ -1,4 +0,0 @@
-Require Import Crypto.Specific.solinas32_2e322m2e161m1_12limbs.freeze.
-Require Import Crypto.Specific.Framework.IntegrationTestDisplayCommon.
-
-Check display freeze.
diff --git a/src/Specific/solinas32_2e322m2e161m1_12limbs/py_interpreter.sh b/src/Specific/solinas32_2e322m2e161m1_12limbs/py_interpreter.sh
deleted file mode 100755
index 4652867d2..000000000
--- a/src/Specific/solinas32_2e322m2e161m1_12limbs/py_interpreter.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -eu
-
-/usr/bin/env python3 "$@" -Dq='2**322 - 2**161 - 1' -Dmodulus_bytes='26 + 5/6' -Da24='121665'