Merge branch 'master' of https://github.com/virtualsecureplatform/TFHEpp

virtualsecureplatform · Aug 29, 2024 · 3bc44a7 · 3bc44a7
2 parents 91c47a4 + 5207698
commit 3bc44a7
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/thirdparties/randen/vector128.h b/thirdparties/randen/vector128.h
@@ -29,7 +29,7 @@
 #define RANDEN_BIG_ENDIAN 1
 #include <altivec.h>
 
-#elif defined(__ARM_NEON) && defined(__ARM_FEATURE_CRYPTO)
+#elif defined(__ARM_NEON) && defined(__ARM_FEATURE_AES)
 
 #define RANDEN_ARM 1
 #include <arm_neon.h>

diff --git a/thirdparties/spqliox_aarch64/fft_processor_spqliox_aarch64.cpp b/thirdparties/spqliox_aarch64/fft_processor_spqliox_aarch64.cpp
@@ -193,6 +193,17 @@ void FFT_Processor_Spqliox_AArch64::execute_reverse_int(double *res,
     for (size_t i = 0; i < N; i++) res[i] = real_inout[i];
 }
 
+void FFT_Processor_Spqliox_AArch64::execute_reverse_uint(double *res,
+                                                         const uint32_t *a)
+{
+    for (size_t i = 0; i < N; i++) real_inout[i] = (double)a[i];
+
+    ifft_(real_inout, NULL, NULL, &tables_reverse_, real_inout,
+          table_negation_reverse_.trig_tables);
+
+    for (size_t i = 0; i < N; i++) res[i] = real_inout[i];
+}
+
 void FFT_Processor_Spqliox_AArch64::execute_reverse_torus32(double *res,
                                                             const uint32_t *a)
 {
@@ -236,7 +247,21 @@ void FFT_Processor_Spqliox_AArch64::execute_direct_torus32_rescale(
     fft_(dst, sit, send, bla, &tables_direct_, real_inout,
          table_negation_forward_.trig_tables);
     for (int32_t i = 0; i < N; i++)
-        res[i] = uint32_t(int64_t(real_inout[i] / (Δ / 4)));
+        res[i] = uint32_t(int64_t(real_inout[i] / Δ));
+}
+
+void FFT_Processor_Spqliox_AArch64::execute_direct_torus64_rescale(
+    uint64_t *res, const double *a, const double Δ)
+{
+    const double *sit = a;
+    const double *send = a + N;
+    static const double _2sN = double(2) / double(N);
+    const double *bla = &_2sN;
+    double *dst = real_inout;
+    fft_(dst, sit, send, bla, &tables_direct_, real_inout,
+         table_negation_forward_.trig_tables);
+    for (int32_t i = 0; i < N; i++)
+        res[i] = uint64_t(int64_t(real_inout[i] / Δ));
 }
 
 void FFT_Processor_Spqliox_AArch64::execute_direct_torus64(uint64_t *res,
@@ -267,4 +292,4 @@ void FFT_Processor_Spqliox_AArch64::execute_direct_torus64(uint64_t *res,
 FFT_Processor_Spqliox_AArch64::~FFT_Processor_Spqliox_AArch64() {}
 
 thread_local FFT_Processor_Spqliox_AArch64 fftplvl1(TFHEpp::lvl1param::n);
-thread_local FFT_Processor_Spqliox_AArch64 fftplvl2(TFHEpp::lvl2param::n);
+thread_local FFT_Processor_Spqliox_AArch64 fftplvl2(TFHEpp::lvl2param::n);
diff --git a/thirdparties/spqliox_aarch64/fft_processor_spqliox_aarch64.h b/thirdparties/spqliox_aarch64/fft_processor_spqliox_aarch64.h
@@ -34,13 +34,18 @@ class FFT_Processor_Spqliox_AArch64 {
 
     void execute_reverse_int(double *res, const int32_t *a);
 
+    void execute_reverse_uint(double *res, const uint32_t *a);
+
     void execute_reverse_torus32(double *res, const uint32_t *a);
 
     void execute_direct_torus32(uint32_t *res, const double *a);
 
     void execute_direct_torus32_rescale(uint32_t *res, const double *a,
                                         const double Δ);
 
+    void execute_direct_torus64_rescale(uint64_t *res, const double *a,
+                                        const double Δ);
+
     void execute_reverse_torus64(double *res, const uint64_t *a);
 
     void execute_direct_torus64(uint64_t *res, const double *a);
@@ -49,4 +54,4 @@ class FFT_Processor_Spqliox_AArch64 {
 };
 
 extern thread_local FFT_Processor_Spqliox_AArch64 fftplvl1;
-extern thread_local FFT_Processor_Spqliox_AArch64 fftplvl2;
+extern thread_local FFT_Processor_Spqliox_AArch64 fftplvl2;