Re-enable fastest family.

relic-toolkit · Nov 10, 2023 · 5aa9c1b · 5aa9c1b
1 parent 33a7ffb
commit 5aa9c1b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/src/ep/relic_ep_param.c b/src/ep/relic_ep_param.c
@@ -1437,8 +1437,8 @@ int ep_param_set_any_endom(void) {
 	//ep_param_set(SG18_P638);
 #endif
 #elif FP_PRIME == 765
-	//ep_param_set(N16_P765);
-	ep_param_set(FM16_P765);
+	ep_param_set(N16_P765);
+	//ep_param_set(FM16_P765);
 #elif FP_PRIME == 766
 	ep_param_set(K16_P766);
 #else

diff --git a/src/fp/relic_fp_param.c b/src/fp/relic_fp_param.c
@@ -797,8 +797,8 @@ int fp_param_set_any_tower(void) {
 	//fp_param_set(SG18_638);
 #endif
 #elif FP_PRIME == 765
-	//fp_param_set(N16_765);
-	fp_param_set(FM16_765);
+	fp_param_set(N16_765);
+	//fp_param_set(FM16_765);
 #elif FP_PRIME == 766
 	fp_param_set(K16_766);
 #elif FP_PRIME == 1536

diff --git a/src/low/x64-asm-12l/macro.s b/src/low/x64-asm-12l/macro.s
@@ -47,7 +47,7 @@
 #define P11 0x3C410B7E6EC19106
 #define U0	0xC18CA908C52344BB
 #elif FP_PRIME == 765
-/* AFG16-765
+/* AFG16-765 */
 #define P0	0x0000000000000001
 #define P1	0x00000000384F0100
 #define P2	0x7D00000000000000
@@ -58,10 +58,10 @@
 #define P7	0xEE9C1E7F21BD9E92
 #define P8	0x249F514A2A836FBF
 #define P9	0x8866F5670199231B
-#define P10 0xB2847B1232833CC3
-#define P11 0x16FAB993B0C96754
+#define P10	0xB2847B1232833CC3
+#define P11	0x16FAB993B0C96754
 #define U0	0xFFFFFFFFFFFFFFFF
-*/
+/* FM16-765
 #define P0	0x1000EFC080000001
 #define P1	0x0000000038223FF0
 #define P2	0x0000000000000000
@@ -75,6 +75,7 @@
 #define P10 0xBC5664C6F237BCB4
 #define P11 0x166A30BEAF4CE221
 #define U0	0xD000EFC07FFFFFFF
+*/
 #endif
 
 #if defined(__APPLE__)
@@ -208,7 +209,7 @@
 
 .macro _RDCN0 i, j, k, R0, R1, R2 A, P
 	movq	8*\i(\A), %rax
-#if U0 != 0xFFFFFFFFFFFFFF
+#if U0 == 0xFFFFFFFFFFFFFF
 	.if \j != 2
 		mulq	8*\j(\P)
 		addq	%rax, \R0
@@ -253,7 +254,7 @@
 .endm
 
 .macro _RDCN1 i, j, k, l, R0, R1, R2 A, P
-#if U0 != 0xFFFFFFFFFFFFFF
+#if U0 == 0xFFFFFFFFFFFFFF
 	.if \j != 2
 		movq	8*\i(\A), %rax
 		mulq	8*\j(\P)
@@ -344,9 +345,7 @@
 
 	subq	p0(%rip), %r11
 	sbbq	p1(%rip), %r12
-#if U0 == 0xFFFFFFFFFFFFFF
 	sbbq	p2(%rip), %r13
-#endif
 	sbbq	p3(%rip), %r14
 	sbbq	p4(%rip), %r15
 	sbbq	p5(%rip), %rcx