From 2e370d1d3288b3dca6c7b20cdd81a376724276a7 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Fri, 3 Nov 2017 13:08:41 -0400 Subject: fibe: Only define bitwidth on the command line We generate the PRI macros and the limb_t type from the bitwidth in the C preprocessor My reasoning here is that generate_parameters.py and the generated *.json files are more user-facing than fibe.c, so we should optimize for cleanliness of that user-facing code. If this is the wrong direction to go in, then this commit should be reverted. --- src/Specific/solinas32_2e221m3/compiler.sh | 2 +- src/Specific/solinas32_2e221m3/compilerxx.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Specific/solinas32_2e221m3') diff --git a/src/Specific/solinas32_2e221m3/compiler.sh b/src/Specific/solinas32_2e221m3/compiler.sh index 0851967f1..943fabf3f 100755 --- a/src/Specific/solinas32_2e221m3/compiler.sh +++ b/src/Specific/solinas32_2e221m3/compiler.sh @@ -1,4 +1,4 @@ #!/bin/sh set -eu -gcc -march=native -mtune=native -std=gnu11 -O3 -flto -fomit-frame-pointer -fwrapv -Wno-attributes -DPRIulimb=PRIu32 -Da24_val='12345' -Dq_mpz='(1_mpz<<221) - 3' -Dlimb_t=uint32_t -Dmodulus_bytes_val='28' -Dlimb_weight_gaps_array='{23,22,22,22,22,22,22,22,22,22}' -Dmodulus_limbs='10' -Dmodulus_array='{0x1f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd}' -DPRIxlimb=PRIx32 -Da24_hex='0x3039' -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,0x30,0x39}' "$@" +gcc -march=native -mtune=native -std=gnu11 -O3 -flto -fomit-frame-pointer -fwrapv -Wno-attributes -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,0x30,0x39}' -Dmodulus_limbs='10' -Da24_val='12345' -Dbitwidth='32' -Dq_mpz='(1_mpz<<221) - 3' -Dlimb_weight_gaps_array='{23,22,22,22,22,22,22,22,22,22}' -Da24_hex='0x3039' -Dmodulus_bytes_val='28' -Dmodulus_array='{0x1f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd}' "$@" diff --git a/src/Specific/solinas32_2e221m3/compilerxx.sh b/src/Specific/solinas32_2e221m3/compilerxx.sh index 725e526ea..d61d91eeb 100755 --- a/src/Specific/solinas32_2e221m3/compilerxx.sh +++ b/src/Specific/solinas32_2e221m3/compilerxx.sh @@ -1,4 +1,4 @@ #!/bin/sh set -eu -g++ -march=native -mtune=native -std=gnu++11 -O3 -flto -fomit-frame-pointer -fwrapv -Wno-attributes -DPRIulimb=PRIu32 -Da24_val='12345' -Dq_mpz='(1_mpz<<221) - 3' -Dlimb_t=uint32_t -Dmodulus_bytes_val='28' -Dlimb_weight_gaps_array='{23,22,22,22,22,22,22,22,22,22}' -Dmodulus_limbs='10' -Dmodulus_array='{0x1f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd}' -DPRIxlimb=PRIx32 -Da24_hex='0x3039' -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,0x30,0x39}' "$@" +g++ -march=native -mtune=native -std=gnu++11 -O3 -flto -fomit-frame-pointer -fwrapv -Wno-attributes -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,0x30,0x39}' -Dmodulus_limbs='10' -Da24_val='12345' -Dbitwidth='32' -Dq_mpz='(1_mpz<<221) - 3' -Dlimb_weight_gaps_array='{23,22,22,22,22,22,22,22,22,22}' -Da24_hex='0x3039' -Dmodulus_bytes_val='28' -Dmodulus_array='{0x1f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd}' "$@" -- cgit v1.2.3