compile fixes

osu-crypto · Nov 4, 2023 · 3dfeb8a · 3dfeb8a
1 parent cfa4726
commit 3dfeb8a
Show file tree

Hide file tree

Showing 12 changed files with 1,779 additions and 1,988 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -8,10 +8,11 @@
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/out/build/${presetName}",
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+        "FETCH_AUTO": true,
         "ENABLE_ALL_OT": true,
-        "ENABLE_SSE": false,
-        "ENABLE_AVX": false,
+        "ENABLE_SSE": true,
+        "ENABLE_AVX": true,
         "ENABLE_BITPOLYMUL": false,
         "LIBOTE_STD_VER": "17",
         "CMAKE_PREFIX_PATH": "${sourceDir}/../out/install",
@@ -51,7 +52,7 @@
         "VERBOSE_FETCH": true,
         "ENABLE_SSE": true,
         "ENABLE_AVX": true,
-        "ENABLE_ASAN": true,
+        "ENABLE_ASAN": false,
         "COPROTO_ENABLE_BOOST": true,
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}",
         "CMAKE_PREFIX_PATH": "${sourceDir}/../out/install/${presetName}"

diff --git a/cryptoTools b/cryptoTools
diff --git a/libOTe/Tools/ExConvCode/ExConvCode.cpp b/libOTe/Tools/ExConvCode/ExConvCode.cpp
@@ -297,7 +297,11 @@ namespace osuCrypto
         u64 j = i + 1;
         if (width)
         {
-            auto xii = _mm_load_ps((float*)(xx + i));
+            My__m128 xii;
+            if constexpr (std::is_same<T,block>::value)
+                xii = _mm_load_ps((float*)(xx + i));
+            else
+                xii = _mm_setzero_ps();
 
             if (q + width > qe)
             {
@@ -349,8 +353,15 @@ namespace osuCrypto
         u64 j = i + 1;
         if (width)
         {
-            auto xii0 = _mm_load_ps((float*)(xx0 + i));
-            auto xii1 = _mm_load_ps((float*)(xx1 + i));
+            My__m128 xii0, xii1;
+            if constexpr (std::is_same<block, T0>::value)
+                xii0 = _mm_load_ps((float*)(xx0 + i));
+            else
+                xii0 = _mm_setzero_ps();
+            if constexpr (std::is_same<block, T1>::value)
+                xii1 = _mm_load_ps((float*)(xx1 + i));
+            else
+                xii1 = _mm_setzero_ps();
 
             if (q + width > qe)
             {
+1 −1		cryptoTools/Common/Aligned.h
+3 −0		cryptoTools/Common/Timer.h
+1 −0		cryptoTools/Crypto/AES.h