From 3ca227f1137e6a3b65bc33f5689e1c230d591595 Mon Sep 17 00:00:00 2001 From: Andres Erbsen Date: Tue, 8 Jan 2019 04:21:38 -0500 Subject: remove old pipeline --- .../solinas64_2e158m15_3limbs/CurveParameters.v | 39 ---------------------- src/Specific/solinas64_2e158m15_3limbs/Synthesis.v | 9 ----- src/Specific/solinas64_2e158m15_3limbs/compiler.sh | 4 --- .../solinas64_2e158m15_3limbs/compilerxx.sh | 4 --- src/Specific/solinas64_2e158m15_3limbs/feadd.c | 12 ------- src/Specific/solinas64_2e158m15_3limbs/feadd.v | 14 -------- .../solinas64_2e158m15_3limbs/feaddDisplay.log | 7 ---- .../solinas64_2e158m15_3limbs/feaddDisplay.v | 4 --- src/Specific/solinas64_2e158m15_3limbs/fecarry.v | 14 -------- .../solinas64_2e158m15_3limbs/fecarryDisplay.v | 4 --- src/Specific/solinas64_2e158m15_3limbs/femul.c | 29 ---------------- src/Specific/solinas64_2e158m15_3limbs/femul.v | 14 -------- .../solinas64_2e158m15_3limbs/femulDisplay.log | 24 ------------- .../solinas64_2e158m15_3limbs/femulDisplay.v | 4 --- src/Specific/solinas64_2e158m15_3limbs/fesquare.c | 26 --------------- src/Specific/solinas64_2e158m15_3limbs/fesquare.v | 14 -------- .../solinas64_2e158m15_3limbs/fesquareDisplay.log | 24 ------------- .../solinas64_2e158m15_3limbs/fesquareDisplay.v | 4 --- src/Specific/solinas64_2e158m15_3limbs/fesub.c | 12 ------- src/Specific/solinas64_2e158m15_3limbs/fesub.v | 14 -------- .../solinas64_2e158m15_3limbs/fesubDisplay.log | 7 ---- .../solinas64_2e158m15_3limbs/fesubDisplay.v | 4 --- src/Specific/solinas64_2e158m15_3limbs/freeze.c | 19 ----------- src/Specific/solinas64_2e158m15_3limbs/freeze.v | 14 -------- .../solinas64_2e158m15_3limbs/freezeDisplay.log | 17 ---------- .../solinas64_2e158m15_3limbs/freezeDisplay.v | 4 --- .../solinas64_2e158m15_3limbs/py_interpreter.sh | 4 --- 27 files changed, 345 deletions(-) delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/CurveParameters.v delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/Synthesis.v delete mode 100755 src/Specific/solinas64_2e158m15_3limbs/compiler.sh delete mode 100755 src/Specific/solinas64_2e158m15_3limbs/compilerxx.sh delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/feadd.c delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/feadd.v delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/feaddDisplay.log delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/feaddDisplay.v delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/fecarry.v delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/fecarryDisplay.v delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/femul.c delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/femul.v delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/femulDisplay.log delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/femulDisplay.v delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/fesquare.c delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/fesquare.v delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/fesquareDisplay.log delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/fesquareDisplay.v delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/fesub.c delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/fesub.v delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/fesubDisplay.log delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/fesubDisplay.v delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/freeze.c delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/freeze.v delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/freezeDisplay.log delete mode 100644 src/Specific/solinas64_2e158m15_3limbs/freezeDisplay.v delete mode 100755 src/Specific/solinas64_2e158m15_3limbs/py_interpreter.sh (limited to 'src/Specific/solinas64_2e158m15_3limbs') diff --git a/src/Specific/solinas64_2e158m15_3limbs/CurveParameters.v b/src/Specific/solinas64_2e158m15_3limbs/CurveParameters.v deleted file mode 100644 index 6c2984501..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/CurveParameters.v +++ /dev/null @@ -1,39 +0,0 @@ -Require Import Crypto.Specific.Framework.RawCurveParameters. -Require Import Crypto.Util.LetIn. - -(*** -Modulus : 2^158 - 15 -Base: 52 + 2/3 -***) - -Definition curve : CurveParameters := - {| - sz := 3%nat; - base := 52 + 2/3; - bitwidth := 64; - s := 2^158; - c := [(1, 15)]; - carry_chains := Some [seq 0 (pred 3); [0; 1]]%nat; - - a24 := None; - coef_div_modulus := Some 2%nat; - - goldilocks := None; - 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/solinas64_2e158m15_3limbs/Synthesis.v b/src/Specific/solinas64_2e158m15_3limbs/Synthesis.v deleted file mode 100644 index f5a132fe0..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/Synthesis.v +++ /dev/null @@ -1,9 +0,0 @@ -Require Import Crypto.Specific.Framework.SynthesisFramework. -Require Import Crypto.Specific.solinas64_2e158m15_3limbs.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/solinas64_2e158m15_3limbs/compiler.sh b/src/Specific/solinas64_2e158m15_3limbs/compiler.sh deleted file mode 100755 index 1137388ac..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/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,0x30,0x39}' -Dbitwidth='64' -Dlimb_weight_gaps_array='{53,53,52}' -Dmodulus_array='{0x3f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf1}' -Dmodulus_bytes_val='20' -Dmodulus_limbs='3' -Dq_mpz='(1_mpz<<158) - 15' "$@" diff --git a/src/Specific/solinas64_2e158m15_3limbs/compilerxx.sh b/src/Specific/solinas64_2e158m15_3limbs/compilerxx.sh deleted file mode 100755 index 7ffd36d7f..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/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,0x30,0x39}' -Dbitwidth='64' -Dlimb_weight_gaps_array='{53,53,52}' -Dmodulus_array='{0x3f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf1}' -Dmodulus_bytes_val='20' -Dmodulus_limbs='3' -Dq_mpz='(1_mpz<<158) - 15' "$@" diff --git a/src/Specific/solinas64_2e158m15_3limbs/feadd.c b/src/Specific/solinas64_2e158m15_3limbs/feadd.c deleted file mode 100644 index 725c1f205..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/feadd.c +++ /dev/null @@ -1,12 +0,0 @@ -static void feadd(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3]) { - { const uint64_t x6 = in1[2]; - { const uint64_t x7 = in1[1]; - { const uint64_t x5 = in1[0]; - { const uint64_t x10 = in2[2]; - { const uint64_t x11 = in2[1]; - { const uint64_t x9 = in2[0]; - out[0] = (x5 + x9); - out[1] = (x7 + x11); - out[2] = (x6 + x10); - }}}}}} -} diff --git a/src/Specific/solinas64_2e158m15_3limbs/feadd.v b/src/Specific/solinas64_2e158m15_3limbs/feadd.v deleted file mode 100644 index ff07bbc36..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/feadd.v +++ /dev/null @@ -1,14 +0,0 @@ -Require Import Crypto.Arithmetic.PrimeFieldTheorems. -Require Import Crypto.Specific.solinas64_2e158m15_3limbs.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/solinas64_2e158m15_3limbs/feaddDisplay.log b/src/Specific/solinas64_2e158m15_3limbs/feaddDisplay.log deleted file mode 100644 index 64fb467ef..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/feaddDisplay.log +++ /dev/null @@ -1,7 +0,0 @@ -λ x x0 : word64 * word64 * word64, -Interp-η -(λ var : Syntax.base_type → Type, - λ '(x6, x7, x5, (x10, x11, x9))%core, - ((x6 + x10), (x7 + x11), (x5 + x9))) -(x, x0)%core - : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t) diff --git a/src/Specific/solinas64_2e158m15_3limbs/feaddDisplay.v b/src/Specific/solinas64_2e158m15_3limbs/feaddDisplay.v deleted file mode 100644 index ff85c5dd9..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/feaddDisplay.v +++ /dev/null @@ -1,4 +0,0 @@ -Require Import Crypto.Specific.solinas64_2e158m15_3limbs.feadd. -Require Import Crypto.Specific.Framework.IntegrationTestDisplayCommon. - -Check display add. diff --git a/src/Specific/solinas64_2e158m15_3limbs/fecarry.v b/src/Specific/solinas64_2e158m15_3limbs/fecarry.v deleted file mode 100644 index 55205b9e4..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/fecarry.v +++ /dev/null @@ -1,14 +0,0 @@ -Require Import Crypto.Arithmetic.PrimeFieldTheorems. -Require Import Crypto.Specific.solinas64_2e158m15_3limbs.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/solinas64_2e158m15_3limbs/fecarryDisplay.v b/src/Specific/solinas64_2e158m15_3limbs/fecarryDisplay.v deleted file mode 100644 index c5267b88c..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/fecarryDisplay.v +++ /dev/null @@ -1,4 +0,0 @@ -Require Import Crypto.Specific.solinas64_2e158m15_3limbs.fecarry. -Require Import Crypto.Specific.Framework.IntegrationTestDisplayCommon. - -Check display carry. diff --git a/src/Specific/solinas64_2e158m15_3limbs/femul.c b/src/Specific/solinas64_2e158m15_3limbs/femul.c deleted file mode 100644 index f45007cd1..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/femul.c +++ /dev/null @@ -1,29 +0,0 @@ -static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3]) { - { const uint64_t x6 = in1[2]; - { const uint64_t x7 = in1[1]; - { const uint64_t x5 = in1[0]; - { const uint64_t x10 = in2[2]; - { const uint64_t x11 = in2[1]; - { const uint64_t x9 = in2[0]; - { uint128_t x12 = (((uint128_t)x5 * x10) + (((uint128_t)x7 * x11) + ((uint128_t)x6 * x9))); - { uint128_t x13 = ((((uint128_t)x5 * x11) + ((uint128_t)x7 * x9)) + (0xf * (0x2 * ((uint128_t)x6 * x10)))); - { uint128_t x14 = (((uint128_t)x5 * x9) + (0xf * ((0x2 * ((uint128_t)x7 * x10)) + (0x2 * ((uint128_t)x6 * x11))))); - { uint64_t x15 = (uint64_t) (x14 >> 0x35); - { uint64_t x16 = ((uint64_t)x14 & 0x1fffffffffffff); - { uint128_t x17 = (x15 + x13); - { uint64_t x18 = (uint64_t) (x17 >> 0x35); - { uint64_t x19 = ((uint64_t)x17 & 0x1fffffffffffff); - { uint128_t x20 = (x18 + x12); - { uint64_t x21 = (uint64_t) (x20 >> 0x34); - { uint64_t x22 = ((uint64_t)x20 & 0xfffffffffffff); - { uint64_t x23 = (x16 + (0xf * x21)); - { uint64_t x24 = (x23 >> 0x35); - { uint64_t x25 = (x23 & 0x1fffffffffffff); - { uint64_t x26 = (x24 + x19); - { uint64_t x27 = (x26 >> 0x35); - { uint64_t x28 = (x26 & 0x1fffffffffffff); - out[0] = x25; - out[1] = x28; - out[2] = (x27 + x22); - }}}}}}}}}}}}}}}}}}}}}}} -} diff --git a/src/Specific/solinas64_2e158m15_3limbs/femul.v b/src/Specific/solinas64_2e158m15_3limbs/femul.v deleted file mode 100644 index 7f070ee75..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/femul.v +++ /dev/null @@ -1,14 +0,0 @@ -Require Import Crypto.Arithmetic.PrimeFieldTheorems. -Require Import Crypto.Specific.solinas64_2e158m15_3limbs.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/solinas64_2e158m15_3limbs/femulDisplay.log b/src/Specific/solinas64_2e158m15_3limbs/femulDisplay.log deleted file mode 100644 index f6e415238..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/femulDisplay.log +++ /dev/null @@ -1,24 +0,0 @@ -λ x x0 : word64 * word64 * word64, -Interp-η -(λ var : Syntax.base_type → Type, - λ '(x6, x7, x5, (x10, x11, x9))%core, - uint128_t x12 = (((uint128_t)x5 * x10) + (((uint128_t)x7 * x11) + ((uint128_t)x6 * x9))); - uint128_t x13 = ((((uint128_t)x5 * x11) + ((uint128_t)x7 * x9)) + (0xf * (0x2 * ((uint128_t)x6 * x10)))); - uint128_t x14 = (((uint128_t)x5 * x9) + (0xf * ((0x2 * ((uint128_t)x7 * x10)) + (0x2 * ((uint128_t)x6 * x11))))); - uint64_t x15 = (uint64_t) (x14 >> 0x35); - uint64_t x16 = ((uint64_t)x14 & 0x1fffffffffffff); - uint128_t x17 = (x15 + x13); - uint64_t x18 = (uint64_t) (x17 >> 0x35); - uint64_t x19 = ((uint64_t)x17 & 0x1fffffffffffff); - uint128_t x20 = (x18 + x12); - uint64_t x21 = (uint64_t) (x20 >> 0x34); - uint64_t x22 = ((uint64_t)x20 & 0xfffffffffffff); - uint64_t x23 = (x16 + (0xf * x21)); - uint64_t x24 = (x23 >> 0x35); - uint64_t x25 = (x23 & 0x1fffffffffffff); - uint64_t x26 = (x24 + x19); - uint64_t x27 = (x26 >> 0x35); - uint64_t x28 = (x26 & 0x1fffffffffffff); - return ((x27 + x22), Return x28, Return x25)) -(x, x0)%core - : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t) diff --git a/src/Specific/solinas64_2e158m15_3limbs/femulDisplay.v b/src/Specific/solinas64_2e158m15_3limbs/femulDisplay.v deleted file mode 100644 index b6c590207..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/femulDisplay.v +++ /dev/null @@ -1,4 +0,0 @@ -Require Import Crypto.Specific.solinas64_2e158m15_3limbs.femul. -Require Import Crypto.Specific.Framework.IntegrationTestDisplayCommon. - -Check display mul. diff --git a/src/Specific/solinas64_2e158m15_3limbs/fesquare.c b/src/Specific/solinas64_2e158m15_3limbs/fesquare.c deleted file mode 100644 index 96cd9d1bc..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/fesquare.c +++ /dev/null @@ -1,26 +0,0 @@ -static void fesquare(uint64_t out[3], const uint64_t in1[3]) { - { const uint64_t x3 = in1[2]; - { const uint64_t x4 = in1[1]; - { const uint64_t x2 = in1[0]; - { uint128_t x5 = (((uint128_t)x2 * x3) + (((uint128_t)x4 * x4) + ((uint128_t)x3 * x2))); - { uint128_t x6 = ((((uint128_t)x2 * x4) + ((uint128_t)x4 * x2)) + (0xf * (0x2 * ((uint128_t)x3 * x3)))); - { uint128_t x7 = (((uint128_t)x2 * x2) + (0xf * ((0x2 * ((uint128_t)x4 * x3)) + (0x2 * ((uint128_t)x3 * x4))))); - { uint64_t x8 = (uint64_t) (x7 >> 0x35); - { uint64_t x9 = ((uint64_t)x7 & 0x1fffffffffffff); - { uint128_t x10 = (x8 + x6); - { uint64_t x11 = (uint64_t) (x10 >> 0x35); - { uint64_t x12 = ((uint64_t)x10 & 0x1fffffffffffff); - { uint128_t x13 = (x11 + x5); - { uint64_t x14 = (uint64_t) (x13 >> 0x34); - { uint64_t x15 = ((uint64_t)x13 & 0xfffffffffffff); - { uint64_t x16 = (x9 + (0xf * x14)); - { uint64_t x17 = (x16 >> 0x35); - { uint64_t x18 = (x16 & 0x1fffffffffffff); - { uint64_t x19 = (x17 + x12); - { uint64_t x20 = (x19 >> 0x35); - { uint64_t x21 = (x19 & 0x1fffffffffffff); - out[0] = x18; - out[1] = x21; - out[2] = (x20 + x15); - }}}}}}}}}}}}}}}}}}}} -} diff --git a/src/Specific/solinas64_2e158m15_3limbs/fesquare.v b/src/Specific/solinas64_2e158m15_3limbs/fesquare.v deleted file mode 100644 index 776e4ba4c..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/fesquare.v +++ /dev/null @@ -1,14 +0,0 @@ -Require Import Crypto.Arithmetic.PrimeFieldTheorems. -Require Import Crypto.Specific.solinas64_2e158m15_3limbs.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/solinas64_2e158m15_3limbs/fesquareDisplay.log b/src/Specific/solinas64_2e158m15_3limbs/fesquareDisplay.log deleted file mode 100644 index 003397707..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/fesquareDisplay.log +++ /dev/null @@ -1,24 +0,0 @@ -λ x : word64 * word64 * word64, -Interp-η -(λ var : Syntax.base_type → Type, - λ '(x3, x4, x2)%core, - uint128_t x5 = (((uint128_t)x2 * x3) + (((uint128_t)x4 * x4) + ((uint128_t)x3 * x2))); - uint128_t x6 = ((((uint128_t)x2 * x4) + ((uint128_t)x4 * x2)) + (0xf * (0x2 * ((uint128_t)x3 * x3)))); - uint128_t x7 = (((uint128_t)x2 * x2) + (0xf * ((0x2 * ((uint128_t)x4 * x3)) + (0x2 * ((uint128_t)x3 * x4))))); - uint64_t x8 = (uint64_t) (x7 >> 0x35); - uint64_t x9 = ((uint64_t)x7 & 0x1fffffffffffff); - uint128_t x10 = (x8 + x6); - uint64_t x11 = (uint64_t) (x10 >> 0x35); - uint64_t x12 = ((uint64_t)x10 & 0x1fffffffffffff); - uint128_t x13 = (x11 + x5); - uint64_t x14 = (uint64_t) (x13 >> 0x34); - uint64_t x15 = ((uint64_t)x13 & 0xfffffffffffff); - uint64_t x16 = (x9 + (0xf * x14)); - uint64_t x17 = (x16 >> 0x35); - uint64_t x18 = (x16 & 0x1fffffffffffff); - uint64_t x19 = (x17 + x12); - uint64_t x20 = (x19 >> 0x35); - uint64_t x21 = (x19 & 0x1fffffffffffff); - return ((x20 + x15), Return x21, Return x18)) -x - : word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t) diff --git a/src/Specific/solinas64_2e158m15_3limbs/fesquareDisplay.v b/src/Specific/solinas64_2e158m15_3limbs/fesquareDisplay.v deleted file mode 100644 index 7e2b0aeed..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/fesquareDisplay.v +++ /dev/null @@ -1,4 +0,0 @@ -Require Import Crypto.Specific.solinas64_2e158m15_3limbs.fesquare. -Require Import Crypto.Specific.Framework.IntegrationTestDisplayCommon. - -Check display square. diff --git a/src/Specific/solinas64_2e158m15_3limbs/fesub.c b/src/Specific/solinas64_2e158m15_3limbs/fesub.c deleted file mode 100644 index 54d3f502f..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/fesub.c +++ /dev/null @@ -1,12 +0,0 @@ -static void fesub(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3]) { - { const uint64_t x6 = in1[2]; - { const uint64_t x7 = in1[1]; - { const uint64_t x5 = in1[0]; - { const uint64_t x10 = in2[2]; - { const uint64_t x11 = in2[1]; - { const uint64_t x9 = in2[0]; - out[0] = ((0x3fffffffffffe2 + x5) - x9); - out[1] = ((0x3ffffffffffffe + x7) - x11); - out[2] = ((0x1ffffffffffffe + x6) - x10); - }}}}}} -} diff --git a/src/Specific/solinas64_2e158m15_3limbs/fesub.v b/src/Specific/solinas64_2e158m15_3limbs/fesub.v deleted file mode 100644 index 6df1c169a..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/fesub.v +++ /dev/null @@ -1,14 +0,0 @@ -Require Import Crypto.Arithmetic.PrimeFieldTheorems. -Require Import Crypto.Specific.solinas64_2e158m15_3limbs.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/solinas64_2e158m15_3limbs/fesubDisplay.log b/src/Specific/solinas64_2e158m15_3limbs/fesubDisplay.log deleted file mode 100644 index 05695579b..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/fesubDisplay.log +++ /dev/null @@ -1,7 +0,0 @@ -λ x x0 : word64 * word64 * word64, -Interp-η -(λ var : Syntax.base_type → Type, - λ '(x6, x7, x5, (x10, x11, x9))%core, - (((0x1ffffffffffffe + x6) - x10), ((0x3ffffffffffffe + x7) - x11), ((0x3fffffffffffe2 + x5) - x9))) -(x, x0)%core - : word64 * word64 * word64 → word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t) diff --git a/src/Specific/solinas64_2e158m15_3limbs/fesubDisplay.v b/src/Specific/solinas64_2e158m15_3limbs/fesubDisplay.v deleted file mode 100644 index 81f92d6a8..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/fesubDisplay.v +++ /dev/null @@ -1,4 +0,0 @@ -Require Import Crypto.Specific.solinas64_2e158m15_3limbs.fesub. -Require Import Crypto.Specific.Framework.IntegrationTestDisplayCommon. - -Check display sub. diff --git a/src/Specific/solinas64_2e158m15_3limbs/freeze.c b/src/Specific/solinas64_2e158m15_3limbs/freeze.c deleted file mode 100644 index d6722b135..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/freeze.c +++ /dev/null @@ -1,19 +0,0 @@ -static void freeze(uint64_t out[3], const uint64_t in1[3]) { - { const uint64_t x3 = in1[2]; - { const uint64_t x4 = in1[1]; - { const uint64_t x2 = in1[0]; - { uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x1ffffffffffff1); - { uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x1fffffffffffff); - { uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0xfffffffffffff); - { uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL); - { uint64_t x15 = (x14 & 0x1ffffffffffff1); - { uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15); - { uint64_t x19 = (x14 & 0x1fffffffffffff); - { uint64_t x21, uint8_t x22 = Op (Syntax.AddWithGetCarry 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x18, Return x9, Return x19); - { uint64_t x23 = (x14 & 0xfffffffffffff); - { uint64_t x25, uint8_t _ = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x12, Return x23); - out[0] = x17; - out[1] = x21; - out[2] = x25; - }}}}}}}}}}}}} -} diff --git a/src/Specific/solinas64_2e158m15_3limbs/freeze.v b/src/Specific/solinas64_2e158m15_3limbs/freeze.v deleted file mode 100644 index 33ba9bb68..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/freeze.v +++ /dev/null @@ -1,14 +0,0 @@ -Require Import Crypto.Arithmetic.PrimeFieldTheorems. -Require Import Crypto.Specific.solinas64_2e158m15_3limbs.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/solinas64_2e158m15_3limbs/freezeDisplay.log b/src/Specific/solinas64_2e158m15_3limbs/freezeDisplay.log deleted file mode 100644 index 4345bf25c..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/freezeDisplay.log +++ /dev/null @@ -1,17 +0,0 @@ -λ x : word64 * word64 * word64, -Interp-η -(λ var : Syntax.base_type → Type, - λ '(x3, x4, x2)%core, - uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x1ffffffffffff1); - uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x1fffffffffffff); - uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0xfffffffffffff); - uint64_t x14 = cmovznz64(x13, 0x0, 0xffffffffffffffffL); - uint64_t x15 = (x14 & 0x1ffffffffffff1); - uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15); - uint64_t x19 = (x14 & 0x1fffffffffffff); - uint64_t x21, uint8_t x22 = Op (Syntax.AddWithGetCarry 53 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x18, Return x9, Return x19); - uint64_t x23 = (x14 & 0xfffffffffffff); - uint64_t x25, uint8_t _ = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x12, Return x23); - (Return x25, Return x21, Return x17)) -x - : word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t) diff --git a/src/Specific/solinas64_2e158m15_3limbs/freezeDisplay.v b/src/Specific/solinas64_2e158m15_3limbs/freezeDisplay.v deleted file mode 100644 index c5ffd962d..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/freezeDisplay.v +++ /dev/null @@ -1,4 +0,0 @@ -Require Import Crypto.Specific.solinas64_2e158m15_3limbs.freeze. -Require Import Crypto.Specific.Framework.IntegrationTestDisplayCommon. - -Check display freeze. diff --git a/src/Specific/solinas64_2e158m15_3limbs/py_interpreter.sh b/src/Specific/solinas64_2e158m15_3limbs/py_interpreter.sh deleted file mode 100755 index 9ff818a21..000000000 --- a/src/Specific/solinas64_2e158m15_3limbs/py_interpreter.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -set -eu - -/usr/bin/env python3 "$@" -Dq='2**158 - 15' -Dmodulus_bytes='52 + 2/3' -Da24='121665' -- cgit v1.2.3